From 89466c652f8a1db8eeecaa9a772da80dcee424cd Mon Sep 17 00:00:00 2001 From: laryn Date: Thu, 19 Oct 2023 15:05:56 -0500 Subject: [PATCH] Begin reworking vertical tabs, progress bar, other minor visual tweaks. --- dist/css/base/gin.css | 147 ++++++++++++++------------ dist/css/components/chosen.css | 10 +- dist/css/components/module_filter.css | 4 + dist/css/components/paragraphs.css | 4 + dist/css/components/tabs.css | 40 ++++++- dist/css/theme/dialog.css | 112 ++++++++++++-------- styles/base/_backdrop-overrides.scss | 4 +- styles/base/_button.scss | 70 +++++++----- styles/base/_form.scss | 12 ++- styles/base/_messages.scss | 1 + styles/base/_progress.scss | 8 +- styles/components/chosen.scss | 4 +- styles/components/module_filter.scss | 7 ++ styles/components/paragraphs.scss | 6 ++ styles/components/tabs.scss | 41 +++++-- template.php | 2 + 16 files changed, 305 insertions(+), 167 deletions(-) diff --git a/dist/css/base/gin.css b/dist/css/base/gin.css index 94d5933f..05387fff 100644 --- a/dist/css/base/gin.css +++ b/dist/css/base/gin.css @@ -2071,14 +2071,12 @@ td.webform-has-field-suffix > .form-item > .form-element { [dir="ltr"] .form-boolean, [dir="ltr"] .form-checkbox, [dir="ltr"] .form-radio { - float: left; margin-right: var(--gin-spacing-xs); } [dir="rtl"] .form-boolean, [dir="rtl"] .form-checkbox, [dir="rtl"] .form-radio { - float: right; margin-left: var(--gin-spacing-xs); } @@ -2562,6 +2560,16 @@ tr .form-item { margin-top: var(--gin-spacing-l); } +.form-managed-file .form-file { + padding: var(--gin-spacing-s) var(--gin-spacing-m); + background-color: var(--gin-bg-layer2); + border-radius: var(--gin-border-m); +} + +.form-managed-file .form-file:hover { + background-color: var(--gin-bg-item-hover); +} + .button, .dropbutton__item:first-of-type > *, .dropbutton__toggle { @@ -2606,7 +2614,6 @@ tr .form-item { } .button, -.button:not(:focus), .form-actions .button, .action-link--icon-trash.action-link { padding: var(--gin-spacing-s) var(--gin-spacing-m); @@ -2617,28 +2624,21 @@ tr .form-item { } .button:hover, -.button:not(:focus):hover, .form-actions .button:hover, .action-link--icon-trash.action-link:hover { background-color: var(--gin-color-primary-hover); - border-color: var(--gin-color-primary-hover) !important; + border-color: var(--gin-color-primary-hover); } .button:active, .button:focus, -.button:not(:focus):active, -.button:not(:focus):focus, .form-actions .button:active, .form-actions .button:focus, .action-link--icon-trash.action-link:active, .action-link--icon-trash.action-link:focus { - border-color: var(--gin-color-primary-active) !important; + border-color: var(--gin-color-primary-active); } .button:hover, .button:active, .button:focus, .button:hover:focus, -.button:not(:focus):hover, -.button:not(:focus):active, -.button:not(:focus):focus, -.button:not(:focus):hover:focus, .form-actions .button:hover, .form-actions .button:active, .form-actions .button:focus, @@ -2650,14 +2650,9 @@ tr .form-item { color: var(--gin-color-button-text); } -[dir="ltr"] .form-actions .button, -[dir="ltr"] input.button { - margin-right: var(--gin-spacing-xs); -} - -[dir="rtl"] .form-actions .button, -[dir="rtl"] input.button { - margin-left: var(--gin-spacing-xs); +.form-actions .button, +input.button { + margin: var(--gin-spacing-xxs); } .button.button--small { @@ -2671,42 +2666,33 @@ tr .form-item { } .button--primary, -.button--primary:not(:focus), .ief-entity-submit { background: var(--gin-color-primary); } [dir="ltr"] .button--primary, -[dir="ltr"] .button--primary:not(:focus), [dir="ltr"] .ief-entity-submit { box-shadow: .1em .25em .5em var(--gin-color-primary-light); } [dir="rtl"] .button--primary, -[dir="rtl"] .button--primary:not(:focus), [dir="rtl"] .ief-entity-submit { box-shadow: -0.1em .25em .5em var(--gin-color-primary-light); } -.button--primary:hover, -.button--primary:not(:focus):hover, -.ief-entity-submit:hover { +.button--primary:hover, .button--primary:focus, +.ief-entity-submit:hover, +.ief-entity-submit:focus { background-color: var(--gin-color-primary-hover); } .button--primary:active, .button--primary:focus, -.button--primary:not(:focus):active, -.button--primary:not(:focus):focus, .ief-entity-submit:active, .ief-entity-submit:focus { background-color: var(--gin-color-primary-active); } .button--primary, .button--primary:hover, .button--primary:active, .button--primary:focus, -.button--primary:not(:focus), -.button--primary:not(:focus):hover, -.button--primary:not(:focus):active, -.button--primary:not(:focus):focus, .ief-entity-submit, .ief-entity-submit:hover, .ief-entity-submit:active, @@ -2714,8 +2700,11 @@ tr .form-item { color: var(--gin-color-button-text); } -a.button:hover, -a.button:active { +a.button { + color: var(--gin-color-primary); +} + +a.button:hover, a.button:active, a.button:focus { color: var(--gin-color-button-text); } @@ -2733,7 +2722,7 @@ a.button:active { .button.button.is-disabled:focus { color: var(--gin-color-disabled); background: transparent; - border: 2px solid var(--gin-color-disabled-border) !important; + border: 2px solid var(--gin-color-disabled-border); box-shadow: none; } @@ -2753,7 +2742,7 @@ a.button:active { } .action-link.action-link--icon-trash, .action-link.action-link--icon-trash:hover, .action-link.action-link--icon-trash:active, .action-link.action-link--icon-trash:focus, .action-link.action-link--icon-trash:focus:hover { - border: 2px solid var(--gin-color-danger) !important; + border: 2px solid var(--gin-color-danger-light); } .multiple-fields-remove-button.button { @@ -2768,29 +2757,62 @@ a.button:active { mask-position: center center; } -.form-actions .button-danger, -.form-actions .form-delete { - border: 2px solid var(--gin-color-danger) !important; +.button-danger, +.button-primary.button-danger, +.form-delete, +.file-remove-button { + border: 2px solid var(--gin-color-danger-light); color: var(--gin-color-danger); } -.form-actions .button-danger:hover, -.form-actions .form-delete:hover { +[dir="ltr"] .button-danger, +[dir="ltr"] .button-primary.button-danger, +[dir="ltr"] .form-delete, +[dir="ltr"] .file-remove-button { + box-shadow: .1em .25em .5em var(--gin-color-danger-lightest); +} + +[dir="rtl"] .button-danger, +[dir="rtl"] .button-primary.button-danger, +[dir="rtl"] .form-delete, +[dir="rtl"] .file-remove-button { + box-shadow: -0.1em .25em .5em var(--gin-color-danger-lightest); +} + +.button-danger:focus, .button-danger:hover, +.button-primary.button-danger:focus, +.button-primary.button-danger:hover, +.form-delete:focus, +.form-delete:hover, +.file-remove-button:focus, +.file-remove-button:hover { background-color: var(--gin-color-danger); - border: 2px solid var(--gin-color-danger) !important; + border: 2px solid var(--gin-color-danger); color: #fff; } -.form-actions .button-secondary { +.button-secondary { font-weight: var(--gin-font-weight-normal); } -.confirmation .button-danger, .confirmation .button-danger:not(:focus), .confirmation .button-danger:not(:focus):hover, .confirmation .button-danger:hover { +.confirmation .button-danger, .confirmation .button-danger:focus, .confirmation .button-danger:hover { background-color: var(--gin-color-danger); - border: 2px solid var(--gin-color-danger) !important; + border: 2px solid var(--gin-color-danger-light); color: #fff; } +.confirmation .button-danger:focus, .confirmation .button-danger:hover { + border: 2px solid var(--gin-color-danger); +} + +[dir="ltr"] .confirmation .button-danger:focus, [dir="ltr"] .confirmation .button-danger:hover { + box-shadow: .1em .25em .5em var(--gin-color-danger-light); +} + +[dir="rtl"] .confirmation .button-danger:focus, [dir="rtl"] .confirmation .button-danger:hover { + box-shadow: -0.1em .25em .5em var(--gin-color-danger-light); +} + .js .dropbutton-widget { border-color: var(--gin-color-primary); border-width: 2px; @@ -3179,6 +3201,7 @@ a.button.button--danger:active:before { .messages { position: relative; padding: var(--gin-spacing-m); + margin: var(--gin-spacing-s) 0; border: 2px solid transparent; border-radius: var(--gin-border-l); transition: opacity var(--gin-transition-fast); @@ -4422,26 +4445,27 @@ tr.color-error:focus, background-color: var(--gin-border-color); } -.progress__bar { +.progress > .bar { border-color: var(--gin-color-primary); background-color: var(--gin-color-primary); } -[dir="ltr"] .progress__bar { +[dir="ltr"] .progress > .bar { box-shadow: 0 .125em .25em var(--gin-color-primary-light), 1.25em .9375em 2em var(--gin-color-primary-light); } -[dir="rtl"] .progress__bar { +[dir="rtl"] .progress > .bar { box-shadow: 0 .125em .25em var(--gin-color-primary-light), -1.25em .9375em 2em var(--gin-color-primary-light); } -.progress__track { +.progress .filled { padding: var(--gin-spacing-xs); border-color: var(--gin-border-color); background-color: var(--gin-bg-layer3); } -.progress__description, .progress__percentage { +.progress > .message, +.progress > .percentage { color: var(--gin-color-text); } @@ -4928,37 +4952,27 @@ table.sticky-enabled { padding-left: .25em; } -.button-primary, -.button-primary:not(:focus) { +.button-primary { background: var(--gin-color-primary); } -[dir="ltr"] .button-primary, -[dir="ltr"] .button-primary:not(:focus) { +[dir="ltr"] .button-primary { box-shadow: .1em .25em .5em var(--gin-color-primary-light); } -[dir="rtl"] .button-primary, -[dir="rtl"] .button-primary:not(:focus) { +[dir="rtl"] .button-primary { box-shadow: -0.1em .25em .5em var(--gin-color-primary-light); } -.button-primary:hover, -.button-primary:not(:focus):hover { +.button-primary:hover { background-color: var(--gin-color-primary-hover); } -.button-primary:active, .button-primary:focus, -.button-primary:not(:focus):active, -.button-primary:not(:focus):focus { +.button-primary:active, .button-primary:focus { background-color: var(--gin-color-primary-active); } -.button-primary, .button-primary:hover, .button-primary:active, .button-primary:focus, -.button-primary:not(:focus), -.button-primary:not(:focus):hover, -.button-primary:not(:focus):active, -.button-primary:not(:focus):focus { +.button-primary, .button-primary:hover, .button-primary:active, .button-primary:focus { color: var(--gin-color-button-text); } @@ -4982,6 +4996,7 @@ table.sticky-enabled { .form-actions { margin-top: 0; margin-bottom: var(--gin-spacing-l); + padding-top: var(--gin-spacing-xs); } .tabs { diff --git a/dist/css/components/chosen.css b/dist/css/components/chosen.css index 77bc7af5..d48822e5 100644 --- a/dist/css/components/chosen.css +++ b/dist/css/components/chosen.css @@ -1,9 +1,9 @@ -.form-element.chosen-container-single { +.form-select.chosen-container-single { width: auto !important; padding: 0; } -.form-element.chosen-container-single .chosen-single { +.form-select.chosen-container-single .chosen-single { min-width: 160px; background: none; border: none; @@ -15,15 +15,15 @@ padding: calc(var(--gin-spacing-s) - 1px) calc(var(--gin-spacing-m) - 1px); } -.form-element.chosen-container-single .chosen-single b { +.form-select.chosen-container-single .chosen-single b { background: none !important; } -.form-element.chosen-container-multi { +.form-select.chosen-container-multi { width: auto !important; } -.form-element.chosen-container-multi .chosen-choices { +.form-select.chosen-container-multi .chosen-choices { min-width: 160px; border: 0 none; background: none; diff --git a/dist/css/components/module_filter.css b/dist/css/components/module_filter.css index c86dcc8d..525c5bd7 100644 --- a/dist/css/components/module_filter.css +++ b/dist/css/components/module_filter.css @@ -121,3 +121,7 @@ color: var(--gin-color-primary); } +#module-filter-show-wrapper .form-item { + display: inline-block; +} + diff --git a/dist/css/components/paragraphs.css b/dist/css/components/paragraphs.css index 89fa3f91..5af8a902 100644 --- a/dist/css/components/paragraphs.css +++ b/dist/css/components/paragraphs.css @@ -455,3 +455,7 @@ html[dir="rtl"].js .paragraph-type-icon { right: 0; } +.field-widget-paragraphs-embed input.field-add-more-submit { + margin: var(--gin-spacing-xss); +} + diff --git a/dist/css/components/tabs.css b/dist/css/components/tabs.css index a0a307cb..01a0f5db 100644 --- a/dist/css/components/tabs.css +++ b/dist/css/components/tabs.css @@ -16,17 +16,51 @@ } } +.vertical-tabs { + border: none; +} + .vertical-tabs .vertical-tabs-list { z-index: inherit; + border: none; } .gin--dark-mode .vertical-tabs .vertical-tabs-list { border-color: #8e929c; } +.vertical-tabs .vertical-tabs-list .vertical-tab-item { + border: none; + background-color: transparent; +} + +.vertical-tabs .vertical-tabs-list .vertical-tab-item.vertical-tab-selected a.vertical-tab-link { + color: var(--gin-color-primary-active); + background-color: var(--gin-bg-app); +} + +.vertical-tabs .vertical-tabs-list .vertical-tab-item.vertical-tab-selected strong { + color: var(--gin-color-primary-active); +} + +.vertical-tabs .vertical-tabs-list .vertical-tab-item a.vertical-tab-link { + background-color: var(--gin-bg-header); + border-radius: var(--gin-border-m); + margin: var(--gin-spacing-s) 0; + padding: var(--gin-spacing-m); + font-size: var(--gin-font-size-m); +} + +.vertical-tabs .vertical-tabs-list .vertical-tab-item a.vertical-tab-link:hover { + background-color: var(--gin-color-primary-light-hover); +} + +.vertical-tabs .vertical-tabs-list .vertical-tab-item a.vertical-tab-link .summary { + font-size: var(--gin-font-size-s); +} + .gin--dark-mode .vertical-tabs .vertical-tabs-list .vertical-tab-item { background-color: var(--gin-bg-item-hover); - border-color: #8e929c; } .vertical-tab-link { @@ -584,10 +618,6 @@ background: var(--gin-bg-item-hover); } -.gin--dark-mode .vertical-tab-selected strong { - color: #fff; -} - [dir="ltr"] [open] > .claro-details__summary--vertical-tabs-item:not(:focus):not(:active)::after, [dir="ltr"] [open] > .claro-details__summary--accordion-item:not(:focus):not(:active)::after { border-left-width: 5px; diff --git a/dist/css/theme/dialog.css b/dist/css/theme/dialog.css index 8d63ec4b..b2f779f1 100644 --- a/dist/css/theme/dialog.css +++ b/dist/css/theme/dialog.css @@ -128,7 +128,6 @@ } .ui-dialog .button, -.ui-dialog .button:not(:focus), .ui-dialog .form-actions .button, .ui-dialog .action-link--icon-trash.action-link { padding: var(--gin-spacing-s) var(--gin-spacing-m); @@ -139,28 +138,21 @@ } .ui-dialog .button:hover, -.ui-dialog .button:not(:focus):hover, .ui-dialog .form-actions .button:hover, .ui-dialog .action-link--icon-trash.action-link:hover { background-color: var(--gin-color-primary-hover); - border-color: var(--gin-color-primary-hover) !important; + border-color: var(--gin-color-primary-hover); } .ui-dialog .button:active, .ui-dialog .button:focus, -.ui-dialog .button:not(:focus):active, -.ui-dialog .button:not(:focus):focus, .ui-dialog .form-actions .button:active, .ui-dialog .form-actions .button:focus, .ui-dialog .action-link--icon-trash.action-link:active, .ui-dialog .action-link--icon-trash.action-link:focus { - border-color: var(--gin-color-primary-active) !important; + border-color: var(--gin-color-primary-active); } .ui-dialog .button:hover, .ui-dialog .button:active, .ui-dialog .button:focus, .ui-dialog .button:hover:focus, -.ui-dialog .button:not(:focus):hover, -.ui-dialog .button:not(:focus):active, -.ui-dialog .button:not(:focus):focus, -.ui-dialog .button:not(:focus):hover:focus, .ui-dialog .form-actions .button:hover, .ui-dialog .form-actions .button:active, .ui-dialog .form-actions .button:focus, @@ -172,14 +164,9 @@ color: var(--gin-color-button-text); } -[dir="ltr"] .ui-dialog .form-actions .button, -[dir="ltr"] .ui-dialog input.button { - margin-right: var(--gin-spacing-xs); -} - -[dir="rtl"] .ui-dialog .form-actions .button, -[dir="rtl"] .ui-dialog input.button { - margin-left: var(--gin-spacing-xs); +.ui-dialog .form-actions .button, +.ui-dialog input.button { + margin: var(--gin-spacing-xxs); } .ui-dialog .button.button--small { @@ -193,42 +180,33 @@ } .ui-dialog .button--primary, -.ui-dialog .button--primary:not(:focus), .ui-dialog .ief-entity-submit { background: var(--gin-color-primary); } [dir="ltr"] .ui-dialog .button--primary, -[dir="ltr"] .ui-dialog .button--primary:not(:focus), [dir="ltr"] .ui-dialog .ief-entity-submit { box-shadow: .1em .25em .5em var(--gin-color-primary-light); } [dir="rtl"] .ui-dialog .button--primary, -[dir="rtl"] .ui-dialog .button--primary:not(:focus), [dir="rtl"] .ui-dialog .ief-entity-submit { box-shadow: -0.1em .25em .5em var(--gin-color-primary-light); } -.ui-dialog .button--primary:hover, -.ui-dialog .button--primary:not(:focus):hover, -.ui-dialog .ief-entity-submit:hover { +.ui-dialog .button--primary:hover, .ui-dialog .button--primary:focus, +.ui-dialog .ief-entity-submit:hover, +.ui-dialog .ief-entity-submit:focus { background-color: var(--gin-color-primary-hover); } .ui-dialog .button--primary:active, .ui-dialog .button--primary:focus, -.ui-dialog .button--primary:not(:focus):active, -.ui-dialog .button--primary:not(:focus):focus, .ui-dialog .ief-entity-submit:active, .ui-dialog .ief-entity-submit:focus { background-color: var(--gin-color-primary-active); } .ui-dialog .button--primary, .ui-dialog .button--primary:hover, .ui-dialog .button--primary:active, .ui-dialog .button--primary:focus, -.ui-dialog .button--primary:not(:focus), -.ui-dialog .button--primary:not(:focus):hover, -.ui-dialog .button--primary:not(:focus):active, -.ui-dialog .button--primary:not(:focus):focus, .ui-dialog .ief-entity-submit, .ui-dialog .ief-entity-submit:hover, .ui-dialog .ief-entity-submit:active, @@ -236,8 +214,11 @@ color: var(--gin-color-button-text); } -.ui-dialog a.button:hover, -.ui-dialog a.button:active { +.ui-dialog a.button { + color: var(--gin-color-primary); +} + +.ui-dialog a.button:hover, .ui-dialog a.button:active, .ui-dialog a.button:focus { color: var(--gin-color-button-text); } @@ -255,7 +236,7 @@ .ui-dialog .button.button.is-disabled:focus { color: var(--gin-color-disabled); background: transparent; - border: 2px solid var(--gin-color-disabled-border) !important; + border: 2px solid var(--gin-color-disabled-border); box-shadow: none; } @@ -275,7 +256,7 @@ } .ui-dialog .action-link.action-link--icon-trash, .ui-dialog .action-link.action-link--icon-trash:hover, .ui-dialog .action-link.action-link--icon-trash:active, .ui-dialog .action-link.action-link--icon-trash:focus, .ui-dialog .action-link.action-link--icon-trash:focus:hover { - border: 2px solid var(--gin-color-danger) !important; + border: 2px solid var(--gin-color-danger-light); } .ui-dialog .multiple-fields-remove-button.button { @@ -290,29 +271,62 @@ mask-position: center center; } -.ui-dialog .form-actions .button-danger, -.ui-dialog .form-actions .form-delete { - border: 2px solid var(--gin-color-danger) !important; +.ui-dialog .button-danger, +.ui-dialog .button-primary.button-danger, +.ui-dialog .form-delete, +.ui-dialog .file-remove-button { + border: 2px solid var(--gin-color-danger-light); color: var(--gin-color-danger); } -.ui-dialog .form-actions .button-danger:hover, -.ui-dialog .form-actions .form-delete:hover { +[dir="ltr"] .ui-dialog .button-danger, +[dir="ltr"] .ui-dialog .button-primary.button-danger, +[dir="ltr"] .ui-dialog .form-delete, +[dir="ltr"] .ui-dialog .file-remove-button { + box-shadow: .1em .25em .5em var(--gin-color-danger-lightest); +} + +[dir="rtl"] .ui-dialog .button-danger, +[dir="rtl"] .ui-dialog .button-primary.button-danger, +[dir="rtl"] .ui-dialog .form-delete, +[dir="rtl"] .ui-dialog .file-remove-button { + box-shadow: -0.1em .25em .5em var(--gin-color-danger-lightest); +} + +.ui-dialog .button-danger:focus, .ui-dialog .button-danger:hover, +.ui-dialog .button-primary.button-danger:focus, +.ui-dialog .button-primary.button-danger:hover, +.ui-dialog .form-delete:focus, +.ui-dialog .form-delete:hover, +.ui-dialog .file-remove-button:focus, +.ui-dialog .file-remove-button:hover { background-color: var(--gin-color-danger); - border: 2px solid var(--gin-color-danger) !important; + border: 2px solid var(--gin-color-danger); color: #fff; } -.ui-dialog .form-actions .button-secondary { +.ui-dialog .button-secondary { font-weight: var(--gin-font-weight-normal); } -.ui-dialog .confirmation .button-danger, .ui-dialog .confirmation .button-danger:not(:focus), .ui-dialog .confirmation .button-danger:not(:focus):hover, .ui-dialog .confirmation .button-danger:hover { +.ui-dialog .confirmation .button-danger, .ui-dialog .confirmation .button-danger:focus, .ui-dialog .confirmation .button-danger:hover { background-color: var(--gin-color-danger); - border: 2px solid var(--gin-color-danger) !important; + border: 2px solid var(--gin-color-danger-light); color: #fff; } +.ui-dialog .confirmation .button-danger:focus, .ui-dialog .confirmation .button-danger:hover { + border: 2px solid var(--gin-color-danger); +} + +[dir="ltr"] .ui-dialog .confirmation .button-danger:focus, [dir="ltr"] .ui-dialog .confirmation .button-danger:hover { + box-shadow: .1em .25em .5em var(--gin-color-danger-light); +} + +[dir="rtl"] .ui-dialog .confirmation .button-danger:focus, [dir="rtl"] .ui-dialog .confirmation .button-danger:hover { + box-shadow: -0.1em .25em .5em var(--gin-color-danger-light); +} + .ui-dialog .form-actions { display: flex; flex-flow: row; @@ -553,14 +567,12 @@ [dir="ltr"] .ui-dialog .form-boolean, [dir="ltr"] .ui-dialog .form-checkbox, [dir="ltr"] .ui-dialog .form-radio { - float: left; margin-right: var(--gin-spacing-xs); } [dir="rtl"] .ui-dialog .form-boolean, [dir="rtl"] .ui-dialog .form-checkbox, [dir="rtl"] .ui-dialog .form-radio { - float: right; margin-left: var(--gin-spacing-xs); } @@ -1044,3 +1056,13 @@ margin-top: var(--gin-spacing-l); } +.ui-dialog .form-managed-file .form-file { + padding: var(--gin-spacing-s) var(--gin-spacing-m); + background-color: var(--gin-bg-layer2); + border-radius: var(--gin-border-m); +} + +.ui-dialog .form-managed-file .form-file:hover { + background-color: var(--gin-bg-item-hover); +} + diff --git a/styles/base/_backdrop-overrides.scss b/styles/base/_backdrop-overrides.scss index 2d7d5e5f..4f0faecf 100644 --- a/styles/base/_backdrop-overrides.scss +++ b/styles/base/_backdrop-overrides.scss @@ -201,8 +201,7 @@ table.sticky-enabled { font-weight: 900; } -.button-primary, -.button-primary:not(:focus) { +.button-primary { background: var(--gin-color-primary); box-shadow: .1em .25em .5em var(--gin-color-primary-light); @@ -248,6 +247,7 @@ a.button-primary:focus:hover { .form-actions { margin-top: 0; margin-bottom: var(--gin-spacing-l); + padding-top: var(--gin-spacing-xs); } .tabs { diff --git a/styles/base/_button.scss b/styles/base/_button.scss index 16395f20..68c03931 100644 --- a/styles/base/_button.scss +++ b/styles/base/_button.scss @@ -29,7 +29,6 @@ } .button, -.button:not(:focus), .form-actions .button, .action-link--icon-trash.action-link { padding: var(--gin-spacing-s) var(--gin-spacing-m); @@ -40,12 +39,12 @@ &:hover { background-color: var(--gin-color-primary-hover); - border-color: var(--gin-color-primary-hover) !important; + border-color: var(--gin-color-primary-hover); } &:active, &:focus { - border-color: var(--gin-color-primary-active) !important; + border-color: var(--gin-color-primary-active); } &:hover, @@ -58,7 +57,7 @@ .form-actions .button, input.button { - margin-right: var(--gin-spacing-xs); + margin: var(--gin-spacing-xxs); } .button.button--small { @@ -72,12 +71,12 @@ input.button { } .button--primary, -.button--primary:not(:focus), .ief-entity-submit { background: var(--gin-color-primary); box-shadow: .1em .25em .5em var(--gin-color-primary-light); - &:hover { + &:hover, + &:focus { background-color: var(--gin-color-primary-hover); } @@ -94,9 +93,15 @@ input.button { } } -a.button:hover, -a.button:active { - color: var(--gin-color-button-text); +a.button { + color: var(--gin-color-primary); + + &:hover, + &:active, + &:focus { + color: var(--gin-color-button-text); + } + } a.button--primary:hover, @@ -117,7 +122,7 @@ a.button--primary:focus:hover { &:focus { color: var(--gin-color-disabled); background: transparent; - border: 2px solid var(--gin-color-disabled-border) !important; + border: 2px solid var(--gin-color-disabled-border); box-shadow: none; } } @@ -144,8 +149,7 @@ a.button--primary:focus:hover { &:active, &:focus, &:focus:hover { - border: 2px solid var(--gin-color-danger) !important; - // border: 2px solid transparent !important; + border: 2px solid var(--gin-color-danger-light); } } @@ -158,32 +162,42 @@ a.button--primary:focus:hover { mask-position: center center; } -.form-actions { - .button-danger, - .form-delete { - border: 2px solid var(--gin-color-danger) !important; - color: var(--gin-color-danger); +.button-danger, +.button-primary.button-danger, +.form-delete, +.file-remove-button { - &:hover { - background-color: var(--gin-color-danger); - border: 2px solid var(--gin-color-danger) !important; - color: #fff; - } - } + border: 2px solid var(--gin-color-danger-light); + color: var(--gin-color-danger); + box-shadow: .1em .25em .5em var(--gin-color-danger-lightest); - .button-secondary { - font-weight: var(--gin-font-weight-normal); + &:focus, + &:hover { + background-color: var(--gin-color-danger); + border: 2px solid var(--gin-color-danger); + color: #fff; } } + +.button-secondary { + font-weight: var(--gin-font-weight-normal); +} + .confirmation { .button-danger { + &, - &:not(:focus), - &:not(:focus):hover, + &:focus, &:hover { background-color: var(--gin-color-danger); - border: 2px solid var(--gin-color-danger) !important; + border: 2px solid var(--gin-color-danger-light); color: #fff; } + + &:focus, + &:hover { + border: 2px solid var(--gin-color-danger); + box-shadow: .1em .25em .5em var(--gin-color-danger-light); + } } } diff --git a/styles/base/_form.scss b/styles/base/_form.scss index 96c4dee5..5860e073 100644 --- a/styles/base/_form.scss +++ b/styles/base/_form.scss @@ -178,7 +178,6 @@ $maxWidth: 520px; .form-checkbox, .form-radio { appearance: none; - float: left; width: 21px; height: 21px; border: 1px solid var(--gin-border-color-form-element); @@ -650,3 +649,14 @@ tr .form-item { margin-top: var(--gin-spacing-l); } } + +.form-managed-file { + .form-file { + padding: var(--gin-spacing-s) var(--gin-spacing-m); + background-color: var(--gin-bg-layer2); + border-radius: var(--gin-border-m); + &:hover { + background-color: var(--gin-bg-item-hover); + } + } +} diff --git a/styles/base/_messages.scss b/styles/base/_messages.scss index 717ac6b2..27eac7e9 100644 --- a/styles/base/_messages.scss +++ b/styles/base/_messages.scss @@ -1,6 +1,7 @@ .messages { position: relative; padding: var(--gin-spacing-m); + margin: var(--gin-spacing-s) 0; border: 2px solid transparent; border-radius: var(--gin-border-l); transition: opacity var(--gin-transition-fast); diff --git a/styles/base/_progress.scss b/styles/base/_progress.scss index bd988e9e..d6dcc6ff 100644 --- a/styles/base/_progress.scss +++ b/styles/base/_progress.scss @@ -1,19 +1,19 @@ .progress { - &__bar { + > .bar { border-color: var(--gin-color-primary); background-color: var(--gin-color-primary); box-shadow: 0 .125em .25em var(--gin-color-primary-light), 1.25em .9375em 2em var(--gin-color-primary-light); } - &__track { + .filled { padding: var(--gin-spacing-xs); border-color: var(--gin-border-color); background-color: var(--gin-bg-layer3); } - &__description, - &__percentage { + > .message, + > .percentage { color: var(--gin-color-text); } } diff --git a/styles/components/chosen.scss b/styles/components/chosen.scss index 0323dac3..5322cfa0 100644 --- a/styles/components/chosen.scss +++ b/styles/components/chosen.scss @@ -1,4 +1,4 @@ -.form-element.chosen-container-single { +.form-select.chosen-container-single { width: auto !important; padding: 0; @@ -19,7 +19,7 @@ } } -.form-element.chosen-container-multi { +.form-select.chosen-container-multi { width: auto !important; .chosen-choices { diff --git a/styles/components/module_filter.scss b/styles/components/module_filter.scss index 0574b84b..0c05d507 100644 --- a/styles/components/module_filter.scss +++ b/styles/components/module_filter.scss @@ -40,6 +40,7 @@ } &.is-selected { + a, a:hover, a:focus, @@ -99,3 +100,9 @@ .system-modules td details a { color: var(--gin-color-primary); } + +#module-filter-show-wrapper { + .form-item { + display: inline-block; + } +} diff --git a/styles/components/paragraphs.scss b/styles/components/paragraphs.scss index 2e14cbad..9ec92f20 100644 --- a/styles/components/paragraphs.scss +++ b/styles/components/paragraphs.scss @@ -376,3 +376,9 @@ html.js .paragraph-type-icon { } } } + +.field-widget-paragraphs-embed { + input.field-add-more-submit { + margin: var(--gin-spacing-xss); + } +} diff --git a/styles/components/tabs.scss b/styles/components/tabs.scss index bfe2aad7..626dbac5 100644 --- a/styles/components/tabs.scss +++ b/styles/components/tabs.scss @@ -16,17 +16,48 @@ // Vertical tabs .vertical-tabs { + border: none; + & &-list { z-index: inherit; + border: none; .gin--dark-mode & { border-color: #8E929C; } .vertical-tab-item { + border: none; + background-color: transparent; + + &.vertical-tab-selected { + a.vertical-tab-link { + color: var(--gin-color-primary-active); + background-color: var(--gin-bg-app); + } + strong { + color: var(--gin-color-primary-active); + } + } + + a.vertical-tab-link { + background-color: var(--gin-bg-header); + border-radius: var(--gin-border-m); + margin: var(--gin-spacing-s) 0; + padding: var(--gin-spacing-m); + font-size: var(--gin-font-size-m); + + &:hover { + background-color: var(--gin-color-primary-light-hover); + } + + .summary { + font-size: var(--gin-font-size-s); + } + } + .gin--dark-mode & { background-color: var(--gin-bg-item-hover); - border-color: #8E929C; } } } @@ -480,14 +511,6 @@ } } -.gin--dark-mode { - .vertical-tab-selected { - strong { - color: #fff; - } - } -} - [open] > .claro-details__summary--vertical-tabs-item:not(:focus):not(:active)::after, [open] > .claro-details__summary--accordion-item:not(:focus):not(:active)::after { border-left-width: 5px; diff --git a/template.php b/template.php index e66ad3eb..db4f6d8d 100644 --- a/template.php +++ b/template.php @@ -38,6 +38,8 @@ function gin_preprocess_layout(&$variables) { 'admin/config/*/*', 'node/*/edit', 'node/add/*', + 'taxonomy/term/*/edit', + 'taxonomy/term/add', 'admin/reports/*', ); $current_path = request_path();