Skip to content
This repository has been archived by the owner. It is now read-only.

Changes to Red #47

Merged
merged 12 commits into from Feb 3, 2015
Merged

Changes to Red #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
676a001
Changes to Red
Jan 14, 2015
91ec342
Fixing the missing Template Information
Jan 14, 2015
9f6f978
Prepros Issues.
Jan 14, 2015
ba52cb1
Color Fix Once more
Jan 14, 2015
0114f91
Sherman Button Color Changes
Jan 19, 2015
808a081
Sherman Sass Reconstruction.
Jan 20, 2015
49ded85
End of Day Sync.
Jan 20, 2015
b23f4ba
Commit with update to many issues:
Jan 22, 2015
a226367
Fixed Border Radius
Jan 22, 2015
7cdafb1
Adding the button Mixin
Jan 26, 2015
396b22e
Sherman Buttons. Changes.
Jan 29, 2015
80fa862
Color changes Per Brian's Request
Jan 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10,885 changes: 5,746 additions & 5,139 deletions css/sherman-black.css
View file
Open in desktop

Large diffs are not rendered by default.

10,881 changes: 5,744 additions & 5,137 deletions css/sherman-blue.css
View file
Open in desktop

Large diffs are not rendered by default.

10,889 changes: 5,748 additions & 5,141 deletions css/sherman-grey.css
View file
Open in desktop

Large diffs are not rendered by default.

10,905 changes: 5,756 additions & 5,149 deletions css/sherman-red.css
View file
Open in desktop

Large diffs are not rendered by default.

1,007 changes: 525 additions & 482 deletions sass/sherman-common.scss
View file
Open in desktop

Large diffs are not rendered by default.

35 changes: 24 additions & 11 deletions sass/sherman-variables-black.scss
View file
Open in desktop
Expand Up @@ -61,18 +61,31 @@ $megafooter-widget-color: rgba(255,255,255, 0.6);
$megafooter-widget-head-color: #ffffff !important;

/* Primary Colors (Bootstrap) */
$brand-primary: #192b60 !default;
$brand-success: #265626 !default;
$brand-info: #3457c3 !default;
$brand-warning: #df8a13 !default;
$brand-danger: #8a211e !default;
$brand-primary: #676767 !default;
$brand-success: #48c239 !default;
$brand-info: #d7d7d7 !default;
$brand-warning: #e4c632 !default;
$brand-danger: #a01413 !default;
$brand-default: #0b2347 !default;

/* Buttons, define text, background and border color. */
$btn-font-weight: normal !default;
$btn-default-color: #717073;
$btn-default-bg: rgba(255,255,255, 0);
$btn-default-border: #c0c0c0;
$btn-font-weight: normal !default;
$btn-default-color: #fff;
$btn-default-bg: #193563;
$btn-default-border: darken($btn-default-bg, 15%);

$btn-font-weight: normal !default;
$btn-info-color: #6b6869;
$btn-info-bg: #ededed;
$btn-info-border: darken($btn-info-bg, 15%);

$btn-font-weight: normal !default;
$btn-warning-color: #313131;
$btn-warning-bg: #fbdf56;
$btn-warning-border: darken($btn-warning-bg, 15%);

//** Default label background color
$label-default-bg: $brand-default !default;

/* Sherman Only Variables */
$sh-masthead-start: #2f2f2f;
Expand All @@ -87,7 +100,7 @@ $sh-navbar-toggle-background-color-active: rgba(0,0,0, .6);
$sh-icon-bar-background-color: rgba(255,255,255, .5);

$sh-current-menu-ancestor-dropdown-toggle: #fff;
$sh-navbar-collapse-dropdown-menu-background-color: #091733;
$sh-navbar-collapse-dropdown-menu-background-color: darken($sh-masthead-end, 15%);

$sh-nav-secondary-border-color: #eee;
$sh-secondary-bg-color: #9A0405;
Expand All @@ -98,7 +111,7 @@ $sh-mega-footer-widget-heading: #ffffff !important;
$sh-mega-footer-border-color: #414141;

$sh-header1-color: #343434;
$sh-header3-color: #717073;


/* Main Search Form */
$searchText: #fff;
Expand Down
40 changes: 27 additions & 13 deletions sass/sherman-variables-blue.scss
View file
Open in desktop
Expand Up @@ -40,12 +40,12 @@ $widget-head-color: #4d628c;

// Calendar
$uc-ecw-month-bg: #f5f5f5;
$uc-ecw-month-color: #2e77b0;
$uc-ecw-month-color: #388ac3;
$uc-ecw-day-bg: #f5f5f5;
$uc-ecw-day-color: #454545;
$uc-ecw-title-color: #B02E36;
$uc-ecw-title-color: #454545;
$uc-ecw-title-hover: darken($uc-ecw-title-color, 15%);
$uc-ecw-time-color: #B02E36;
$uc-ecw-time-color: #388ac3;
$uc-ecw-time-hover: darken($uc-ecw-time-color, 15%);

