@navikt/ds-css 0.7.1 → 0.8.0

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.
package/LICENCE ADDED
@@ -0,0 +1,31 @@
1
+ Font License
2
+
3
+ The Source Sans Pro font files in packages/node_modules/nav-frontend-typografi-style/assets are a subset of Source Sans Pro, licensed under the SIL Open Font License, and copyright Adobe Systems Incorporated, with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
4
+
5
+ Icon License
6
+
7
+ This project uses Streamline Icons. If you use nav-frontend-moduler in your project please adhere to the Streamline Icons license agreement found here: https://streamlineicons.com/ux/extended-license.html
8
+
9
+ The rest of the codebase (excluding 3rd party dependencies):
10
+
11
+ # The MIT License
12
+
13
+ Copyright 2019 NAV (Arbeids- og velferdsdirektoratet) - The Norwegian Labour and Welfare Administration
14
+
15
+ Permission is hereby granted, free of charge, to any person obtaining
16
+ a copy of this software and associated documentation files (the "Software"),
17
+ to deal in the Software without restriction, including without limitation
18
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
19
+ and/or sell copies of the Software, and to permit persons to whom the
20
+ Software is furnished to do so, subject to the following conditions:
21
+
22
+ The above copyright notice and this permission notice shall be included
23
+ in all copies or substantial portions of the Software.
24
+
25
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
26
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
27
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
28
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
29
+ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
30
+ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
31
+ USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -1,3 +1,11 @@
1
+ :root {
2
+ --navds-accordion-menu-color-text: var(--navds-color-text-link);
3
+ --navds-accordion-menu-color-text-focus: var(--navds-color-darkgray);
4
+ --navds-accordion-menu-color-background-hover: var(--navds-color-blue-10);
5
+ --navds-accordion-menu-color-text-active: var(--navds-color-text);
6
+ --navds-accordion-menu-outline-focus: var(--navds-text-focus);
7
+ }
8
+
1
9
  .navds-accordion-menu__list {
2
10
  list-style: none;
3
11
  margin: 0;
@@ -18,7 +26,7 @@
18
26
  justify-content: space-between;
19
27
  align-items: center;
20
28
  font-weight: var(--navds-font-weight-bold);
21
- color: var(--navds-color-text-link);
29
+ color: var(--navds-accordion-menu-color-text);
22
30
  text-decoration: underline;
23
31
  }
24
32
 
@@ -31,7 +39,7 @@
31
39
 
32
40
  .navds-accordion-menu-collapsable__expand-icon {
33
41
  font-size: 1.5rem;
34
- color: var(--navds-color-text-link);
42
+ color: var(--navds-accordion-menu-color);
35
43
  flex-shrink: 0;
36
44
  margin-left: var(--navds-spacing-2);
37
45
  }
@@ -73,18 +81,23 @@
73
81
 
74
82
  .navds-accordion-menu-item:focus,
75
83
  .navds-accordion-menu-collapsable__button:focus {
76
- outline: 3px solid var(--navds-text-focus);
84
+ outline: 3px solid var(--navds-accordion-menu-outline-focus);
77
85
  outline-offset: -3px;
78
- color: var(--navds-color-darkgray);
86
+ color: var(--navds-accordion-menu-color-text-focus);
87
+ }
88
+
89
+ .navds-accordion-menu-collapsable__button:focus
90
+ > .navds-accordion-menu-collapsable__expand-icon {
91
+ color: var(--navds-accordion-menu-color-focus);
79
92
  }
80
93
 
81
94
  .navds-accordion-menu-item:hover,
82
95
  .navds-accordion-menu-collapsable__button:hover {
83
- background-color: var(--navds-color-blue-10);
96
+ background-color: var(--navds-accordion-menu-color-background-hover);
84
97
  }
85
98
 
86
99
  .navds-accordion-menu-item--active {
87
100
  box-shadow: inset 0.5rem 0 var(--navds-color-text-link);
88
- color: var(--navds-color-text);
101
+ color: var(--navds-accordion-menu-color-text-active);
89
102
  text-decoration: none;
90
103
  }
