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 a7a391e
Date Tue, 20 Jan 2015 13:18:33 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 17cfa631c -> a7a391ebf


Cleanup: delete unused less & more specific selectors

 - delete not used less
 - make css more specific


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

Branch: refs/heads/master
Commit: a7a391ebf2f264359b1843985dfe1df382bf898c
Parents: 17cfa63
Author: Robert Kowalski <robertkowalski@apache.org>
Authored: Tue Jan 20 10:50:26 2015 +0100
Committer: Robert Kowalski <robertkowalski@apache.org>
Committed: Tue Jan 20 14:18:03 2015 +0100

----------------------------------------------------------------------
 app/addons/fauxton/templates/notification.html |  2 +-
 assets/less/fauxton.less                       | 65 +++++++++++++--------
 assets/less/variables.less                     | 10 ----
 3 files changed, 43 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/a7a391eb/app/addons/fauxton/templates/notification.html
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/templates/notification.html b/app/addons/fauxton/templates/notification.html
index 16ac43b..84ac7ac 100644
--- a/app/addons/fauxton/templates/notification.html
+++ b/app/addons/fauxton/templates/notification.html
@@ -12,7 +12,7 @@ License for the specific language governing permissions and limitations
under
 the License.
 */%>
 
-<div class="alert alert-<%- type %>">
+<div class="global-notification alert alert-<%- type %>">
   <a data-bypass href="#" class="js-dismiss"><i class="pull-right fonticon-cancel"></i></a>
   <i class="notification-icon <%- icon %>"></i>
   <%= htmlToRender %><!-- every caller has to escape on it's own -->

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/a7a391eb/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less
index 0874fd5..36259e7 100644
--- a/assets/less/fauxton.less
+++ b/assets/less/fauxton.less
@@ -164,38 +164,57 @@ table.databases {
 }
 
 // customize the twitter bootstrap alert
-.alert {
-  padding-left: 20px;
-  padding-top: 20px;
-  min-height: @collapsedNavWidth;
-  margin-bottom: auto;
-  text-shadow: none;
-  .border-radius(0);
-  border-bottom: 1px solid #3a2c2b; 
-  box-shadow: 0px 4px 0 0 rgba(0, 0, 0, 0.4);
-  a, a:hover {
-    color: #cecece;
-    text-decoration: underline;
+.global-notification {
+  &.alert {
+    padding-left: 20px;
+    padding-top: 20px;
+    min-height: @collapsedNavWidth;
+    margin-bottom: auto;
+    text-shadow: none;
+    .border-radius(0);
+    border-bottom: 1px solid #3a2c2b; 
+    box-shadow: 0px 4px 0 0 rgba(0, 0, 0, 0.4);
+    a, a:hover {
+      color: #cecece;
+      text-decoration: underline;
+    }
+    a.js-dismiss {
+      color: rgba(255, 255, 255, 1);
+    }
+    a.js-dismiss :hover {
+      color: rgba(255, 255, 255, 0.4);
+    }
+  }
+  &.alert-success {
+    background-color: #448c11;
+    color: #CBDFBD;
   }
-  a.js-dismiss {
-    color: rgba(255, 255, 255, 1);
+  &.alert-success h4 {
+    color: #CBDFBD;
   }
-  a.js-dismiss :hover {
-    color: rgba(255, 255, 255, 0.4);
+  &.alert-danger,
+  &.alert-error {
+    background-color: #222;
+    color: #ff0c35;
+  }
+  &.alert-danger h4,
+  &.alert-error h4 {
+    color: #ff0c35;
+  }
+  &.alert-info {
+    background-color: #329898;
+    color: #fff;
+  }
+  &.alert-info h4 {
+    color: #fff;
   }
 }
 
+
 .notification-icon {
   padding-right: 8px;
 }
 
-.tray .alert {
-  padding: 15px 14px 8px 14px;
-  .bottom-shadow-border(0px);
-  border-bottom: none;
-  margin-bottom: 10px;
-}
-
 #dashboard-upper-content{
   .tab-content {
     padding-top: 70px;

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/a7a391eb/assets/less/variables.less
----------------------------------------------------------------------
diff --git a/assets/less/variables.less b/assets/less/variables.less
index db533b8..a75c513 100644
--- a/assets/less/variables.less
+++ b/assets/less/variables.less
@@ -106,13 +106,3 @@
 
 /* breakpoints */
 @collapsedNavWidth: 64px;
-
-/* notifications */
-@errorText: #ff0c35;
-@errorBackground: #222;
-
-@successText: #CBDFBD;
-@successBackground: #448c11;
-
-@infoText: #fff;
-@infoBackground: #329898;


Mime
View raw message