$link-color: #388ac3;
Expand All @@ -61,17 +61,31 @@ $megafooter-widget-color: rgba(255,255,255, 0.6);
$megafooter-widget-head-color: #999999!important;

/* Primary Colors (Bootstrap) */
$brand-primary: #428BCA !default;
$brand-success: #5cb85c !default;
$brand-info: #71797c !default;
$brand-warning: #f0ad4e !default;
$brand-danger: #d9534f !default;
$brand-primary: #676767 !default;
$brand-success: #48c239 !default;
$brand-info: #d7d7d7 !default;
$brand-warning: #e4c632 !default;
$brand-danger: #a01413 !default;
$brand-default: #0b2347 !default;

/* Buttons, define text, background and border color. */
$btn-font-weight: normal !default;
$btn-default-color: #717073;
$btn-default-bg: rgba(255,255,255, 0);
$btn-default-border: #c0c0c0;
$btn-default-color: #fff;
$btn-default-bg: #193563;
$btn-default-border: darken($btn-default-bg, 15%);

$btn-font-weight: normal !default;
$btn-info-color: #6b6869;
$btn-info-bg: #ededed;
$btn-info-border: darken($btn-info-bg, 15%);

$btn-font-weight: normal !default;
$btn-warning-color: #313131;
$btn-warning-bg: #fbdf56;
$btn-warning-border: darken($btn-warning-bg, 15%);

//** Default label background color
$label-default-bg: $brand-default !default;

/* Sherman Only Variables */
$sh-masthead-start: #142548;
Expand All @@ -86,7 +100,7 @@ $sh-navbar-toggle-background-color-active: rgba(0,0,0, .6);
$sh-icon-bar-background-color: rgba(255,255,255, .5);

$sh-current-menu-ancestor-dropdown-toggle: #fff;
$sh-navbar-collapse-dropdown-menu-background-color: #091733;
$sh-navbar-collapse-dropdown-menu-background-color: darken($sh-masthead-end, 15%);

$sh-nav-secondary-border-color: #eee;
$sh-secondary-bg-color: #081b39;
Expand All @@ -97,7 +111,7 @@ $sh-mega-footer-widget-heading: #999999;
$sh-mega-footer-border-color: #233e75;

$sh-header1-color: #ac0000;
$sh-header3-color: #4C608A;


/* Main Search Form */
$searchText: #fff;
Expand Down
36 changes: 25 additions & 11 deletions sass/sherman-variables-grey.scss
View file
Open in desktop
Expand Up @@ -60,17 +60,31 @@ $megafooter-widget-color: rgba(255,255,255, 0.6);
$megafooter-widget-head-color: #999999!important;

/* Primary Colors (Bootstrap) */
$brand-primary: #002566 !default;
$brand-success: #657fad !default;
$brand-info: #a0a0a0 !default;
$brand-warning: #F0AD4E !default;
$brand-danger: #ac0000 !default;
$brand-primary: #676767 !default;
$brand-success: #48c239 !default;
$brand-info: #d7d7d7 !default;
$brand-warning: #e4c632 !default;
$brand-danger: #a01413 !default;
$brand-default: #0b2347 !default;

/* Buttons, define text, background and border color. */
$btn-font-weight: normal !default;
$btn-default-color: #002566;
$btn-default-bg: rgba(255,255,255, 0);
$btn-default-border: #c0c0c0;
$btn-font-weight: normal !default;
$btn-default-color: #fff;
$btn-default-bg: #193563;
$btn-default-border: darken($btn-default-bg, 15%);

$btn-font-weight: normal !default;
$btn-info-color: #6b6869;
$btn-info-bg: #ededed;
$btn-info-border: darken($btn-info-bg, 15%);

$btn-font-weight: normal !default;
$btn-warning-color: #313131;
$btn-warning-bg: #fbdf56;
$btn-warning-border: darken($btn-warning-bg, 15%);

//** Default label background color
$label-default-bg: $brand-default !default;

/* Sherman Only Variables */
$sh-masthead-start: #e3e3e3;
Expand All @@ -85,7 +99,7 @@ $sh-navbar-toggle-background-color-active: rgba(0,0,0, .6);
$sh-icon-bar-background-color: rgba(255,255,255, .5);

$sh-current-menu-ancestor-dropdown-toggle: rgba(7,26,56, 1);
$sh-navbar-collapse-dropdown-menu-background-color: #091733;
$sh-navbar-collapse-dropdown-menu-background-color: darken($sh-masthead-end, 15%);

