jenkins-bot has submitted this change and it was merged. Change subject: Bottom Navbar Styles ......................................................................
Bottom Navbar Styles Make a nicer execute button Move query totals to the left (better responsiveness) Insert margin to dropdown icons Change-Id: I29b28d14d78507808d681a898d3684d527fa7650 --- M gui/index.html M gui/style.css M gui/wikibase/queryService/ui/App.js 3 files changed, 17 insertions(+), 10 deletions(-) Approvals: Smalyshev: Looks good to me, approved jenkins-bot: Verified diff --git a/gui/index.html b/gui/index.html index 313af58..499ec8f 100644 --- a/gui/index.html +++ b/gui/index.html @@ -69,14 +69,17 @@ <nav class="navbar navbar-default"> <div class="navbar-form navbar-left"> <div class="form-group"> - <input class="btn btn-default" type="submit" id="execute-button" value="Execute"> <input class="btn btn-default" type="reset" id="clear-button" value="Clear"> + <button type="submit" class="btn btn-danger" id="execute-button" value="Execute"> + <span class="glyphicon glyphicon-play" aria-hidden="true"></span> Execute + </button> + <input class="btn btn-default" type="reset" id="clear-button" value="Clear"> + <span class="query-total"><span class="label label-primary"><span id="total-results"></span> Results</span> <span> + <span class="label label-info">in <span id="query-time"></span> ms + </span> + </span> </span> </div> </div> - <ul class="nav navbar-nav navbar-right" id="total"> - <li class="navbar-text"><span class="label label-primary"><span id="total-results"></span> Results</span> <span> <span class="label label-info">in <span id="query-time"></span> - ms - </span> - </span></li> + <ul class="nav navbar-nav navbar-right query-total"> <li><a href="#" data-toggle="dropdown" class="dropdown-toggle"> <span class="glyphicon glyphicon-download-alt" aria-hidden="true">Download</span><span class="caret"></span> </a> <ul class="dropdown-menu" role="menu"> @@ -87,7 +90,7 @@ <li><a id="downloadFull-JSON" href="#">Full JSON</a></li> </ul></li> <li> - <a data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <a data-toggle="dropdown" class="dropdown-toggle" aria-haspopup="true" aria-expanded="false"> <span class="glyphicon glyphicon-link" aria-hidden="true">Link</span><span class="caret"></span> </a> <ul class="dropdown-menu"> diff --git a/gui/style.css b/gui/style.css index a1a5338..7b3a433 100644 --- a/gui/style.css +++ b/gui/style.css @@ -5,7 +5,7 @@ white-space: pre; } -#total, +.query-total, #query-result, #hide-explorer { display: none; @@ -77,6 +77,10 @@ width: auto; } +.dropdown-toggle .glyphicon:before { + margin-right: 3px; +} + /** Query example dialog **/ diff --git a/gui/wikibase/queryService/ui/App.js b/gui/wikibase/queryService/ui/App.js index 0f25092..fed47ab 100644 --- a/gui/wikibase/queryService/ui/App.js +++ b/gui/wikibase/queryService/ui/App.js @@ -281,7 +281,7 @@ $( '#query-result' ).empty( '' ); $( '#query-result' ).hide(); - $( '#total' ).hide(); + $( '.query-total' ).hide(); $( '.actionMessage' ).show(); $( '.actionMessage' ).text( 'Running query...' ); @@ -305,7 +305,7 @@ var api = this._sparqlApi; $( '#total-results' ).text( api.getResultLength() ); $( '#query-time' ).text( api.getExecutionTime() ); - $( '#total' ).show(); + $( '.query-total' ).show(); $( '#query-result' ).append( api.getResultAsTable() ).show(); $( '.actionMessage' ).hide(); $( '#query-error' ).hide(); -- To view, visit https://gerrit.wikimedia.org/r/261985 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I29b28d14d78507808d681a898d3684d527fa7650 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/rdf Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) <jonas.kr...@wikimedia.de> Gerrit-Reviewer: Smalyshev <smalys...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits