Skip to content

Commit

Permalink
SHS-5691: New color palette for Traditional (#1600)
Browse files Browse the repository at this point in the history
* SHS-5692: Implementation: New Spotlight design for Colorful and Traditional (#1589)

* feat(shs-5692): add new field for variantion style and start implementing new styles

* feat(shs-5692): styles for colorful

* feat(shs-5692): finish styles for colorful

* feat(shs-5692): finish styles for colorful

* feat(shs-5692): finish styles for traditional

* feat(shs-5692): finish styles for traditional

* fix(shs-5692): fix on colorful

* fix(shs-5692): image dimensions and height when spotlits are in sliders

* fix(shs-5692): refactor spotlight style field class assignation

---------

Co-authored-by: Mari Nez <mariannuar@gmail.com>
Co-authored-by: Andrés Díaz Soto <andres.diaz.soto@gmail.com>

* SHS-5772 - Regression: External Links on Postcards are wrong color (#1591)

* fix(shs-5772): regression in external links in postcards

* fix(shs-5772): update card title link styles

---------

Co-authored-by: Mari Nez <mariannuar@gmail.com>
Co-authored-by: Andrés Díaz Soto <andres.diaz.soto@gmail.com>

* SHS-5629: Editors can more easily edit a caption (#1580)

* feat(SHS-5629): Add patch to allow editing of media items in a modal from a node edit page

* fix(SHS-5629): Remove todo in patch file

* SHS-5661: Remove legacy fields (#1577)

* feat(SHS-5661): Remove paragraph field Overlay Color on banner image with text box

* feat(SHS-5661): Remove other references to the overlay field

* feat(SHS-5661): Add update hook to remove legacy field

* fix(SHS-5661): Fix linting error

* fix(shs-5661): remove hero-text-overlay variants and update viewmode config

---------

Co-authored-by: Andrés Díaz Soto <andres.diaz.soto@gmail.com>

* SHS-4929: Hide caption/credits on images in default views (#1578)

* feat(shs-4929): add new media view mode and update news default views

* feat(shs-4929):  update people default views

* feat(shs-4929):  update publications default views

---------

Co-authored-by: Mari Nez <mariannuar@gmail.com>
Co-authored-by: Andrés Díaz Soto <andres.diaz.soto@gmail.com>

* refactor(SHS-5629): Switch local patch for remote patch, add patch to fix missing save button on media modal

* SHS-5675: Helping users avoid 'Table cell missing context (e.g. headings) A11y warning (#1579)

* feat(SHS-5675): Add default table header rows to new tables in CKEditor

* fix(SHS-5675): Fix linting error

* docs(SHS-5675): Add comments describing change and source of change.

* feat(SHS-5675): Update table heading color in CKEditor

* fix(shs-5675): change color variable for table headings

---------

Co-authored-by: Andrés Díaz Soto <andres.diaz.soto@gmail.com>

* fix(shs-5629): revert composer.lock changes

* fix(SHS-5629): Possible fix for dialog box too low on screen

* fix(SHS-5629): Fix dialog too low on screen issue (clear browser cache to fix)

* fix(shs-5629): remove unnecesary change

* fix(shs-5629): update patch

---------

Co-authored-by: Andrés Díaz Soto <andres.diaz.soto@gmail.com>
Co-authored-by: Mariana Núñez <48533432+mariannuar@users.noreply.github.com>
Co-authored-by: Mari Nez <mariannuar@gmail.com>

* feat(shs-5691): add new color pallete-for-traditional

* feat(shs-5691): add new color palette-for-traditional

* fix(shs-5691): update secondary and secondary active colors

---------

Co-authored-by: Mari Nez <mariannuar@gmail.com>
Co-authored-by: Andrés Díaz Soto <andres.diaz.soto@gmail.com>
Co-authored-by: Marc Berger <107938318+codechefmarc@users.noreply.github.com>
  • Loading branch information
4 people authored Aug 22, 2024
1 parent 7478db7 commit fb74037
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const backstopFile = './backstop/backstop.json';
const sites = ['hs-colorful', 'hs-traditional'];
const colorPairings = {
'hs-colorful': ['ocean', 'mountain', 'cardinal', 'lake', 'canyon', 'cliff'],
'hs-traditional': ['cardinal', 'bluejay', 'warbler', 'firefinch'],
'hs-traditional': ['cardinal', 'bluejay', 'warbler', 'firefinch', 'vireo'],
};
const testPages = [
'/',
Expand Down
1 change: 1 addition & 0 deletions docroot/themes/humsci/humsci_basic/docs/color-pairings.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ A user can update the color pairing in the Drupal admin by going to Appearance /
| Blue Jay | ht-pairing-bluejay |
| Warbler | ht-pairing-warbler |
| Firefinch| ht-pairing-firefinch |
| Vireo| ht-pairing-vireo |
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,22 @@ $ht-traditional-pairings: (
'tertiary-darken-20': darken(#8c1515, 20%),
'spotlight': #e0e0d1,
),
'vireo': (
'primary': #2b2e13,
'secondary': #63692b,
'tertiary': #666252,
'primary-hero-overlay': rgba(33, 36, 17, 0.8),
'primary-dark': #212411,
'secondary-active': #666252,
'secondary-highlight': #f4f5ec,
'secondary-highlight-darken': darken(#f4f5ec, 20%),
'secondary-darken-12': darken(#727a32, 12%),
'tertiary-highlight': #e9e7e0,
'tertiary-highlight-darken-10': darken(#e9e7e0, 10%),
'tertiary-reversed': #dbdcde,
'tertiary-darken-20': darken(#666252, 20%),
'spotlight': #e1dfd5,
),
);

// Specific shades of gray that compliment traditional pairing palettes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@
background-image: svg(hc-get-icons($icon, $icon-color));
}

.ht-pairing-vireo & {
$icon-color: map-get(map-get($ht-traditional-pairings, 'vireo'), $color);
background-image: svg(hc-get-icons($icon, $icon-color));
}

}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ function humsci_traditional_form_system_theme_settings_alter(array &$form, FormS
'bluejay' => t('Blue Jay'),
'warbler' => t('Warbler'),
'firefinch' => t('Firefinch'),
'vireo' => t('Vireo'),
],
'#default_value' => theme_get_setting('theme_color_pairing'),
];
Expand Down

0 comments on commit fb74037

Please sign in to comment.