package/accordion.css CHANGED
@@ -1,82 +1,70 @@
1
- .ReactCollapse--collapse {
2
- transition: height 300ms cubic-bezier(0.4, 0, 0.2, 1);
1
+ :root {
2
+ --navds-accordion-color-text: var(--navds-color-darkgray);
3
+ --navds-accordion-color-background: var(--navds-color-background);
4
+ --navds-accordion-color-text-hover: var(--navds-color-blue-50);
5
+ --navds-accordion-color-border-hover: var(--navds-color-blue-50);
6
+ --navds-accordion-color-border-focus: var(--navds-color-background);
3
7
  }
4
8
 
5
- .navds-accordion {
6
- position: relative;
7
- background: var(--navds-color-background);
8
- border-bottom: 2px solid #c9c9c9;
9
+ .navds-accordion .ReactCollapse--collapse {
10
+ transition: height 250ms cubic-bezier(0.4, 0, 0.2, 1);
9
11
  }
10
12
 
11
- .navds-accordion:hover {
12
- /* color: black; */
13
- border-bottom: 2px solid var(--navds-color-blue-50);
13
+ .navds-accordion {
14
+ background: var(--navds-accordion-color-background);
14
15
  }
15
16
 
16
- .navds-accordion:focus,
17
- .navds-accordion__button:focus {
18
- box-shadow: var(--navds-shadow-focus);
17
+ .navds-accordion__header:focus {
19
18
  outline: none;
19
+ box-shadow: var(--navds-shadow-focus);
20
+ border-color: var(--navds-accordion-color-border-focus);
20
21
  }
21
22
 
22
- .navds-accordion__chevron {
23
- width: 1.25em;
24
- height: 1.25em;
25
- transform: rotateZ(0deg);
26
- flex-shrink: 0;
27
- margin-left: var(--navds-spacing-4);
23
+ .navds-accordion__header:hover {
24
+ color: var(--navds-accordion-color-text-hover);
25
+ border-color: var(--navds-accordion-color-border-hover);
26
+ text-decoration: underline;
28
27
  }
29
28
 
30
- .navds-accordion__chevron--up {
31
- transform: rotateZ(-180deg);
29
+ .navds-accordion__expand-icon {
30
+ width: 1.5rem;
31
+ height: 1.5rem;
32
+ flex-shrink: 0;
32
33
  }
33
34
 
34
- .navds-accordion__chevron--down {
35
- transform: rotateZ(0deg);
35
+ .navds-accordion__expand-icon--flip {
36
+ transform: rotateZ(180deg);
36
37
  }
37
38
 
38
- .navds-accordion__button {
39
- padding: var(--navds-spacing-4);
39
+ .navds-accordion__header {
40
+ padding: var(--navds-spacing-4) var(--navds-spacing-3);
40
41
  background: transparent;
41
42
  text-align: left;
42
43
  border: none;
43
44
  width: 100%;
44
- margin-bottom: 0;
45
+ margin: 0;
45
46
  cursor: pointer;
46
47
  display: flex;
47
48
  justify-content: space-between;
48
49
  align-items: center;
49
- color: var(--navds-color-text-link);
50
- }
51
-
52
- .navds-accordion__button:hover .navds-accordion__heading {
53
- text-decoration: underline;
54
- color: var(--navds-color-text-link);
50
+ border-bottom: 2px solid #a0a0a0;
51
+ gap: var(--navds-spacing-4);
55
52
  }
56
53
 
57
54
  .navds-accordion__content {
58
- padding: var(--navds-spacing-2) var(--navds-spacing-4) var(--navds-spacing-4);
59
- }
60
-
61
- .navds-accordion--open .navds-accordion__content {
62
- border-top-left-radius: 0;
63
- border-top-right-radius: 0;
64
- }
65
-
66
- .navds-accordion--open > .navds-accordion__button {
67
- border-bottom-left-radius: 0;
68
- border-bottom-right-radius: 0;
55
+ color: var(--navds-accordion-color-text);
56
+ padding: var(--navds-spacing-5) var(--navds-spacing-3) var(--navds-spacing-10);
69
57
  }
70
58
 
71
- .navds-accordion__chevron--filled {
59
+ .navds-accordion__expand-icon--filled {
72
60
  display: none;
73
61
  }
74
62
 
75
- .navds-accordion__button:hover
76
- > .navds-accordion__chevron.navds-accordion__chevron--filled {
63
+ .navds-accordion__header:hover
64
+ > .navds-accordion__expand-icon.navds-accordion__expand-icon--filled {
77
65
  display: inherit;
78
66
  }
79
67
 
80
- .navds-accordion__button:hover > .navds-accordion__chevron {
68
+ .navds-accordion__header:hover > .navds-accordion__expand-icon {
81
69
  display: none;
82
70
  }
package/alert.css CHANGED
@@ -1,84 +1,119 @@
1
+ :root {
2
+ --navds-alert-color-border: var(--navds-color-gray-40);
3
+ --navds-alert-color-error-border: var(--navds-color-error-border);
4
+ --navds-alert-color-error-background: var(--navds-color-error-background);
5
+ --navds-alert-color-warning-border: var(--navds-color-warning-border);
6
+ --navds-alert-color-warning-background: var(--navds-color-warning-background);
7
+ --navds-alert-color-info-border: var(--navds-color-info-border);
8
+ --navds-alert-color-info-background: var(--navds-color-info-background);
9
+ --navds-alert-color-success-border: var(--navds-color-success-border);
10
+ --navds-alert-color-success-background: var(--navds-color-success-background);
11
+ --navds-alert-color-error-icon: var(--navds-color-red-60);
12
+ --navds-alert-color-error-icon-background: var(--navds-color-white);
13
+ --navds-alert-color-warning-icon: var(--navds-color-orange-40);
14
+ --navds-alert-color-warning-icon-background: var(--navds-color-darkgray);
15
+ --navds-alert-color-info-icon: var(--navds-color-lightblue-70);
16
+ --navds-alert-color-info-icon-background: var(--navds-color-white);
17
+ --navds-alert-color-success-icon: var(--navds-color-green-70);
18
+ --navds-alert-color-success-icon-background: var(--navds-color-white);
19
+ }
20
+
1
21
  .navds-alert {
2
22
  border-radius: 4px;
3
- border: var(--navds-border-default);
23
+ border: 1px solid;
24
+ border-color: var(--navds-alert-color-border);
25
+ padding: calc(var(--navds-spacing-4) + 1px) calc(var(--navds-spacing-4) + 1px);
26
+ display: flex;
27
+ gap: var(--navds-spacing-3);
28
+ align-items: center;
29
+ }
4
30
 
5
- /* Padding calculated based on 18px font for 64px tall alert */
6
- padding: var(--navds-spacing-4) var(--navds-spacing-4);
7
- display: grid;
8
- grid-auto-flow: column;
9
- justify-content: start;
10
- min-height: 64px;
11
- box-sizing: border-box;
31
+ .navds-alert__wrapper {
32
+ max-width: 43.5rem;
12
33
  }
13
34
 
14
- .navds-alert--s {
15
- padding: var(--navds-spacing-1) var(--navds-spacing-4);
16
- min-height: 32px;
35
+ .navds-alert--small {
36
+ padding: calc(var(--navds-spacing-1) - 1px) var(--navds-spacing-4);
17
37
  }
18
38
 
19
- .navds-alert > span > svg {
20
- margin-right: var(--navds-spacing-3);
21
- font-size: 1.5rem;
22
- flex-shrink: 0;
23
- background: radial-gradient(
24
- circle,
25
- var(--navds-color-background) 50%,
26
- 0,
27
- transparent
28
- );
39
+ .navds-alert--full-width {
40
+ border-radius: 0;
29
41
  }
30
42
 
31
- .navds-alert > div {
32
- display: block;
33
- margin: auto 0;
34
- max-width: 43.5rem;
35
- flex: 1;
43
+ .navds-alert > .navds-alert__icon {
44
+ flex-shrink: 0;
45
+ font-size: 1.5rem;
46
+ align-self: flex-start;
47
+ height: var(--navds-font-line-height-xl);
36
48
  }
37
49
 
38
- .navds-alert > span {
39
- display: flex;
40
- align-items: center;
41
- max-height: calc(var(--navds-spacing-8) - 2px);
50
+ .navds-alert--small > .navds-alert__icon {
51
+ font-size: 1.25rem;
52
+ height: var(--navds-font-line-height-l);
42
53
  }
43
54
 
44
55
  .navds-alert--error {
45
- border-color: var(--navds-color-error-border);
46
- background-color: var(--navds-color-error-background);
56
+ border-color: var(--navds-alert-color-error-border);
57
+ background-color: var(--navds-alert-color-error-background);
47
58
  }
48
59
 
49
- .navds-alert--error > span > svg {
50
- color: var(--navds-color-red-60);
60
+ .navds-alert--error > .navds-alert__icon {
61
+ color: var(--navds-alert-color-error-icon);
62
+ background: radial-gradient(
63
+ circle,
64
+ var(--navds-alert-color-error-icon-background) 50%,
65
+ 0,
66
+ transparent
67
+ );
51
68
  }
52
69
 
53
70
  .navds-alert--warning {
54
- border-color: var(--navds-color-warning-border);
55
- background-color: var(--navds-color-warning-background);
71
+ border-color: var(--navds-alert-color-warning-border);
72
+ background-color: var(--navds-alert-color-warning-background);
56
73
  }
57
74
 
58
- .navds-alert--warning > span > svg {
59
- color: var(--navds-color-orange-40);
75
+ .navds-alert--warning > .navds-alert__icon {
76
+ color: var(--navds-alert-color-warning-icon);
60
77
  background: radial-gradient(
61
78
  circle,
62
- var(--navds-color-darkgray) 50%,
79
+ var(--navds-alert-color-warning-icon-background) 50%,
63
80
  0,
64
81
  transparent
65
82
  );
66
83
  }
67
84
 
68
85
  .navds-alert--info {
69
- border-color: var(--navds-color-info-border);
70
- background-color: var(--navds-color-info-background);
86
+ border-color: var(--navds-alert-color-info-border);
87
+ background-color: var(--navds-alert-color-info-background);
71
88
  }
72
89
 
73
- .navds-alert--info > span > svg {
74
- color: var(--navds-color-lightblue-70);
90
+ .navds-alert--info > .navds-alert__icon {
91
+ color: var(--navds-alert-color-info-icon);
92
+ background: radial-gradient(
93
+ circle,
94
+ var(--navds-alert-color-info-icon-background) 50%,
95
+ 0,
96
+ transparent
97
+ );
75
98
  }
76
99
 
77
100
  .navds-alert--success {
78
- border-color: var(--navds-color-success-border);
79
- background-color: var(--navds-color-success-background);
101
+ border-color: var(--navds-alert-color-success-border);
102
+ background-color: var(--navds-alert-color-success-background);
103
+ }
104
+
105
+ .navds-alert--success > .navds-alert__icon {
106
+ color: var(--navds-alert-color-success-icon);
107
+ background: radial-gradient(
108
+ circle,
109
+ var(--navds-alert-color-success-icon-background) 50%,
110
+ 0,
111
+ transparent
112
+ );
80
113
  }
81
114
 
82
- .navds-alert--success > span > svg {
83
- color: var(--navds-color-green-70);
115
+ .navds-alert--inline {
116
+ background-color: transparent;
117
+ border-color: transparent;
118
+ padding: 0;
84
119
  }
@@ -9,7 +9,8 @@
9
9
  * https://medium.com/@jessebeach/beware-smushed-off-screen-accessible-text-5952a4c2cbfe
10
10
  */
11
11
 
12
- .sr-only {
12
+ .sr-only,
13
+ .navds-sr-only {
13
14
  border: 0;
14
15
  clip: rect(0, 0, 0, 0);
15
16
  height: 1px;
@@ -32,7 +33,9 @@
32
33
  */
33
34
 
34
35
  .sr-only.focusable:active,
35
- .sr-only.focusable:focus {
36
+ .sr-only.focusable:focus,
37
+ .navds-sr-only.focusable:active,
38
+ .navds-sr-only.focusable:focus {
36
39
  clip: auto;
37
40
  height: auto;
38
41
  margin: 0;
package/button.css CHANGED
@@ -1,46 +1,96 @@
1
+ :root {
2
+ --navds-button-color-text: var(--navds-color-action-default);
3
+ --navds-button-color-background: var(--navds-color-background);
4
+ --navds-button-color-border: var(--navds-color-action-default);
5
+
6
+ /* Primary */
7
+ --navds-button-color-primary-text: var(--navds-color-white);
8
+ --navds-button-color-primary-background: var(--navds-color-action-default);
9
+ --navds-button-color-primary-border: var(--navds-color-action-default);
10
+ --navds-button-color-primary-background-hover: var(
11
+ --navds-color-action-hover
12
+ );
13
+ --navds-button-color-primary-border-hover: var(--navds-color-action-hover);
14
+ --navds-button-color-primary-background-active: var(
15
+ --navds-color-action-active
16
+ );
17
+ --navds-button-color-primary-border-focus: var(--navds-color-white);
18
+
19
+ /* secondary */
20
+ --navds-button-color-secondary-text-hover: var(--navds-color-text-inverse);
21
+ --navds-button-color-secondary-background-hover: var(
22
+ --navds-color-action-hover
23
+ );
24
+ --navds-button-color-secondary-text-active: var(--navds-color-text-inverse);
25
+ --navds-button-color-secondary-background-active: var(
26
+ --navds-color-action-active
27
+ );
28
+ --navds-button-color-secondary-border-focus-active-hover: var(
29
+ --navds-color-white
30
+ );
31
+
32
+ /* tertiary */
33
+ --navds-button-color-tertiary-border: transparent;
34
+ --navds-button-color-tertiary-background: transparent;
35
+ --navds-button-color-tertiary-border-hover: var(--navds-color-action-default);
36
+ --navds-button-color-tertiary-border-focus: var(--navds-color-action-default);
37
+ --navds-button-color-tertiary-border-active: var(--navds-color-white);
38
+ --navds-button-color-tertiary-text-active: var(--navds-color-text-inverse);
39
+ --navds-button-color-tertiary-background-active: var(
40
+ --navds-color-action-active
41
+ );
42
+
43
+ /* Danger */
44
+ --navds-button-color-danger-text: var(--navds-color-white);
45
+ --navds-button-color-danger-background: var(--navds-color-danger-default);
46
+ --navds-button-color-danger-border: var(--navds-color-danger-default);
47
+ --navds-button-color-danger-background-hover: var(--navds-color-danger-hover);
48
+ --navds-button-color-danger-border-hover: var(--navds-color-danger-hover);
49
+ --navds-button-color-danger-background-active: var(
50
+ --navds-color-danger-active
51
+ );
52
+ --navds-button-color-danger-border-focus: var(--navds-color-white);
53
+
54
+ /* Disabled */
55
+ --navds-button-color-text-disabled: var(--navds-color-text-inverse);
56
+ --navds-button-color-background-disabled: var(--navds-color-disabled);
57
+ }
58
+
1
59
  .navds-button {
2
60
  display: inline-flex;
3
61
  cursor: pointer;
4
- background-color: var(--navds-color-background);
5
- color: var(--navds-color-action-default);
62
+ background-color: var(--navds-button-color-background);
63
+ color: var(--navds-button-color-text);
6
64
  margin: 0;
7
65
  text-align: center;
8
66
  text-decoration: none;
9
- border-color: var(--navds-color-action-default);
67
+ border-color: var(--navds-button-color-border);
10
68
  border-radius: 2px;
11
69
  border-style: solid;
12
70
  border-width: 2px;
13
71
  min-height: 48px;
14
- align-items: center;
72
+ min-width: 48px;
73
+ padding: var(--navds-spacing-2) var(--navds-spacing-2);
74
+ flex-shrink: 0;
75
+ }
15
76
 
16
- /* Padding calculated based on 18px font for 44px tall button */
17
- padding: calc(var(--navds-spacing-3) - 2px) var(--navds-spacing-3);
77
+ .navds-button__inner {
78
+ display: flex;
79
+ align-items: center;
80
+ margin: auto;
81
+ gap: var(--navds-spacing-2);
18
82
  }
19
83
 
20
- .navds-button > svg {
84
+ .navds-button svg {
21
85
  font-size: 1.5rem;
22
- width: 1.5rem;
23
- height: 1.5rem;
24
86
  }
25
87
 
26
- .navds-button--s > svg {
88
+ .navds-button--small svg {
27
89
  font-size: 1.25rem;
28
- width: 1.25rem;
29
- height: 1.25rem;
30
90
  }
31
91
 
32
- .navds-button > svg + *:not(.sr-only),
33
- .navds-button > *:not(.sr-only) + svg {
34
- margin-left: 0.5rem;
35
- }
36
-
37
- /* .navds-button:last-child {
38
- margin-left: 0.5rem;
39
- } */
40
-
41
- .navds-button--s {
42
- /* Padding calculated based on 16px font for 32px tall button */
43
- padding: 0.25rem calc(var(--navds-spacing-4) - 2px);
92
+ .navds-button--small {
93
+ padding: var(--navds-spacing-1) var(--navds-spacing-2);
44
94
  min-height: 32px;
45
95
  }
46
96
 
@@ -50,93 +100,123 @@
50
100
  }
51
101
 
52
102
  /**************************
53
- * .navds-button--primary *
103
+ * .navds-button--secondary *
54
104
  **************************/
55
105
 
56
- .navds-button--primary:hover,
57
- .navds-button--primary:active {
58
- color: var(--navds-color-text-inverse);
59
- background-color: var(--navds-color-action-hover);
106
+ .navds-button--secondary:hover {
107
+ color: var(--navds-button-color-secondary-text-hover);
108
+ background-color: var(--navds-button-color-secondary-background-hover);
60
109
  border-color: transparent;
61
110
  }
62
111
 
63
- .navds-button--primary:active {
64
- background-color: var(--navds-color-action-active);
112
+ .navds-button--secondary:active {
113
+ color: var(--navds-button-color-secondary-text-active);
114
+ background-color: var(--navds-button-color-secondary-background-active);
115
+ border-color: transparent;
116
+ }
117
+
118
+ .navds-button--secondary:focus:hover {
119
+ border-color: var(--navds-button-color-secondary-border-focus-active-hover);
120
+ border-width: 1px;
121
+ padding: calc(0.25rem + 1px) calc(0.5rem + 1px);
122
+ }
123
+
124
+ .navds-button--secondary:focus:active {
125
+ border-color: var(--navds-button-color-secondary-border-focus-active-hover);
126
+ border-width: 1px;
127
+ padding: calc(0.25rem + 1px) calc(0.5rem + 1px);
65
128
  }
66
129
 
67
130
  /****************************
68
- * .navds-button--secondary *
131
+ * .navds-button--tertiary *
69
132
  ****************************/
70
133
 
71
- .navds-button--secondary {
72
- border-color: transparent;
73
- background-color: transparent;
134
+ .navds-button--tertiary {
135
+ border-color: var(--navds-button-color-tertiary-border);
136
+ background-color: var(--navds-button-color-tertiary-background);
74
137
  }
75
138
 
76
- .navds-button--secondary:hover,
77
- .navds-button--secondary:focus {
78
- border-color: var(--navds-color-action-default);
139
+ .navds-button--tertiary:hover {
140
+ border-color: var(--navds-button-color-tertiary-border-hover);
79
141
  }
80
142
 
81
- .navds-button--secondary:active {
82
- color: var(--navds-color-text-inverse);
83
- border-color: var(--navds-color-action-active);
84
- background-color: var(--navds-color-action-active);
143
+ .navds-button--tertiary:focus {
144
+ border-color: var(--navds-button-color-tertiary-border-focus);
145
+ }
146
+
147
+ .navds-button--tertiary:active {
148
+ color: var(--navds-button-color-tertiary-text-active);
149
+ background-color: var(--navds-button-color-tertiary-background-active);
150
+ border-color: var(--navds-button-color-tertiary-border-active);
151
+ border-width: 1px;
152
+ padding: calc(0.5rem + 1px) calc(0.5rem + 1px);
153
+ }
154
+
155
+ .navds-button--small.navds-button--tertiary:active {
156
+ padding: calc(0.25rem + 1px) calc(0.5rem + 1px);
85
157
  }
86
158
 
87
159
  /*************************
88
- * .navds-button--action *
160
+ * .navds-button--primary *
89
161
  * .navds-button--danger *
90
162
  *************************/
91
163
 
92
- .navds-button--action {
93
- background-color: var(--navds-color-action-default);
94
- border-color: var(--navds-color-action-default);
164
+ .navds-button--primary {
165
+ background-color: var(--navds-button-color-primary-background);
166
+ border-color: var(--navds-button-color-primary-border);
167
+ color: var(--navds-button-color-primary-text);
95
168
  }
96
169
 
97
170
  .navds-button--danger {
98
- background-color: var(--navds-color-danger-default);
99
- border-color: var(--navds-color-danger-default);
171
+ background-color: var(--navds-button-color-danger-background);
172
+ border-color: var(--navds-button-color-danger-border);
173
+ color: var(--navds-button-color-danger-text);
100
174
  }
101
175
 
102
- .navds-button--action,
176
+ .navds-button--primary,
103
177
  .navds-button--danger {
104
- color: white;
105
178
  border-width: 1px;
106
179
  }
107
180
 
108
- .navds-button--action:hover {
109
- background-color: var(--navds-color-action-hover);
110
- border-color: var(--navds-color-action-hover);
181
+ .navds-button--primary:hover {
182
+ background-color: var(--navds-button-color-primary-background-hover);
183
+ border-color: var(--navds-button-color-primary-border-hover);
111
184
  }
112
185
 
113
186
  .navds-button--danger:hover {
114
- background-color: var(--navds-color-danger-hover);
115
- border-color: var(--navds-color-danger-hover);
187
+ background-color: var(--navds-button-color-danger-background-hover);
188
+ border-color: var(--navds-button-color-danger-border-hover);
116
189
  }
117
190
 
118
- .navds-button--action:active {
119
- background-color: var(--navds-color-action-active);
191
+ .navds-button--primary:active {
192
+ background-color: var(--navds-button-color-primary-background-active);
120
193
  }
121
194
 
122
195
  .navds-button--danger:active {
123
- background-color: var(--navds-color-danger-active);
196
+ background-color: var(--navds-button-color-danger-background-active);
197
+ }
198
+
199
+ .navds-button--primary:focus {
200
+ border-color: var(--navds-button-color-primary-border-focus);
124
201
  }
125
202
 
126
- .navds-button--action:focus,
127
203
  .navds-button--danger:focus {
128
- border-color: white;
204
+ border-color: var(--navds-button-color-danger-border-focus);
129
205
  }
130
206
 
131
207
  /**************************
132
208
  * .navds-button:disabled *
133
209
  **************************/
134
210
 
135
- .navds-button:disabled:disabled {
136
- background-color: var(--navds-color-disabled);
137
- color: var(--navds-color-text-inverse);
211
+ .navds-button:disabled {
212
+ color: var(--navds-button-color-text-disabled);
213
+ background-color: var(--navds-button-color-background-disabled);
138
214
  cursor: not-allowed;
139
215
  border-width: 0;
140
216
  box-shadow: none;
141
217
  transform: none;
142
218
  }
219
+
220
+ .navds-button:disabled.navds-button--tertiary:active {
221
+ padding: var(--navds-spacing-2) var(--navds-spacing-2);
222
+ }