couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chewbra...@apache.org
Subject [40/46] git commit: updated refs/heads/1829-User-Experience-Redesign to b7ee0e5
Date Tue, 25 Jun 2013 21:07:47 GMT
One pane works but 2 pane is now messed up. Yay I hate you css


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

Branch: refs/heads/1829-User-Experience-Redesign
Commit: d2c0eeaff278855bfbfb73c3465cc1388aa4bd1e
Parents: 23b89bb
Author: suelockwood <deathbearbrown@gmail.com>
Authored: Tue Jun 18 14:21:08 2013 -0400
Committer: suelockwood <deathbearbrown@gmail.com>
Committed: Tue Jun 18 14:21:08 2013 -0400

----------------------------------------------------------------------
 src/fauxton/app/addons/auth/resources.js        |  2 +-
 .../app/templates/databases/newdatabase.html    |  2 +-
 src/fauxton/app/templates/fauxton/nav_bar.html  |  2 +-
 src/fauxton/app/templates/layouts/one_pane.html |  4 +-
 src/fauxton/assets/index.underscore             |  2 +-
 src/fauxton/assets/less/fauxton.less            | 92 ++++++++++++++------
 6 files changed, 71 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/d2c0eeaf/src/fauxton/app/addons/auth/resources.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/auth/resources.js b/src/fauxton/app/addons/auth/resources.js
