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

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #54 from jem08002/master 
Sherman Updates.
  • Loading branch information
@bcd04001
bcd04001 committed Feb 25, 2015
2 parents e1481ad + 237b8fa commit a87c634
Show file tree
Hide file tree
Showing 10 changed files with 1,885 additions and 1,356 deletions.
780 changes: 456 additions & 324 deletions css/sherman-black.css
View file

Large diffs are not rendered by default.

814 changes: 473 additions & 341 deletions css/sherman-blue.css
View file

Large diffs are not rendered by default.

758 changes: 445 additions & 313 deletions css/sherman-grey.css
View file

Large diffs are not rendered by default.

774 changes: 453 additions & 321 deletions css/sherman-red.css
View file

Large diffs are not rendered by default.

72 changes: 31 additions & 41 deletions sass/sherman-common.scss
View file
Expand Up @@ -360,23 +360,18 @@ body{
}
&.btn-info{
@include button($brand-info);
color:$brand-primary;
color:$brand-default;
}
&.btn-warning{
@include button($brand-warning);
color:$brand-primary;
color:$brand-default;
}
&.btn-danger{
@include button($brand-danger);
}
&.btn-link{
@include button($brand-default);
@include button(#fff);
}
&.active{
-moz-box-shadow: inset 0 0 3px $brand-default;
-webkit-box-shadow: inset 0 0 3px $brand-default;
box-shadow: inset 0 0 3px $brand-default;
}
}
.form-inline .form-control {
@media (max-width: 767px) {
Expand Down Expand Up @@ -496,42 +491,37 @@ table .external .glyphicon-new-window {
-moz-border-radius: 5px;
border-radius: 5px;
font-weight: 400;
&.btn-default{
@include button($brand-default);
}
&.btn-primary{
@include button($brand-primary);
}
&.btn-success{
@include button($brand-success);
}
&.btn-info{
@include button($brand-info);
color:$brand-primary;
}
&.btn-warning{
@include button($brand-warning);
color:$brand-primary;
}
&.btn-danger{
@include button($brand-danger);
&.btn-default{
@include button($brand-default);
border-color:#c6c6c6;
}
&.btn-primary{
@include button($brand-primary);
}
&.btn-success{
@include button($brand-success);
}
&.btn-info{
@include button($brand-info);
color:#fff;
&.active, &.dropdown-toggle{
color:#fff !important;
}
&.btn-link{
@include button($brand-default);
}
&.btn-warning{
@include button($brand-warning);
color:#fff;
&.active, &.dropdown-toggle{
color:#fff !important;
}
&.active{
-moz-box-shadow: inset 0 0 3px $brand-default;
-webkit-box-shadow: inset 0 0 3px $brand-default;
box-shadow: inset 0 0 3px $brand-default;
}
}







&.btn-danger{
@include button($brand-danger);
}
&.btn-link{
@include button(#fff);
}
}



5 changes: 3 additions & 2 deletions sass/sherman-variables-black.scss
View file
Expand Up @@ -98,12 +98,13 @@ $footers-link-hover: rgba(255,255,255,1);
$footers-border-color: #414141;

/* Primary Colors (Bootstrap) */
$brand-primary: #676767 !default;
$brand-default: #676767 !default;
$brand-primary: #0b2347 !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;
Expand Down
12 changes: 6 additions & 6 deletions sass/sherman-variables-blue.scss
View file
Expand Up @@ -98,18 +98,18 @@ $footers-link-hover: rgba(255,255,255,1);
$footers-border-color: #B8000F;

/* Primary Colors (Bootstrap) */
$brand-primary: #676767 !default;
$brand-default: #ffffff !default;
$brand-primary: #0b2347 !default;
$brand-success: #48c239 !default;
$brand-info: #d7d7d7 !default;
$brand-info: #5b9fde !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: #fff;
$btn-default-color: #333;
$btn-default-bg: #193563;
$btn-default-border: darken($btn-default-bg, 15%);
$btn-default-border: darken($btn-default-color, 10%);

$btn-font-weight: normal !default;
$btn-info-color: #6b6869;
Expand All @@ -122,7 +122,7 @@ $btn-warning-bg: #fbdf56;
$btn-warning-border: darken($btn-warning-bg, 15%);

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

/* Sherman Only Variables */
$sh-masthead-start: #142548;
Expand Down
18 changes: 14 additions & 4 deletions sass/sherman-variables-common.scss
View file
Expand Up @@ -94,14 +94,24 @@ $uc-footer-link-spacing: 1.5em;
background: linear-gradient(to bottom, lighten($color, 5%) 0%,$color 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#{ligten($color, 5%)}', endColorstr='#{$color}',GradientType=0 );
filter:none;
color:$sh-secondary-text-color;
border-color: darken($color, 8%);
border-color: darken($color, 3%);
opacity:0.9;
&:hover{
opacity:0.75;
opacity:1;
background-color: darken($color, 30%);
border-color: darken($color, 15%);
}
&:focus{
outline-color: $color;
opacity:1;
}
}
&.active{
-moz-box-shadow: inset 0 0 3px $color;
-webkit-box-shadow: inset 0 0 3px $color;
box-shadow: inset 0 0 3px $color;
}
&.dropdown-toggle{
background-color: darken($color, 15%);
border-color: darken($color, 8%);
}
}
4 changes: 2 additions & 2 deletions sass/sherman-variables-grey.scss
View file
Expand Up @@ -97,12 +97,12 @@ $footers-link-hover: rgba(255,255,255,1);
$footers-border-color: #fff;

/* Primary Colors (Bootstrap) */
$brand-primary: #676767 !default;
$brand-default: #676767 !default;
$brand-primary: #0b2347 !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;
Expand Down
4 changes: 2 additions & 2 deletions sass/sherman-variables-red.scss
View file
Expand Up @@ -99,12 +99,12 @@ $footers-border-color: #BC3E3E;


/* Primary Colors (Bootstrap) */
$brand-primary: #676767 !default;
$brand-default: #676767 !default;
$brand-primary: #0b2347 !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;
Expand Down

0 comments on commit a87c634

Please sign in to comment.