Color fix (#1750)

* color updates * Added all bootstrap 3 variables * Added list group hover color to normal list group item * First color iteration fixes
reactioncommerce · Jan 25, 2017 · 037d687 · 037d687
1 parent 339e751
commit 037d687
Show file tree

Hide file tree

Showing 6 changed files with 994 additions and 56 deletions.
diff --git a/imports/plugins/included/default-theme/client/styles/button.less b/imports/plugins/included/default-theme/client/styles/button.less
@@ -2,6 +2,14 @@
   &:focus {
     outline: none;
   }
+
+  &.disabled,
+  &[disabled],
+  fieldset[disabled] & {
+    cursor: @cursor-disabled;
+    .opacity(.65);
+    .box-shadow(none);
+  }
 }
 
 .rui.button > .contents {
@@ -13,7 +21,6 @@
   align-items: center;
 }
 
-
 .rui.button.edit, .btn-edit {
   border: none;
   font-size: 10px;
@@ -29,24 +36,64 @@
   margin-left: 5px;
 }
 
-// .rui.button.edit.btn-default, .btn-edit.btn-default {
-//   background-color: @btn-default-bg;
-// }
+.rui.button.edit.btn-default, .btn-edit.btn-default {
+  background-color: @btn-edit-bg;
+
+  &.disabled,
+  &[disabled],
+  fieldset[disabled] & {
+    .opacity(.65);
+  }
+}
+
+.rui.button.edit.active, .btn-edit.active {
+  background-color: @btn-active-bg;
+
+  &.disabled,
+  &[disabled],
+  fieldset[disabled] & {
+    .opacity(.65);
+  }
+}
 
 .rui.button.edit.btn-success, .btn-edit.btn-success {
   background-color: @btn-success-bg;
+
+  &.disabled,
+  &[disabled],
+  fieldset[disabled] & {
+    .opacity(.65);
+  }
 }
 
 .rui.button.edit.btn-warning, .btn-edit.btn-warning {
   background-color: @btn-warning-bg;
+
+  &.disabled,
+  &[disabled],
+  fieldset[disabled] & {
+    .opacity(.65);
+  }
 }
 
 .rui.button.edit.btn-danger, .btn-edit.btn-danger {
   background-color: @btn-danger-bg;
+
+  &.disabled,
+  &[disabled],
+  fieldset[disabled] & {
+    .opacity(.65);
+  }
 }
 
 .rui.button.edit.btn-info, .btn-edit.btn-info {
   background-color: @btn-info-bg;
+
+  &.disabled,
+  &[disabled],
+  fieldset[disabled] & {
+    .opacity(.65);
+  }
 }
 
 .rui.button.edit > .icon,
@@ -81,6 +128,16 @@
   background-color: transparent;
 }
 
+.toolbar-group .rui.button.flat {
+  color: @reaction-brand;
+
+  &.disabled,
+  &[disabled],
+  fieldset[disabled] & {
+    color: desaturate(mix(@white,@btn-success-bg, 40%),30%);
+  }
+}
+
 .rui.button.icon, .btn-icon {
   border: none;
   padding: 0;
@@ -171,6 +228,14 @@
   border-radius: 0;
   font-weight: 600;
   text-transform: uppercase;
+
+  &.disabled,
+  &[disabled],
+  fieldset[disabled] & {
+    color: desaturate(mix(@white,@btn-success-bg, 40%),30%);
+    border: 3px solid desaturate(mix(@white,@btn-success-bg, 40%),30%);
+
+  }
 }
 
 // .rui.button .btn-default.btn-bordered
diff --git a/imports/plugins/included/default-theme/client/styles/lists.less b/imports/plugins/included/default-theme/client/styles/lists.less
@@ -18,3 +18,8 @@
 .rui.list-group-item .list-item-action {
   flex: 0 0 auto;
 }
+
+.rui.list-group-item .list-group-item:hover, .list-group-item:hover {
+  background-color: @list-group-hover-bg;
+  cursor: pointer;
+}
diff --git a/imports/plugins/included/default-theme/client/styles/panels.less b/imports/plugins/included/default-theme/client/styles/panels.less
@@ -15,6 +15,10 @@
   }
 }
 
+.panel-heading {
+  text-transform: capitalize;
+}
+
 .flex-item > .panel {
   margin-bottom: 0;
   min-height: 220px;
@@ -38,7 +42,7 @@ label.panel-title {
 }
 
 .panel-active > .panel-heading {
-  background-color: @brand-accent-color;
+  background-color: @gray-lightest;
 }
 
 .action-view-body .panel-group {
@@ -69,7 +73,7 @@ label.panel-title {
 }
 
 .panel-group-accordian .panel-active a.panel-heading {
-  background-color: @brand-accent-color;
+  background-color: @gray-lightest;
 }
 
 .panel-heading-flex {

diff --git a/imports/plugins/included/default-theme/client/styles/toolbar.less b/imports/plugins/included/default-theme/client/styles/toolbar.less
@@ -6,6 +6,9 @@
   align-items: center;
   padding-left: @navbar-padding-horizontal;
   padding-right: @navbar-padding-horizontal;
+  border-radius: 0;
+  border: none;
+  border-bottom: @toolbar-border-width solid @toolbar-border-color;
 }
 
 .rui.toolbar-group {