couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robertkowal...@apache.org
Subject fauxton commit: updated refs/heads/master to 7cde947
Date Wed, 24 Sep 2014 21:29:42 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master abc9024b9 -> 7cde947fb


Replace colour variables used in various places with generic variables

Allows easier theming


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

Branch: refs/heads/master
Commit: 7cde947fb6ce28e93fe492defa8517405721afff
Parents: abc9024
Author: Nick Colley <nickcolley7@gmail.com>
Authored: Mon Sep 22 01:07:56 2014 +0100
Committer: Robert Kowalski <rok@kowalski.gd>
Committed: Wed Sep 24 23:26:59 2014 +0200

----------------------------------------------------------------------
 app/addons/auth/assets/less/auth.less           |  5 +-
 app/addons/databases/assets/less/databases.less |  2 +-
 app/addons/documents/assets/less/sidenav.less   |  6 +-
 .../replication/assets/less/replication.less    |  4 +-
 assets/less/fauxton.less                        | 41 +++++----
 assets/less/variables.less                      | 89 +++++++++++---------
 6 files changed, 78 insertions(+), 69 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7cde947f/app/addons/auth/assets/less/auth.less
----------------------------------------------------------------------
diff --git a/app/addons/auth/assets/less/auth.less b/app/addons/auth/assets/less/auth.less
index 8a71817..0210094 100644
--- a/app/addons/auth/assets/less/auth.less
+++ b/app/addons/auth/assets/less/auth.less
@@ -10,6 +10,9 @@
  *  License for the specific language governing permissions and limitations under
  *  the License.
  */
+
+@import "../../../../../assets/less/variables.less";
+
 #primary-navbar .navbar nav .nav li a#user-create-admin{
-  background-color: #af2d24;
+  background-color: @navBG;
 }

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7cde947f/app/addons/databases/assets/less/databases.less
----------------------------------------------------------------------
diff --git a/app/addons/databases/assets/less/databases.less b/app/addons/databases/assets/less/databases.less
index 963179e..021319c 100644
--- a/app/addons/databases/assets/less/databases.less
+++ b/app/addons/databases/assets/less/databases.less
@@ -24,7 +24,7 @@
 .databases {
     a.db-actions,
     a.db-actions:visited {
-        color: @red;
+        color: @linkColor;
         border: 1px solid #e3e3e3;
         padding: 5px 7px;
         .border-radius(6px);

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7cde947f/app/addons/documents/assets/less/sidenav.less
----------------------------------------------------------------------
diff --git a/app/addons/documents/assets/less/sidenav.less b/app/addons/documents/assets/less/sidenav.less
index 477af7a..12e2b0c 100644
--- a/app/addons/documents/assets/less/sidenav.less
+++ b/app/addons/documents/assets/less/sidenav.less
@@ -12,7 +12,7 @@
     color: white;
   }
   .dropdown-toggle:hover {
-    color: @linkRed
+    color: @linkColor;
   }
   li{
     position: relative;
@@ -76,7 +76,7 @@
       .accordion-list-item p{
         margin: 0;
         padding: 10px 13px 10px 36px;
-        color: @linkRed;
+        color: @linkColor;
       }
       .fonticon-play{
         font-size: 12px;
@@ -90,7 +90,7 @@
         right: 15px;
       }
       .dropdown-toggle:hover{
-        color: @linkRed
+        color: @linkColor;
       }
     }
     > ul.accordion-body{

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7cde947f/app/addons/replication/assets/less/replication.less
----------------------------------------------------------------------
diff --git a/app/addons/replication/assets/less/replication.less b/app/addons/replication/assets/less/replication.less
index a60f509..d917885 100644
--- a/app/addons/replication/assets/less/replication.less
+++ b/app/addons/replication/assets/less/replication.less
@@ -49,7 +49,7 @@
         display: none;
       }
       .local-btn {
-        background-color: @red;
+        background-color: @brandPrimary;
         color: #fff;
       }
       .remote-btn {
@@ -61,7 +61,7 @@
       display: none;
     }
     .remote-btn {
-      background-color: @red;
+      background-color: @brandPrimary;
       color: #fff;
     }
   }

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7cde947f/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less
index 56cf132..e944704 100644
--- a/assets/less/fauxton.less
+++ b/assets/less/fauxton.less
@@ -16,7 +16,6 @@
  * Fauxton less style files
  *
  */
