Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add More Pink to Primer! 💖🌸💕🌷💞🎀💗🌺💝 #778

Merged
merged 5 commits into from
Apr 30, 2019
Merged

Add More Pink to Primer! 💖🌸💕🌷💞🎀💗🌺💝 #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db897dc
Merge branch 'pink' into more-pink
Apr 30, 2019
ed737d1
add pink utilities and full scale
Apr 30, 2019
2c8a0b9
Merge branch 'release-12.3.0' into more-pink
shawnbot Apr 30, 2019
d915c3a
add pinks to hue map
Apr 30, 2019
b2293f9
hanging comma
Apr 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion src/support/variables/color-system.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,16 @@ $purple-800: #3a1d6e !default;
$purple-900: #29134e !default;

// -------- Pink --------
$pink-500: #ea4aaa;
$pink-000: #ffeef8 !default;
$pink-100: #fedbf0 !default;
$pink-200: #f9b3dd !default;
$pink-300: #f692ce !default;
$pink-400: #ec6cb9 !default;
$pink-500: #ea4aaa !default;
$pink-600: #d03592 !default;
$pink-700: #b93a86 !default;
$pink-800: #99306f !default;
$pink-900: #6d224f !default;

// -------- Fades --------
// Black based on same hue as $gray-900
Expand Down Expand Up @@ -209,6 +218,19 @@ $purples: (
9: $purple-900,
) !default;

$pinks: (
0: $pink-000,
1: $pink-100,
2: $pink-200,
3: $pink-300,
4: $pink-400,
5: $pink-500,
6: $pink-600,
7: $pink-700,
8: $pink-800,
9: $pink-900,
) !default;

$hue-maps: (
gray: $grays,
blue: $blues,
Expand All @@ -217,4 +239,5 @@ $hue-maps: (
orange: $oranges,
red: $reds,
purple: $purples,
pink: $pinks,
) !default;
2 changes: 2 additions & 0 deletions src/support/variables/colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ $bg-green-light: $green-100 !default;
$bg-orange: $orange-700 !default;
$bg-purple: $purple-500 !default;
$bg-purple-light: $purple-000 !default;
$bg-pink: $pink-500 !default;
$bg-red: $red-500 !default;
$bg-red-light: $red-100 !default;
$bg-white: $white !default;
Expand All @@ -64,5 +65,6 @@ $text-green: $green-500 !default;
$text-orange: $orange-900 !default;
$text-orange-light: $orange-600 !default;
$text-purple: $purple !default;
$text-pink: $pink-500 !default;
$text-red: $red-600 !default;
$text-white: $white !default;
4 changes: 4 additions & 0 deletions src/utilities/colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
.bg-yellow-light { background-color: $bg-yellow-light !important; }
/* Set the background to $bg-purple */
.bg-purple { background-color: $bg-purple !important; }
/* Set the background to $bg-pink */
.bg-pink { background-color: $bg-pink !important; }
/* Set the background to $bg-purple-light */
.bg-purple-light { background-color: $bg-purple-light !important; }

Expand Down Expand Up @@ -65,6 +67,8 @@
.text-orange-light { color: $text-orange-light !important; }
/* Set the text color to $text-purple */
.text-purple { color: $text-purple !important; }
/* Set the text color to $text-pink */
.text-pink { color: $text-pink !important; }
/* Set the text color to $text-white */
.text-white { color: $text-white !important; }
/* Set the text color to inherit */
Expand Down