You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by de...@apache.org on 2014/08/11 21:16:56 UTC
[2/3] fauxton commit: updated refs/heads/secondary-indexes to 9d9b2cd
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/98ee4501
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/98ee4501
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/98ee4501
Branch: refs/heads/secondary-indexes
Commit: 98ee450192d0d5fec39a9c657e81d5f490228fdc
Parents: 2a7b1fa
Author: Jenn Schiffer <je...@pancaketheorem.com>
Authored: Thu Aug 7 16:36:58 2014 -0400
Committer: deathbearbrown <de...@gmail.com>
Committed: Mon Aug 11 15:15:32 2014 -0400
----------------------------------------------------------------------
.../documents/assets/less/advancedOptions.less | 3 +-
app/addons/documents/assets/less/headers.less | 35 ++++++++++++++++++--
.../documents/templates/advanced_options.html | 2 +-
.../documents/templates/header_alldocs.html | 20 ++++++-----
app/addons/fauxton/templates/api_bar.html | 10 +++---
assets/less/fauxton.less | 1 +
6 files changed, 52 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/98ee4501/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..0dd9035 100644
--- a/app/addons/documents/assets/less/advancedOptions.less
+++ b/app/addons/documents/assets/less/advancedOptions.less
@@ -23,6 +23,7 @@
.border-radius(5px);
width: 490px;
position: absolute;
+ right: 5px;
z-index: 11;
background-color: #333;
color: #fff;
@@ -128,7 +129,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/98ee4501/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..0d8cf8b 100644
--- a/app/addons/documents/assets/less/headers.less
+++ b/app/addons/documents/assets/less/headers.less
@@ -1,21 +1,50 @@
.header-right {
+ .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: 23px;
z-index: 2;
color: #999;
}
}
+ .btn {
+ padding: 0;
+ margin: 0;
+ line-height: inherit;
+ }
+ .button,
+ .button a,
+ .api-url-btn button {
+ color: #666;
+ font-size: 13px;
+ }
+ > 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;
+ }
}
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/98ee4501/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/98ee4501/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/98ee4501/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/98ee4501/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less
index 29ef04f..42fa961 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 {