couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject fauxton commit: updated refs/heads/master to f264015
Date Tue, 06 Jan 2015 12:35:01 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master a52664590 -> f2640155a


remove sidebar class and set sidebar width in #sidebar-content


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

Branch: refs/heads/master
Commit: f2640155ae582d14cd86f3703687b40e97c44cea
Parents: a526645
Author: Garren Smith <garren.smith@gmail.com>
Authored: Mon Jan 5 16:11:03 2015 +0200
Committer: Garren Smith <garren.smith@gmail.com>
Committed: Tue Jan 6 14:34:40 2015 +0200

----------------------------------------------------------------------
 app/addons/activetasks/assets/less/activetasks.less |  2 +-
 app/templates/layouts/with_sidebar.html             |  2 +-
 app/templates/layouts/with_tabs_sidebar.html        |  2 +-
 assets/less/templates.less                          | 10 ++++++----
 4 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/f2640155/app/addons/activetasks/assets/less/activetasks.less
----------------------------------------------------------------------
diff --git a/app/addons/activetasks/assets/less/activetasks.less b/app/addons/activetasks/assets/less/activetasks.less
index 5acc4bb..68c44a9 100644
--- a/app/addons/activetasks/assets/less/activetasks.less
+++ b/app/addons/activetasks/assets/less/activetasks.less
@@ -45,7 +45,7 @@
   }
 }
 
-.sidebar .polling-interval {
+.nav.polling-interval {
   li.nav-header {
     padding: 9px 0px 0px 9px;
   }

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/f2640155/app/templates/layouts/with_sidebar.html
----------------------------------------------------------------------
diff --git a/app/templates/layouts/with_sidebar.html b/app/templates/layouts/with_sidebar.html
index 4eba634..1192621 100644
--- a/app/templates/layouts/with_sidebar.html
+++ b/app/templates/layouts/with_sidebar.html
@@ -21,7 +21,7 @@ the License.
   </header>
 
   <div class="with-sidebar content-area">
-    <div id="sidebar-content" class="sidebar"></div>
+    <div id="sidebar-content"></div>
     <div id="dashboard-content" class="list window-resizeable"></div>
   </div>
 </div>

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/f2640155/app/templates/layouts/with_tabs_sidebar.html
----------------------------------------------------------------------
diff --git a/app/templates/layouts/with_tabs_sidebar.html b/app/templates/layouts/with_tabs_sidebar.html
index 780f319..345acfc 100644
--- a/app/templates/layouts/with_tabs_sidebar.html
+++ b/app/templates/layouts/with_tabs_sidebar.html
@@ -29,7 +29,7 @@ the License.
           </div>
         </div>
 
-        <aside id="sidebar-content" class="sidebar scrollable"></aside>
+        <aside id="sidebar-content" class="scrollable"></aside>
 
         <section id="dashboard-content" class="list">
           <div class="scrollable">

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/f2640155/assets/less/templates.less
----------------------------------------------------------------------
diff --git a/assets/less/templates.less b/assets/less/templates.less
index aa2d944..94b5bd7 100644
--- a/assets/less/templates.less
+++ b/assets/less/templates.less
@@ -303,11 +303,8 @@ with_tabs_sidebar.html
   }
 }
 
-.sidebar {
-  width: @sidebarWidth;
-}
-
 #sidebar-content {
+  width: @sidebarWidth;
   position: absolute;
   top: @collapsedNavWidth;
   left: 0;
@@ -316,6 +313,11 @@ with_tabs_sidebar.html
     display: block;
   }
   margin-top: 6px;
+  
+  .nav-list:last-child {
+    margin-bottom: 30px;
+  }
+
 }
 
 .scrollable {


Mime
View raw message