You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ro...@apache.org on 2014/10/11 00:49:23 UTC

fauxton commit: updated refs/heads/master to 06f95c9

Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master a0fc78160 -> 06f95c96f


Logout link doesn't overlap CouchDB version anymore


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

Branch: refs/heads/master
Commit: 06f95c96f23482bb1aaf1d643b4814d5ba1a9b6c
Parents: a0fc781
Author: Luis Gerhorst <lu...@luisgerhorst.de>
Authored: Wed Oct 8 21:07:08 2014 +0200
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Sat Oct 11 00:44:45 2014 +0200

----------------------------------------------------------------------
 app/addons/fauxton/templates/nav_bar.html |  2 +-
 assets/less/fauxton.less                  | 13 +++----------
 2 files changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/06f95c96/app/addons/fauxton/templates/nav_bar.html
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/templates/nav_bar.html b/app/addons/fauxton/templates/nav_bar.html
index 0d9450d..b1618c8 100644
--- a/app/addons/fauxton/templates/nav_bar.html
+++ b/app/addons/fauxton/templates/nav_bar.html
@@ -57,6 +57,7 @@ the License.
   <div class="brand">
      <div class="icon">Apache Fauxton</div>
   </div>
+  <div class="js-version"></div>
   <div id="footer-links">
     <ul id="footer-nav-links" class="nav">
       <% _.each(footerNavLinks, function(link) { %>
@@ -70,5 +71,4 @@ the License.
       <% }); %>
     </ul>
   </div>
-  <div class="js-version"></div>
 </div>

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/06f95c96/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less
index 097b83e..b14e0d2 100644
--- a/assets/less/fauxton.less
+++ b/assets/less/fauxton.less
@@ -364,11 +364,6 @@ table.databases {
       display: none;
     }
   }
-  #footer-links{
-    position: absolute;
-    bottom: 0;
-    width: 100%;
-  }
   #user-create-admin{
     font-size: 12px
   }
@@ -395,7 +390,6 @@ table.databases {
         }
       }
       .bottom-container {
-       height: 110px;
        position: fixed;
        bottom: 0;
        width: 220px;
@@ -425,11 +419,13 @@ table.databases {
           }
        }
        #footer-nav-links {
+       width: 100%;
+       margin: 0;
        li {
        a {
          font-size: 12px;
          color: @linkColor;
-         padding: 12px;
+         padding: 0 0 10px 10px;
          text-shadow: none;
        }
        &.active, &:hover{
@@ -502,9 +498,6 @@ table.databases {
           background-color: @primaryNav;
           border-top: 1px solid @linkColor;
           border-bottom: none;
-          font-size: 12px;
-          padding: 12px;
-          min-height: 44px;
           &.active, &:hover{
             background-color: @navBGHover;
             border-top: 1px solid @linkColor;