Skip to content

Commit 89466c6

Browse files
committed
Begin reworking vertical tabs, progress bar, other minor visual tweaks.
1 parent 636466f commit 89466c6

File tree

16 files changed

+305
-167
lines changed

16 files changed

+305
-167
lines changed

dist/css/base/gin.css

Lines changed: 81 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -2071,14 +2071,12 @@ td.webform-has-field-suffix > .form-item > .form-element {
20712071
[dir="ltr"] .form-boolean,
20722072
[dir="ltr"] .form-checkbox,
20732073
[dir="ltr"] .form-radio {
2074-
float: left;
20752074
margin-right: var(--gin-spacing-xs);
20762075
}
20772076

20782077
[dir="rtl"] .form-boolean,
20792078
[dir="rtl"] .form-checkbox,
20802079
[dir="rtl"] .form-radio {
2081-
float: right;
20822080
margin-left: var(--gin-spacing-xs);
20832081
}
20842082

@@ -2562,6 +2560,16 @@ tr .form-item {
25622560
margin-top: var(--gin-spacing-l);
25632561
}
25642562

2563+
.form-managed-file .form-file {
2564+
padding: var(--gin-spacing-s) var(--gin-spacing-m);
2565+
background-color: var(--gin-bg-layer2);
2566+
border-radius: var(--gin-border-m);
2567+
}
2568+
2569+
.form-managed-file .form-file:hover {
2570+
background-color: var(--gin-bg-item-hover);
2571+
}
2572+
25652573
.button,
25662574
.dropbutton__item:first-of-type > *,
25672575
.dropbutton__toggle {
@@ -2606,7 +2614,6 @@ tr .form-item {
26062614
}
26072615

26082616
.button,
2609-
.button:not(:focus),
26102617
.form-actions .button,
26112618
.action-link--icon-trash.action-link {
26122619
padding: var(--gin-spacing-s) var(--gin-spacing-m);
@@ -2617,28 +2624,21 @@ tr .form-item {
26172624
}
26182625

26192626
.button:hover,
2620-
.button:not(:focus):hover,
26212627
.form-actions .button:hover,
26222628
.action-link--icon-trash.action-link:hover {
26232629
background-color: var(--gin-color-primary-hover);
2624-
border-color: var(--gin-color-primary-hover) !important;
2630+
border-color: var(--gin-color-primary-hover);
26252631
}
26262632

26272633
.button:active, .button:focus,
2628-
.button:not(:focus):active,
2629-
.button:not(:focus):focus,
26302634
.form-actions .button:active,
26312635
.form-actions .button:focus,
26322636
.action-link--icon-trash.action-link:active,
26332637
.action-link--icon-trash.action-link:focus {
2634-
border-color: var(--gin-color-primary-active) !important;
2638+
border-color: var(--gin-color-primary-active);
26352639
}
26362640

26372641
.button:hover, .button:active, .button:focus, .button:hover:focus,
2638-
.button:not(:focus):hover,
2639-
.button:not(:focus):active,
2640-
.button:not(:focus):focus,
2641-
.button:not(:focus):hover:focus,
26422642
.form-actions .button:hover,
26432643
.form-actions .button:active,
26442644
.form-actions .button:focus,
@@ -2650,14 +2650,9 @@ tr .form-item {
26502650
color: var(--gin-color-button-text);
26512651
}
26522652

2653-
[dir="ltr"] .form-actions .button,
2654-
[dir="ltr"] input.button {
2655-
margin-right: var(--gin-spacing-xs);
2656-
}
2657-
2658-
[dir="rtl"] .form-actions .button,
2659-
[dir="rtl"] input.button {
2660-
margin-left: var(--gin-spacing-xs);
2653+
.form-actions .button,
2654+
input.button {
2655+
margin: var(--gin-spacing-xxs);
26612656
}
26622657

26632658
.button.button--small {
@@ -2671,51 +2666,45 @@ tr .form-item {
26712666
}
26722667

26732668
.button--primary,
2674-
.button--primary:not(:focus),
26752669
.ief-entity-submit {
26762670
background: var(--gin-color-primary);
26772671
}
26782672

26792673
[dir="ltr"] .button--primary,
2680-
[dir="ltr"] .button--primary:not(:focus),
26812674
[dir="ltr"] .ief-entity-submit {
26822675
box-shadow: .1em .25em .5em var(--gin-color-primary-light);
26832676
}
26842677

26852678
[dir="rtl"] .button--primary,
2686-
[dir="rtl"] .button--primary:not(:focus),
26872679
[dir="rtl"] .ief-entity-submit {
26882680
box-shadow: -0.1em .25em .5em var(--gin-color-primary-light);
26892681
}
26902682

2691-
.button--primary:hover,
2692-
.button--primary:not(:focus):hover,
2693-
.ief-entity-submit:hover {
2683+
.button--primary:hover, .button--primary:focus,
2684+
.ief-entity-submit:hover,
2685+
.ief-entity-submit:focus {
26942686
background-color: var(--gin-color-primary-hover);
26952687
}
26962688

26972689
.button--primary:active, .button--primary:focus,
2698-
.button--primary:not(:focus):active,
2699-
.button--primary:not(:focus):focus,
27002690
.ief-entity-submit:active,
27012691
.ief-entity-submit:focus {
27022692
background-color: var(--gin-color-primary-active);
27032693
}
27042694

27052695
.button--primary, .button--primary:hover, .button--primary:active, .button--primary:focus,
2706-
.button--primary:not(:focus),
2707-
.button--primary:not(:focus):hover,
2708-
.button--primary:not(:focus):active,
2709-
.button--primary:not(:focus):focus,
27102696
.ief-entity-submit,
27112697
.ief-entity-submit:hover,
27122698
.ief-entity-submit:active,
27132699
.ief-entity-submit:focus {
27142700
color: var(--gin-color-button-text);
27152701
}
27162702

2717-
a.button:hover,
2718-
a.button:active {
2703+
a.button {
2704+
color: var(--gin-color-primary);
2705+
}
2706+
2707+
a.button:hover, a.button:active, a.button:focus {
27192708
color: var(--gin-color-button-text);
27202709
}
27212710

@@ -2733,7 +2722,7 @@ a.button:active {
27332722
.button.button.is-disabled:focus {
27342723
color: var(--gin-color-disabled);
27352724
background: transparent;
2736-
border: 2px solid var(--gin-color-disabled-border) !important;
2725+
border: 2px solid var(--gin-color-disabled-border);
27372726
box-shadow: none;
27382727
}
27392728

@@ -2753,7 +2742,7 @@ a.button:active {
27532742
}
27542743

27552744
.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 {
2756-
border: 2px solid var(--gin-color-danger) !important;
2745+
border: 2px solid var(--gin-color-danger-light);
27572746
}
27582747

27592748
.multiple-fields-remove-button.button {
@@ -2768,29 +2757,62 @@ a.button:active {
27682757
mask-position: center center;
27692758
}
27702759

2771-
.form-actions .button-danger,
2772-
.form-actions .form-delete {
2773-
border: 2px solid var(--gin-color-danger) !important;
2760+
.button-danger,
2761+
.button-primary.button-danger,
2762+
.form-delete,
2763+
.file-remove-button {
2764+
border: 2px solid var(--gin-color-danger-light);
27742765
color: var(--gin-color-danger);
27752766
}
27762767

2777-
.form-actions .button-danger:hover,
2778-
.form-actions .form-delete:hover {
2768+
[dir="ltr"] .button-danger,
2769+
[dir="ltr"] .button-primary.button-danger,
2770+
[dir="ltr"] .form-delete,
2771+
[dir="ltr"] .file-remove-button {
2772+
box-shadow: .1em .25em .5em var(--gin-color-danger-lightest);
2773+
}
2774+
2775+
[dir="rtl"] .button-danger,
2776+
[dir="rtl"] .button-primary.button-danger,
2777+
[dir="rtl"] .form-delete,
2778+
[dir="rtl"] .file-remove-button {
2779+
box-shadow: -0.1em .25em .5em var(--gin-color-danger-lightest);
2780+
}
2781+
2782+
.button-danger:focus, .button-danger:hover,
2783+
.button-primary.button-danger:focus,
2784+
.button-primary.button-danger:hover,
2785+
.form-delete:focus,
2786+
.form-delete:hover,
2787+
.file-remove-button:focus,
2788+
.file-remove-button:hover {
27792789
background-color: var(--gin-color-danger);
2780-
border: 2px solid var(--gin-color-danger) !important;
2790+
border: 2px solid var(--gin-color-danger);
27812791
color: #fff;
27822792
}
27832793

2784-
.form-actions .button-secondary {
2794+
.button-secondary {
27852795
font-weight: var(--gin-font-weight-normal);
27862796
}
27872797

2788-
.confirmation .button-danger, .confirmation .button-danger:not(:focus), .confirmation .button-danger:not(:focus):hover, .confirmation .button-danger:hover {
2798+
.confirmation .button-danger, .confirmation .button-danger:focus, .confirmation .button-danger:hover {
27892799
background-color: var(--gin-color-danger);
2790-
border: 2px solid var(--gin-color-danger) !important;
2800+
border: 2px solid var(--gin-color-danger-light);
27912801
color: #fff;
27922802
}
27932803

2804+
.confirmation .button-danger:focus, .confirmation .button-danger:hover {
2805+
border: 2px solid var(--gin-color-danger);
2806+
}
2807+
2808+
[dir="ltr"] .confirmation .button-danger:focus, [dir="ltr"] .confirmation .button-danger:hover {
2809+
box-shadow: .1em .25em .5em var(--gin-color-danger-light);
2810+
}
2811+
2812+
[dir="rtl"] .confirmation .button-danger:focus, [dir="rtl"] .confirmation .button-danger:hover {
2813+
box-shadow: -0.1em .25em .5em var(--gin-color-danger-light);
2814+
}
2815+
27942816
.js .dropbutton-widget {
27952817
border-color: var(--gin-color-primary);
27962818
border-width: 2px;
@@ -3179,6 +3201,7 @@ a.button.button--danger:active:before {
31793201
.messages {
31803202
position: relative;
31813203
padding: var(--gin-spacing-m);
3204+
margin: var(--gin-spacing-s) 0;
31823205
border: 2px solid transparent;
31833206
border-radius: var(--gin-border-l);
31843207
transition: opacity var(--gin-transition-fast);
@@ -4422,26 +4445,27 @@ tr.color-error:focus,
44224445
background-color: var(--gin-border-color);
44234446
}
44244447

4425-
.progress__bar {
4448+
.progress > .bar {
44264449
border-color: var(--gin-color-primary);
44274450
background-color: var(--gin-color-primary);
44284451
}
44294452

4430-
[dir="ltr"] .progress__bar {
4453+
[dir="ltr"] .progress > .bar {
44314454
box-shadow: 0 .125em .25em var(--gin-color-primary-light), 1.25em .9375em 2em var(--gin-color-primary-light);
44324455
}
44334456

4434-
[dir="rtl"] .progress__bar {
4457+
[dir="rtl"] .progress > .bar {
44354458
box-shadow: 0 .125em .25em var(--gin-color-primary-light), -1.25em .9375em 2em var(--gin-color-primary-light);
44364459
}
44374460

4438-
.progress__track {
4461+
.progress .filled {
44394462
padding: var(--gin-spacing-xs);
44404463
border-color: var(--gin-border-color);
44414464
background-color: var(--gin-bg-layer3);
44424465
}
44434466

4444-
.progress__description, .progress__percentage {
4467+
.progress > .message,
4468+
.progress > .percentage {
44454469
color: var(--gin-color-text);
44464470
}
44474471

@@ -4928,37 +4952,27 @@ table.sticky-enabled {
49284952
padding-left: .25em;
49294953
}
49304954

4931-
.button-primary,
4932-
.button-primary:not(:focus) {
4955+
.button-primary {
49334956
background: var(--gin-color-primary);
49344957
}
49354958

4936-
[dir="ltr"] .button-primary,
4937-
[dir="ltr"] .button-primary:not(:focus) {
4959+
[dir="ltr"] .button-primary {
49384960
box-shadow: .1em .25em .5em var(--gin-color-primary-light);
49394961
}
49404962

4941-
[dir="rtl"] .button-primary,
4942-
[dir="rtl"] .button-primary:not(:focus) {
4963+
[dir="rtl"] .button-primary {
49434964
box-shadow: -0.1em .25em .5em var(--gin-color-primary-light);
49444965
}
49454966

4946-
.button-primary:hover,
4947-
.button-primary:not(:focus):hover {
4967+
.button-primary:hover {
49484968
background-color: var(--gin-color-primary-hover);
49494969
}
49504970

4951-
.button-primary:active, .button-primary:focus,
4952-
.button-primary:not(:focus):active,
4953-
.button-primary:not(:focus):focus {
4971+
.button-primary:active, .button-primary:focus {
49544972
background-color: var(--gin-color-primary-active);
49554973
}
49564974

4957-
.button-primary, .button-primary:hover, .button-primary:active, .button-primary:focus,
4958-
.button-primary:not(:focus),
4959-
.button-primary:not(:focus):hover,
4960-
.button-primary:not(:focus):active,
4961-
.button-primary:not(:focus):focus {
4975+
.button-primary, .button-primary:hover, .button-primary:active, .button-primary:focus {
49624976
color: var(--gin-color-button-text);
49634977
}
49644978

@@ -4982,6 +4996,7 @@ table.sticky-enabled {
49824996
.form-actions {
49834997
margin-top: 0;
49844998
margin-bottom: var(--gin-spacing-l);
4999+
padding-top: var(--gin-spacing-xs);
49855000
}
49865001

49875002
.tabs {

dist/css/components/chosen.css

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
.form-element.chosen-container-single {
1+
.form-select.chosen-container-single {
22
width: auto !important;
33
padding: 0;
44
}
55

6-
.form-element.chosen-container-single .chosen-single {
6+
.form-select.chosen-container-single .chosen-single {
77
min-width: 160px;
88
background: none;
99
border: none;
@@ -15,15 +15,15 @@
1515
padding: calc(var(--gin-spacing-s) - 1px) calc(var(--gin-spacing-m) - 1px);
1616
}
1717

18-
.form-element.chosen-container-single .chosen-single b {
18+
.form-select.chosen-container-single .chosen-single b {
1919
background: none !important;
2020
}
2121

22-
.form-element.chosen-container-multi {
22+
.form-select.chosen-container-multi {
2323
width: auto !important;
2424
}
2525

26-
.form-element.chosen-container-multi .chosen-choices {
26+
.form-select.chosen-container-multi .chosen-choices {
2727
min-width: 160px;
2828
border: 0 none;
2929
background: none;

dist/css/components/module_filter.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,3 +121,7 @@
121121
color: var(--gin-color-primary);
122122
}
123123

124+
#module-filter-show-wrapper .form-item {
125+
display: inline-block;
126+
}
127+

dist/css/components/paragraphs.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,3 +455,7 @@ html[dir="rtl"].js .paragraph-type-icon {
455455
right: 0;
456456
}
457457

458+
.field-widget-paragraphs-embed input.field-add-more-submit {
459+
margin: var(--gin-spacing-xss);
460+
}
461+

0 commit comments

Comments
 (0)