hide other trays when opening another tray fix tray styling from button work style buttons to right header
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/effbe5e4 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/effbe5e4 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/effbe5e4 Branch: refs/heads/secondary-indexes Commit: effbe5e40319a242d3aa823cf1e28ff4dad6cf70 Parents: cd7b26f Author: Jenn Schiffer <[email protected]> Authored: Sun Aug 24 16:33:43 2014 +0200 Committer: deathbearbrown <[email protected]> Committed: Mon Aug 25 09:37:35 2014 -0400 ---------------------------------------------------------------------- .../documents/assets/less/advancedOptions.less | 7 +++- app/addons/documents/assets/less/headers.less | 41 ++++++++++++++++++-- .../documents/templates/advanced_options.html | 2 +- .../documents/templates/header_alldocs.html | 20 +++++----- app/addons/documents/views-advancedopts.js | 4 +- app/addons/fauxton/components.js | 1 + app/addons/fauxton/templates/api_bar.html | 10 ++--- assets/less/fauxton.less | 2 + 8 files changed, 66 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/effbe5e4/app/addons/documents/assets/less/advancedOptions.less ---------------------------------------------------------------------- diff --git a/app/addons/documents/assets/less/advancedOptions.less b/app/addons/documents/assets/less/advancedOptions.less index 83b1655..6febf3b 100644 --- a/app/addons/documents/assets/less/advancedOptions.less +++ b/app/addons/documents/assets/less/advancedOptions.less @@ -23,13 +23,16 @@ .border-radius(5px); width: 490px; position: absolute; + right: 5px; z-index: 11; background-color: #333; color: #fff; padding: 0; margin: 0; .add-on { - padding-bottom: 10px; + padding: 0; + margin: 0; + line-height: 1em; } .query-group { padding: 20px; @@ -128,7 +131,7 @@ content: ''; position: absolute; top: -25px; - left: 30px; + right: 140px; border-color: transparent transparent #333 transparent; border-style: solid; border-width: 15px; http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/effbe5e4/app/addons/documents/assets/less/headers.less ---------------------------------------------------------------------- diff --git a/app/addons/documents/assets/less/headers.less b/app/addons/documents/assets/less/headers.less index 31faef1..ce5a27d 100644 --- a/app/addons/documents/assets/less/headers.less +++ b/app/addons/documents/assets/less/headers.less @@ -1,21 +1,56 @@ .header-right { + .add-on { + font-size: 16px; + } + .well { + padding: 0; + margin: 0; + } .searchbox-container { position: relative; right: inherit; - height: 38px; input[type="text"] { .border-radius(5px); font-size: 13px; padding: 8px 35px 8px 10px; + width: 275px; } .btn-primary { background: none repeat scroll 0% 0% transparent; border: none; position: absolute; - right: 0; - padding-top: 7px; + right: 12px; + top: 8px; z-index: 2; color: #999; } } + > .btn { + padding: 0; + margin: 0; + } + > .button, + > .button a, + .api-url-btn > button { + color: #666; + font-size: 13px; + line-height: 3em; + } + > div { + float: right; + height: 60px; + border-left: 1px solid #ccc; + margin: 0; + padding: 10px 15px; + line-height: 40px; + } + > div:last-child { + border-left: none; + } + .api-url-btn { + background: none; + border: none; + padding: 0; + margin: 0; + } } http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/effbe5e4/app/addons/documents/templates/advanced_options.html ---------------------------------------------------------------------- diff --git a/app/addons/documents/templates/advanced_options.html b/app/addons/documents/templates/advanced_options.html index 0502301..5e0e77f 100644 --- a/app/addons/documents/templates/advanced_options.html +++ b/app/addons/documents/templates/advanced_options.html @@ -12,7 +12,7 @@ License for the specific language governing permissions and limitations under the License. --> <a id="toggle-query" href="#query-options-tray" data-bypass="true" data-toggle="tab"> - <i class="fonticon fonticon-plus"></i> + <i class="fonticon fonticon-cog"></i> Query Options </a> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/effbe5e4/app/addons/documents/templates/header_alldocs.html ---------------------------------------------------------------------- diff --git a/app/addons/documents/templates/header_alldocs.html b/app/addons/documents/templates/header_alldocs.html index 6e8f97f..3434dde 100644 --- a/app/addons/documents/templates/header_alldocs.html +++ b/app/addons/documents/templates/header_alldocs.html @@ -12,18 +12,20 @@ License for the specific language governing permissions and limitations under the License. --> - <!-- Select toggle --> - <div id="header-select-all"> - <span class="toggle-select-menu icon fonticon-ok-circled">Select</span> - </div> + <!-- floats right --> - <div id="header-select-menu"></div> - <!-- search (jump to doc)--> - <div id="header-search" class="js-search searchbox-container"></div> + <div id="header-api-bar" class="button"></div> <!-- Query Options--> - <div class="header-query-options"> + <div class="button header-query-options"> <!-- Insert the query options here :) --> <div id="query-options"></div> </div> - <div id="header-api-bar"></div> + + <!-- search (jump to doc)--> + <div id="header-search" class="js-search searchbox-container"></div> + + <!-- Select toggle --> + <div id="header-select-all" class="button"> + <span class="toggle-select-menu icon fonticon-ok-circled">Select</span> + </div> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/effbe5e4/app/addons/documents/views-advancedopts.js ---------------------------------------------------------------------- diff --git a/app/addons/documents/views-advancedopts.js b/app/addons/documents/views-advancedopts.js index 6500b50..0a91914 100644 --- a/app/addons/documents/views-advancedopts.js +++ b/app/addons/documents/views-advancedopts.js @@ -64,7 +64,8 @@ function(app, FauxtonAPI, resizeColumns ) { toggleQuery: function(event) { $('#dashboard-content').scrollTop(0); this.$('#query-options-tray').toggle(); - }, + $('.api-navbar').hide(); + }, resetForm: function() { $('input, textarea').each(function(){ @@ -74,6 +75,7 @@ function(app, FauxtonAPI, resizeColumns ) { $("select").each(function(){ this.selectedIndex = 0; }); + $('#query-options-tray').hide(); }, showKeys: function(){ http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/effbe5e4/app/addons/fauxton/components.js ---------------------------------------------------------------------- diff --git a/app/addons/fauxton/components.js b/app/addons/fauxton/components.js index 60d0c26..55f4af4 100644 --- a/app/addons/fauxton/components.js +++ b/app/addons/fauxton/components.js @@ -109,6 +109,7 @@ function(app, FauxtonAPI, ace, spin, ZeroClipboard) { }else{ $currentTarget.removeClass("fonticon-minus").addClass("fonticon-plus"); } + $('#query-options-tray').hide(); $('.api-navbar').toggle(); }, http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/effbe5e4/app/addons/fauxton/templates/api_bar.html ---------------------------------------------------------------------- diff --git a/app/addons/fauxton/templates/api_bar.html b/app/addons/fauxton/templates/api_bar.html index f56741c..bab431b 100644 --- a/app/addons/fauxton/templates/api_bar.html +++ b/app/addons/fauxton/templates/api_bar.html @@ -12,22 +12,22 @@ License for the specific language governing permissions and limitations under the License. --> -<button class="btn btn-primary pull-right api-url-btn"> - API URL +<a class="btn btn-primary pull-right api-url-btn"> <i class="fonticon-plus icon"></i> -</button> + API URL +</a> <div class="clearfix"></div> <div class="api-navbar" style="display: none"> <div class="input-prepend input-append"> <span class="add-on"> API URL <a class="help-link" data-bypass="true" href="<%-getDocUrl(documentation)%>" target="_blank"> - <i class="icon-question-sign"></i> + <i class="fonticon-link"></i> </a> </span> <input id="api-url-text" type="text" class="input-xxlarge" value="<%- endpoint %>"> <a class="btn copy-url" data-clipboard-target="api-url-text"> - <i class="fonticon-eye icon"></i> + <i class="fonticon-clipboard icon"></i> Copy </a> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/effbe5e4/assets/less/fauxton.less ---------------------------------------------------------------------- diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less index 29ef04f..e8a9fdb 100644 --- a/assets/less/fauxton.less +++ b/assets/less/fauxton.less @@ -262,6 +262,7 @@ div.spinner { right: 5px; background-color: #333; padding: 5px 20px; + z-index: 2; .input-append.input-prepend { margin-bottom: 0px; .copying { @@ -293,6 +294,7 @@ div.spinner { margin-left: -1px; padding: 10px 10px 8px; border: none; + line-height: 1.5em; .border-radius(5px); &:hover{ background-color: #cbcbcb;
