Skip to content

Commit

Permalink
fix(color): colors now take precedence over components default color
Browse files Browse the repository at this point in the history 
[Fixes #83039526]

Signed-off-by: Spencer Hurst <spencer@pivotallabs.com>
  • Loading branch information
Geoff Pleiss authored and Spencer Hurst committed Nov 21, 2014
1 parent 0126f01 commit 0bd3d02
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 75 deletions.
84 changes: 42 additions & 42 deletions src/pivotal-ui/components/colors.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -434,133 +434,133 @@ $tabs-active-bg-color: $gray-2;
*/

.bg-neutral-1 {
background-color: $neutral-1;
background-color: $neutral-1 !important;
}
.bg-neutral-2 {
background-color: $neutral-2;
background-color: $neutral-2 !important;
}
.bg-neutral-3 {
background-color: $neutral-3;
background-color: $neutral-3 !important;
}
.bg-neutral-4 {
background-color: $neutral-4;
background-color: $neutral-4 !important;
}
.bg-neutral-5 {
background-color: $neutral-5;
background-color: $neutral-5 !important;
}
.bg-neutral-6 {
background-color: $neutral-6;
background-color: $neutral-6 !important;
}
.bg-neutral-7 {
background-color: $neutral-7;
background-color: $neutral-7 !important;
}
.bg-neutral-8 {
background-color: $neutral-8;
background-color: $neutral-8 !important;
}
.bg-neutral-9 {
background-color: $neutral-9;
background-color: $neutral-9 !important;
}
.bg-neutral-10 {
background-color: $neutral-10;
background-color: $neutral-10 !important;
}
.bg-neutral-11 {
background-color: $neutral-11;
background-color: $neutral-11 !important;
}

// Teals
.bg-brand-1{
background-color: $brand-1;
background-color: $brand-1 !important;
}

.bg-brand-2{
background-color: $brand-2;
background-color: $brand-2 !important;
}

.bg-brand-3{
background-color: $brand-3;
background-color: $brand-3 !important;
}

.bg-brand-4{
background-color: $brand-4;
background-color: $brand-4 !important;
}

.bg-brand-5{
background-color: $brand-5;
background-color: $brand-5 !important;
}

// Blues

.bg-accent-1{
background-color: $accent-1;
background-color: $accent-1 !important;
}

.bg-accent-2{
background-color: $accent-2;
background-color: $accent-2 !important;
}

.bg-accent-3{
background-color: $accent-3;
background-color: $accent-3 !important;
}

.bg-accent-4{
background-color: $accent-4;
background-color: $accent-4 !important;
}

.bg-accent-5{
background-color: $accent-5;
background-color: $accent-5 !important;
}

// Navies

.bg-dark-1{
background-color: $dark-1;
background-color: $dark-1 !important;
}

.bg-dark-2{
background-color: $dark-2;
background-color: $dark-2 !important;
}

.bg-dark-3{
background-color: $dark-3;
background-color: $dark-3 !important;
}

// Reds
.bg-error-1{
background-color: $error-1;
background-color: $error-1 !important;
}

.bg-error-2{
background-color: $error-2;
background-color: $error-2 !important;
}

.bg-error-3{
background-color: $error-3;
background-color: $error-3 !important;
}

.bg-error-4{
background-color: $error-4;
background-color: $error-4 !important;
}

// Yellows
.bg-warn-1{
background-color: $warn-1;
background-color: $warn-1 !important;
}

.bg-warn-2{
background-color: $warn-2;
background-color: $warn-2 !important;
}

.bg-warn-3{
background-color: $warn-3;
background-color: $warn-3 !important;
}

// Greens
.bg-success-1{
background-color: $success-1;
background-color: $success-1 !important;
}

.bg-success-2{
background-color: $success-2;
background-color: $success-2 !important;
}

/*doc
Expand Down Expand Up @@ -635,39 +635,39 @@ parent: color
// These classes are for the style guide only

.bg-glow-1 {
background-color: $glow-1;
background-color: $glow-1 !important;
}

.bg-glow-2 {
background-color: $glow-2;
background-color: $glow-2 !important;
}

.bg-glow-3 {
background-color: $glow-3;
background-color: $glow-3 !important;
}

.bg-glow-4 {
background-color: $glow-4;
background-color: $glow-4 !important;
}

.bg-glow-5 {
background-color: $glow-5;
background-color: $glow-5 !important;
}

.bg-shadow-1{
background-color: $shadow-1;
background-color: $shadow-1 !important;
}

.bg-shadow-2{
background-color: $shadow-2;
background-color: $shadow-2 !important;
}

.bg-shadow-3{
background-color: $shadow-3;
background-color: $shadow-3 !important;
}

.bg-shadow-4{
background-color: $shadow-4;
background-color: $shadow-4 !important;
}


Expand Down
66 changes: 33 additions & 33 deletions src/pivotal-ui/components/typography.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,57 +386,57 @@ Here's a table of all the color classes.

// gray type

.type-neutral-1 { color: $neutral-1; }
.type-neutral-2 { color: $neutral-2; }
.type-neutral-3 { color: $neutral-3; }
.type-neutral-4 { color: $neutral-4; }
.type-neutral-5 { color: $neutral-5; }
.type-neutral-6 { color: $neutral-6; }
.type-neutral-7 { color: $neutral-7; }
.type-neutral-8 { color: $neutral-8; }
.type-neutral-9 { color: $neutral-9; }
.type-neutral-10 { color: $neutral-10; }
.type-neutral-11 { color: $neutral-11; }
.type-neutral-1 { color: $neutral-1 !important; }
.type-neutral-2 { color: $neutral-2 !important; }
.type-neutral-3 { color: $neutral-3 !important; }
.type-neutral-4 { color: $neutral-4 !important; }
.type-neutral-5 { color: $neutral-5 !important; }
.type-neutral-6 { color: $neutral-6 !important; }
.type-neutral-7 { color: $neutral-7 !important; }
.type-neutral-8 { color: $neutral-8 !important; }
.type-neutral-9 { color: $neutral-9 !important; }
.type-neutral-10 { color: $neutral-10 !important; }
.type-neutral-11 { color: $neutral-11 !important; }

// navy type

.type-dark-1 { color: $dark-1; }
.type-dark-2 { color: $dark-2; }
.type-dark-3 { color: $dark-3; }
.type-dark-1 { color: $dark-1 !important; }
.type-dark-2 { color: $dark-2 !important; }
.type-dark-3 { color: $dark-3 !important; }

// teal type

.type-brand-1 { color: $brand-1; }
.type-brand-2 { color: $brand-2; }
.type-brand-3 { color: $brand-3; }
.type-brand-4 { color: $brand-4; }
.type-brand-5 { color: $brand-5; }
.type-brand-1 { color: $brand-1 !important; }
.type-brand-2 { color: $brand-2 !important; }
.type-brand-3 { color: $brand-3 !important; }
.type-brand-4 { color: $brand-4 !important; }
.type-brand-5 { color: $brand-5 !important; }

// blue type

.type-accent-1 { color: $accent-1; }
.type-accent-2 { color: $accent-2; }
.type-accent-3 { color: $accent-3; }
.type-accent-4 { color: $accent-4; }
.type-accent-5 { color: $accent-5; }
.type-accent-1 { color: $accent-1 !important; }
.type-accent-2 { color: $accent-2 !important; }
.type-accent-3 { color: $accent-3 !important; }
.type-accent-4 { color: $accent-4 !important; }
.type-accent-5 { color: $accent-5 !important; }

// red type

.type-error-1 { color: $error-1; }
.type-error-2 { color: $error-2; }
.type-error-3 { color: $error-3; }
.type-error-4 { color: $error-4; }
.type-error-1 { color: $error-1 !important; }
.type-error-2 { color: $error-2 !important; }
.type-error-3 { color: $error-3 !important; }
.type-error-4 { color: $error-4 !important; }

// yellow type

.type-warn-1 { color: $warn-1; }
.type-warn-2 { color: $warn-2; }
.type-warn-3 { color: $warn-3; }
.type-warn-1 { color: $warn-1 !important; }
.type-warn-2 { color: $warn-2 !important; }
.type-warn-3 { color: $warn-3 !important; }

// green type

.type-success-1 { color: $success-1; }
.type-success-2 { color: $success-2; }
.type-success-1 { color: $success-1 !important; }
.type-success-2 { color: $success-2 !important; }

.type-inverse {
color: $type-inverse !important;
Expand Down

0 comments on commit 0bd3d02

Please sign in to comment.