Skip to content

[WIP] Feature/theme toggle #19

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

Open
backlineint wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[WIP] Feature/theme toggle #19

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
f0d1491
Initial refactoring for theme toggle
backlineint Nov 18, 2019
d516112
Merge branch 'master' into feature/theme-toggle
backlineint Nov 25, 2019
0b13cb5
Continued theme toggle related refactoring.
backlineint Nov 25, 2019
4015bd2
Merge branch 'master' into feature/theme-toggle
backlineint Dec 17, 2020
1df741e
Set drupal theme as default and created template example for o-midcam…
backlineint Dec 17, 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
4 changes: 2 additions & 2 deletions source/_meta/_00-head.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<!-- Begin Pattern Lab (Required for Pattern Lab to run properly) -->
{{ patternLabHead | raw }}
<!-- End Pattern Lab -->

</head>
<body class="{{ bodyClass }}">

90 changes: 30 additions & 60 deletions source/_patterns/00-elements/buttons/_e-buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@ input[type="button"] {
//outline: none;
border: 0;
text-transform: uppercase;
// Keeping these commented out for now as I'd love to be able to impelment a toggle between
// the O'midcamp and default Midcamp themes. Worst case we could remove the crosshatches
// in the default theme as well.
// background: url("../imgs/crosshatch--purple.svg") no-repeat;
background-size: cover;
background-position: center;
background-color: $button-background;
/* stylelint-disable */
-webkit-appearance: none;
Expand All @@ -55,9 +49,6 @@ input[type="button"] {
&:active,
&:hover,
&:focus {
//background: url("../imgs/crosshatch--blue.svg") no-repeat;
background-size: cover;
background-position: center;
background-color: $button-hover-background;
color: $button-hover-text;
text-decoration: none;
Expand All @@ -77,9 +68,6 @@ input[type="reset"] {
.button--outline[type="submit"],
.button--outline[type="button"] {
@extend %button;
//background: url("../imgs/crosshatch--purple-light.svg") no-repeat;
background-size: cover;
background-position: center;
background-color: transparent;
border: 1px solid $button-background;
color: $button-background;
Expand All @@ -94,9 +82,6 @@ input[type="reset"] {
&:active,
&:hover,
&:focus {
//background: url("../imgs/crosshatch--blue-light.svg") no-repeat;
background-size: cover;
background-position: center;
background-color: transparent;
border: 1px solid $button-hover-background;
color: $button-hover-background;
Expand All @@ -108,24 +93,21 @@ input[type="reset"] {
.button--primary[type="submit"],
.button--primary[type="button"] {
@extend %button;
//background: url("../imgs/crosshatch--blue.svg") no-repeat;
background-size: cover;
background-position: center;
background-color: $blue-dark;
background-color: $color-primary;
background-color: var(--color-primary);


&:link,
&:visited {
background-color: $blue-dark;
background-color: $color-primary;
background-color: var(--color-primary);
}

&:active,
&:hover,
&:focus {
//background: url("../imgs/crosshatch--purple.svg") no-repeat;
background-size: cover;
background-position: center;
background-color: $purple;
background-color: $color-primary;
background-color: var(--color-primary);
}
}

Expand All @@ -134,29 +116,29 @@ input[type="reset"] {
.button--primary-outline[type="submit"],
.button--primary-outline[type="button"] {
@extend %button;
//background: url("../imgs/crosshatch--blue-light.svg") no-repeat;
background-size: cover;
background-position: center;
background-color: transparent;
border: 1px solid $blue-dark;
color: $blue-dark;
border: 1px solid $color-primary;
border: 1px solid var(--color-primary);
color: $color-primary;
color: var(--color-primary);

&:link,
&:visited {
background-color: transparent;
border: 1px solid $blue-dark;
color: $blue-dark;
border: 1px solid $color-primary;
border: 1px solid var(--color-primary);
color: $color-primary;
color: var(--color-primary);
}

&:active,
&:hover,
&:focus {
//background: url("../imgs/crosshatch--purple-light.svg") no-repeat;
background-size: cover;
background-position: center;
background-color: transparent;
border: 1px solid $purple;
color: $purple;
border: 1px solid $color-secondary;
border: 1px solid var(--color-secondary);
color: $color-secondary;
color: var(--color-secondary);
}
}

Expand All @@ -165,9 +147,6 @@ input[type="reset"] {
.button--secondary[type="submit"],
.button--secondary[type="button"] {
@extend %button;
//background: url("../imgs/crosshatch--gray.svg") no-repeat;
background-size: cover;
background-position: center;
background-color: $gray-medium;
color: $white;

Expand All @@ -180,10 +159,8 @@ input[type="reset"] {
&:active,
&:hover,
&:focus {
//background: url("../imgs/crosshatch--purple.svg") no-repeat;
background-size: cover;
background-position: center;
background-color: $purple;
background-color: $color-secondary;
background-color: var(--color-secondary);
}
}

Expand All @@ -192,9 +169,6 @@ input[type="reset"] {
.button--secondary-outline[type="submit"],
.button--secondary-outline[type="button"] {
@extend %button;
//background: url("../imgs/crosshatch--gray-light.svg") no-repeat;
background-size: cover;
background-position: center;
background-color: transparent;
border: 1px solid $gray-medium;
color: $gray-medium;
Expand All @@ -209,12 +183,11 @@ input[type="reset"] {
&:active,
&:hover,
&:focus {
//background: url("../imgs/crosshatch--purple-light.svg") no-repeat;
background-size: cover;
background-position: center;
background-color: transparent;
border: 1px solid $purple;
color: $purple;
border: 1px solid $color-secondary;
border: 1px solid var(--color-secondary);
color: $color-secondary;
color: var(--color-secondary);
}
}

Expand All @@ -223,26 +196,23 @@ input[type="reset"] {
.button--tertiary[type="submit"],
.button--tertiary[type="button"] {
@extend %button;
//background: url("../imgs/crosshatch--yellow.svg") no-repeat;
background-size: cover;
background-position: center;
background-color: $yellow;
color: $blue-dark;
color: $color-primary;
color: var(--color-primary);


&:link,
&:visited {
background-color: $yellow;
color: $blue-dark;
color: $color-primary;
color: var(--color-primary);
}

&:active,
&:hover,
&:focus {
//background: url("../imgs/crosshatch--purple.svg") no-repeat;
background-size: cover;
background-position: center;
background-color: $purple;
background-color: $color-secondary;
background-color: var(--color-secondary);
color: $white;
}
}
3 changes: 2 additions & 1 deletion source/_patterns/01-components/footer/_c-footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
background: url("../imgs/dots--green.svg") no-repeat;
background-size: cover;
background-position: center;
background-color: $blue-dark;
background-color: $color-primary;
background-color: var(--color-primary);
box-shadow: inset 0px 20px 40px rgba($black, .3);
border-top: 4px solid $magenta;
padding: 1em 0;
Expand Down
26 changes: 17 additions & 9 deletions source/_patterns/01-components/navigation/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
background: url("../imgs/dots--green.svg") no-repeat;
background-size: cover;
background-position: center;
background-color: $blue-dark;
border-top: 4px solid $purple;
background-color: $color-primary;
background-color: var(--color-primary);
border-top: 4px solid $color-secondary;
border-top: 4px solid var(--color-secondary);
box-shadow: 0px 2px 3px rgba($black, .3);
}

Expand Down Expand Up @@ -51,7 +53,8 @@
&:hover,
&:focus {
background: none;
background-color: $purple;
background-color: $color-secondary;
background-color: var(--color-secondary);
}

@include breakpoint($bp1) {
Expand Down Expand Up @@ -130,7 +133,8 @@
> a:active,
> a:hover,
> a:focus {
background-color: $purple;
background-color: $color-secondary;
background-color: var(--color-secondary);
color: $white;
text-decoration: none;
}
Expand Down Expand Up @@ -161,7 +165,8 @@
&:hover,
&:focus {
background: none;
background-color: darken($blue-dark, 10%);
background-color: darken($color-primary, 10%);
background-color: var(--color-primary-darken-10);

svg {
fill: $white;
Expand All @@ -171,7 +176,8 @@
}

.primary-nav__item.is-active & {
background-color: darken($blue-dark, 10%);
background-color: darken($color-primary, 10%);
background-color: var(--color-primary-darken-10);

svg {
transform: rotate(90deg);
Expand All @@ -196,7 +202,8 @@
.primary-nav__sublist {
@extend %list--simple;
border-top: 1px dotted $blue;
background-color: darken($blue-dark, 10%);
background-color: darken($color-primary, 10%);
background-color: var(--color-primary-darken-10);
display: none;
visibility: hidden;

Expand Down Expand Up @@ -241,7 +248,8 @@
a:active,
a:hover,
a:focus {
background-color: $purple;
background-color: $color-secondary;
background-color: var(--color-secondary);
color: $white;
text-decoration: none;
}
Expand All @@ -264,7 +272,7 @@
font-family: $sans;
font-weight: 400;
overflow: hidden;
background-color: $blue-dark;
background-color: var(--color-primary);
padding: 10px 0;
color: $white;
.path-frontpage & {
Expand Down
4 changes: 4 additions & 0 deletions source/_patterns/02-templates/o-midcamp/t-o-midcamp.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
title: O'Midcamp Homepage
---
Homepage with O'Midcamp theme enabled via data-theme="o-midcamp" attribute.
Loading