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
Sherman Buttons. Changes. 
Changes to sherman colors to help contrast.
  • Loading branch information
Jessika Mika Caldera authored and Jessika Mika Caldera committed Jan 29, 2015
1 parent 7cdafb1 commit 396b22e
Show file tree
Hide file tree
Showing 9 changed files with 538 additions and 528 deletions.
248 changes: 125 additions & 123 deletions css/sherman-black.css
View file

Large diffs are not rendered by default.

248 changes: 125 additions & 123 deletions css/sherman-blue.css
View file

Large diffs are not rendered by default.

248 changes: 125 additions & 123 deletions css/sherman-grey.css
View file

Large diffs are not rendered by default.

248 changes: 125 additions & 123 deletions css/sherman-red.css
View file

Large diffs are not rendered by default.

26 changes: 14 additions & 12 deletions sass/sherman-common.scss
View file
Expand Up @@ -491,14 +491,14 @@ table .external .glyphicon-new-window {
*/

@mixin button($color){
background: lighten($color, 10%);
background: -moz-linear-gradient(top, lighten($color, 10%) 0%, $color 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, lighten($color, 10%)), color-stop(100%,$color));
background: -webkit-linear-gradient(top, lighten($color, 10%) 0%,$color 100%);
background: -o-linear-gradient(top, lighten($color, 10%) 0%,$color 100%);
background: -ms-linear-gradient(top, lighten($color, 10%) 0%,$color 100%);
background: linear-gradient(to bottom, lighten($color, 10%) 0%,$color 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 10%)', endColorstr='$color',GradientType=0 );
background: $color;
background: -moz-linear-gradient(top, lighten($color, 5%) 0%, $color 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, lighten($color, 5%)), color-stop(100%,$color));
background: -webkit-linear-gradient(top, lighten($color, 5%) 0%,$color 100%);
background: -o-linear-gradient(top, lighten($color, 5%) 0%,$color 100%);
background: -ms-linear-gradient(top, lighten($color, 5%) 0%,$color 100%);
background: linear-gradient(to bottom, lighten($color, 5%) 0%,$color 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 );
color:$sh-secondary-text-color;
border-color: darken($sh-secondary-text-color, 2%);
opacity:0.9;
Expand All @@ -516,7 +516,7 @@ table .external .glyphicon-new-window {
*/
//Button Styles
.btn{
-webkit-border-radius: 4px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
font-weight: 400;
Expand All @@ -526,16 +526,18 @@ table .external .glyphicon-new-window {
&.btn-primary{
@include button($brand-primary);
}
&.btn-success{
&.btn-success{
@include button($brand-success);
}
&.btn-info{
@include button($brand-info);
color:$brand-primary;
border-color: lighten($brand-primary, 2%);
border-color: darken($brand-info, 15%);
}
&.btn-warning{
@include button($brand-warning);
@include button($brand-warning);
color:$brand-primary;
border-color: darken($brand-warning, 15%);
}
&.btn-danger{
@include button($brand-danger);
Expand Down
12 changes: 6 additions & 6 deletions sass/sherman-variables-black.scss
View file
Expand Up @@ -61,12 +61,12 @@ $megafooter-widget-color: rgba(255,255,255, 0.6);
$megafooter-widget-head-color: #ffffff !important;

/* Primary Colors (Bootstrap) */
$brand-primary: #909090 !default;
$brand-success: #69d15b !default;
$brand-info: #ededed !default;
$brand-warning: #fbdf56 !default;
$brand-danger: #c84441 !default;
$brand-default: #193462 !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;
Expand Down
12 changes: 6 additions & 6 deletions sass/sherman-variables-blue.scss
View file
Expand Up @@ -61,12 +61,12 @@ $megafooter-widget-color: rgba(255,255,255, 0.6);
$megafooter-widget-head-color: #999999!important;

/* Primary Colors (Bootstrap) */
$brand-primary: #909090 !default;
$brand-success: #69d15b !default;
$brand-info: #ededed !default;
$brand-warning: #fbdf56 !default;
$brand-danger: #c84441 !default;
$brand-default: #193462 !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;
Expand Down
12 changes: 6 additions & 6 deletions sass/sherman-variables-grey.scss
View file
Expand Up @@ -60,12 +60,12 @@ $megafooter-widget-color: rgba(255,255,255, 0.6);
$megafooter-widget-head-color: #999999!important;

/* Primary Colors (Bootstrap) */
$brand-primary: #909090 !default;
$brand-success: #69d15b !default;
$brand-info: #ededed !default;
$brand-warning: #fbdf56 !default;
$brand-danger: #c84441 !default;
$brand-default: #193462 !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;
Expand Down
12 changes: 6 additions & 6 deletions sass/sherman-variables-red.scss
View file
Expand Up @@ -61,12 +61,12 @@ $megafooter-widget-color: rgba(255,255,255, 0.6);
$megafooter-widget-head-color: #ffffff !important;

/* Primary Colors (Bootstrap) */
$brand-primary: #909090 !default;
$brand-success: #69d15b !default;
$brand-info: #ededed !default;
$brand-warning: #fbdf56 !default;
$brand-danger: #c84441 !default;
$brand-default: #193462 !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;
Expand Down

0 comments on commit 396b22e

Please sign in to comment.