couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [07/50] [abbrv] git commit: updated refs/heads/1867-feature-plugins to 8aad450
Date Mon, 09 Sep 2013 09:53:27 GMT
Making nav bar match the comps with bottom footer
Add documentation link


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

Branch: refs/heads/1867-feature-plugins
Commit: a36168aae6129922922ee51d4fed9d953bcacc7f
Parents: 6eb21ed
Author: suelockwood <deathbearbrown@gmail.com>
Authored: Tue Aug 13 11:07:18 2013 -0400
Committer: Jan Lehnardt <jan@apache.org>
Committed: Mon Sep 9 11:16:42 2013 +0200

----------------------------------------------------------------------
 src/fauxton/app/templates/fauxton/nav_bar.html | 50 +++++++++++++--------
 src/fauxton/assets/less/fauxton.less           |  6 +--
 2 files changed, 34 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/a36168aa/src/fauxton/app/templates/fauxton/nav_bar.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/fauxton/nav_bar.html b/src/fauxton/app/templates/fauxton/nav_bar.html
index 636d176..64a0336 100644
--- a/src/fauxton/app/templates/fauxton/nav_bar.html
+++ b/src/fauxton/app/templates/fauxton/nav_bar.html
@@ -29,26 +29,38 @@ the License.
     <% }); %>
   </ul>
 
+  <div id="footer-links">
+
     <ul id="bottom-nav-links" class="nav">
-    <% _.each(bottomNavLinks, function(link) { %>
-    <% if (link.view) {return;}  %>
-      <li data-nav-name= "<%= link.title %>">
-          <a class="<%= link.icon %> fonticon" href="<%= link.href %>">
-              <%= link.title %>
-          </a>
-      </li>
-    <% }); %>
-  </ul>
-  <ul id="footer-nav-links" class="nav">
-    <% _.each(footerNavLinks, function(link) { %>
-    <% if (link.view) {return;}  %>
-      <li data-nav-name= "<%= link.title %>">
-          <a class="<%= link.icon %> fonticon" href="<%= link.href %>">
-              <%= link.title %>
-          </a>
-      </li>
-    <% }); %>
-  </ul>
+        <li data-nav-name= "Documentation">
+            <a class="fonticon-bookmark fonticon" target="_blank" href="http://docs.couchdb.org/en/latest/">
+                Documentation
+            </a>
+        </li>
+
+
+      <% _.each(bottomNavLinks, function(link) { %>
+      <% if (link.view) {return;}  %>
+        <li data-nav-name= "<%= link.title %>">
+            <a class="<%= link.icon %> fonticon" href="<%= link.href %>">
+                <%= link.title %>
+            </a>
+        </li>
+      <% }); %>
+    </ul>
+
+    <ul id="footer-nav-links" class="nav">
+      <% _.each(footerNavLinks, function(link) { %>
+      <% if (link.view) {return;}  %>
+        <li data-nav-name= "<%= link.title %>">
+            <a class="<%= link.icon %> fonticon" href="<%= link.href %>">
+                <%= link.title %>
+            </a>
+        </li>
+      <% }); %>
+    </ul>
+
+  </div>
 </nav>
 
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/a36168aa/src/fauxton/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/fauxton.less b/src/fauxton/assets/less/fauxton.less
index 4beb18c..0b72c6d 100644
--- a/src/fauxton/assets/less/fauxton.less
+++ b/src/fauxton/assets/less/fauxton.less
@@ -31,7 +31,7 @@
 @red: #E93F33;
 @darkred: #73161E;
 @linkRed: #DA4F49;
-
+@greyBrown: #554D4C;
 @fontGrey: #808080;
 @secondarySidebar: #E4DFDC;
 
@@ -40,12 +40,12 @@
 
 /*nav*/
 @primaryNav : @brown;
-@navBG: @bottomNav;
+@navBG: @darkred;
 @navBGHighlight: @red;
 @navBGHover: @red;
 @navIconColor: @darkred;
 @navIconHighlight: #FFFFFF;
-@bottomNav: @darkred;
+@bottomNav: @greyBrown;
 
 /*top header*/
 @breadcrumbBG: #F1F1F1;


Mime
View raw message