Skip to content
This repository has been archived by the owner on Mar 13, 2023. It is now read-only.

Implement contextual color controls #63

Merged
merged 21 commits into from
Aug 19, 2016
Merged

Implement contextual color controls #63

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c2d17e7
First pass at contextual color controls
fjarrett-godaddy Aug 6, 2016
1ba2af8
Merge in develop
fjarrett-godaddy Aug 16, 2016
3993386
Add a lot more colors
fjarrett-godaddy Aug 16, 2016
0e65ecf
Make hero selector a helper func
fjarrett-godaddy Aug 17, 2016
5d3548b
Fixed #40
Aug 17, 2016
a4c691c
Fix bug in navigation when inline styles are added and not removed
Aug 17, 2016
b86211a
Convert nav script to full jQuery.
Aug 17, 2016
18b4d6d
Add jquery for navigation
Aug 17, 2016
a2586fb
No need to resize + small js tweak
Aug 17, 2016
affc0e7
Normalize colors in Sass
fjarrett-godaddy Aug 18, 2016
3750127
Merge in develop
fjarrett-godaddy Aug 18, 2016
e3606f5
Use singular color names
fjarrett-godaddy Aug 18, 2016
9d80602
Rename header_background to hero_background
fjarrett-godaddy Aug 18, 2016
705aa92
Add schemes for bronze, orange and yellow
fjarrett-godaddy Aug 18, 2016
c45dec7
OCD
fjarrett-godaddy Aug 18, 2016
9c63f65
Better default text colors every child can use
fjarrett-godaddy Aug 19, 2016
3196706
Merge in develop
fjarrett-godaddy Aug 19, 2016
415dba6
Use panel and sections for color controls
fjarrett-godaddy Aug 19, 2016
f5e7cb1
Rename header to hero in all areas
fjarrett-godaddy Aug 19, 2016
6dad6c5
Comma and rename filter
fjarrett-godaddy Aug 19, 2016
9c819a3
Double quote not necessary
fjarrett-godaddy Aug 19, 2016
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
39 changes: 26 additions & 13 deletions .dev/sass/common/_customizer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,28 @@
// Fonts
$primary-font: "Open Sans";
$secondary-font: "Open Sans";
$heading-font: "Open Sans";
$font__heading: "Open Sans", sans-serif;
$font__main: "Open Sans", sans-serif;
$font__secondary: "Open Sans", sans-serif;

// Colors
$header-textcolor: #f4f5f9;
$background-color: #f4f5f9;
$header-background-color: #0b3954;
$menu-background-color: #0b3954;
$footer-background-color: #0b3954;
$tagline-text-color: #f4f5f9;
$link-color: #ff6663;
$main-text-color: #0b3954;
$secondary-text-color: #686868;
// Text
$color__site-title-text: #ffffff; // header_textcolor
$color__tagline-text: #ffffff;
$color__hero-text: #ffffff;
$color__menu-text: #ffffff;
$color__heading-text: #353535;
$color__main-text: #252525;
$color__secondary-text: #686868;
$color__footer-widget-text: #252525;
$color__footer-text: #757575;

// Links & Buttons
$color__link: #ff6663;
$color__button_bg: #ff6663;
$color__button-text: #ffffff;

// Backgrounds
$color__bg: #f4f5f9;
$color__content-bg: #ffffff;
$color__hero-bg: #0b3954;
$color__menu-bg: #0b3954;
$color__footer-widget-bg: #0b3954;
$color__footer-bg: #f4f5f9;
30 changes: 0 additions & 30 deletions .dev/sass/common/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,38 +18,8 @@ $medium-only: "only screen and (min-width: #{$medium-screen}) and (max-width: #{
$large-up: "only screen and (min-width: #{$large-screen})";