index 9946f70..ad7c529 100644
--- a/src/fauxton/app/addons/auth/resources.js
+++ b/src/fauxton/app/addons/auth/resources.js
@@ -340,7 +340,7 @@ function (app, FauxtonAPI) {
     template: 'addons/auth/templates/nav_link',
 
     tagName: "li",
-    className: "dropdown fonticon fonticon-users",
+    className: "dropdown",
 
     events: {
       "click #user-create-admin": 'show_admin_modal',

http://git-wip-us.apache.org/repos/asf/couchdb/blob/d2c0eeaf/src/fauxton/app/templates/databases/newdatabase.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/databases/newdatabase.html b/src/fauxton/app/templates/databases/newdatabase.html
index 1621fd1..a39cd74 100644
--- a/src/fauxton/app/templates/databases/newdatabase.html
+++ b/src/fauxton/app/templates/databases/newdatabase.html
@@ -12,6 +12,6 @@ License for the specific language governing permissions and limitations
under
 the License.
 -->
 
-<a class="btn new" id="new"><i class="icon-plus"></i> New database</a>
+<a class="button new" id="new"><i class="icon fonticon-new-database"></i>Add
new database</a>
 
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/d2c0eeaf/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 dee387b..1f39bb2 100644
--- a/src/fauxton/app/templates/fauxton/nav_bar.html
+++ b/src/fauxton/app/templates/fauxton/nav_bar.html
@@ -17,7 +17,7 @@ the License.
   <ul id="nav-links" class="nav pull-right">
     <% _.each(navLinks, function(link) { %>
       <% if (!link.view) { %>
-        <li class="<%= link.icon %> fonticon"><a href="<%= link.href %>"><%=
link.title %></a></li>
+        <li><a class="<%= link.icon %> fonticon" href="<%= link.href %>"><%=
link.title %></a></li>
       <% } %>
     <% }); %>
   </ul>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/d2c0eeaf/src/fauxton/app/templates/layouts/one_pane.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/layouts/one_pane.html b/src/fauxton/app/templates/layouts/one_pane.html
index 8ef7f95..1f85261 100644
--- a/src/fauxton/app/templates/layouts/one_pane.html
+++ b/src/fauxton/app/templates/layouts/one_pane.html
@@ -13,7 +13,7 @@ the License.
 -->
 
 <div id="primary-navbar"></div>
-<div id="dashboard" class="container-fluid">
+<div id="dashboard" class="container-fluid one-pane">
   <div class="row-fluid fixed-header">
     <div id="breadcrumbs" class="span12"></div>
   </div>
@@ -21,7 +21,7 @@ the License.
 
   <div class="row-fluid content-area">
   	<div id="tabs" class="row"></div>
-    <div id="dashboard-content" class="list span12"></div>
+    <div id="dashboard-content"></div>
   </div>
 </div>
 <div id="api-navbar"></div>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/d2c0eeaf/src/fauxton/assets/index.underscore
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/index.underscore b/src/fauxton/assets/index.underscore
index e85d2ea..91cda64 100644
--- a/src/fauxton/assets/index.underscore
+++ b/src/fauxton/assets/index.underscore
@@ -35,7 +35,7 @@
   <div role="main" id="main">
     <!-- these are notifications that will appear as a fixed bar up top-->
     <div id="global-notifications" class="container errors-container"></div>
-    <div id="app-container" class="container-fluid"></div>
+    <div id="app-container"></div>
     <footer id="mainFooter">
       <div id="footer-content" class="container"></div>
     </footer>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/d2c0eeaf/src/fauxton/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/fauxton.less b/src/fauxton/assets/less/fauxton.less
index 1b4e652..d62be45 100644
--- a/src/fauxton/assets/less/fauxton.less
+++ b/src/fauxton/assets/less/fauxton.less
@@ -119,6 +119,11 @@
 
 @saveButton: #80A221;
 
+@collapsedNavWidth: 100px;
+
+
+/*buttons */
+@redButton: #E93F33;
 
 
 .buttonStyle{
@@ -173,7 +178,7 @@
   bottom: 0;
   background-color: @primaryNav;
   .closeMenu & {
-    width: 105px;
+    width: @collapsedNavWidth;
     .nav{
       li{
         a{
@@ -195,16 +200,7 @@
     nav {
       .nav{
         li{
-          &.fonticon {
-            position: relative;
-            &:before {
-              position: absolute;
-              left: 35px;
-              font-size: 24px;
-              color: #fff;
-            }
-          }
-          padding: 15px 0px 15px 80px;
+          padding: 15px 0px 15px 60px;
           font-size: 19px;
           width: 100%;
           font-weight: normal;
@@ -218,6 +214,15 @@
             padding: 0;
             color: #fff;
             text-shadow: none;
+            &.fonticon {
+              position: relative;
+              &:before {
+                position: absolute;
+                left: -35px;
+                font-size: 24px;
+                color: #fff;
+              }
+            }
           }
         }
       }
@@ -226,34 +231,46 @@
 }
 
 #dashboard {
-  height: 100%;
-  z-index: 100;
-  padding: 0;
-  margin: 0;
-  .box-shadow(-10px 0 15px -6px #333333);
-  position: absolute;
-  left: 220px;
-  width: 100%;
+  position: relative;
+  margin-left: 220px;
   .closeMenu & {
-    left: 105px;
+    margin-left: @collapsedNavWidth;
   }
+  &.one-pane{}
 }
+
+
+
+
+
+// #dashboard {
+//   height: 100%;
+//   z-index: 100;
+//   padding: 0;
+//   margin: 0;
+//   .box-shadow(-10px 0 15px -6px #333333);
+//   position: absolute;
+//   left: 220px;
+//   width: 100%;
+//   .closeMenu & {
+//     left: 105px;
+//   }
+// }
 #dashboard-content{
   padding: 20px;
-  position: absolute;
-  left: 0;
   .with-sidebar &{
     .setLeft(3);
+    bottom: 0px;
+    top: 60px;
+    overflow: auto;
+    position: fixed;
   }
-  bottom: 0px;
-  top: 60px;
-  overflow: auto;
   > div.inner {
     display: block;
   }
 }
 #sidebar-content {
-  position: absolute;
+  position: fixed;
   bottom: 0px;
   top: 60px;
   overflow: auto;
@@ -270,6 +287,10 @@
   .box-shadow(0 4px 6px -2px #808080);
   left: auto;
   z-index: 100;
+  .one-pane & {
+    border: none;
+    .box-shadow(none);
+  }
 }
 
 #breadcrumbs {
@@ -283,6 +304,9 @@
       color: @breadcrumbText;
       font-size: 30px;
       text-shadow: none;
+      a{
+        color: @breadcrumbText;
+      }
     }
    }
 }
@@ -293,4 +317,18 @@ footer#mainFooter{
   bottom: 0;
 }
 
-
+/*form elements and buttons*/
+.button{
+  border: none;
+  background-color: @redButton;
+  color: #fff;
+  padding: 10px;
+  .icon {
+    margin-right: 10px;
+    font-size: 20px;
+  }
+  &:hover {
+    color: #fff;
+    text-decoration: none;
+  }
+}


Mime
View raw message