From ea293d6f019b33e09ab82087c5cc1cbf64a0c850 Mon Sep 17 00:00:00 2001 From: Jules Date: Thu, 7 Mar 2024 18:15:49 -0800 Subject: [PATCH] #61 moves styleguide sections into "organisms" --- .../_elements}/color-all.twig | 0 .../_elements}/color-bg.twig | 0 .../_elements}/colorways.twig | 0 .../styleguide_sections/_elements}/grids.twig | 0 .../_elements}/spacing.twig | 0 .../_elements}/typography.twig | 0 .../atoms}/buttons-&-links.twig | 28 ++++++++++++------- .../styleguide_sections/atoms}/inputs.twig | 0 .../styleguide_sections/molecules}/cards.twig | 0 .../molecules}/section-title.twig | 0 10 files changed, 18 insertions(+), 10 deletions(-) rename views/{_styleguide_sections/foundation => organisms/styleguide_sections/_elements}/color-all.twig (100%) rename views/{_styleguide_sections/foundation => organisms/styleguide_sections/_elements}/color-bg.twig (100%) rename views/{_styleguide_sections/foundation => organisms/styleguide_sections/_elements}/colorways.twig (100%) rename views/{_styleguide_sections/foundation => organisms/styleguide_sections/_elements}/grids.twig (100%) rename views/{_styleguide_sections/foundation => organisms/styleguide_sections/_elements}/spacing.twig (100%) rename views/{_styleguide_sections/foundation => organisms/styleguide_sections/_elements}/typography.twig (100%) rename views/{_styleguide_sections/components => organisms/styleguide_sections/atoms}/buttons-&-links.twig (74%) rename views/{_styleguide_sections/components => organisms/styleguide_sections/atoms}/inputs.twig (100%) rename views/{_styleguide_sections/components => organisms/styleguide_sections/molecules}/cards.twig (100%) rename views/{_styleguide_sections/components => organisms/styleguide_sections/molecules}/section-title.twig (100%) diff --git a/views/_styleguide_sections/foundation/color-all.twig b/views/organisms/styleguide_sections/_elements/color-all.twig similarity index 100% rename from views/_styleguide_sections/foundation/color-all.twig rename to views/organisms/styleguide_sections/_elements/color-all.twig diff --git a/views/_styleguide_sections/foundation/color-bg.twig b/views/organisms/styleguide_sections/_elements/color-bg.twig similarity index 100% rename from views/_styleguide_sections/foundation/color-bg.twig rename to views/organisms/styleguide_sections/_elements/color-bg.twig diff --git a/views/_styleguide_sections/foundation/colorways.twig b/views/organisms/styleguide_sections/_elements/colorways.twig similarity index 100% rename from views/_styleguide_sections/foundation/colorways.twig rename to views/organisms/styleguide_sections/_elements/colorways.twig diff --git a/views/_styleguide_sections/foundation/grids.twig b/views/organisms/styleguide_sections/_elements/grids.twig similarity index 100% rename from views/_styleguide_sections/foundation/grids.twig rename to views/organisms/styleguide_sections/_elements/grids.twig diff --git a/views/_styleguide_sections/foundation/spacing.twig b/views/organisms/styleguide_sections/_elements/spacing.twig similarity index 100% rename from views/_styleguide_sections/foundation/spacing.twig rename to views/organisms/styleguide_sections/_elements/spacing.twig diff --git a/views/_styleguide_sections/foundation/typography.twig b/views/organisms/styleguide_sections/_elements/typography.twig similarity index 100% rename from views/_styleguide_sections/foundation/typography.twig rename to views/organisms/styleguide_sections/_elements/typography.twig diff --git a/views/_styleguide_sections/components/buttons-&-links.twig b/views/organisms/styleguide_sections/atoms/buttons-&-links.twig similarity index 74% rename from views/_styleguide_sections/components/buttons-&-links.twig rename to views/organisms/styleguide_sections/atoms/buttons-&-links.twig index 36cd36639..a8398c403 100644 --- a/views/_styleguide_sections/components/buttons-&-links.twig +++ b/views/organisms/styleguide_sections/atoms/buttons-&-links.twig @@ -3,7 +3,8 @@ {% set btnLinkStyles = [ 'btn-solid', 'btn-outline', - 'btn-underline' + 'btn-underline', + 'btn-text-link' ] %} {% set sizes = [ @@ -18,14 +19,17 @@ {# "Light Colorway": 'ts-bg-lt',#} {% set bgColors = { "Dark Colorway": 'ts-bg-dk', + "Light Colorway": 'ts-bg-lt', + "Brand 1 Colorway": 'ts-bg-brand-1', + "Brand 2 Colorway": 'ts-bg-brand-2', } %} {% set svgs = { - "before": "download", - "after": "arrow-right", - "none": "", - } + "before": "download", + "after": "arrow-right", + "none": "", +} %} {% set iconBtnLinkStyles = [ @@ -34,16 +38,16 @@ {% set link_url = '/' %} +btn--lg ts-bg-brand-1">

css/common/_buttons-links.css

views/btns

Buttons and links with icons are reusable components found in twig "views/btns"


- Button styles +Button styles

All button and links use an included template.
- See views/btns/[btn name] for templates and docs

+ See views/atoms/btns/[btn name] for templates and docs

{# Loops through buttons, prints them on all backgrounds at all sizes #} {% for key, bgColor in bgColors %} @@ -54,7 +58,7 @@ btn--lg">
{% for key, svg in svgs %} - {% include 'btns/' ~ btn ~ '.twig' with { + {% include 'atoms/btns/' ~ btn ~ '.twig' with { link: {title: btn ~ " " ~ size, url: link_url}, size: size, svg_position: key, @@ -63,7 +67,7 @@ btn--lg"> } %} {% if key == 'none' %} - {% include 'btns/' ~ btn ~ '.twig' with { + {% include 'atoms/btns/' ~ btn ~ '.twig' with { link: {title: btn ~ " " ~ size, url: link_url}, size: size, link_svg_name: "arrow-right", @@ -76,4 +80,8 @@ btn--lg"> {% endfor %}
{% endfor %} +
+ {% include "/molecules/social-nav.twig" %} + {% include "/atoms/btns/btn-tag.twig" with { svg_name: "hike-type", text: "Type"} %} +
{% endfor %} diff --git a/views/_styleguide_sections/components/inputs.twig b/views/organisms/styleguide_sections/atoms/inputs.twig similarity index 100% rename from views/_styleguide_sections/components/inputs.twig rename to views/organisms/styleguide_sections/atoms/inputs.twig diff --git a/views/_styleguide_sections/components/cards.twig b/views/organisms/styleguide_sections/molecules/cards.twig similarity index 100% rename from views/_styleguide_sections/components/cards.twig rename to views/organisms/styleguide_sections/molecules/cards.twig diff --git a/views/_styleguide_sections/components/section-title.twig b/views/organisms/styleguide_sections/molecules/section-title.twig similarity index 100% rename from views/_styleguide_sections/components/section-title.twig rename to views/organisms/styleguide_sections/molecules/section-title.twig