Skip to content

Issue 43 #49

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

Merged
merged 8 commits into from
Nov 24, 2020
Merged

Issue 43 #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2af9be9
Remove jungle green
jscaffrey Nov 23, 2020
7c9e582
Add honey yellow
jscaffrey Nov 23, 2020
d266617
Change icosahedron color
jscaffrey Nov 23, 2020
18d27b8
Update color test variables
jscaffrey Nov 24, 2020
f746114
Lighten light bg-color throughout site
jscaffrey Nov 24, 2020
ffc134c
Add button outline options
jscaffrey Nov 24, 2020
887b530
Fix crayola pink typo
jscaffrey Nov 24, 2020
e9ad775
Update button colors
jscaffrey Nov 24, 2020
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
70 changes: 50 additions & 20 deletions assets/_scss/_color-test.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,27 @@

// Background
$oxford-blue: #061A40;
$jungle-green: #041F1E;
$xiketic: #070413;

// Foreground
$cultured-white: #F5F5F5;
$turquoise: #00D5C0;
$crayola-ink: #FA62F0;
$crayola-pink: #FA62F0;
$honey-yellow: #FDB827;

//Lighter
$cultured-white-lighter: #FFF;
$turquoise-lighter: lighten($turquoise, 10%);
$crayola-pink-lighter: lighten($crayola-pink, 10%);
$honey-yellow-lighter: lighten($honey-yellow, 10%);
//
// Settings
// --------------------------------------------------

.CT-body {
/* Margin bottom by footer height */
color: $cultured-white;
background-color: $jungle-green;
background-color: $oxford-blue;
font-family: $font-family-sans-serif;
font-weight: 300;
padding: 50px;
Expand All @@ -32,7 +38,7 @@ $crayola-ink: #FA62F0;
}

.CT-body a:hover, .CT-body a:focus {
background-color: $crayola-ink !important;
background-color: $black !important;
color: $cultured-white !important;
}

Expand All @@ -46,16 +52,16 @@ $crayola-ink: #FA62F0;
}

.CT-body .speaker-box-inner {
border-top: 3px solid $crayola-ink;
border-left: 3px solid $crayola-ink;
border-right: 3px solid $crayola-ink;
border-top: 3px solid $crayola-pink;
border-left: 3px solid $crayola-pink;
border-right: 3px solid $crayola-pink;
border-radius: 3px;
}

.CT-body .arrow-down {
border-left: 140px solid transparent;
border-right: 140px solid transparent;
border-top: 15px solid $crayola-ink;
border-top: 15px solid $crayola-pink;
height: 0;
margin-top: 15px;
opacity: 0;
Expand All @@ -65,29 +71,53 @@ $crayola-ink: #FA62F0;
}

.CT-body .ct-btn-light{
background-color: $cultured-white;
color: $turquoise;
background-color: $honey-yellow;
color: $black;
&:hover {
background-color: $honey-yellow-lighter;
}
}

.CT-body .ct-btn-outline-light{
border-color: $honey-yellow;
color: $honey-yellow;
&:hover {
outline: 2px solid $crayola-ink;
outline-offset: -2px;
border-color: $honey-yellow-lighter;
color: $honey-yellow-lighter;
}
}

.CT-body .ct-btn-middle{
background-color: $gray-600;
color: $cultured-white;
background-color: $crayola-pink;
color: $black;
&:hover {
outline: 2px solid $crayola-ink;
outline-offset: -2px;
background-color: $crayola-pink-lighter;
}
}

.CT-body .ct-btn-outline-middle{
border-color: $crayola-pink;
color: $crayola-pink;
&:hover {
border-color: $crayola-pink-lighter;
color: $crayola-pink-lighter;
}
}

.CT-body .ct-btn-dark{
background-color: $gray-900;
color: $gray-300;
background-color: $turquoise;
color: $black;
&:hover {
background-color: $turquoise-lighter;
}
}

.CT-body .ct-btn-outline-dark{
border-color: $turquoise;
color: $turquoise;
&:hover {
outline: 2px solid $crayola-ink;
outline-offset: -2px;
border-color: $turquoise-lighter;
color: $turquoise-lighter;
}
}

2 changes: 1 addition & 1 deletion assets/_scss/_homepage.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@

