stop14-themesystem-legacy 2.1.0 → 2.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (25) hide show
  1. package/package.json +2 -1
  2. package/scaffolding/drupal/_00_main_configuration.yml +4 -2
  3. package/scaffolding/drupal/package.json +6 -13
  4. package/scaffolding/drupal/source/sass/10_colours_and_patterns/_effects.sass +53 -40
  5. package/scaffolding/drupal/source/sass/40_ui/_browser_ui_definitions.sass +0 -0
  6. package/scaffolding/drupal/source/sass/40_ui/_buttons.sass +1 -1
  7. package/scaffolding/drupal/source/sass/40_ui/_component_drupal_search_block_form.sass +16 -0
  8. package/scaffolding/drupal/source/sass/40_ui/_component_drupal_user_login_form.sass +21 -0
  9. package/scaffolding/drupal/source/sass/40_ui/_form_elements.sass +5 -6
  10. package/scaffolding/drupal/source/sass/40_ui/_index.sass +2 -0
  11. package/scaffolding/drupal/source/sass/40_ui/_search_form.sass +1 -1
  12. package/scaffolding/drupal/source/sass/40_ui/_ui_definitions.sass +13 -10
  13. package/scaffolding/drupal/source/sass/60_site_elements/00_definitions/_index.sass +0 -1
  14. package/scaffolding/drupal/source/sass/60_site_elements/content/_slide.sass +1 -1
  15. package/scaffolding/drupal/source/sass/60_site_elements/paragraphs/agile_theme_tools/_callout.sass +76 -23
  16. package/scaffolding/drupal/source/sass/60_site_elements/paragraphs/agile_theme_tools/_quotation.sass +10 -11
  17. package/scaffolding/drupal/templates/content/node--slide.html.twig +99 -0
  18. package/source/sass/a_components/10_colours_and_patterns/00_core/11_functions/_hsb.sass +15 -4
  19. package/source/sass/a_components/40_ui/ui_element_base_v002/13_definitions/_form_elements.sass +1 -0
  20. package/source/sass/a_components/40_ui/ui_element_base_v002/_form_ui.sass +6 -1
  21. package/source/sass/a_components/40_ui/ui_element_base_v002/_general_ui.sass +5 -1
  22. package/source/sass/a_components/40_ui/ui_element_base_v002/_standardized_icons/_icon_mixins.sass +5 -6
  23. package/source/sass/a_components/60_site_elements/drupal_general_support/_component_drupal_contextual_menu.sass +6 -0
  24. package/source/sass/a_components/60_site_elements/drupal_general_support/_mirador_compatibility.sass +3 -0
  25. package/scaffolding/drupal/source/sass/60_site_elements/00_definitions/_callout_definitions.sass +0 -27
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "stop14-themesystem-legacy",
3
- "version": "2.1.0",
3
+ "version": "2.1.2",
4
4
  "description": "A scaffolding and build system for theme development across platforms. Legacy version",
