diff --git a/generators/app/templates/_src/stories/global/builder/_builder.scss b/generators/app/templates/_src/stories/global/builder/_builder.scss deleted file mode 100644 index c7e4d9d..0000000 --- a/generators/app/templates/_src/stories/global/builder/_builder.scss +++ /dev/null @@ -1,102 +0,0 @@ -.layout-builder-form { - - .layout-builder__message > .container { - max-width: 100%; - } - - .button { - padding: 5px 8px; - } -} - -.block-help-block { - font-size: 80%; - font-style: italic; - padding: 10px 1.5rem 0; -} - -.layout-builder { - margin: 10px; - - & > .container { - max-width: 100%; - } - - .message--warning { - margin: 0 0 10px; - } -} - -.layout-builder__link { - margin-bottom: 10px; -} - -#drupal-off-canvas { - - .form-search { - margin: 20px 0; - width: 100%; - font-size: inherit; - } - - .layout-builder-browser-block-item { - text-align: center; - display: block; - padding-bottom: 5px; - - &:hover { - color: #fff; - text-decoration: none; - } - - img { - margin-bottom: 10px; - width: 100%; - cursor: pointer; - - &:hover { - transition-property: opacity; - transition-duration: 500ms; - opacity: 0.8; - } - } - } - - .layout-builder-remove-block { - padding-top: 20px; - } - - .layout-selection { - margin-top: 20px; - } - - svg { - margin-bottom: 8px; - margin-left: 2px; - } - - .moderation-sidebar-info p { - display: block; - } - - .js-layout-builder-filter { - margin-bottom: 20px; - } - - .js-layout-builder-category { - - & > summary { - margin-bottom: 15px; - display: block; - cursor: pointer; - } - - .links li { - margin-bottom: 10px; - } - } - - a { - cursor: pointer; - } -} diff --git a/generators/app/templates/_src/stories/global/global.scss b/generators/app/templates/_src/stories/global/global.scss index 1379b93..3f2e8b2 100644 --- a/generators/app/templates/_src/stories/global/global.scss +++ b/generators/app/templates/_src/stories/global/global.scss @@ -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 diff --git a/generators/starter-kit/templates/button/button.scss b/generators/starter-kit/templates/button/button.scss index b406afe..6e48af2 100644 --- a/generators/starter-kit/templates/button/button.scss +++ b/generators/starter-kit/templates/button/button.scss @@ -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; @@ -32,7 +32,7 @@ input[type='submit'] { padding: 1rem 2rem; } - &.button--small { + &.btn--small { font-size: 0.875rem; padding: 0.5rem 1rem; } diff --git a/generators/starter-kit/templates/button/button.stories.js b/generators/starter-kit/templates/button/button.stories.js index 2cbe202..de5ae62 100644 --- a/generators/starter-kit/templates/button/button.stories.js +++ b/generators/starter-kit/templates/button/button.stories.js @@ -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" } }; diff --git a/generators/starter-kit/templates/button/button.twig b/generators/starter-kit/templates/button/button.twig index db731a5..179c1c8 100644 --- a/generators/starter-kit/templates/button/button.twig +++ b/generators/starter-kit/templates/button/button.twig @@ -1,7 +1,7 @@ {{ attach_library('<%= themeNameMachine %>/button') }} {% if button.url %} - {{ button.text }} + {{ button.text }} {% else %} - + {% endif %} diff --git a/generators/starter-kit/templates/views/templates/block-content--views.html.twig b/generators/starter-kit/templates/views/templates/block-content--views.html.twig index be78b21..052c468 100644 --- a/generators/starter-kit/templates/views/templates/block-content--views.html.twig +++ b/generators/starter-kit/templates/views/templates/block-content--views.html.twig @@ -38,8 +38,8 @@ {% endif %} {{ content|without('field_title', 'field_link') }} {% if content.field_link[0]['#url'] %} -