Skip to content

Commit

Permalink
refining colors
Browse files Browse the repository at this point in the history
  • Loading branch information
nmorduch committed Jun 2, 2014
1 parent f1bf3be commit 33ed991
Show file tree
Hide file tree
Showing 3 changed files with 132 additions and 116 deletions.
37 changes: 20 additions & 17 deletions argus/sass/_variables.sass
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,17 @@
//$gray-lighter: lighten(black, 93.5%)
// #eee
$white: #FCFAF7
$white: #FCFBFA
$whitesmoke: #F0EEEB

$brand-primary: #a062c4
//$brand-success: #5cb85c
//$brand-info: #5bc0de
//$brand-warning: #f0ad4e
//$brand-danger: #d9534f
$header-background: #F5EEE4
//== Scaffolding
//
Expand Down Expand Up @@ -162,7 +165,7 @@ $component-active-color: $white
//$table-bg-accent: #f9f9f9
//* Background color used for `.table-hover`.
$table-bg-hover: $header-background
$table-bg-hover: $whitesmoke
//$table-bg-active: $table-bg-hover
//* Border color for table and cell borders.
Expand Down Expand Up @@ -205,7 +208,7 @@ $btn-danger-color: $white
//##
//* `<input>` background color
$input-bg: $white
// $input-bg: white
//* `<input disabled>` background color
//$input-bg-disabled: $gray-lighter
Expand Down Expand Up @@ -266,7 +269,7 @@ $dropdown-bg: $white
//$dropdown-link-hover-color: darken($gray-dark, 5%)
//* Hover background for dropdown links.
$dropdown-link-hover-bg: $header-background
$dropdown-link-hover-bg: $whitesmoke

//* Active dropdown menu item text color.
//$dropdown-link-active-color: $component-active-color
Expand Down Expand Up @@ -383,14 +386,14 @@ $navbar-border-radius: 0
//$navbar-collapse-max-height: 340px
//$navbar-default-color: #777777
$navbar-default-bg: $header-background
$navbar-default-bg: $whitesmoke
//$navbar-default-border: darken($navbar-default-bg, 6.5%)
// Navbar links
//$navbar-default-link-color: #777777
//$navbar-default-link-hover-color: #333333
$navbar-default-link-color: #555
$navbar-default-link-hover-color: #222
//$navbar-default-link-hover-bg: transparent
//$navbar-default-link-active-color: #555555
$navbar-default-link-active-color: #333
//$navbar-default-link-active-bg: darken($navbar-default-bg, 6.5%)
//$navbar-default-link-disabled-color: #cccccc
//$navbar-default-link-disabled-bg: transparent
Expand Down Expand Up @@ -435,7 +438,7 @@ $navbar-inverse-toggle-icon-bar-bg: $white
//##
//=== Shared nav styles
//$nav-link-padding: 10px 15px
$nav-link-padding: 10px 12px
//$nav-link-hover-bg: $gray-lighter
//$nav-disabled-link-color: $gray-light
Expand Down Expand Up @@ -674,7 +677,7 @@ $modal-content-bg: $white
//##
//* Background color of the whole progress component
$progress-bg: $header-background
$progress-bg: $whitesmoke

//* Progress bar text color
$progress-bar-color: $white
Expand Down Expand Up @@ -708,7 +711,7 @@ $list-group-bg: $white
//$list-group-border-radius: $border-radius-base
//* Background color of single list elements on hover
$list-group-hover-bg: $header-background
$list-group-hover-bg: $whitesmoke

//* Text color of active list elements
//$list-group-active-color: $component-active-color
Expand All @@ -733,11 +736,11 @@ $panel-bg: $white
//* Border color for elements within panels
//$panel-inner-border: #dddddd
$panel-footer-bg: $header-background
$panel-footer-bg: $whitesmoke

//$panel-default-text: $gray-dark
//$panel-default-border: #dddddd
$panel-default-heading-bg: $header-background
$panel-default-heading-bg: $whitesmoke

$panel-primary-text: $white
//$panel-primary-border: $brand-primary
Expand Down Expand Up @@ -785,7 +788,7 @@ $panel-primary-text: $white
//
//##
$well-bg: $header-background
$well-bg: $whitesmoke
//$well-border: darken($well-bg, 7%)
//== Badges
Expand Down Expand Up @@ -816,7 +819,7 @@ $badge-active-bg: $white
//$breadcrumb-padding-horizontal: 15px
//* Breadcrumb background color
$breadcrumb-bg: $header-background
$breadcrumb-bg: $whitesmoke

//* Breadcrumb text color
//$breadcrumb-color: #cccccc
Expand Down Expand Up @@ -861,7 +864,7 @@ $carousel-caption-color: $white
$kbd-color: $white
//$kbd-bg: #333333
$pre-bg: $header-background
$pre-bg: $whitesmoke
//$pre-color: $gray-dark
//$pre-border-color: #cccccc
//$pre-scrollable-max-height: 340px
Expand Down
8 changes: 7 additions & 1 deletion argus/sass/styles.sass
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
@import variables
@import bootstrap

@import "compass/css3/box-shadow"

.panel-body:first-child > :first-child
margin-top: 0

Expand All @@ -13,4 +15,8 @@
margin-left: 0

.nav-pills h4:first-child
margin-right: 15px
margin-right: 12px

.form-control:focus
border-color: $brand-primary
+box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba($brand-primary,0.6))
Loading

0 comments on commit 33ed991

Please sign in to comment.