Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Variable cleanup #1712

Merged
merged 8 commits into from
Jan 13, 2017
Merged

Variable cleanup #1712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b1f0730
removed old unused styles
kieckhafer Jan 12, 2017
9840ca4
updated brand color hex: 1c98d5 -> 1999dd
kieckhafer Jan 12, 2017
e49777e
killed @brand-muted-color (for now, as it's currently unused)
kieckhafer Jan 12, 2017
7ad4895
update font to Source Sans Pro in emails
kieckhafer Jan 13, 2017
3b9367d
update search variables
kieckhafer Jan 13, 2017
ef0c684
variables.less cleanup
kieckhafer Jan 13, 2017
0022923
bright colors for secondary, accent, vivid color for easy visibility
kieckhafer Jan 13, 2017
eb6de05
Merge branch 'release-0.19.0' into ek-colorVariables
kieckhafer Jan 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions imports/plugins/included/default-theme/client/styles/buttonGroup.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
.rui.buttons button {
border-radius: 0;
border: none;

// background-color: darken(@brand-muted-color, 10%);
color: #fff;
}

Expand Down
2 changes: 1 addition & 1 deletion imports/plugins/included/default-theme/client/styles/dashboard/orders.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
}

.order-panel.panel-info {
box-shadow: 0 0 0 3px @brand-muted-color;
box-shadow: 0 0 0 3px @brand-accent-color;
}