// "Welcome to..." section of the home page
.welcome {
background-color: $oxford-blue;
background-color: $xiketic;
}
.welcome a {
@include link-styles;
Expand Down
4 changes: 2 additions & 2 deletions assets/_scss/_sections.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ section:nth-of-type(3n+1) {
}

section:nth-of-type(3n+2) {
border-top: 2px solid $crayola-ink;
border-bottom: 2px solid $crayola-ink;
border-top: 2px solid $crayola-pink;
border-bottom: 2px solid $crayola-pink;
}

section:nth-of-type(3n+3) {
Expand Down
40 changes: 24 additions & 16 deletions assets/_scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,30 @@ $bootstrap-sass-asset-helper: true !default;
// --------------------------------------------------

// Background
$oxford-blue: #061A40;
$jungle-green: #041F1E;
$oxford-blue: #060c40;
$xiketic: #070413;

// Foreground
$cultured-white: #F5F5F5;
$turquoise: #00D5C0;
$crayola-ink: #FA62F0;
$crayola-pink: #F971F0 ;
$honey-yellow: #FDB827;

//Foreground lighter
$cultured-white-lighter: #FFF;
$turquoise-lighter: lighten($turquoise, 10%);
$crayola-pink-lighter: lighten($crayola-pink, 10%);
$honey-yellow-lighter: lighten($honey-yellow, 10%);

// Buttons
$btn-bg-color-mid: #495057; //$gray-700
$btn-color-mid: $cultured-white;
$btn-border-color-mid: #8e908c; //$gray-600
$btn-border-hover: $crayola-ink;
$btn-bg-color-mid: $honey-yellow;
$btn-color-mid: #000;
$btn-border-color-mid: #000;
$btn-border-hover: $honey-yellow-lighter;

// Random Utils
$transparent: transparent !important;
$icosahedron-color: #2692b2;
$icosahedron-color: $turquoise;
$hero-transition: #770681;


Expand Down Expand Up @@ -51,20 +58,21 @@ $gray-darker: $gray-900 !default; // #222
$gray-dark: $gray-800 !default; // #333
$gray: $gray-600 !default; // #555
$gray-light: $gray-400 !default; // #777
$gray-light: $cultured-white; //2021 override
$gray-lighter: $gray-200 !default; // #eee
//End fo gray setting

$primary: $jungle-green;
$primary: $xiketic;
$primary-dark: darken($primary, 10%) !default;
$primary-light: lighten($primary, 10%) !default;

$accent: $crayola-ink;
$accent: $crayola-pink;
$accent-dark: darken($accent, 10%) !default;
$accent-light: lighten($accent, 10%);
$accent-darker: darken($accent, 20%);
$accent-lighter: lighten($accent, 20%);

$brand-primary: $jungle-green !default; // #337ab7
$brand-primary: $oxford-blue !default; // #337ab7
$brand-success: #5cb85c !default;
$brand-info: #5bc0de !default;
$brand-warning: $gray-600 !default;
Expand All @@ -87,7 +95,7 @@ $section-2-color: color-contrast($primary);
$section-2-link: $accent-dark;
$section-2-hover: $accent-lighter;

$section-3-bg: $jungle-green;
$section-3-bg: $oxford-blue;
$section-3-color: $gray-lighter;
$section-3-link: $accent-dark;
$section-3-hover: darken($accent-light, 6.5%);
Expand All @@ -108,10 +116,10 @@ $sponsor-badge-ribbon: $accent-light;
$sponsor-badge-bg: $gray-lighter;

// Speaker Box
$speaker-selected-bg: $oxford-blue;
$speaker-selected-bg: $xiketic;
$speaker-selected-color: $turquoise;
$speaker-selected-outline: 2px solid $crayola-ink;
$speaker-selected-arrow: $crayola-ink;
$speaker-selected-outline: 2px solid $crayola-pink;
$speaker-selected-arrow: $crayola-pink;
$speaker-info-bg: $gray-light;
$speaker-info-color: $gray-base;

Expand Down Expand Up @@ -160,7 +168,7 @@ $night-event: $primary-dark;
//## Settings for some of the most global styles.

//** Background color for `<body>`.
$body-bg: $jungle-green !default;
$body-bg: $oxford-blue !default;
//** Global text color on `<body>`.
$text-color: $cultured-white !default;

Expand Down
7 changes: 4 additions & 3 deletions color-test.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ Oxford Blue (#061A40), do a test.)
- Feel free to use shades or tints of colors to achieve accessible results.

<div class="mt-5">
<p>Customized buttons here <button class="btn ct-btn-light">button light</button> </p>
<p>Customized buttons here <button class="btn ct-btn-middle">button middle</button> </p>
<p>Customized buttons here <button class="btn ct-btn-dark">button dark</button> </p>
##Buttons
<p>Customized buttons here <button class="btn ct-btn-light">button light</button> <button type="button" class="btn ct-btn-outline-light">light outline</button></p>
<p>Customized buttons here <button class="btn ct-btn-middle">button middle</button> <button type="button" class="btn ct-btn-outline-middle">middle outline</button></p>
<p>Customized buttons here <button class="btn ct-btn-dark">button dark</button> <button type="button" class="btn ct-btn-outline-dark">middle dark</button></p>
</div>

---
Expand Down