// Typography
$font__main: $primary-font, "Helvetica Neue", sans-serif;
$font__secondary: $secondary-font, "Helvetica Neue", sans-serif;
$font__heading: $heading-font, "Helvetica Neue", sans-serif;
$font__code: Monaco, Consolas, "Andale Mono", "DejaVu Sans Mono", monospace;
$font__pre: "Courier 10 Pitch", Courier, monospace;
$font__line-height-body: 1.8;
$font__line-height-pre: 1.6;
$font__line-height-headings: 1.4;

// Colors
$color__background-body: $background-color;
$color__background-screen: #fff;
$color__background-hr: rgba($main-text-color, 0.1);
$color__background-button: $link-color;
$color__background-button-hover: rgba($link-color, 0.8);
$color__background-pre: #eee;
$color__background-ins: #fff9c0;
$color__background-header: $header-background-color;
$color__background-menu: $menu-background-color;
$color__background-menu-hover: rgba(0, 0, 0, 0.1);
$color__background-footer: $footer-background-color;
$color__text-screen: #21759b;
$color__text-input: rgba($main-text-color, 0.5);
$color__text-input-focus: $main-text-color;
$color__text-main: $main-text-color;
$color__text-secondary: $secondary-text-color;
$color__text-heading: $main-text-color;
$color__text-tagline: $tagline-text-color;
$color__text-menu: #fff;
$color__text-button: #fff;
$color__link: $link-color;
$color__link-hover: rgba($link-color, 0.8);
$color__link-visited: $link-color;
$color__border: $color__background-hr;
$color__border-abbr: $color__background-hr;
8 changes: 4 additions & 4 deletions .dev/sass/components/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ input[type="submit"] {
display: inline-block;
border: none;
border-radius: 3px;
background-color: $color__background-button;
color: $color__text-button;
background-color: $color__button-bg;
color: $color__button-text;
line-height: 1;
margin-bottom: 0.5em;
padding: 0.75em 1em;
Expand All @@ -18,7 +18,7 @@ input[type="submit"] {
&:active,
&:focus {
cursor: pointer;
background-color: $color__background-button-hover;
color: $color__text-button;
background-color: rgba($color__button-bg, 0.8);
color: $color__button-text;
}
}
4 changes: 2 additions & 2 deletions .dev/sass/components/_elements.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ html {
}

body {
background: $color__background-body;
background: $color__bg;
}

blockquote, q {
Expand All @@ -22,7 +22,7 @@ blockquote, q {
}

hr {
background-color: $color__background-hr;
background-color: rgba($color__main-text, 0.1);
border: 0;
height: 1px;
margin-bottom: 1.5em;
Expand Down
12 changes: 7 additions & 5 deletions .dev/sass/components/_forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,16 @@ input[type="datetime"],
input[type="datetime-local"],
input[type="color"],
textarea {
color: $color__text-input;
border: 1px solid $color__border;
color: rgba($color__main-text, 0.5);
border: 1px solid rgba($color__main-text, 0.1);
border-radius: 3px;
padding: 0.75rem;
resize: none;
background-color: rgba(255, 255, 255, 0.5);

&:focus {
color: $color__text-input-focus;
color: $color__main-text;
background-color: rgba(255, 255, 255, 0.75);
}
}

Expand All @@ -35,7 +37,7 @@ input[type="file"] {
}

select {
border: 1px solid $color__border;
border: 1px solid rgba($color__main-text, 0.1);
}

textarea {
Expand All @@ -44,7 +46,7 @@ textarea {

fieldset {
padding: 0.5em 1.5em;
border-color: $color__border;
border-color: rgba($color__main-text, 0.1);
}

legend {
Expand Down
4 changes: 2 additions & 2 deletions .dev/sass/components/_links.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ a {
text-decoration: none;

&:visited {
color: $color__link-visited;
color: $color__link;
}

&:hover,
&:focus,
&:active {
color: $color__link-hover;
color: rgba($color__link, 0.8);
}

&:focus {
Expand Down
Loading