-@import "bootstrap/variables.less";
 @import "variables.less";
 @import "bootstrap/bootstrap.less";
 @import "bootstrap/mixins.less";
@@ -54,7 +53,7 @@ a:active {
 }
 
 a:hover {
-  color: @red;
+  color: @linkColorHover;
 }
 
 input[type=text],
@@ -104,8 +103,8 @@ select {
     border-right: none;
     &:hover,
     &:focus {
-      background-color: @linkRed;
-      border-top: 1px solid @red;
+      background-color: @linkColor;
+      border-top: 1px solid @linkColor;
       color: white;
     }
   }
@@ -153,7 +152,7 @@ table tr td{
   }
 }
 thead {
-  border-bottom: 2px solid @redButton;
+  border-bottom: 2px solid @brandPrimary;
 }
 tbody {
   padding-top: 10px;
@@ -206,7 +205,7 @@ tbody {
   }
 }
 .btn-primary {
-  background: @redButton;
+  background: @brandPrimary;
 }
 
 .btn-primary a:visited {
@@ -392,7 +391,7 @@ table.databases {
           margin: 2px 0px;
         }
         &:hover div{
-          background-color: @orange;
+          background-color: @navBGHover;
         }
       }
       .bottom-container {
@@ -429,7 +428,7 @@ table.databases {
        li {
        a {
          font-size: 12px;
-         color: @red;
+         color: @linkColor;
          padding: 12px;
          text-shadow: none;
        }
@@ -462,7 +461,7 @@ table.databases {
             a{
               .box-shadow(none);
             }
-            background-color: @red;
+            background-color: @navBGHover;
           }
           &:hover .fonticon:before{
             color: @white;
@@ -501,20 +500,20 @@ table.databases {
       ul#footer-nav-links{
         li{
           background-color: @primaryNav;
-          border-top: 1px solid @red;
+          border-top: 1px solid @linkColor;
           border-bottom: none;
           font-size: 12px;
           padding: 12px;
           min-height: 44px;
           &.active, &:hover{
-            background-color: @linkRed;
-            border-top: 1px solid @red;
+            background-color: @navBGHover;
+            border-top: 1px solid @linkColor;
             a{
               color: white;
             }
           }
           a{
-            color: @red;
+            color: @linkColor;
           }
         }
 
@@ -526,7 +525,7 @@ table.databases {
           min-height: 55px;
           background-color: @bottomNav;
           &.active{
-            background-color:@linkRed;
+            background-color:@navBGHover;
           }
           &:hover{
             background-color: @navBGHover;
@@ -665,14 +664,14 @@ table.databases {
     }
     > li > a:hover,
     > li > a:focus{
-      background-color: @darkRed;
+      background-color: @linkColorHover;
       color: #fff;
     }
     li.active > a {
-      color: @darkRed;
+      color: @linkColorHover;
     }
     > li > a{
-      color: @linkRed;
+      color: @linkColor;
       padding: 10px 13px 10px 24px;
       border-bottom: 1px solid #d3d7db;
       span{
@@ -697,7 +696,7 @@ table.databases {
       text-shadow: none;
       color: #333333;
       & > span:hover {
-        color: @red;
+        color: @linkColor;
       }
     }
   }
@@ -798,7 +797,7 @@ table.databases {
     content: "\00d7";
     text-shadow: 1px 1px 1px rgba(0, 0, 0, .2);
     font-size: 16px;
-    background-color: @red;
+    background-color: @linkColor;
     color: white;
     text-align: center;
     line-height: 15px;
@@ -890,7 +889,7 @@ div.spinner {
       transition: background-color 100ms linear;
     }
     .btn{
-      background-color: @red;
+      background-color: @navBG;
       color: #fff;
       margin-left: -1px;
       padding: 10px 10px 8px;
@@ -962,7 +961,7 @@ div.add-dropdown {
         background-color: #202326;
         color: rgba(255, 255, 255, 0.8);
         &:hover{
-          background-color: @red;
+          background-color: @navBG;
           color: white;
         }
       }

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7cde947f/assets/less/variables.less
----------------------------------------------------------------------
diff --git a/assets/less/variables.less b/assets/less/variables.less
index 467ec2e..c062345 100644
--- a/assets/less/variables.less
+++ b/assets/less/variables.less
@@ -11,69 +11,74 @@
  *  the License.
  */
 
-/* = color variables
-   ---------------------------------------------------------------------- */
+@import "bootstrap/variables.less";
+
+/* colors */
 @brown: #3A2C2B;
 @red: #E33F3B;
+@orange: #F3622D;
 @darkRed: #AF2D24;
 @linkRed: #DA4F49;
 @greyBrown: #554D4C;
 @greyBrownLighter: #A59D9D;
-@fontGrey: #808080;
-@secondarySidebar: white;
-@subListGray: #767F89;
+@blue: #049cdb;
+@blueDark: #0064cd;
+@green: #7FA30C;
+@yellow: #ffcc00;
+@pink: #c3325f;
+@purple: #7a43b6;
+
+/* brand */
+@brandPrimary: @red;
+@brandPrimaryDark: @darkRed;
+
+/* base */
+@background: #F2F2F2;
+@leftPanel: @background;
+@rightPanel: #CBCBCB;
 
+/* font */
+@fontGrey: #808080;
+@defaultText: #4D4D4D;
+@defaultHTag: #333333;
 
-@orange: #F3622D;
+/* sublist */
+@subListGray: #767F89;
 
 /*nav*/
 @primaryNav : @brown;
-@navBG: @darkRed;
-@navBGHighlight: @red;
-@navBGHover: @red;
-@navIconColor: @darkRed;
+@navBG: @brandPrimaryDark;
+@navBGHighlight: @brandPrimary;
+@navBGHover: @brandPrimary;
+@navWidth: 220px;
+@navIconColor: @brandPrimaryDark;
 @navIconHighlight: #FFFFFF;
 @bottomNav: @greyBrown;
+@NavIconActive: #ffffff;
+@NavIcon: @brown;
 
 /*top header*/
 @breadcrumbBG: #F1F1F1;
-@breadcrumbText: @red;
+@breadcrumbText: @brandPrimary;
 @breadcrumbArrow: #999999;
-@breadcrumbBorder: @red;
-
-/*background colors*/
-@background: #F2F2F2;
-@leftPanel: @background;
-@rightPanel: #CBCBCB;
-@defaultText: #4D4D4D;
-@defaultHTag: #333333;
+@breadcrumbBorder: @brandPrimary;
 
-@saveButton: #80A221;
-
-@collapsedNavWidth: 64px;
-@navWidth: 220px;
+/* sidebar */
 @sidebarBG: #F2F2F2;
 @sidebarWidth: 330px;
 
+/* secondary sidebar */
+@secondarySidebar: white;
 
-@NavIconActive: #ffffff;
-@NavIcon: @brown;
-
-
-/*buttons */
-@redButton: @red;
-@linkColor: @red;
-@blue:                  #049cdb;
-@blueDark:              #0064cd;
-@green:                 #7FA30C;
-//@red:                   #9d261d;
-@yellow:                #ffcc00;
-@pink:                  #c3325f;
-@purple:                #7a43b6;
-
-
+/* links */
+@linkColor: @brandPrimary;
+@linkColorHover: @brandPrimaryDark;
 
+/* borders */
+@radius: 4px;
+@baseBorderRadius: 0;
 
+/* shadows */
 @boxShadow: 2px 2px rgba(0,0,0,0.2);
 @boxShadowOff: 2px 2px rgba(0,0,0,0);
 @boxShadowLeft: -4px 4px rgba(0,0,0,0.2);
@@ -81,7 +86,9 @@
 @textShadow: 1px 2px rgba(0,0,0,0.2);
 @textShadowOff: 1px 2px rgba(0,0,0,0);
 
-@radius: 4px;
-@baseBorderRadius: 0;
+/* animation */
 @transitionSpeed: .25s;
 @transitionEaseType: linear;
+
+/* breakpoints */
+@collapsedNavWidth: 64px;


Mime
View raw message