.order-panel > .panel-heading {
Expand Down
7 changes: 0 additions & 7 deletions imports/plugins/included/default-theme/client/styles/panels.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,13 +134,6 @@ label.panel-title {
.justify-content(center);
}

.panel-header--brand {
padding: 10px 20px;
background-color: darken(@brand-primary-color, 10%);

color: #fff;
}

.panel-content,
.flex-item > .panel .panel-body {
.flex(1 1 auto);
Expand Down
4 changes: 2 additions & 2 deletions imports/plugins/included/default-theme/client/styles/search/search-type-toggle.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
transition: border-color 200ms linear;

&:hover {
border-bottom: 3px solid fade(@brand-primary-color, 40%);
border-bottom: 3px solid @search-type-hover;
}

&.search-type-active {
border-bottom: 3px solid @brand-primary-color;
border-bottom: 3px solid @search-type-active;
transition: border-color 200ms linear;
}

Expand Down
112 changes: 76 additions & 36 deletions imports/plugins/included/default-theme/client/styles/variables.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
//== Google Fonts
//*requires browser-policy to be set in client
@import url(//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,700,300,600,800,400);
@import url(//fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,700,900);


//== Colors
@reaction-brand: #1999dd;

// Shades of gray
@white: #fff;
Expand All @@ -26,19 +28,56 @@
@whiteAlpha20: rgba(255, 255, 255, 0.2);
@whiteAlpha50: rgba(255, 255, 255, 0.5);

// Brand
@brand-primary-color: #8c5a9c; // Vivid Violet
@brand-secondary-color: #4aa5bd; // Pelorous (Teal-ish)
@brand-light-color: #e3e3e3; // Platinum (Light gray)
@brand-dark-color: #414141; // Charcoal (Dark gray)
@brand-vivid-color: #00dcdd; // Bright Turqouise
@brand-muted-color: #abe2e7; // Powder Blue

@brand-accent-color: @brand-muted-color; //@brand-vivid-color;
// 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;

// Bootstrap brand primary
@brand-primary: @black60;
@brand-light-highlight: @black02;
@brand-light-color: #e3e3e3;
@brand-dark-color: #414141;

@brand-success-color: #5cb85c;
@brand-info-color: #5bc0de;
@brand-warning-color: #f0ad4e;
@brand-danger-color: #d9534f;

//== Bootstrap colors
//
// All color variables from bootstraps variables.less file in one place for easy override.

@gray-base: #000;
@gray-darker: lighten(@gray-base, 13.5%); // #222
@gray-dark: lighten(@gray-base, 20%); // #333
@gray: lighten(@gray-base, 33.5%); // #555
@gray-light: lighten(@gray-base, 46.7%); // #777
@gray-lighter: lighten(@gray-base, 93.5%); // #eee

@brand-primary: @black60;
@brand-success: @brand-success-color;
@brand-info: @brand-info-color;
@brand-warning: @brand-warning-color;
@brand-danger: @brand-danger-color;


//== Scaffolding
//
//## Settings for some of the most global styles.

//** Background color for `<body>`.
@body-bg: #fff;
//** Global text color on `<body>`.
@text-color: @gray-dark;

//** 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

//== End Colors


@body-bg: darken(white, 2%);
Expand All @@ -47,48 +86,38 @@

@shadow-1: 0 0 5px rgba(0, 0, 0, 0.2);


// CMS Controls
// @controlbar-bg: @brand-primary-color;
// @controlbar-fg: @white;
// @controlbar-seperator: darken(@brand-primary-color, 10%);
// @controlbar-hover: lighten(@brand-primary-color, 20%);

@controlbar-bg: @white;
@controlbar-fg: @black;
@controlbar-seperator: darken(@controlbar-bg, 10%);
@controlbar-hover: lighten(@controlbar-fg, 20%);
@controlbar-fg-hover: @white;

@edit-bg: lighten(@brand-primary-color, 10%);
@edit-border: @brand-primary-color;



//== Typography
@font-family-sans-serif: "Open Sans", "Roboto", "Helvetica Neue", Helvetica, sans-serif;
@font-family-sans-serif: "Source Sans Pro", "Roboto", "Helvetica Neue", Helvetica, sans-serif;
@letter-spacing: .8px;

@product-grid-large-title-size: 2rem;



//== Headings
@headings-font-family-h1: @headings-font-family;
@headings-color-h1: @headings-color;
@headings-font-weight-h1: 700;

@headings-font-family-h2: @headings-font-family;
@headings-color-h2: #1999dd;
@headings-color-h2: @reaction-brand;
@headings-font-weight-h2: 400;

@headings-font-family-h3: @headings-font-family;
@headings-color-h3: @headings-color;
@headings-font-weight-h3: 200;


//== Well
@well-bg: @white;


//== Navbar
@navbar-default-bg: @black60;
@navbar-default-color: @white;
Expand All @@ -110,31 +139,36 @@
@navbar-secondary-color: @black;
@navbar-secondary-border: 1px solid @black10;


//== Dashboard navbar
@navbar-dashboard-bg: @white;
@navbar-dashboard-color: @black;
@navbar-dashboard-border-color: @border-color;
@navbar-dashboard-height: 88px;
@navbar-dashboard-height-sm: 44px;


// == Admin Controls Menu
@admin-controls-menu-width: 65px;
@admin-controls-menu-button-height: @admin-controls-menu-width;


// == Buttons
@btn-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;
@badge-offset-right: -@badge-offset / 2;
@badge-offset-bottom: @badge-offset / 2;
@badge-offset-left: @badge-offset / 2;


//== Footer
@footer-default-bg: transparent;
@footer-default-color: @black70;
Expand All @@ -146,9 +180,10 @@
@product-overlay-bg: @body-bg;
@product-overlay-text: @text-color;
@grid-gutter-width: 10px; //inline forms will get messed up with larger values
@drag-drop-zone-bg: #F0F8FF;
@drag-drop-zone-bg: @black05;
@product-grid-columns-size: 28em;


//== Product Detail
@product-title-font-size: floor((@font-size-base * 3.6)); // ~36px
@product-page-title-font-size: floor((@font-size-base * 2.35)); // ~30px
Expand All @@ -159,18 +194,18 @@
//== Cart Drawer
@cart-drawer-bg: @white;
@cart-drawer-height: 275px;
@cart-icon-bg: #25B315;
@cart-icon-badge: #25B315;
@cart-icon-badge-warning: #FF0000;
@cart-icon-bg: @brand-success;
@cart-icon-badge: @brand-success;
@cart-icon-badge-warning: @brand-warning;
@cart-icon-text: @white;
@cart-icon-color: @white;
@cart-icon-border-radius: 0;
@cart-icon-border: none;
@cart-icon-padding: (@navbar-padding-vertical - 4px) 30px (@navbar-padding-vertical - 4px) 24px;

@cart-progress-active: #57aed1;
@cart-progress-visited: @brand-vivid-color; //#8bc53f;
@cart-progress-next: #EcEcEc;
@cart-progress-active: #57aed1; //lighten(@brand-vivid-color, 8); // TODO: @cart-progress-active is used nowhere
@cart-progress-visited: @brand-vivid-color;
@cart-progress-next: @brand-light-color;

@checkout-progress-visited: @brand-vivid-color;
@checkout-progress-visited-text: @white;
Expand All @@ -185,14 +220,20 @@
@dashboard-sidebar-bg: contrast(@body-bg,darken(@body-bg, 10%),lighten(@body-bg, 20%));
@dashboard-row-bg: contrast(@dashboard-sidebar-bg,darken(@dashboard-sidebar-bg, 10%),lighten(@dashboard-sidebar-bg, 20%));
@dashboard-drawer-height: @cart-drawer-height;
@dashboard-font-color: #000;
@dashboard-font-color: @black;


//== Accounts
@accounts-dialog-width: 300px;
@accounts-dialog-link-color: @black80;
@accounts-dialog-link-color: @black80; // TODO: This is the only place in the app @black80 is used

//== Responsive

//== Search
@search-type-active: @brand-primary-color;
@search-type-hover: fade(@brand-primary-color, 40%);


//== Responsive
@highdensity: ~"only screen and (-webkit-min-device-pixel-ratio: 1.5)",
~"only screen and (min--moz-device-pixel-ratio: 1.5)",
~"only screen and (-o-min-device-pixel-ratio: 3/2)",
Expand All @@ -206,6 +247,5 @@
@desktop-xl: ~"only screen and (min-width: 1129px)";
// @desktop-sm:


@height-sm: ~"only screen and (max-height: 730px)";
@height-md: ~"only screen and (min-height: 731px) and (max-height: 1000px)";
4 changes: 2 additions & 2 deletions private/email/templates/accounts/inviteShopMember.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<tr>
<td align="left" valign="top" bgcolor="#ffffff"><table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td height="4" align="left" valign="top" bgcolor="#1c98d5" style="font-size:1px; line-height:1px;">&nbsp;</td>
<td height="4" align="left" valign="top" bgcolor="#1999dd" style="font-size:1px; line-height:1px;">&nbsp;</td>
</tr>
<tr>
<td align="center" valign="top"><table width="480" class="wrap1001" border="0" cellspacing="0" cellpadding="0">
Expand Down Expand Up @@ -75,7 +75,7 @@
<tr>
<td align="left" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td width="223" height="40" align="center" valign="middle" bgcolor="#1c98d5" style="font-family: 'Open Sans', sans-serif; font-size:18px; font-weight:normal; line-height:18px;"><a href="{{url}}" style="text-decoration:none; color:#ffffff;">Get Started</a></td>
<td width="223" height="40" align="center" valign="middle" bgcolor="#1999dd" style="font-family: 'Source Sans Pro', sans-serif; font-size:18px; font-weight:normal; line-height:18px;"><a href="{{url}}" style="text-decoration:none; color:#ffffff;">Get Started</a></td>
<td>&nbsp;</td>
</tr>
</table></td>
Expand Down
4 changes: 2 additions & 2 deletions private/email/templates/accounts/resetPassword.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<tr>
<td align="left" valign="top" bgcolor="#ffffff"><table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td height="4" align="left" valign="top" bgcolor="#1c98d5" style="font-size:1px; line-height:1px;">&nbsp;</td>
<td height="4" align="left" valign="top" bgcolor="#1999dd" style="font-size:1px; line-height:1px;">&nbsp;</td>
</tr>
<tr>
<td align="center" valign="top"><table width="480" class="wrap1001" border="0" cellspacing="0" cellpadding="0">
Expand Down Expand Up @@ -75,7 +75,7 @@
<tr>
<td align="left" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td width="223" height="40" align="center" valign="middle" bgcolor="#1c98d5" style="font-family: 'Open Sans', sans-serif; font-size:18px; font-weight:normal; line-height:18px;"><a href="{{passwordResetUrl}}" style="text-decoration:none; color:#ffffff;">Reset Password</a></td>
<td width="223" height="40" align="center" valign="middle" bgcolor="#1999dd" style="font-family: 'Source Sans Pro', sans-serif; font-size:18px; font-weight:normal; line-height:18px;"><a href="{{passwordResetUrl}}" style="text-decoration:none; color:#ffffff;">Reset Password</a></td>
<td>&nbsp;</td>
</tr>
</table></td>
Expand Down
4 changes: 2 additions & 2 deletions private/email/templates/accounts/sendWelcomeEmail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<tr>
<td align="left" valign="top" bgcolor="#ffffff"><table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td height="4" align="left" valign="top" bgcolor="#1c98d5" style="font-size:1px; line-height:1px;">&nbsp;</td>
<td height="4" align="left" valign="top" bgcolor="#1999dd" style="font-size:1px; line-height:1px;">&nbsp;</td>
</tr>
<tr>
<td align="center" valign="top"><table width="480" class="wrap1001" border="0" cellspacing="0" cellpadding="0">
Expand Down Expand Up @@ -75,7 +75,7 @@
<tr>
<td align="left" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td width="223" height="40" align="center" valign="middle" bgcolor="#1c98d5" style="font-family: 'Open Sans', sans-serif; font-size:18px; font-weight:normal; line-height:18px;"><a href="{{homepage}}" style="text-decoration:none; color:#ffffff;">Get Started</a></td>
<td width="223" height="40" align="center" valign="middle" bgcolor="#1999dd" style="font-family: 'Source Sans Pro', sans-serif; font-size:18px; font-weight:normal; line-height:18px;"><a href="{{homepage}}" style="text-decoration:none; color:#ffffff;">Get Started</a></td>
<td>&nbsp;</td>
</tr>
</table></td>
Expand Down
4 changes: 2 additions & 2 deletions private/email/templates/accounts/verifyEmail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<tr>
<td align="left" valign="top" bgcolor="#ffffff"><table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td height="4" align="left" valign="top" bgcolor="#1c98d5" style="font-size:1px; line-height:1px;">&nbsp;</td>
<td height="4" align="left" valign="top" bgcolor="#1999dd" style="font-size:1px; line-height:1px;">&nbsp;</td>
</tr>
<tr>
<td align="center" valign="top"><table width="480" class="wrap1001" border="0" cellspacing="0" cellpadding="0">
Expand Down Expand Up @@ -75,7 +75,7 @@
<tr>
<td align="left" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td width="223" height="40" align="center" valign="middle" bgcolor="#1c98d5" style="font-family: 'Open Sans', sans-serif; font-size:18px; font-weight:normal; line-height:18px;"><a href="{{confirmationUrl}}" style="text-decoration:none; color:#ffffff;">Verify Your Email</a></td>
<td width="223" height="40" align="center" valign="middle" bgcolor="#1999dd" style="font-family: 'Source Sans Pro', sans-serif; font-size:18px; font-weight:normal; line-height:18px;"><a href="{{confirmationUrl}}" style="text-decoration:none; color:#ffffff;">Verify Your Email</a></td>
<td>&nbsp;</td>
</tr>
</table></td>
Expand Down
4 changes: 2 additions & 2 deletions private/email/templates/orders/new.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
<td height="10" align="left" valign="top" style="font-size:1px; line-height:1px;">&nbsp;</td>
</tr>
<tr>
<td height="4" align="left" valign="top" bgcolor="#1c98d5" style="font-size:1px; line-height:1px;">&nbsp;</td>
<td height="4" align="left" valign="top" bgcolor="#1999dd" style="font-size:1px; line-height:1px;">&nbsp;</td>
</tr>
<tr>
<td align="center" valign="top">
Expand Down Expand Up @@ -182,7 +182,7 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="emailwrapto100pc">
<tbody>
<tr>
<td width="33%" align="left" valign="top" style="font-size:14px; line-height:normal; color:#1c98d5; font-family:Arial, helvetica;"><a href="{{homepage}}{{orderUrl}}" style="color:#1c98d5;">{{order._id}}</a></td>
<td width="33%" align="left" valign="top" style="font-size:14px; line-height:normal; color:#1999dd; font-family:Arial, helvetica;"><a href="{{homepage}}{{orderUrl}}" style="color:#1999dd;">{{order._id}}</a></td>
<td width="33%" align="left" valign="top" style="font-size:14px; line-height:normal; color:#4c4c4d; font-family:Arial, helvetica;">{{orderDate}}</td>
<td width="33%" align="left" valign="top" style="font-size:14px; line-height:normal; color:#4c4c4d; font-family:Arial, helvetica;">&nbsp;</td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions private/email/templates/orders/refunded.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
<td height="10" align="left" valign="top" style="font-size:1px; line-height:1px;">&nbsp;</td>
</tr>
<tr>
<td height="4" align="left" valign="top" bgcolor="#1c98d5" style="font-size:1px; line-height:1px;">&nbsp;</td>
<td height="4" align="left" valign="top" bgcolor="#1999dd" style="font-size:1px; line-height:1px;">&nbsp;</td>
</tr>
<tr>
<td align="center" valign="top">
Expand Down Expand Up @@ -182,7 +182,7 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="emailwrapto100pc">
<tbody>
<tr>
<td width="33%" align="left" valign="top" style="font-size:14px; line-height:normal; color:#1c98d5; font-family:Arial, helvetica;"><a href="{{homepage}}{{orderUrl}}" style="color:#1c98d5;">{{order._id}}</a></td>
<td width="33%" align="left" valign="top" style="font-size:14px; line-height:normal; color:#1999dd; font-family:Arial, helvetica;"><a href="{{homepage}}{{orderUrl}}" style="color:#1999dd;">{{order._id}}</a></td>
<td width="33%" align="left" valign="top" style="font-size:14px; line-height:normal; color:#4c4c4d; font-family:Arial, helvetica;">{{orderDate}}</td>
<td width="33%" align="left" valign="top" style="font-size:14px; line-height:normal; color:#4c4c4d; font-family:Arial, helvetica;">&nbsp;</td>
</tr>
Expand Down
Loading