Skip to content

Commit fcd87d8

Browse files
author
mortendk
committed
#184 dialog buttons added in
1 parent aa469dd commit fcd87d8

File tree

8 files changed

+112
-35
lines changed

8 files changed

+112
-35
lines changed

elevenfeat/css/ui-dialog.css

Lines changed: 0 additions & 12 deletions
This file was deleted.

elevenfeat/elevenfeat.info.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,14 @@ libraries-extend:
3535
- elevenfeat/feat.placeblock
3636

3737
quickedit/quickedit:
38-
- elevenfeat/feat.quickedit
39-
# core/jquery.ui:
40-
# - elevenfeat/feat.jquery_ui
38+
- elevenfeat/feat.quickedit
39+
40+
core/jquery.ui:
41+
- elevenfeat/feat.jquery_ui
4142

4243
#Forms
4344
ckeditor/drupal.ckeditor:
44-
- elevenfeat/form.ckeditor
45+
- elevenfeat/form.ckeditor
4546

4647

4748

@@ -141,7 +142,7 @@ libraries-override:
141142
# css:
142143
# component:
143144
# assets/vendor/jquery.ui/themes/base/button.css: false
144-
145+
#
145146

146147
node/drupal.node.preview:
147148
css:

elevenfeat/elevenfeat.libraries.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ global:
88
# templates/form/select/form-select.css: {}
99
# layout:
1010
# css/layout.css: {}
11-
component:
12-
css/ui-dialog.css: {}
1311
theme:
1412
css/type.css: {}
1513
dependencies:
@@ -61,10 +59,12 @@ feat.quickedit:
6159

6260

6361

64-
# feat.jquery_ui:
65-
# css:
66-
# theme:
67-
# templates/jquery_ui/jquery_ui.css: {}
62+
feat.jquery_ui:
63+
css:
64+
theme:
65+
templates/jquery_ui/jquery_ui.css: {}
66+
templates/jquery_ui/dialog.css: {}
67+
6868

6969
# ------------------------------------------------------------------------------
7070
# Forms
Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
/*
2+
overwrites for ui dialog for eleven feat.
3+
*/
4+
body .ui-widget-overlay {
5+
background: var(--white-90);
6+
}
7+
8+
/*.ui-dialog[style] {
9+
width: 33% !important;
10+
left: 33% !important
11+
}*/
12+
.ui-dialog.ui-corner-all.ui-widget-content {
13+
/*border: 1px solid var(--concrete);*/
14+
}
15+
.ui-widget-content,
16+
.ui-widget.ui-widget-content{
17+
border: none;
18+
}
19+
20+
.ui-dialog-title {
21+
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", sans-serif;
22+
font-weight: bold;
23+
}
24+
25+
.ui-dialog .ui-dialog-content {
26+
margin: 0;
27+
padding: 16px;
28+
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", sans-serif;
29+
font-size: 16px;
30+
background-color: var(--gravel);
31+
color: var(--asphalt);
32+
}
33+
34+
/* Buttons */
35+
.ui-dialog .ui-dialog-buttonpane {
36+
background-color: var(--gravel);
37+
padding-bottom: 16px;
38+
border: none;
39+
}
40+
41+
body .ui-dialog .button {
42+
font-size: 16px;
43+
color: var(--white);
44+
position: relative;
45+
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", sans-serif;
46+
border: none;
47+
border-radius: 0;
48+
text-shadow: none;
49+
width: auto;
50+
height: 2rem;
51+
padding-left: 2.5rem;
52+
margin: 0 0.25rem 0 0;
53+
border:none;
54+
transition: all 0.2s;
55+
background-image: var(--button-asphalt);
56+
}
57+
body .ui-dialog .button:before {
58+
content: '';
59+
position: absolute;
60+
width: 16px;
61+
height: 16px;
62+
left: 8px;
63+
top: 8px;
64+
background-color: var(--white);
65+
66+
mask-image: var(--icon-coffee);
67+
-webkit-mask-image: var(--icon-coffee);
68+
-webkit-mask-size: contain !important;
69+
mask-size: contain !important;
70+
-webkit-mask-repeat: no-repeat;
71+
mask-repeat: no-repeat;
72+
}
73+
74+
body .ui-dialog .button:hover {
75+
background-image: var(--button-asphalt-rev);
76+
}
77+
/* save */
78+
body .ui-dialog .button.button--primary:before{
79+
mask-image: url(icons/thumbs-up.svg);
80+
-webkit-mask-image: url(icons/thumbs-up.svg);
81+
}
82+
body .ui-dialog .button--primary{
83+
background-image: var(--button-grass);
84+
}
85+
body .ui-dialog .button--primary:hover{
86+
background-image: var(--button-grass-rev);
87+
}
88+
89+
90+
body .ui-dialog .button:before{
91+
mask-image: url(icons/times.svg);
92+
-webkit-mask-image: url(icons/times.svg);
93+
}
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

elevenfeat/templates/jquery_ui/jquery_ui.css

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,6 @@
44
}
55

66
/*UI dialog*/
7-
.ui-widget.ui-widget-content {
8-
border: 0 solid var(--asphalt);
9-
}
10-
11-
/* dialog */
12-
.ui-dialog .ui-dialog-buttonpane button{
13-
margin: 0 0.25rem
14-
}
157

168
.ui-dialog {
179
position: absolute;
@@ -40,9 +32,6 @@
4032
width: 100%;
4133
}
4234

43-
/* button
44-
TODO: this should be a standard button
45-
*/
4635
.ui-dialog a.button-action,
4736
.ui-dialog .dropbutton-single a {
4837
/*background-image: var(--icon-heart), var(--button-rasberry);

elevenfeat/templates/quickedit/quickedit.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ Quickedit
2525
border: 1px solid var(--asphalt-light);
2626
}
2727

28-
.quickedit-candidate { }
28+
.quickedit-candidate:hover {
29+
outline: 1px dashed var(--bluesky-light);
30+
background-color: var(--bluesky-light-light);
31+
}
32+
2933

3034

3135
/*This is the active element */

0 commit comments

Comments
 (0)