5
5
  "author": {
6
6
  "name": "Bill Kennedy",
@@ -55,6 +55,7 @@
55
55
  "jshint": "^2.13.0",
56
56
  "jshint-stylish": "^2.2.1",
57
57
  "lazypipe": "^1.0.1",
58
+ "masonry-layout": "^4.2.2",
58
59
  "object-path": "^0.11.5",
59
60
  "postcss": "^8.4.38",
60
61
  "prettier": "^2.8.8",
@@ -147,6 +147,7 @@ ui_minheight: $ui_element_height
147
147
  ui_maxheight: 60px
148
148
  ui_compactheight: 40px
149
149
  ui_largeheight: 80px
150
+ ui_input_minwidth: 300px
150
151
  ui_max_text_width: 500px
151
152
  ui_element_spacing: "rv($mobile_edge_padding_factor)"
152
153
  ui_border_radius: 8px
@@ -226,8 +227,9 @@ ui_select_max_width: 100%
226
227
 
227
228
  #Callouts
228
229
 
229
- callout_shift: 0
230
+ callout_shift: 90px
230
231
  callout_width: 40%
232
+ callout_text_size: clamped(2,3)
231
233
  callout_inset: null
232
234
  callout_breakpoint: lrg
233
235
 
@@ -297,7 +299,7 @@ slide_item_portrait_object_fit: contain
297
299
  slide_item_portrait_position: center
298
300
  slide_item_portrait_slide_padding: 0
299
301
 
300
- slide_item_landscape_object_fit: contain
302
+ slide_item_landscape_object_fit: cover
301
303
  slide_item_landscape_position: center
302
304
  slide_item_landscape_slide_padding: 0
303
305
 
@@ -1,25 +1,18 @@
1
1
  {
2
- "name": "agile-generic-theme",
3
- "version": "1.0.0",
4
- "description": "Base Omeka theme and front-end development system.",
2
+ "name": "stop14-theme-scaffolding",
3
+ "version": "1.1.0",
4
+ "description": "Base Drupal theme and front-end development system.",
5
5
  "main": "gulpfile.js",
6
6
  "scripts": {
7
7
  "test": "echo \"Error: no test specified\" && exit 1"
8
8
  },
9
9
  "repository": {
10
10
  "type": "git",
11
- "url": "https://agile.git.beanstalkapp.com/ctc-19.git"
11
+ "url": "https://agile.git.beanstalkapp.com/agile-d9-theme-scaffold.git"
12
12
  },
13
- "author": "Agile Humanities Agency",
13
+ "author": "Stop14 Media",
14
14
  "license": "MIT",
15
15
  "dependencies": {
16
- "fs": "^0.0.1-security",
17
- "gulp-if": "^3.0.0",
18
- "masonry-layout": "^4.2.2",
19
- "path": "^0.12.7",
20
- "pdfjs-dist": "^4.10",
21
- "stop14-themesystem-legacy": "^2.0",
22
- "superfish": "^1.7.10",
23
- "yargs": "^16.2.0"
16
+ "stop14-themesystem-legacy": "^2.1.0"
24
17
  }
25
18
  }
@@ -12,7 +12,7 @@ $glow_radius: 25px
12
12
 
13
13
  %feature-glow
14
14
  position: relative
15
-
15
+
16
16
  &:before
17
17
  position: absolute
18
18
  content: ''
@@ -25,48 +25,48 @@ $glow_radius: 25px
25
25
  transform: scale(1.03) rotate(-2deg)
26
26
  filter: blur(4px)
27
27
  border-radius: $ui_border_radius
28
-
28
+
29
29
  &:hover
30
30
  &:before
31
31
  background-color: set-colour-tint(2,90)
32
-
32
+
33
33
  %rotation-glow
34
- position: relative
35
-
36
- &:before
37
- position: absolute
38
- content: ''
39
- z-index: -2
40
- top: 0
41
- left: 0
42
- right: 0
43
- bottom: 0
44
- background-color: set-colour-tint(2,40)
45
- transform: scale(1.03) rotate(-4deg)
46
- filter: blur(5px)
47
- border-radius: 0
48
- mix-blend-mode: multiply
49
- opacity: 0.7
50
-
51
- &:after
52
- position: absolute
53
- content: ''
54
- z-index: -1
55
- top: 0
56
- left: 0
57
- right: 0
58
- bottom: 0
59
- background-color: set-colour-tint(2,40)
60
- transform: scale(1.03) rotate(4deg)
61
- filter: blur(3px)
62
- border-radius: 0
63
- mix-blend-mode: multiply
64
- opacity: 0.6
65
-
66
-
67
- &:hover
68
- &:before, &:after
69
- background-color: set-colour-tint(2,70)
34
+ position: relative
35
+
36
+ &:before
37
+ position: absolute
38
+ content: ''
39
+ z-index: -2
40
+ top: 0
41
+ left: 0
42
+ right: 0
43
+ bottom: 0
44
+ background-color: set-colour-tint(2,40)
45
+ transform: scale(1.03) rotate(-4deg)
46
+ filter: blur(5px)
47
+ border-radius: 0
48
+ mix-blend-mode: multiply
49
+ opacity: 0.7
50
+
51
+ &:after
52
+ position: absolute
53
+ content: ''
54
+ z-index: -1
55
+ top: 0
56
+ left: 0
57
+ right: 0
58
+ bottom: 0
59
+ background-color: set-colour-tint(2,40)
60
+ transform: scale(1.03) rotate(4deg)
61
+ filter: blur(3px)
62
+ border-radius: 0
63
+ mix-blend-mode: multiply
64
+ opacity: 0.6
65
+
66
+
67
+ &:hover
68
+ &:before, &:after
69
+ background-color: set-colour-tint(2,70)
70
70
 
71
71
  %glow-hover
72
72
  position: relative
@@ -98,7 +98,7 @@ $glow_radius: 25px
98
98
  width: rv(4)
99
99
  +bp($tablet)
100
100
  width: rv(6)
101
-
101
+
102
102
 
103
103
  %trailing-rule-right
104
104
  &:before
@@ -109,6 +109,19 @@ $glow_radius: 25px
109
109
  left: 100%
110
110
  margin-left: rv(-2)
111
111
  width: rv(4)
112
+
113
+ +bp($tablet)
114
+ width: rv(6)
115
+
116
+ %rule-top
117
+ &:before
118
+ position: relative
119
+ content: ''
120
+ border-bottom: 4px solid $black
121
+ margin: rv($mobile_edge_padding_factor) auto
122
+ width: rv(4)
123
+ display: block
124
+
112
125
  +bp($tablet)
113
126
  width: rv(6)
114
127
 
@@ -7,7 +7,7 @@
7
7
  **/
8
8
 
9
9
 
10
- .button
10
+ .button, .btn
11
11
  @extend %button
12
12
 
13
13
  &.compact
@@ -0,0 +1,16 @@
1
+ #search-block-form, #search-block-form--2
2
+ display: flex
3
+ flex-direction: column
4
+
5
+ +bp($tablet)
6
+ flex-direction: row
7
+
8
+ > *
9
+ margin-bottom: $ui_element_spacing
10
+
11
+ +bp($tablet)
12
+ margin-right: $ui_element_spacing
13
+
14
+ &:last-child
15
+ +bp($tablet)
16
+ margin-right: 0
@@ -0,0 +1,21 @@
1
+ #user-login-form
2
+ display: flex
3
+ flex-direction: column
4
+ flex-wrap: wrap
5
+
6
+ +bp($desktop)
7
+ flex-direction: row
8
+ align-items: flex-end
9
+
10
+ > *
11
+ display: flex
12
+ flex-direction: column
13
+
14
+ margin-bottom: $ui_element_spacing
15
+
16
+ +bp($desktop)
17
+ margin-right: $ui_element_spacing
18
+
19
+ &:last-child
20
+ +bp($desktop)
21
+ margin-right: 0
@@ -28,9 +28,9 @@
28
28
  * overlay-colour|Overlay: yellow background
29
29
  *
30
30
  */
31
- // “trigger” class used by Drupal for its contextual menus. “MuiButtonBase used for Mirador.
32
- button:not(.trigger,.MuiButtonBase-root)
33
- @extend %button
31
+ // “trigger” class used by Drupal for its contextual menus. “MuiButtonBase used for Mirador. This now handled in core
32
+ // button:not(.trigger,.MuiButtonBase-root)
33
+ // @extend %button
34
34
 
35
35
  input:focus
36
36
  outline: none !important
@@ -38,11 +38,10 @@ input:focus
38
38
 
39
39
  input[type='text'],
40
40
  input[type='email'],
41
+ input[type="search"],
41
42
  textarea#edit-message
42
43
  @extend %input-text
43
-
44
- input[type="search"] // Button
45
- @extend %button-search
44
+ min-width: $ui_input_minwidth
46
45
 
47
46
  input[type="submit"] //Button
48
47
  @extend %button-submit
@@ -8,7 +8,9 @@
8
8
  @import _browser_ui_definitions
9
9
  @import _component_capsule
10
10
  @import _component_drupal_advanced_search_form
11
+ @import _component_drupal_user_login_form
11
12
  @import _component_drupal_one_line_form
13
+ @import _component_drupal_search_block_form
12
14
  @import _component_form_select2
13
15
  @import _component_superfish_navigation
14
16
  @import _component_views
@@ -12,7 +12,7 @@
12
12
  align-items: center
13
13
 
14
14
  > *
15
- margin: 0 rv($mobile_edge_padding_factor) 0 0
15
+ margin: 0 $ui_element_spacing 0 0
16
16
 
17
17
  &:last-child
18
18
  margin-right: 0
@@ -51,7 +51,7 @@
51
51
 
52
52
  %button
53
53
  @extend %button-base
54
- text-decoration: underline
54
+ text-decoration: none
55
55
  display: inline-flex
56
56
  flex-direction: row
57
57
  align-items: center
@@ -209,23 +209,26 @@
209
209
  &:hover
210
210
  border-bottom: 2px solid $black
211
211
 
212
+ // !important flag needed because of specificity issues in Drupal implementations
213
+ // @todo: look at the :not declarations in the core ui components to manage specificity better.
214
+
215
+
212
216
  %button-submit
213
217
  @extend %button
214
- +submit-arrow
215
- border-width: $btn_submit_border_width
216
- border-color: $btn_submit_border_color
218
+ +input-button-icon('arrow',$btn_icon_size,$ui_padding,'reversed','reversed','right')
219
+ border-width: $btn_submit_border_width !important
220
+ border-color: $btn_submit_border_color !important
217
221
  font-style: normal
218
- background-color: $btn_submit_bg_color
219
- color: $btn_submit_color
222
+ background-color: $btn_submit_bg_color !important
223
+ color: $btn_submit_color !important
220
224
  min-width: $btn_compactwidth
221
225
  text-decoration: none
222
226
  justify-content: flex-start
223
227
 
224
228
  &:hover
225
- +submit-arrow-hover
226
- color: $btn_submit_hover_color
227
- background-color: $btn_submit_hover_bg_color
228
- border-color: $btn_submit_hover_border_color
229
+ color: $btn_submit_hover_color !important
230
+ background-color: $btn_submit_hover_bg_color !important
231
+ border-color: $btn_submit_hover_border_color !important
229
232
 
230
233
  %button-search
231
234
  @extend %button-ghost
@@ -4,4 +4,3 @@
4
4
  @description Loads SASS files for local theme. */
5
5
 
6
6
  @import _media_element_definitions
7
- @import _callout_definitions
@@ -21,7 +21,7 @@
21
21
  &:hover
22
22
  border: 0
23
23
 
24
- .node--content
24
+ .node--content, .node__content
25
25
  height: inherit
26
26
  +gradient-overlay-slide
27
27
 
@@ -1,32 +1,85 @@
1
- /**
1
+ /*
2
2
  * @file _callout.sass
3
- * @category 60_site_elements
4
- * @theme LOCAL
5
- * @description Styles for the paragraph callout block.
3
+ * @description defines the callout paragraph in the Content Builder suite
6
4
  *
7
- **/
5
+ * $callout_shift is defined in the Main configuration
6
+ */
8
7
 
9
- .paragraph--type--callout
10
- padding: rv($mobile_block_spacing) * 2 0
11
- +bp($tablet)
12
- padding: rv($block_spacing) * 2 0
8
+ // Consider moving these into main config
13
9
 
14
- .field_body_container
15
- .field_body
16
- p
17
- color: black
10
+ $callout_border_width: 10px
11
+ $callout_border_colour: set-colour(2)
18
12
 
19
- .field_callout_container
20
- .field_callout
21
- p
22
- @extend %callout-center
13
+ .callout, .paragraph--type--callout
14
+ min-height: 100px
15
+
16
+ .callout-text, .field_callout_container
17
+ position: relative
18
+ width: 100%
19
+ padding: 0 rv($mobile_edge_padding_factor) rv($mobile_edge_padding_factor) rv($mobile_edge_padding_factor)
20
+ display: flex
21
+ flex-direction: column
22
+ align-items: center
23
+
24
+ +bp($tablet)
25
+ display: block
26
+ max-width: 370px
27
+ padding: 0 rv($edge_padding_factor) rv($edge_padding_factor) rv($edge_padding_factor)
28
+ width: $callout_width
29
+ max-width: 370px
30
+
31
+ +bp($desktop)
32
+ max-width: 500px
33
+
34
+ // Sets the sizing of the callout
35
+
36
+ .field-value
37
+ font-size: $callout_text_size
38
+ font-weight: $bold
23
39
 
24
- .callout-left
25
- .field_callout
26
40
  p
27
- @extend %callout-left
41
+ font-size: inherit
42
+ font-weight: inherit
43
+ margin-top: rv($mobile_edge_padding_factor)
44
+ margin-bottom: 0
45
+
46
+ +bp($tablet)
47
+ margin-top: 0
28
48
 
29
49
  .callout-right
30
- .field_callout
31
- p
32
- @extend %callout-right
50
+ .callout-text, .field_callout_container
51
+ +bp($tablet)
52
+ float: right
53
+ +bp($desktop)
54
+ transform: translateX($callout_shift)
55
+ margin-left: $callout_shift * -1
56
+
57
+ .field_callout
58
+ border-bottom: $callout_border_width solid $callout_border_colour
59
+ padding-bottom: rv($mobile_edge_padding_factor)
60
+
61
+ +bp($tablet)
62
+ border-bottom: none
63
+ padding-bottom: 0
64
+ border-left: $callout_border_width solid $callout_border_colour
65
+ padding-left: rv($edge_padding_factor)
66
+
67
+ .callout-left
68
+ .callout-text, .field_callout_container
69
+ +bp($tablet)
70
+ text-align: right
71
+ float: left
72
+ +bp($desktop)
73
+ transform: translateX($callout_shift * -1)
74
+ margin-right: $callout_shift * -1
75
+
76
+ .field_callout
77
+ border-bottom: $callout_border_width solid set-colour(2)
78
+ padding-bottom: rv($mobile_edge_padding_factor)
79
+
80
+ +bp($tablet)
81
+ border-bottom: none
82
+ padding-bottom: 0
83
+ border-right: $callout_border_width solid set-colour(2)
84
+ padding-right: rv($edge_padding_factor)
85
+
@@ -5,29 +5,28 @@
5
5
  * @description Styles for the paragraph quotation block.
6
6
  *
7
7
  **/
8
-
9
-
10
-
8
+
9
+
10
+
11
11
  .paragraph--type--quotation.paragraph--view-mode--default
12
12
  padding: rv($mobile_block_spacing) * 3 0
13
13
  +bp($tablet)
14
14
  padding: rv($block_spacing) * 3 0
15
-
15
+
16
16
  .field_quotation
17
17
  font-family: $basefont
18
- font-weight: $light
18
+ font-weight: $normal
19
19
  text-align: center
20
- font-size: clamped(2, 5, 'sml', 'xlrg')
20
+ font-size: clamped(2, 5, 'sml', 'xlrg')
21
21
  line-height: 1.25
22
22
 
23
23
  .field_attribution_container
24
24
  text-align: center
25
- padding-top: rv(0)
25
+ padding-top: rv($edge_padding_factor)
26
+
26
27
  .field_attribution
27
- font-size: clamped(0, 1, 'sml', 'xlrg')
28
+ font-size: clamped(0, 1, 'sml', 'xlrg')
28
29
  text-transform: uppercase
29
- display: inline
30
- padding-left: rv(-2)
31
30
  position: relative
32
- @extend %trailing-rule-left
31
+ @extend %rule-top
33
32
 
@@ -0,0 +1,99 @@
1
+ {#
2
+ /**
3
+ * @file
4
+ * Theme override to display a node.
5
+ *
6
+ * Available variables:
7
+ * - node: The node entity with limited access to object properties and methods.
8
+ * Only method names starting with "get", "has", or "is" and a few common
9
+ * methods such as "id", "label", and "bundle" are available. For example:
10
+ * - node.getCreatedTime() will return the node creation timestamp.
11
+ * - node.hasField('field_example') returns TRUE if the node bundle includes
12
+ * field_example. (This does not indicate the presence of a value in this
13
+ * field.)
14
+ * - node.isPublished() will return whether the node is published or not.
15
+ * Calling other methods, such as node.delete(), will result in an exception.
16
+ * See \Drupal\node\Entity\Node for a full list of public properties and
17
+ * methods for the node object.
18
+ * - label: The title of the node.
19
+ * - content: All node items. Use {{ content }} to print them all,
20
+ * or print a subset such as {{ content.field_example }}. Use
21
+ * {{ content|without('field_example') }} to temporarily suppress the printing
22
+ * of a given child element.
23
+ * - author_picture: The node author user entity, rendered using the "compact"
24
+ * view mode.
25
+ * - metadata: Metadata for this node.
26
+ * - date: Themed creation date field.
27
+ * - author_name: Themed author name field.
28
+ * - url: Direct URL of the current node.
29
+ * - display_submitted: Whether submission information should be displayed.
30
+ * - attributes: HTML attributes for the containing element.
31
+ * The attributes.class element may contain one or more of the following
32
+ * classes:
33
+ * - node: The current template type (also known as a "theming hook").
34
+ * - node--type-[type]: The current node type. For example, if the node is an
35
+ * "Article" it would result in "node--type-article". Note that the machine
36
+ * name will often be in a short form of the human readable label.
37
+ * - node--view-mode-[view_mode]: The View Mode of the node; for example, a
38
+ * teaser would result in: "node--view-mode-teaser", and
39
+ * full: "node--view-mode-full".
40
+ * The following are controlled through the node publishing options.
41
+ * - node--promoted: Appears on nodes promoted to the front page.
42
+ * - node--sticky: Appears on nodes ordered above other non-sticky nodes in
43
+ * teaser listings.
44
+ * - node--unpublished: Appears on unpublished nodes visible only to site
45
+ * admins.
46
+ * - title_attributes: Same as attributes, except applied to the main title
47
+ * tag that appears in the template.
48
+ * - content_attributes: Same as attributes, except applied to the main
49
+ * content tag that appears in the template.
50
+ * - author_attributes: Same as attributes, except applied to the author of
51
+ * the node tag that appears in the template.
52
+ * - title_prefix: Additional output populated by modules, intended to be
53
+ * displayed in front of the main title tag that appears in the template.
54
+ * - title_suffix: Additional output populated by modules, intended to be
55
+ * displayed after the main title tag that appears in the template.
56
+ * - view_mode: View mode; for example, "teaser" or "full".
57
+ * - teaser: Flag for the teaser state. Will be true if view_mode is 'teaser'.
58
+ * - page: Flag for the full page state. Will be true if view_mode is 'full'.
59
+ * - readmore: Flag for more state. Will be true if the teaser content of the
60
+ * node cannot hold the main body content.
61
+ * - logged_in: Flag for authenticated user status. Will be true when the
62
+ * current user is a logged-in member.
63
+ * - is_admin: Flag for admin user status. Will be true when the current user
64
+ * is an administrator.
65
+ *
66
+ * @see template_preprocess_node()
67
+ *
68
+ * @todo Remove the id attribute (or make it a class), because if that gets
69
+ * rendered twice on a page this is invalid CSS for example: two lists
70
+ * in different view modes.
71
+ */
72
+ #}
73
+ {%
74
+ set classes = [
75
+ 'node',
76
+ 'node--type-' ~ node.bundle|clean_class,
77
+ 'slide',
78
+ node.isPromoted() ? 'node--promoted',
79
+ node.isSticky() ? 'node--sticky',
80
+ not node.isPublished() ? 'node--unpublished',
81
+ view_mode ? 'node--view-mode-' ~ view_mode|clean_class,
82
+ view_mode
83
+ ]
84
+ %}
85
+ {{ attach_library('classy/node') }}
86
+ <article{{ attributes.addClass(classes) }}>
87
+ <a href="{{ url }}">
88
+ {{ title_prefix }}
89
+ <div{{ content_attributes.addClass('node__content') }}>
90
+ {{ content|without('body','field_thumbnail') }}
91
+ </div>
92
+ <footer class="reversed">
93
+ {{ title_suffix }}
94
+ <h3{{ title_attributes }}>{{ label }}</h3>
95
+ {{ content.body }}
96
+ <p class='read-more'>Read more</p>
97
+ </footer>
98
+ </a>
99
+ </article>
@@ -1,10 +1,21 @@
1
1
  /* @file
2
- * Converts HSB colours (e.g. as defined in Adobe CC or Sketch) into SASS-supported HSL colours. */
2
+ * Converts HSB colours (e.g. as defined in Adobe CC or Sketch)
3
+ * into SASS-supported HSL colours.
4
+ */
3
5
 
4
6
  @function hsb($h-hsb, $s-hsb, $b-hsb, $a: 1)
5
7
  @if $b-hsb == 0
6
8
  @return hsla(0, 0, 0, $a)
9
+
10
+
11
+ $l-hsl: ($b-hsb / 2) * (2 - ($s-hsb / 100))
12
+
13
+ @if $l-hsl < 50
14
+ $denominator: $l-hsl * 2
7
15
  @else
8
- $l-hsl: ($b-hsb/2) * (2 - ($s-hsb/100))
9
- $s-hsl: ($b-hsb * $s-hsb) / if($l-hsl < 50, $l-hsl * 2, 200 - $l-hsl * 2)
10
- @return hsla($h-hsb, $s-hsl, $l-hsl, $a)
16
+ $denominator: 200 - ($l-hsl * 2)
17
+
18
+
19
+ $s-hsl: ($b-hsb * $s-hsb) / $denominator
20
+
21
+ @return hsla($h-hsb, $s-hsl, $l-hsl, $a)
@@ -262,6 +262,7 @@
262
262
 
263
263
  +reversed
264
264
  background-color: $white
265
+ color: neutral(80)
265
266
 
266
267
  &:hover
267
268
  border-color: $ui_hover_border_color
@@ -29,9 +29,14 @@
29
29
  *
30
30
  */
31
31
  // “trigger” class used by Drupal for its contextual menus. “MuiButtonBase used for Mirador.
32
- button:not(.trigger,.MuiButtonBase-root,.icon)
32
+ //.trigger,.MuiButtonBase-root,.icon
33
+
34
+ button
33
35
  @extend %button
34
36
 
37
+ &.icon, &.trigger, &.MuiButtonBase-root
38
+ all: unset
39
+
35
40
  input:focus
36
41
  outline: none !important
37
42
  border-color: $clr2
@@ -7,7 +7,11 @@
7
7
  // Note: applying styles to <button> elements often create problems with third-party modules and admin interfaces.
8
8
  // It is advised that you add a button class to button elements to avoid conflicts
9
9
 
10
- .button:not(.trigger,.MuiButtonBase-root,.icon)
10
+ //.button:not(.trigger,.MuiButtonBase-root,.icon) was originally called, but its specificity is too high
11
+ // and it’s only applicable to specific platforms and situations where the standard button styling was interfering
12
+ // with specifically styled applications. @todo: figure out another approach.
13
+
14
+ .button, .btn
11
15
  @extend %button
12
16
 
13
17
  &.compact
@@ -36,7 +36,7 @@
36
36
  height: $size
37
37
  width: $size
38
38
  margin-right: $ui_padding
39
- +background-icon-base($icon_name,'contain',$initial_state,$active_state)
39
+ +background-icon-base($icon_name,$btn_icon_size,$initial_state,$active_state)
40
40
  background-position: center left
41
41
 
42
42
  &.active, &:hover
@@ -56,7 +56,7 @@
56
56
  height: $size
57
57
  width: $size
58
58
  margin-left: $ui_padding
59
- +background-icon-base($icon_name,'contain',$initial_state,$active_state)
59
+ +background-icon-base($icon_name,$btn_icon_size,$initial_state,$active_state)
60
60
  background-position: center right
61
61
 
62
62
  &.active, &:hover
@@ -74,14 +74,13 @@
74
74
 
75
75
 
76
76
 
77
- =icon($icon_name, $size: $btn_icon_size, $initial_state: 'default', $active_state: 'active')
77
+ =icon($icon_name, $size: $btn_icon_size, $initial_state: 'default', $active_state: 'active',$position: center)
78
78
  height: $size
79
79
  width: $size
80
- +background-icon-base($icon_name,$size,$initial_state,$active_state)
81
- background-position: center
80
+ +background-icon-base($icon_name,$size,$initial_state,$active_state,$position)
82
81
 
83
82
  &.active, &:hover
84
- +background-icon-base($icon_name,$size,$initial_state,$active_state)
83
+ +background-icon-base($icon_name,$size,$initial_state,$active_state,$position)
85
84
 
86
85
  =icon-with-label($icon_name, $size: $btn_icon_size, $initial_state: 'default', $active_state: 'active', $position: 'left')
87
86
  @extend %icon-label
@@ -10,6 +10,11 @@
10
10
  bottom: initial !important
11
11
  left: initial !important
12
12
 
13
+ // Handles certain contextual menu buttons, following base definitions overridden by UI core
14
+
15
+ button.trigger
16
+ clip: rect(1px, 1px, 1px, 1px)
17
+ min-width: initial
13
18
 
14
19
  // Handles reversed situations
15
20
 
@@ -23,3 +28,4 @@
23
28
  a
24
29
  color: $white
25
30
  background-color: $black
31
+
@@ -8,3 +8,6 @@
8
8
 
9
9
  .toolbar-oriented .toolbar-bar
10
10
  z-index: 1102
11
+
12
+ button.MuiButtonBase-root
13
+ min-width: initial // Let’s Mirador control button widths
@@ -1,27 +0,0 @@
1
- // Callout definitions
2
-
3
- %callout-left
4
- +bp($tablet)
5
- max-width: rv(8)
6
- text-align: right
7
- float: left
8
- margin: 0 rv(1) rv(1) 0
9
- line-height: rv(1)
10
- +bp($desktop)
11
- max-width: rv(10)
12
- line-height: rv(2)
13
-
14
- %callout-right
15
- +bp($tablet)
16
- max-width: rv(9)
17
- float: right
18
- margin: 0 0 rv(1) rv(1)
19
- line-height: rv(1)
20
- +bp($desktop)
21
- max-width: rv(10)
22
- line-height: rv(2)
23
-
24
- %callout-center
25
- color: black !important
26
- font-size: clamped(1, 4, 'sml', 'xlrg')!important
27
- text-align: center