couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From deathb...@apache.org
Subject [2/4] fauxton commit: updated refs/heads/secondary-indexes to 61c9e3c
Date Wed, 13 Aug 2014 20:30:19 GMT
refactor css for header trays


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/84e6f9ee
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/84e6f9ee
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/84e6f9ee

Branch: refs/heads/secondary-indexes
Commit: 84e6f9eec5b31c56f888ca9c3d017b5eff1601a6
Parents: ad4c128
Author: Jenn Schiffer <jenn@pancaketheorem.com>
Authored: Wed Aug 13 15:53:11 2014 -0400
Committer: deathbearbrown <deathbearbrown@gmail.com>
Committed: Wed Aug 13 16:30:20 2014 -0400

----------------------------------------------------------------------
 .../documents/assets/less/advancedOptions.less  | 35 ++++------------
 .../documents/templates/advanced_options.html   |  2 +-
 app/addons/fauxton/templates/api_bar.html       |  2 +-
 assets/less/fauxton.less                        | 37 ++++-------------
 assets/less/headers.less                        | 42 ++++++++++++++++----
 5 files changed, 50 insertions(+), 68 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/84e6f9ee/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 6febf3b..16ddb2b 100644
--- a/app/addons/documents/assets/less/advancedOptions.less
+++ b/app/addons/documents/assets/less/advancedOptions.less
@@ -13,27 +13,17 @@
 
 /*for advanced options css*/
 .advanced-options.well {
-  display: inline-block;
-  background: none;
-  border: none;
   box-shadow: none;
+  border: none;
+  background: none;
+}
+
+#query-options-tray:before {
+  right: 140px;
 }
+
 #query-options-tray {
-  display: none;
-  .border-radius(5px);
   width: 490px;
-  position: absolute;
-  right: 5px;
-  z-index: 11;
-  background-color: #333;
-  color: #fff;
-  padding: 0;
-  margin: 0;
-  .add-on {
-    padding: 0;
-    margin: 0;
-    line-height: 1em;
-  }
   .query-group {
     padding: 20px;
     border-bottom: 1px solid #555;
@@ -126,15 +116,4 @@
   #skipRows {
     margin-left: 5px;
   }
-}
-#query-options-tray:before {
-  content: '';
-  position: absolute;
-  top: -25px;
-  right: 140px;
-  border-color: transparent transparent #333 transparent;
-  border-style: solid;
-  border-width: 15px;
-  width: 0;
-  height: 0;
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/84e6f9ee/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 5e0e77f..95bbe5c 100644
--- a/app/addons/documents/templates/advanced_options.html
+++ b/app/addons/documents/templates/advanced_options.html
@@ -16,7 +16,7 @@ the License.
   Query Options
 </a>
 
-<div id="query-options-tray">
+<div id="query-options-tray" class="tray">
   <form class="js-view-query-update custom-inputs">
 
     <div class="query-group">

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/84e6f9ee/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 255087d..90dd5e0 100644
--- a/app/addons/fauxton/templates/api_bar.html
+++ b/app/addons/fauxton/templates/api_bar.html
@@ -17,7 +17,7 @@ the License.
   API URL
 </a>
 <div class="clearfix"></div>
-<div class="api-navbar" style="display: none">
+<div class="api-navbar tray">
     <div class="input-prepend input-append">
       <span class="add-on">
         API URL

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/84e6f9ee/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less
index e8a9fdb..74c698a 100644
--- a/assets/less/fauxton.less
+++ b/assets/less/fauxton.less
@@ -249,37 +249,25 @@ div.spinner {
 }
 
 .api-url-btn {
-  margin-top: 5px;
-  margin-bottom: 5px;
   .icon {
     font-size: 11px;
   }
+  background: none;
+  border: none;
+  padding: 0;
+  margin: 0;
+}
+.api-url-btn:hover {
+  background: none;
 }
-
 .api-navbar {
-  .border-radius(5px);
-  position: absolute;
-  right: 5px;
-  background-color: #333;
   padding: 5px 20px;
-  z-index: 2;
   .input-append.input-prepend {
     margin-bottom: 0px;
     .copying {
       background-color: #999;
       transition: background-color 5ms linear;
     }
-    .add-on {
-      background: none;
-      padding: 0px;
-      margin: 10px 0;
-      border: none;
-      display: block;
-      text-align: left;
-      color: #fff;
-      text-shadow: none;
-      height: auto;
-    }
     .input-xxlarge {
       .border-radius(5px 0 0 5px);
       border: none;
@@ -315,17 +303,6 @@ div.spinner {
     }
   }
 }
-.api-navbar:before {
-  content: '';
-  position: absolute;
-  top: -25px;
-  right: 30px;
-  border-color: transparent transparent #333 transparent;
-  border-style: solid;
-  border-width: 15px;
-  width: 0;
-  height: 0;
-}
 
 .js-filter-form {
   .help-block {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/84e6f9ee/assets/less/headers.less
----------------------------------------------------------------------
diff --git a/assets/less/headers.less b/assets/less/headers.less
index 149e90b..ff790e5 100644
--- a/assets/less/headers.less
+++ b/assets/less/headers.less
@@ -21,7 +21,6 @@
   .box-shadow(0px 6px 0 0 rgba(0, 0, 0, 0.1));
 }
 
-
 .fixed-header{
   height: 60px;
   background-color: @breadcrumbBG;
@@ -143,10 +142,40 @@
   }
 }
 
-
 .header-right {
+  .tray {
+    display: none;
+    .border-radius(5px);
+    position: absolute;
+    right: 5px;
+    top: 55px;
+    z-index: 11;
+    background-color: #333;
+    color: #fff;
+    margin: 0;
+  }
+  .tray:before {
+    content: '';
+    position: absolute;
+    top: -25px;
+    border-color: transparent transparent #333 transparent;
+    border-style: solid;
+    border-width: 15px;
+    width: 0;
+    height: 0;
+  }
   .add-on {
     font-size: 16px;
+    background: none;
+    padding: 0px;
+    margin: 10px 0;
+    border: none;
+    display: block;
+    text-align: left;
+    color: #fff;
+    text-shadow: none;
+    height: auto;
+    line-height: 1em;
   }
   .well {
     padding: 0;
@@ -182,6 +211,9 @@
     font-size: 13px;
     line-height: 3em;
   }
+  .api-navbar:before {
+    right: 25px;
+  }
   > div {
     float: right;
     height: 60px;
@@ -193,11 +225,5 @@
   > div:last-child {
     border-left: none;
   }
-  .api-url-btn {
-    background: none;
-    border: none;
-    padding: 0;
-    margin: 0;
-  }
 }
 


Mime
View raw message