Skip to content

Commit

Permalink
Merge branch 'rc-v1.0.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
cjg89 committed May 1, 2019
2 parents 3663655 + 032c8c3 commit 5aef838
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
2 changes: 1 addition & 1 deletion _docs/static/css/docs.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/framework.min.css

Large diffs are not rendered by default.

23 changes: 12 additions & 11 deletions src/scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -129,16 +129,17 @@ $ucf-metalgold-darker: darken($ucf-metalgold, 5%) !default;
$ucf-metalgold-darkest: darken($ucf-metalgold, 10%) !default;

// Start with assigning color names to specific hex values.
$white: #fff !default;
$black: #000 !default;
$red: #ff6445 !default;
$orange: #f4b350 !default;
$yellow: $ucf-gold !default; // modified
$green: #2ecc71 !default;
$blue: #0275d8 !default;
$teal: #81cfe0 !default;
$pink: #ff5b77 !default;
$purple: #613d7c !default;
$white: #fff !default;
$black: #000 !default;
$red: #ff6445 !default;
$orange: #f4b350 !default;
$yellow: $ucf-gold !default; // modified
$green: #2ecc71 !default;
$blue: #0275d8 !default;
$blue-dark: #0262b6 !default; // custom
$teal: #81cfe0 !default;
$pink: #ff5b77 !default;
$purple: #613d7c !default;

// Create grayscale
$gray-darkest: #292b2c !default; // custom
Expand Down Expand Up @@ -409,7 +410,7 @@ $ucf-header-height: 50px; // custom
//
// Style anchor elements.

$link-color: $brand-complementary !default; // modified
$link-color: $blue-dark !default; // modified
$link-decoration: none !default;
$link-hover-color: darken($link-color, 15%) !default;
$link-hover-decoration: underline !default;
Expand Down

0 comments on commit 5aef838

Please sign in to comment.