From c9e6aacd3c4db627eaa9278356442a5f24da6072 Mon Sep 17 00:00:00 2001
From: rymorgan <ryan@reactioncommerce.com>
Date: Tue, 24 Jan 2017 13:18:07 -0800
Subject: [PATCH 1/4] color updates

---
 .../default-theme/client/styles/panels.less   |  4 +--
 .../default-theme/client/styles/toolbar.less  |  3 ++
 .../client/styles/variables.less              | 36 ++++++++++++++-----
 .../notifications/client/styles/dropdown.css  |  2 +-
 4 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/imports/plugins/included/default-theme/client/styles/panels.less b/imports/plugins/included/default-theme/client/styles/panels.less
index f1ba8a77cd5..a6fbb281bff 100644
--- a/imports/plugins/included/default-theme/client/styles/panels.less
+++ b/imports/plugins/included/default-theme/client/styles/panels.less
@@ -38,7 +38,7 @@ label.panel-title {
 }
 
 .panel-active > .panel-heading {
-  background-color: @brand-accent-color;
+  background-color: @gray-lightest;
 }
 
 .action-view-body .panel-group {
@@ -69,7 +69,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
index e1bd92a69c6..14cb1da5f31 100644
--- 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: 1px solid #ccc;
 }
 
 .rui.toolbar-group {
diff --git a/imports/plugins/included/default-theme/client/styles/variables.less b/imports/plugins/included/default-theme/client/styles/variables.less
index 3b2014a6153..836106e8f3a 100644
--- a/imports/plugins/included/default-theme/client/styles/variables.less
+++ b/imports/plugins/included/default-theme/client/styles/variables.less
@@ -32,17 +32,21 @@
 // Brand
 @brand-primary-color: @reaction-brand;
 @brand-secondary-color: #ff00ff; //lighten(@brand-primary-color, 20); // old @brand-secondary-color: #4aa5bd;
-@brand-accent-color: #ffff00; //lighten(@brand-primary-color, 37); // old @brand-accent-color: #abe2e7;
-@brand-vivid-color: #00ff00; //lighten(@brand-primary-color, 20); // old @brand-vivid-color: #00dcdd;
+@brand-accent-color: #94E8D1; //lighten(@brand-primary-color, 37); // old @brand-accent-color: #abe2e7;
+@brand-vivid-color: #1AEFCC; //lighten(@brand-primary-color, 20); // old @brand-vivid-color: #00dcdd;
 
 @brand-light-highlight: @black02;
 @brand-light-color: #e3e3e3;
 @brand-dark-color: #414141;
 
-@brand-success-color:         #5cb85c;
+@brand-success-color:         @reaction-brand;
 @brand-info-color:            #5bc0de;
-@brand-warning-color:         #f0ad4e;
-@brand-danger-color:          #d9534f;
+@brand-warning-color:         #EFC95F;
+@brand-danger-color:          #EB4D5C;
+
+@btn-edit-color: @gray-darker;
+
+.toolbar-group .rui.button.flat { color: @reaction-brand }
 
 //== Bootstrap colors
 //
@@ -54,6 +58,7 @@
 @gray:                   lighten(@gray-base, 33.5%); // #555
 @gray-light:             lighten(@gray-base, 46.7%); // #777
 @gray-lighter:           lighten(@gray-base, 93.5%); // #eee
+@gray-lightest:          lighten(@gray-base, 96%); // #f6f6f6
 
 @brand-primary:         @black60;
 @brand-success:         @brand-success-color;
@@ -61,6 +66,21 @@
 @brand-warning:         @brand-warning-color;
 @brand-danger:          @brand-danger-color;
 
+@state-success-text:             #3c763d;
+@state-success-bg:               @gray-lighter;
+@state-success-border:           darken(spin(@state-success-bg, -10), 5%);
+
+@state-info-text:                #31708f;
+@state-info-bg:                  #d9edf7;
+@state-info-border:              darken(spin(@state-info-bg, -10), 7%);
+
+@state-warning-text:             #8a6d3b;
+@state-warning-bg:               #fcf8e3;
+@state-warning-border:           darken(spin(@state-warning-bg, -10), 5%);
+
+@state-danger-text:              #a94442;
+@state-danger-bg:                #f2dede;
+@state-danger-border:            darken(spin(@state-danger-bg, -10), 5%);
 
 //== Scaffolding
 //
@@ -154,7 +174,7 @@
 
 
 // == Buttons
-@btn-edit-color: @text-color;
+@btn-info-edit-color: @text-color;
 @btn-edit-bg: @black20;
 @btn-active-color: darken(@brand-accent-color, 50%);
 @btn-active-bg: @brand-accent-color;
@@ -194,8 +214,8 @@
 //== Cart Drawer
 @cart-drawer-bg: @white;
 @cart-drawer-height: 275px;
-@cart-icon-bg: @brand-success;
-@cart-icon-badge:  @brand-success;
+@cart-icon-bg: #23566d;
+@cart-icon-badge:  #23566d;
 @cart-icon-badge-warning: @brand-warning;
 @cart-icon-text: @white;
 @cart-icon-color: @white;
diff --git a/imports/plugins/included/notifications/client/styles/dropdown.css b/imports/plugins/included/notifications/client/styles/dropdown.css
index d1568fc88ae..d721f344e75 100644
--- a/imports/plugins/included/notifications/client/styles/dropdown.css
+++ b/imports/plugins/included/notifications/client/styles/dropdown.css
@@ -19,7 +19,7 @@
 }
 
 .badge.badge-red {
-    background: red !important;
+    background: #d9534f !important;
     position: relative !important;
     min-width: 20px !important;
     padding: 3px 3px !important;

From 8d3420bb7caa7028cfd22366fd87e7a0bec1eecd Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Tue, 24 Jan 2017 13:50:27 -0800
Subject: [PATCH 2/4] Added all bootstrap 3 variables

---
 .../default-theme/client/styles/toolbar.less  |   2 +-
 .../client/styles/variables.less              | 905 +++++++++++++++++-
 2 files changed, 877 insertions(+), 30 deletions(-)

diff --git a/imports/plugins/included/default-theme/client/styles/toolbar.less b/imports/plugins/included/default-theme/client/styles/toolbar.less
index 14cb1da5f31..d61a4679aaf 100644
--- a/imports/plugins/included/default-theme/client/styles/toolbar.less
+++ b/imports/plugins/included/default-theme/client/styles/toolbar.less
@@ -8,7 +8,7 @@
   padding-right: @navbar-padding-horizontal;
   border-radius: 0;
   border: none;
-  border-bottom: 1px solid #ccc;
+  border-bottom: @toolbar-border-width solid @toolbar-border-color;
 }
 
 .rui.toolbar-group {
diff --git a/imports/plugins/included/default-theme/client/styles/variables.less b/imports/plugins/included/default-theme/client/styles/variables.less
index 836106e8f3a..7c311fa0d7b 100644
--- a/imports/plugins/included/default-theme/client/styles/variables.less
+++ b/imports/plugins/included/default-theme/client/styles/variables.less
@@ -3,6 +3,11 @@
 @import url(//fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,700,900);
 
 
+//
+// Variables
+// --------------------------------------------------
+
+
 //== Colors
 @reaction-brand: #1999dd;
 
@@ -82,36 +87,895 @@
 @state-danger-bg:                #f2dede;
 @state-danger-border:            darken(spin(@state-danger-bg, -10), 5%);
 
+
+@shadow-1: 0 0 5px rgba(0, 0, 0, 0.2);
+
+@controlbar-bg: @white;
+@controlbar-fg: @black;
+@controlbar-seperator: darken(@controlbar-bg, 10%);
+@controlbar-hover: lighten(@controlbar-fg, 20%);
+@controlbar-fg-hover: @white;
+
 //== Scaffolding
 //
 //## Settings for some of the most global styles.
 
 //** Background color for `<body>`.
-@body-bg:               #fff;
+@body-bg:               darken(white, 2%);;
 //** Global text color on `<body>`.
 @text-color:            @gray-dark;
+//** Global border-color and border-width.
+@border-color: @black10;
+@border-width: 1px;
+@border-thin: 1px solid @black10;
+
 
 //** Global textual link color.
 @link-color:            @brand-primary;
 //** Link hover color set via `darken()` function.
 @link-hover-color:      darken(@link-color, 15%);
-//== End Bootstrap colors
+//** Link hover decoration.
+@link-hover-decoration: underline;
 
-//== End Colors
 
+//== Typography
+//
+//## Font, line-height, and color for body text, headings, and more.
+
+@font-family-sans-serif:  "Helvetica Neue", Helvetica, Arial, sans-serif;
+@font-family-serif:       Georgia, "Times New Roman", Times, serif;
+//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
+@font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;
+@font-family-base:        @font-family-sans-serif;
+
+@font-size-base:          14px;
+@font-size-large:         ceil((@font-size-base * 1.25)); // ~18px
+@font-size-small:         ceil((@font-size-base * 0.85)); // ~12px
+
+@font-size-h1:            floor((@font-size-base * 2.6)); // ~36px
+@font-size-h2:            floor((@font-size-base * 2.15)); // ~30px
+@font-size-h3:            ceil((@font-size-base * 1.7)); // ~24px
+@font-size-h4:            ceil((@font-size-base * 1.25)); // ~18px
+@font-size-h5:            @font-size-base;
+@font-size-h6:            ceil((@font-size-base * 0.85)); // ~12px
+
+//** Unit-less `line-height` for use in components like buttons.
+@line-height-base:        1.428571429; // 20/14
+//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
+@line-height-computed:    floor((@font-size-base * @line-height-base)); // ~20px
+
+//** By default, this inherits from the `<body>`.
+@headings-font-family:    inherit;
+@headings-font-weight:    500;
+@headings-line-height:    1.1;
+@headings-color:          inherit;
+
+
+//== Iconography
+//
+//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
 
-@body-bg: darken(white, 2%);
-@border-color: @black10;
-@border-thin: 1px solid @black10;
+//** Load fonts from this directory.
+@icon-font-path:          "../fonts/";
+//** File name for all font files.
+@icon-font-name:          "glyphicons-halflings-regular";
+//** Element ID within SVG icon file.
+@icon-font-svg-id:        "glyphicons_halflingsregular";
 
-@shadow-1: 0 0 5px rgba(0, 0, 0, 0.2);
 
-@controlbar-bg: @white;
-@controlbar-fg: @black;
-@controlbar-seperator: darken(@controlbar-bg, 10%);
-@controlbar-hover: lighten(@controlbar-fg, 20%);
-@controlbar-fg-hover: @white;
+//== Components
+//
+//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
+
+@padding-base-vertical:     6px;
+@padding-base-horizontal:   12px;
+
+@padding-large-vertical:    10px;
+@padding-large-horizontal:  16px;
+
+@padding-small-vertical:    5px;
+@padding-small-horizontal:  10px;
+
+@padding-xs-vertical:       1px;
+@padding-xs-horizontal:     5px;
+
+@line-height-large:         1.3333333; // extra decimals for Win 8.1 Chrome
+@line-height-small:         1.5;
+
+@border-radius-base:        4px;
+@border-radius-large:       6px;
+@border-radius-small:       3px;
+
+//** Global color for active items (e.g., navs or dropdowns).
+@component-active-color:    #fff;
+//** Global background color for active items (e.g., navs or dropdowns).
+@component-active-bg:       @brand-primary;
+
+//** Width of the `border` for generating carets that indicate dropdowns.
+@caret-width-base:          4px;
+//** Carets increase slightly in size for larger components.
+@caret-width-large:         5px;
+
+
+//== Tables
+//
+//## Customizes the `.table` component with basic values, each used across all table variations.
+
+//** Padding for `<th>`s and `<td>`s.
+@table-cell-padding:            8px;
+//** Padding for cells in `.table-condensed`.
+@table-condensed-cell-padding:  5px;
+
+//** Default background color used for all tables.
+@table-bg:                      transparent;
+//** Background color used for `.table-striped`.
+@table-bg-accent:               #f9f9f9;
+//** Background color used for `.table-hover`.
+@table-bg-hover:                #f5f5f5;
+@table-bg-active:               @table-bg-hover;
+
+//** Border color for table and cell borders.
+@table-border-color:            #ddd;
+
+
+//== Buttons
+//
+//## For each of Bootstrap's buttons, define text, background and border color.
+
+@btn-font-weight:                normal;
+
+@btn-default-color:              #333;
+@btn-default-bg:                 #fff;
+@btn-default-border:             #ccc;
+
+@btn-primary-color:              #fff;
+@btn-primary-bg:                 @brand-primary;
+@btn-primary-border:             darken(@btn-primary-bg, 5%);
+
+@btn-success-color:              #fff;
+@btn-success-bg:                 @brand-success;
+@btn-success-border:             darken(@btn-success-bg, 5%);
+
+@btn-info-color:                 #fff;
+@btn-info-bg:                    @brand-info;
+@btn-info-border:                darken(@btn-info-bg, 5%);
+
+@btn-warning-color:              #fff;
+@btn-warning-bg:                 @brand-warning;
+@btn-warning-border:             darken(@btn-warning-bg, 5%);
+
+@btn-danger-color:               #fff;
+@btn-danger-bg:                  @brand-danger;
+@btn-danger-border:              darken(@btn-danger-bg, 5%);
+
+@btn-link-disabled-color:        @gray-light;
+
+// Allows for customizing button radius independently from global border radius
+@btn-border-radius-base:         @border-radius-base;
+@btn-border-radius-large:        @border-radius-large;
+@btn-border-radius-small:        @border-radius-small;
+
+
+//== Forms
+//
+//##
+
+//** `<input>` background color
+@input-bg:                       #fff;
+//** `<input disabled>` background color
+@input-bg-disabled:              @gray-lighter;
+
+//** Text color for `<input>`s
+@input-color:                    @gray;
+//** `<input>` border color
+@input-border:                   #ccc;
+
+// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
+//** Default `.form-control` border radius
+// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
+@input-border-radius:            @border-radius-base;
+//** Large `.form-control` border radius
+@input-border-radius-large:      @border-radius-large;
+//** Small `.form-control` border radius
+@input-border-radius-small:      @border-radius-small;
+
+//** Border color for inputs on focus
+@input-border-focus:             #66afe9;
+
+//** Placeholder text color
+@input-color-placeholder:        #999;
+
+//** Default `.form-control` height
+@input-height-base:              (@line-height-computed + (@padding-base-vertical * 2) + 2);
+//** Large `.form-control` height
+@input-height-large:             (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
+//** Small `.form-control` height
+@input-height-small:             (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
+
+//** `.form-group` margin
+@form-group-margin-bottom:       15px;
+
+@legend-color:                   @gray-dark;
+@legend-border-color:            #e5e5e5;
+
+//** Background color for textual input addons
+@input-group-addon-bg:           @gray-lighter;
+//** Border color for textual input addons
+@input-group-addon-border-color: @input-border;
+
+//** Disabled cursor for form controls and buttons.
+@cursor-disabled:                not-allowed;
+
+
+//== Dropdowns
+//
+//## Dropdown menu container and contents.
+
+//** Background for the dropdown menu.
+@dropdown-bg:                    #fff;
+//** Dropdown menu `border-color`.
+@dropdown-border:                rgba(0,0,0,.15);
+//** Dropdown menu `border-color` **for IE8**.
+@dropdown-fallback-border:       #ccc;
+//** Divider color for between dropdown items.
+@dropdown-divider-bg:            #e5e5e5;
+
+//** Dropdown link text color.
+@dropdown-link-color:            @gray-dark;
+//** Hover color for dropdown links.
+@dropdown-link-hover-color:      darken(@gray-dark, 5%);
+//** Hover background for dropdown links.
+@dropdown-link-hover-bg:         #f5f5f5;
+
+//** Active dropdown menu item text color.
+@dropdown-link-active-color:     @component-active-color;
+//** Active dropdown menu item background color.
+@dropdown-link-active-bg:        @component-active-bg;
+
+//** Disabled dropdown menu item background color.
+@dropdown-link-disabled-color:   @gray-light;
+
+//** Text color for headers within dropdown menus.
+@dropdown-header-color:          @gray-light;
+
+//** Deprecated `@dropdown-caret-color` as of v3.1.0
+@dropdown-caret-color:           #000;
+
+
+//-- Z-index master list
+//
+// Warning: Avoid customizing these values. They're used for a bird's eye view
+// of components dependent on the z-axis and are designed to all work together.
+//
+// Note: These variables are not generated into the Customizer.
+
+@zindex-navbar:            1000;
+@zindex-dropdown:          1000;
+@zindex-popover:           1060;
+@zindex-tooltip:           1070;
+@zindex-navbar-fixed:      1030;
+@zindex-modal-background:  1040;
+@zindex-modal:             1050;
+
+
+//== Media queries breakpoints
+//
+//## Define the breakpoints at which your layout will change, adapting to different screen sizes.
+
+// Extra small screen / phone
+//** Deprecated `@screen-xs` as of v3.0.1
+@screen-xs:                  480px;
+//** Deprecated `@screen-xs-min` as of v3.2.0
+@screen-xs-min:              @screen-xs;
+//** Deprecated `@screen-phone` as of v3.0.1
+@screen-phone:               @screen-xs-min;
+
+// Small screen / tablet
+//** Deprecated `@screen-sm` as of v3.0.1
+@screen-sm:                  768px;
+@screen-sm-min:              @screen-sm;
+//** Deprecated `@screen-tablet` as of v3.0.1
+@screen-tablet:              @screen-sm-min;
+
+// Medium screen / desktop
+//** Deprecated `@screen-md` as of v3.0.1
+@screen-md:                  992px;
+@screen-md-min:              @screen-md;
+//** Deprecated `@screen-desktop` as of v3.0.1
+@screen-desktop:             @screen-md-min;
+
+// Large screen / wide desktop
+//** Deprecated `@screen-lg` as of v3.0.1
+@screen-lg:                  1200px;
+@screen-lg-min:              @screen-lg;
+//** Deprecated `@screen-lg-desktop` as of v3.0.1
+@screen-lg-desktop:          @screen-lg-min;
+
+// So media queries don't overlap when required, provide a maximum
+@screen-xs-max:              (@screen-sm-min - 1);
+@screen-sm-max:              (@screen-md-min - 1);
+@screen-md-max:              (@screen-lg-min - 1);
+
+
+//== Grid system
+//
+//## Define your custom responsive grid.
+
+//** Number of columns in the grid.
+@grid-columns:              12;
+//** Padding between columns. Gets divided in half for the left and right.
+@grid-gutter-width:         30px;
+// Navbar collapse
+//** Point at which the navbar becomes uncollapsed.
+@grid-float-breakpoint:     @screen-sm-min;
+//** Point at which the navbar begins collapsing.
+@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);
+
+
+//== Container sizes
+//
+//## Define the maximum width of `.container` for different screen sizes.
+
+// Small screen / tablet
+@container-tablet:             (720px + @grid-gutter-width);
+//** For `@screen-sm-min` and up.
+@container-sm:                 @container-tablet;
+
+// Medium screen / desktop
+@container-desktop:            (940px + @grid-gutter-width);
+//** For `@screen-md-min` and up.
+@container-md:                 @container-desktop;
+
+// Large screen / wide desktop
+@container-large-desktop:      (1140px + @grid-gutter-width);
+//** For `@screen-lg-min` and up.
+@container-lg:                 @container-large-desktop;
+
+
+//== Navbar
+//
+//##
+
+// Basics of a navbar
+@navbar-height:                    55px;
+@navbar-margin-bottom:             0;
+@navbar-border-radius:             0;
+@navbar-padding-horizontal:        floor((@grid-gutter-width / 2));
+@navbar-padding-vertical:          ((@navbar-height - @line-height-computed) / 2);
+@navbar-collapse-max-height:       340px;
+
+@navbar-default-color:             @white;
+@navbar-default-bg:                @black60;
+@navbar-default-border:            darken(@navbar-default-bg, 6.5%);
+
+// Navbar links
+@navbar-default-link-color:                @black05;
+@navbar-default-link-hover-color:          #333;
+@navbar-default-link-hover-bg:             transparent;
+@navbar-default-link-active-color:         #555;
+@navbar-default-link-active-bg:            darken(@navbar-default-bg, 6.5%);
+@navbar-default-link-disabled-color:       #ccc;
+@navbar-default-link-disabled-bg:          transparent;
+
+// Navbar brand label
+@navbar-default-brand-color:               @navbar-default-link-color;
+@navbar-default-brand-hover-color:         darken(@navbar-default-brand-color, 10%);
+@navbar-default-brand-hover-bg:            transparent;
+
+// Navbar toggle
+@navbar-default-toggle-hover-bg:           darken(@navbar-default-bg, 10%);
+@navbar-default-toggle-icon-bar-bg:        darken(@navbar-default-bg, 10%);
+@navbar-default-toggle-border-color:       #ddd;
+
+//=== Inverted toolbar
+// Reset inverted toolbar basics
+@navbar-inverse-color:                      @black;
+@navbar-inverse-bg:                         @white;
+@navbar-inverse-border:                     darken(@navbar-inverse-bg, 10%);
+
+// Inverted navbar links
+@navbar-inverse-link-color:                 @black;
+@navbar-inverse-link-hover-color:           @black60;
+@navbar-inverse-link-hover-bg:              transparent;
+@navbar-inverse-link-active-color:          @navbar-inverse-link-hover-color;
+@navbar-inverse-link-active-bg:             darken(@navbar-inverse-bg, 10%);
+@navbar-inverse-link-disabled-color:        #444;
+@navbar-inverse-link-disabled-bg:           transparent;
+
+// Inverted navbar brand label
+@navbar-inverse-brand-color:                @navbar-inverse-link-color;
+@navbar-inverse-brand-hover-color:          #fff;
+@navbar-inverse-brand-hover-bg:             transparent;
+
+// Inverted navbar toggle
+@navbar-inverse-toggle-hover-bg:            #333;
+@navbar-inverse-toggle-icon-bar-bg:         #fff;
+@navbar-inverse-toggle-border-color:        #333;
+
+//=== Toolbar
+// Reset inverted navbar basics
+@toolbar-inverse-color:                      @black;
+@toolbar-inverse-bg:                         @white;
+@toolbar-inverse-border:                     darken(@toolbar-inverse-bg, 10%);
+@toolbar-border-width:                       1px;
+@toolbar-border-color:                       @border-color;
+
+// Inverted toolbar links
+@toolbar-inverse-link-color:                 @black;
+@toolbar-inverse-link-hover-color:           @black60;
+@toolbar-inverse-link-hover-bg:              transparent;
+@toolbar-inverse-link-active-color:          @toolbar-inverse-link-hover-color;
+@toolbar-inverse-link-active-bg:             darken(@toolbar-inverse-bg, 10%);
+@toolbar-inverse-link-disabled-color:        #444;
+@toolbar-inverse-link-disabled-bg:           transparent;
+
+// Inverted toolbar brand label
+@toolbar-inverse-brand-color:                @toolbar-inverse-link-color;
+@toolbar-inverse-brand-hover-color:          #fff;
+@toolbar-inverse-brand-hover-bg:             transparent;
+
+// Inverted toolbar toggle
+@toolbar-inverse-toggle-hover-bg:            #333;
+@toolbar-inverse-toggle-icon-bar-bg:         #fff;
+@toolbar-inverse-toggle-border-color:        #333;
+
+
+//== Navs
+//
+//##
+
+//=== Shared nav styles
+@nav-link-padding:                          10px 15px;
+@nav-link-hover-bg:                         @gray-lighter;
+
+@nav-disabled-link-color:                   @gray-light;
+@nav-disabled-link-hover-color:             @gray-light;
+
+//== Tabs
+@nav-tabs-border-color:                     #ddd;
+
+@nav-tabs-link-hover-border-color:          @gray-lighter;
+
+@nav-tabs-active-link-hover-bg:             @body-bg;
+@nav-tabs-active-link-hover-color:          @gray;
+@nav-tabs-active-link-hover-border-color:   #ddd;
+
+@nav-tabs-justified-link-border-color:            #ddd;
+@nav-tabs-justified-active-link-border-color:     @body-bg;
+
+//== Pills
+@nav-pills-border-radius:                   @border-radius-base;
+@nav-pills-active-link-hover-bg:            @component-active-bg;
+@nav-pills-active-link-hover-color:         @component-active-color;
+
+
+//== Pagination
+//
+//##
+
+@pagination-color:                     @link-color;
+@pagination-bg:                        #fff;
+@pagination-border:                    #ddd;
+
+@pagination-hover-color:               @link-hover-color;
+@pagination-hover-bg:                  @gray-lighter;
+@pagination-hover-border:              #ddd;
+
+@pagination-active-color:              #fff;
+@pagination-active-bg:                 @brand-primary;
+@pagination-active-border:             @brand-primary;
+
+@pagination-disabled-color:            @gray-light;
+@pagination-disabled-bg:               #fff;
+@pagination-disabled-border:           #ddd;
+
+
+//== Pager
+//
+//##
+
+@pager-bg:                             @pagination-bg;
+@pager-border:                         @pagination-border;
+@pager-border-radius:                  15px;
+
+@pager-hover-bg:                       @pagination-hover-bg;
+
+@pager-active-bg:                      @pagination-active-bg;
+@pager-active-color:                   @pagination-active-color;
 
+@pager-disabled-color:                 @pagination-disabled-color;
+
+
+//== Jumbotron
+//
+//##
+
+@jumbotron-padding:              30px;
+@jumbotron-color:                inherit;
+@jumbotron-bg:                   @gray-lighter;
+@jumbotron-heading-color:        inherit;
+@jumbotron-font-size:            ceil((@font-size-base * 1.5));
+@jumbotron-heading-font-size:    ceil((@font-size-base * 4.5));
+
+
+//== Form states and alerts
+//
+//## Define colors for form feedback states and, by default, alerts.
+
+@state-success-text:             #3c763d;
+@state-success-bg:               #dff0d8;
+@state-success-border:           darken(spin(@state-success-bg, -10), 5%);
+
+@state-info-text:                #31708f;
+@state-info-bg:                  #d9edf7;
+@state-info-border:              darken(spin(@state-info-bg, -10), 7%);
+
+@state-warning-text:             #8a6d3b;
+@state-warning-bg:               #fcf8e3;
+@state-warning-border:           darken(spin(@state-warning-bg, -10), 5%);
+
+@state-danger-text:              #a94442;
+@state-danger-bg:                #f2dede;
+@state-danger-border:            darken(spin(@state-danger-bg, -10), 5%);
+
+
+//== Tooltips
+//
+//##
+
+//** Tooltip max width
+@tooltip-max-width:           200px;
+//** Tooltip text color
+@tooltip-color:               #fff;
+//** Tooltip background color
+@tooltip-bg:                  #000;
+@tooltip-opacity:             .9;
+
+//** Tooltip arrow width
+@tooltip-arrow-width:         5px;
+//** Tooltip arrow color
+@tooltip-arrow-color:         @tooltip-bg;
+
+
+//== Popovers
+//
+//##
+
+//** Popover body background color
+@popover-bg:                          #fff;
+//** Popover maximum width
+@popover-max-width:                   276px;
+//** Popover border color
+@popover-border-color:                rgba(0,0,0,.2);
+//** Popover fallback border color
+@popover-fallback-border-color:       #ccc;
+
+//** Popover title background color
+@popover-title-bg:                    darken(@popover-bg, 3%);
+
+//** Popover arrow width
+@popover-arrow-width:                 10px;
+//** Popover arrow color
+@popover-arrow-color:                 @popover-bg;
+
+//** Popover outer arrow width
+@popover-arrow-outer-width:           (@popover-arrow-width + 1);
+//** Popover outer arrow color
+@popover-arrow-outer-color:           fadein(@popover-border-color, 5%);
+//** Popover outer arrow fallback color
+@popover-arrow-outer-fallback-color:  darken(@popover-fallback-border-color, 20%);
+
+
+//== Labels
+//
+//##
+
+//** Default label background color
+@label-default-bg:            @gray-light;
+//** Primary label background color
+@label-primary-bg:            @brand-primary;
+//** Success label background color
+@label-success-bg:            @brand-success;
+//** Info label background color
+@label-info-bg:               @brand-info;
+//** Warning label background color
+@label-warning-bg:            @brand-warning;
+//** Danger label background color
+@label-danger-bg:             @brand-danger;
+
+//** Default label text color
+@label-color:                 #fff;
+//** Default text color of a linked label
+@label-link-hover-color:      #fff;
+
+
+//== Modals
+//
+//##
+
+//** Padding applied to the modal body
+@modal-inner-padding:         15px;
+
+//** Padding applied to the modal title
+@modal-title-padding:         15px;
+//** Modal title line-height
+@modal-title-line-height:     @line-height-base;
+
+//** Background color of modal content area
+@modal-content-bg:                             #fff;
+//** Modal content border color
+@modal-content-border-color:                   rgba(0,0,0,.2);
+//** Modal content border color **for IE8**
+@modal-content-fallback-border-color:          #999;
+
+//** Modal backdrop background color
+@modal-backdrop-bg:           #000;
+//** Modal backdrop opacity
+@modal-backdrop-opacity:      .5;
+//** Modal header border color
+@modal-header-border-color:   #e5e5e5;
+//** Modal footer border color
+@modal-footer-border-color:   @modal-header-border-color;
+
+@modal-lg:                    900px;
+@modal-md:                    600px;
+@modal-sm:                    300px;
+
+
+//== Alerts
+//
+//## Define alert colors, border radius, and padding.
+
+@alert-padding:               15px;
+@alert-border-radius:         @border-radius-base;
+@alert-link-font-weight:      bold;
+
+@alert-success-bg:            @state-success-bg;
+@alert-success-text:          @state-success-text;
+@alert-success-border:        @state-success-border;
+
+@alert-info-bg:               @state-info-bg;
+@alert-info-text:             @state-info-text;
+@alert-info-border:           @state-info-border;
+
+@alert-warning-bg:            @state-warning-bg;
+@alert-warning-text:          @state-warning-text;
+@alert-warning-border:        @state-warning-border;
+
+@alert-danger-bg:             @state-danger-bg;
+@alert-danger-text:           @state-danger-text;
+@alert-danger-border:         @state-danger-border;
+
+
+//== Progress bars
+//
+//##
+
+//** Background color of the whole progress component
+@progress-bg:                 #f5f5f5;
+//** Progress bar text color
+@progress-bar-color:          #fff;
+//** Variable for setting rounded corners on progress bar.
+@progress-border-radius:      @border-radius-base;
+
+//** Default progress bar color
+@progress-bar-bg:             @brand-primary;
+//** Success progress bar color
+@progress-bar-success-bg:     @brand-success;
+//** Warning progress bar color
+@progress-bar-warning-bg:     @brand-warning;
+//** Danger progress bar color
+@progress-bar-danger-bg:      @brand-danger;
+//** Info progress bar color
+@progress-bar-info-bg:        @brand-info;
+
+
+//== List group
+//
+//##
+
+//** Background color on `.list-group-item`
+@list-group-bg:                 #fff;
+//** `.list-group-item` border color
+@list-group-border:             #ddd;
+//** List group border radius
+@list-group-border-radius:      @border-radius-base;
+
+//** Background color of single list items on hover
+@list-group-hover-bg:           #f5f5f5;
+//** Text color of active list items
+@list-group-active-color:       @component-active-color;
+//** Background color of active list items
+@list-group-active-bg:          @component-active-bg;
+//** Border color of active list elements
+@list-group-active-border:      @list-group-active-bg;
+//** Text color for content within active list items
+@list-group-active-text-color:  lighten(@list-group-active-bg, 40%);
+
+//** Text color of disabled list items
+@list-group-disabled-color:      @gray-light;
+//** Background color of disabled list items
+@list-group-disabled-bg:         @gray-lighter;
+//** Text color for content within disabled list items
+@list-group-disabled-text-color: @list-group-disabled-color;
+
+@list-group-link-color:         #555;
+@list-group-link-hover-color:   @list-group-link-color;
+@list-group-link-heading-color: #333;
+
+
+//== Panels
+//
+//##
+
+@panel-bg:                    #fff;
+@panel-body-padding:          15px;
+@panel-heading-padding:       10px 15px;
+@panel-footer-padding:        @panel-heading-padding;
+@panel-border-radius:         @border-radius-base;
+
+//** Border color for elements within panels
+@panel-inner-border:          #ddd;
+@panel-footer-bg:             #f5f5f5;
+
+@panel-default-text:          @gray-dark;
+@panel-default-border:        #ddd;
+@panel-default-heading-bg:    #f5f5f5;
+
+@panel-primary-text:          #fff;
+@panel-primary-border:        @brand-primary;
+@panel-primary-heading-bg:    @brand-primary;
+
+@panel-success-text:          @state-success-text;
+@panel-success-border:        @state-success-border;
+@panel-success-heading-bg:    @state-success-bg;
+
+@panel-info-text:             @state-info-text;
+@panel-info-border:           @state-info-border;
+@panel-info-heading-bg:       @state-info-bg;
+
+@panel-warning-text:          @state-warning-text;
+@panel-warning-border:        @state-warning-border;
+@panel-warning-heading-bg:    @state-warning-bg;
+
+@panel-danger-text:           @state-danger-text;
+@panel-danger-border:         @state-danger-border;
+@panel-danger-heading-bg:     @state-danger-bg;
+
+
+//== Thumbnails
+//
+//##
+
+//** Padding around the thumbnail image
+@thumbnail-padding:           4px;
+//** Thumbnail background color
+@thumbnail-bg:                @body-bg;
+//** Thumbnail border color
+@thumbnail-border:            #ddd;
+//** Thumbnail border radius
+@thumbnail-border-radius:     @border-radius-base;
+
+//** Custom text color for thumbnail captions
+@thumbnail-caption-color:     @text-color;
+//** Padding around the thumbnail caption
+@thumbnail-caption-padding:   9px;
+
+
+//== Wells
+//
+//##
+
+@well-bg:                     #f5f5f5;
+@well-border:                 darken(@well-bg, 7%);
+
+
+//== Badges
+//
+//##
+
+@badge-color:                 #fff;
+//** Linked badge text color on hover
+@badge-link-hover-color:      #fff;
+@badge-bg:                    @gray-light;
+
+//** Badge text color in active nav link
+@badge-active-color:          @link-color;
+//** Badge background color in active nav link
+@badge-active-bg:             #fff;
+
+@badge-font-weight:           bold;
+@badge-line-height:           1;
+@badge-border-radius:         10px;
+
+
+//== Breadcrumbs
+//
+//##
+
+@breadcrumb-padding-vertical:   8px;
+@breadcrumb-padding-horizontal: 15px;
+//** Breadcrumb background color
+@breadcrumb-bg:                 #f5f5f5;
+//** Breadcrumb text color
+@breadcrumb-color:              #ccc;
+//** Text color of current page in the breadcrumb
+@breadcrumb-active-color:       @gray-light;
+//** Textual separator for between breadcrumb elements
+@breadcrumb-separator:          "/";
+
+
+//== Carousel
+//
+//##
+
+@carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6);
+
+@carousel-control-color:                      #fff;
+@carousel-control-width:                      15%;
+@carousel-control-opacity:                    .5;
+@carousel-control-font-size:                  20px;
+
+@carousel-indicator-active-bg:                #fff;
+@carousel-indicator-border-color:             #fff;
+
+@carousel-caption-color:                      #fff;
+
+
+//== Close
+//
+//##
+
+@close-font-weight:           bold;
+@close-color:                 #000;
+@close-text-shadow:           0 1px 0 #fff;
+
+
+//== Code
+//
+//##
+
+@code-color:                  #c7254e;
+@code-bg:                     #f9f2f4;
+
+@kbd-color:                   #fff;
+@kbd-bg:                      #333;
+
+@pre-bg:                      #f5f5f5;
+@pre-color:                   @gray-dark;
+@pre-border-color:            #ccc;
+@pre-scrollable-max-height:   340px;
+
+
+//== Type
+//
+//##
+
+//** Horizontal offset for forms and lists.
+@component-offset-horizontal: 180px;
+//** Text muted color
+@text-muted:                  @gray-light;
+//** Abbreviations and acronyms border color
+@abbr-border-color:           @gray-light;
+//** Headings small color
+@headings-small-color:        @gray-light;
+//** Blockquote small color
+@blockquote-small-color:      @gray-light;
+//** Blockquote font size
+@blockquote-font-size:        (@font-size-base * 1.25);
+//** Blockquote border color
+@blockquote-border-color:     @gray-lighter;
+//** Page header border color
+@page-header-border-color:    @gray-lighter;
+//** Width of horizontal description list titles
+@dl-horizontal-offset:        @component-offset-horizontal;
+//** Point at which .dl-horizontal becomes horizontal
+@dl-horizontal-breakpoint:    @grid-float-breakpoint;
+//** Horizontal line color.
+@hr-border:                   @gray-lighter;
+
+// =============================================================================
+// Reaction Specific Overrides
 
 //== Typography
 @font-family-sans-serif:  "Source Sans Pro", "Roboto", "Helvetica Neue", Helvetica, sans-serif;
@@ -137,23 +1001,6 @@
 //== Well
 @well-bg: @white;
 
-
-//== Navbar
-@navbar-default-bg: @black60;
-@navbar-default-color: @white;
-@navbar-default-link-color: @black05;
-@navbar-default-toggle-icon-bar-bg: darken(@navbar-default-bg, 10%);
-@navbar-default-toggle-hover-bg: darken(@navbar-default-bg, 10%);
-@navbar-margin-bottom: 0;
-@navbar-brand-font-size: @font-size-large; //required
-@navbar-height: 55px;
-@navbar-padding-vertical: 14px;
-@navbar-inverse-bg: @white;
-@navbar-inverse-color: @black;
-@navbar-inverse-link-color: @black;
-@navbar-inverse-link-hover-color: @black60;
-
-
 //== Tag navbar
 @navbar-secondary-bg: @white;
 @navbar-secondary-color: @black;

From b046fe6c2b436ed44651533f10b1ee9e21cc0433 Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Tue, 24 Jan 2017 14:06:45 -0800
Subject: [PATCH 3/4] Added list group hover color to normal list group item

---
 .../plugins/included/default-theme/client/styles/lists.less  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/imports/plugins/included/default-theme/client/styles/lists.less b/imports/plugins/included/default-theme/client/styles/lists.less
index d9c32483cc1..42ec6d6d05c 100644
--- 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;
+}

From 71e8cbad8033088946905ae9a46fe77119e6bc05 Mon Sep 17 00:00:00 2001
From: rymorgan <ryan@reactioncommerce.com>
Date: Tue, 24 Jan 2017 16:22:28 -0800
Subject: [PATCH 4/4] First color iteration fixes

---
 .../default-theme/client/styles/button.less   | 73 ++++++++++++++++++-
 .../default-theme/client/styles/panels.less   |  4 +
 .../client/styles/variables.less              | 31 ++++----
 3 files changed, 87 insertions(+), 21 deletions(-)

diff --git a/imports/plugins/included/default-theme/client/styles/button.less b/imports/plugins/included/default-theme/client/styles/button.less
index 8244981250c..6596bbdfcd8 100644
--- 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/panels.less b/imports/plugins/included/default-theme/client/styles/panels.less
index a6fbb281bff..653603eb90d 100644
--- 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;
diff --git a/imports/plugins/included/default-theme/client/styles/variables.less b/imports/plugins/included/default-theme/client/styles/variables.less
index 7c311fa0d7b..8fc508c379f 100644
--- a/imports/plugins/included/default-theme/client/styles/variables.less
+++ b/imports/plugins/included/default-theme/client/styles/variables.less
@@ -49,10 +49,6 @@
 @brand-warning-color:         #EFC95F;
 @brand-danger-color:          #EB4D5C;
 
-@btn-edit-color: @gray-darker;
-
-.toolbar-group .rui.button.flat { color: @reaction-brand }
-
 //== Bootstrap colors
 //
 // All color variables from bootstraps variables.less file in one place for easy override.
@@ -182,9 +178,9 @@
 @line-height-large:         1.3333333; // extra decimals for Win 8.1 Chrome
 @line-height-small:         1.5;
 
-@border-radius-base:        4px;
-@border-radius-large:       6px;
-@border-radius-small:       3px;
+@border-radius-base:        2px;
+@border-radius-large:       4px;
+@border-radius-small:       1px;
 
 //** Global color for active items (e.g., navs or dropdowns).
 @component-active-color:    #fff;
@@ -250,6 +246,15 @@
 
 @btn-link-disabled-color:        @gray-light;
 
+@btn-info-edit-color: @text-color;
+@btn-edit-color: @gray-darker;
+@btn-edit-bg: @black20;
+
+@btn-active-color: darken(@brand-accent-color, 50%);
+@btn-active-bg: @brand-accent-color;
+
+@btn-icon-size: 24px;
+
 // Allows for customizing button radius independently from global border radius
 @btn-border-radius-base:         @border-radius-base;
 @btn-border-radius-large:        @border-radius-large;
@@ -445,11 +450,11 @@
 @navbar-collapse-max-height:       340px;
 
 @navbar-default-color:             @white;
-@navbar-default-bg:                @black60;
+@navbar-default-bg:                @white;
 @navbar-default-border:            darken(@navbar-default-bg, 6.5%);
 
 // Navbar links
-@navbar-default-link-color:                @black05;
+@navbar-default-link-color:                @black;
 @navbar-default-link-hover-color:          #333;
 @navbar-default-link-hover-bg:             transparent;
 @navbar-default-link-active-color:         #555;
@@ -1020,14 +1025,6 @@
 @admin-controls-menu-button-height: @admin-controls-menu-width;
 
 
-// == Buttons
-@btn-info-edit-color: @text-color;
-@btn-edit-bg: @black20;
-@btn-active-color: darken(@brand-accent-color, 50%);
-@btn-active-bg: @brand-accent-color;
-@btn-icon-size: 24px;
-
-
 // == Badge
 @badge-offset: @btn-icon-size / 2;
 @badge-offset-top: -@badge-offset / 2;