Skip to content

Added gin cleanup #12

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
nextagencyio wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Added gin cleanup #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b540226
Added gin cleanup
jaymediacurrent Nov 16, 2022
6b58636
Removed LB CSS
jaymediacurrent Nov 17, 2022
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
102 changes: 0 additions & 102 deletions generators/app/templates/_src/stories/global/builder/_builder.scss
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions generators/app/templates/_src/stories/global/global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
// Import Rain blocks default styles.
@import 'blocks/blocks';

// Layout builder styles.
@import 'builder/builder';

// Base
//
// Plain html element styling. Shouldn't require
Expand Down
6 changes: 3 additions & 3 deletions generators/starter-kit/templates/button/button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
// Import site utilities.
@import '../../global/utils/init';

.button__container {
.btn__container {
margin-top: 30px;
}

.button,
.btn,
input[type='submit'] {
background-color: $color-blue;
border: 2px solid $color-blue;
Expand All @@ -32,7 +32,7 @@ input[type='submit'] {
padding: 1rem 2rem;
}

&.button--small {
&.btn--small {
font-size: 0.875rem;
padding: 0.5rem 1rem;
}
Expand Down
2 changes: 1 addition & 1 deletion generators/starter-kit/templates/button/button.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const ButtonSmall = ButtonTemplate.bind({});
ButtonSmall.args = {
"button": {
"url": "https://www.mediacurrent.com",
"modifier": "button--small",
"modifier": "btn--small",
"text": "Small Button"
}
};
4 changes: 2 additions & 2 deletions generators/starter-kit/templates/button/button.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{ attach_library('<%= themeNameMachine %>/button') }}

{% if button.url %}
<a href="{{ button.url }}" class="button{{ button.modifier ? ' ' ~ button.modifier }}">{{ button.text }}</a>
<a href="{{ button.url }}" class="btn{{ button.modifier ? ' ' ~ button.modifier }}">{{ button.text }}</a>
{% else %}
<button class="button{{ button.modifier ? ' ' ~ button.modifier }}">{{ button.text }}</button>
<button class="btn{{ button.modifier ? ' ' ~ button.modifier }}">{{ button.text }}</button>
{% endif %}
4 changes: 2 additions & 2 deletions generators/starter-kit/templates/views/templates/block-content--views.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
{% endif %}
{{ content|without('field_title', 'field_link') }}
{% if content.field_link[0]['#url'] %}
<div class="button__container container">
<div class="button__inner">
<div class="btn__container container">
<div class="btn__inner">
{% if content.field_link[0]['#url'] %}
{% include '@<%= themeNameMachine %>/button/button.twig' with {
"button": {
Expand Down