$sh-nav-secondary-border-color: #fff;
$sh-secondary-bg-color: #081b39;
Expand All @@ -96,7 +110,7 @@ $sh-mega-footer-widget-heading: #ffffff !important;
$sh-mega-footer-border-color: #fff;

$sh-header1-color: #ac0000;
$sh-header3-color: #717073;


/* Main Search Form */
$searchText: #212121;
Expand Down
49 changes: 31 additions & 18 deletions sass/sherman-variables-red.scss
View file
Open in desktop
Expand Up @@ -19,13 +19,13 @@ $title_parentHover: darken($title_parent, 15%);
$title_txt: #fff;
$title_txtHover: darken($title_txt, 15%);

$headings-color: #081B39;
$headings-color: #091733;

$navbar-default-link-color: rgba(255,255,255, .8);
$navbar-default-link-hover-color: rgba(255,255,255, 1);
$navbar-default-link-color: rgba(255,255,255, 1);
$navbar-default-link-hover-color: #ccc;
$navbar-default-link-hover-bg: transparent;
$navbar-default-link-active-color: #fff;
$navbar-default-link-active-bg: transparent;
$navbar-default-link-active-color: #e1e1e1;
$navbar-default-link-active-bg: transparent;

$dropdown-bg: #e9e9e9;
$dropdown-link-color: rgba(0,0,0, .6);
Expand Down Expand Up @@ -61,21 +61,35 @@ $megafooter-widget-color: rgba(255,255,255, 0.6);
$megafooter-widget-head-color: #ffffff !important;

/* Primary Colors (Bootstrap) */
$brand-primary: #113B7C !default;
$brand-success: #3d8b3d !default;
$brand-info: #3457c3 !default;
$brand-warning: #f0ad4e !default;
$brand-danger: #c9302c !default;
$brand-primary: #676767 !default;
$brand-success: #48c239 !default;
$brand-info: #d7d7d7 !default;
$brand-warning: #e4c632 !default;
$brand-danger: #a01413 !default;
$brand-default: #0b2347 !default;

/* Buttons, define text, background and border color. */
$btn-font-weight: normal !default;
$btn-default-color: #717073;
$btn-default-bg: rgba(255,255,255, 0);
$btn-default-border: #c0c0c0;
$btn-default-color: #fff;
$btn-default-bg: #193563;
$btn-default-border: darken($btn-default-bg, 15%);

$btn-font-weight: normal !default;
$btn-info-color: #6b6869;
$btn-info-bg: #ededed;
$btn-info-border: darken($btn-info-bg, 15%);

$btn-font-weight: normal !default;
$btn-warning-color: #313131;
$btn-warning-bg: #fbdf56;
$btn-warning-border: darken($btn-warning-bg, 15%);

//** Default label background color
$label-default-bg: $brand-default !default;

/* Sherman Only Variables */
$sh-masthead-start: #b30506;
$sh-masthead-end: #9A0405;
$sh-masthead-start: #ab140d;
$sh-masthead-end: #9b0000;

$sh-navbar-toggle-color: rgba(255,255,255, .7);
$sh-navbar-toggle-border-color: rgba(255,255,255, .1);
Expand All @@ -86,7 +100,7 @@ $sh-navbar-toggle-background-color-active: rgba(0,0,0, .6);
$sh-icon-bar-background-color: rgba(255,255,255, .5);

$sh-current-menu-ancestor-dropdown-toggle: #fff;
$sh-navbar-collapse-dropdown-menu-background-color: #091733;
$sh-navbar-collapse-dropdown-menu-background-color: darken($sh-masthead-end, 15%);

$sh-nav-secondary-border-color: #eee;
$sh-secondary-bg-color: #081b39;
Expand All @@ -96,8 +110,7 @@ $sh-table-border: rgba(255, 255, 255, 0.2);
$sh-mega-footer-widget-heading: #ffffff !important;
$sh-mega-footer-border-color: rgba(0,0,0, 1);

$sh-header1-color: #ac0000;
$sh-header3-color: #717073;
$sh-header1-color: #091733;

/* Main Search Form */
$searchText: #fff;
Expand Down
2 changes: 1 addition & 1 deletion style.css
View file
Open in desktop
Expand Up @@ -4,4 +4,4 @@
Author: UITS Web Development Lab
Template: cornerstone
Version: 1.0.1
*/
*/
3 changes: 1 addition & 2 deletions style.scss
View file
Open in desktop
Expand Up @@ -4,5 +4,4 @@
Author: UITS Web Development Lab
Template: cornerstone
Version: 1.0.1
*/

*/