@gitlab/ui 43.5.0 → 43.6.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/CHANGELOG.md +7 -0
- package/dist/index.css +2 -2
- package/dist/index.css.map +1 -1
- package/dist/utility_classes.css +1 -1
- package/dist/utility_classes.css.map +1 -1
- package/dist/utils/constants.js +1 -2
- package/package.json +5 -8
- package/scss_to_js/scss_variables.js +12 -13
- package/scss_to_js/scss_variables.json +61 -19
- package/src/components/base/accordion/accordion_item.spec.js +4 -4
- package/src/scss/mixins.spec.scss +2 -2
- package/src/scss/run_scss_tests.spec.js +8 -0
- package/src/scss/utilities.scss +12 -0
- package/src/scss/utility-mixins/flex.scss +6 -0
- package/src/scss/variables.scss +0 -4
- package/src/utils/constants.js +2 -5
package/dist/utils/constants.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { POSITION } from '../components/utilities/truncate/constants';
|
|
2
2
|
|
|
3
|
-
const glThemes$1 = 'indigo , blue , light-blue , green , red , light-red';
|
|
4
3
|
const glIconSizes = '8 12 14 16 24 32 48 72';
|
|
5
4
|
|
|
6
5
|
function appendDefaultOption(options) {
|
|
@@ -10,7 +9,7 @@ function appendDefaultOption(options) {
|
|
|
10
9
|
}
|
|
11
10
|
|
|
12
11
|
const COMMA = ',';
|
|
13
|
-
const glThemes =
|
|
12
|
+
const glThemes = ['indigo', 'blue', 'light-blue', 'green', 'red', 'light-red'];
|
|
14
13
|
const variantOptions = {
|
|
15
14
|
primary: 'primary',
|
|
16
15
|
secondary: 'secondary',
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gitlab/ui",
|
|
3
|
-
"version": "43.
|
|
3
|
+
"version": "43.6.0",
|
|
4
4
|
"description": "GitLab UI Components",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -73,15 +73,13 @@
|
|
|
73
73
|
},
|
|
74
74
|
"resolutions": {
|
|
75
75
|
"chokidar": "^3.5.2",
|
|
76
|
-
"node-gyp": "^9.0.0",
|
|
77
|
-
"node-sass": "^6.0.0",
|
|
78
76
|
"sane": "^5.0.1"
|
|
79
77
|
},
|
|
80
78
|
"devDependencies": {
|
|
81
79
|
"@arkweid/lefthook": "0.7.7",
|
|
82
80
|
"@babel/core": "^7.18.10",
|
|
83
81
|
"@babel/preset-env": "^7.18.10",
|
|
84
|
-
"@gitlab/eslint-plugin": "
|
|
82
|
+
"@gitlab/eslint-plugin": "16.0.0",
|
|
85
83
|
"@gitlab/stylelint-config": "4.1.0",
|
|
86
84
|
"@gitlab/svgs": "3.0.0",
|
|
87
85
|
"@rollup/plugin-commonjs": "^11.1.0",
|
|
@@ -109,7 +107,7 @@
|
|
|
109
107
|
"eslint": "8.21.0",
|
|
110
108
|
"eslint-import-resolver-jest": "3.0.2",
|
|
111
109
|
"eslint-plugin-cypress": "2.12.1",
|
|
112
|
-
"eslint-plugin-storybook": "0.6.
|
|
110
|
+
"eslint-plugin-storybook": "0.6.4",
|
|
113
111
|
"file-loader": "^4.2.0",
|
|
114
112
|
"glob": "^7.2.0",
|
|
115
113
|
"identity-obj-proxy": "^3.0.0",
|
|
@@ -121,7 +119,6 @@
|
|
|
121
119
|
"jest-serializer-vue": "^2.0.2",
|
|
122
120
|
"markdownlint-cli": "^0.29.0",
|
|
123
121
|
"mockdate": "^2.0.5",
|
|
124
|
-
"node-sass": "^6.0.0",
|
|
125
122
|
"npm-run-all": "^4.1.5",
|
|
126
123
|
"pikaday": "^1.8.0",
|
|
127
124
|
"plop": "^2.5.4",
|
|
@@ -138,9 +135,9 @@
|
|
|
138
135
|
"rollup-plugin-svg": "^2.0.0",
|
|
139
136
|
"rollup-plugin-vue": "^5.1.6",
|
|
140
137
|
"sass": "^1.49.9",
|
|
141
|
-
"sass-export": "^1.
|
|
138
|
+
"sass-export": "^2.1.2",
|
|
142
139
|
"sass-loader": "^10.2.0",
|
|
143
|
-
"sass-true": "^
|
|
140
|
+
"sass-true": "^6.1.0",
|
|
144
141
|
"start-server-and-test": "^1.10.6",
|
|
145
142
|
"storybook-dark-mode": "^1.0.8",
|
|
146
143
|
"stylelint": "14.9.1",
|
|
@@ -101,7 +101,6 @@ export const gray700 = '#525252'
|
|
|
101
101
|
export const gray800 = '#404040'
|
|
102
102
|
export const gray900 = '#303030'
|
|
103
103
|
export const gray950 = '#1f1f1f'
|
|
104
|
-
export const glThemes = 'indigo , blue , light-blue , green , red , light-red'
|
|
105
104
|
export const themeIndigo50 = '#f1f1ff'
|
|
106
105
|
export const themeIndigo100 = '#dbdbf8'
|
|
107
106
|
export const themeIndigo200 = '#c7c7f2'
|
|
@@ -276,9 +275,9 @@ export const glFontSizeCompactMarkdownH1Xl = '1.4375rem'
|
|
|
276
275
|
export const glFontSizeMonospace = '0.8125rem'
|
|
277
276
|
export const glFontSizeMonospaceLg = '0.9375rem'
|
|
278
277
|
export const glFontSizeMonospaceSm = '0.6875rem'
|
|
279
|
-
export const glMonospaceFont = '
|
|
280
|
-
export const glRegularFont = '
|
|
281
|
-
export const glFonts = '("monospace": "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace, "regular": -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Noto Sans", Ubuntu, Cantarell, "Helvetica Neue", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji")'
|
|
278
|
+
export const glMonospaceFont = ''
|
|
279
|
+
export const glRegularFont = ''
|
|
280
|
+
export const glFonts = '("monospace": ("Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace), "regular": (-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Noto Sans", Ubuntu, Cantarell, "Helvetica Neue", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"))'
|
|
282
281
|
export const borderColor = '#dbdbdb'
|
|
283
282
|
export const glBorderSize1 = '1px'
|
|
284
283
|
export const glBorderSize2 = '2px'
|
|
@@ -297,18 +296,18 @@ export const glTransitionDurationMedium = '0.2s'
|
|
|
297
296
|
export const outlineOffset = '1px'
|
|
298
297
|
export const outlineWidth = '2px'
|
|
299
298
|
export const outline = '3px'
|
|
300
|
-
export const focusRing = '
|
|
301
|
-
export const focusRingInset = '
|
|
302
|
-
export const focusRingDark = '
|
|
299
|
+
export const focusRing = ''
|
|
300
|
+
export const focusRingInset = ''
|
|
301
|
+
export const focusRingDark = ''
|
|
303
302
|
export const focusRingOutline = '2px solid #428fdc'
|
|
304
303
|
export const toastMaxWidth = '36.625rem'
|
|
305
304
|
export const toastPaddingRight = '2.625rem'
|
|
306
305
|
export const toastBackgroundColor = '#303030'
|
|
307
306
|
export const chartTooltipMaxWidth = '32rem'
|
|
308
|
-
export const glIconChevronLeft = '
|
|
309
|
-
export const glIconChevronRight = '
|
|
310
|
-
export const glIconChevronDown = '
|
|
311
|
-
export const glIconSelectChevronDown = '
|
|
307
|
+
export const glIconChevronLeft = ''
|
|
308
|
+
export const glIconChevronRight = ''
|
|
309
|
+
export const glIconChevronDown = ''
|
|
310
|
+
export const glIconSelectChevronDown = ''
|
|
312
311
|
export const defaultIconSize = '1rem'
|
|
313
312
|
export const glIconSizes = '8 12 14 16 24 32 48 72'
|
|
314
313
|
export const glDropdownWidth = '15rem'
|
|
@@ -331,8 +330,8 @@ export const info = '#1f75cb'
|
|
|
331
330
|
export const warning = '#ab6100'
|
|
332
331
|
export const danger = '#dd2b0e'
|
|
333
332
|
export const fontWeightBold = '600'
|
|
334
|
-
export const fontFamilySansSerif = '-apple-system, BlinkMacSystemFont, Segoe UI
|
|
335
|
-
export const fontFamilyMonospace = 'Menlo
|
|
333
|
+
export const fontFamilySansSerif = '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Noto Sans", Ubuntu, Cantarell, "Helvetica Neue", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", Noto Color Emoji'
|
|
334
|
+
export const fontFamilyMonospace = '"Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace'
|
|
336
335
|
export const h1FontSize = '2.1875rem'
|
|
337
336
|
export const h2FontSize = '1.75rem'
|
|
338
337
|
export const h3FontSize = '1.53125rem'
|
|
@@ -542,11 +542,6 @@
|
|
|
542
542
|
"value": "#1f1f1f",
|
|
543
543
|
"compiledValue": "#1f1f1f"
|
|
544
544
|
},
|
|
545
|
-
{
|
|
546
|
-
"name": "$gl-themes",
|
|
547
|
-
"value": "indigo', 'blue', 'light-blue', 'green', 'red', 'light-red",
|
|
548
|
-
"compiledValue": "indigo , blue , light-blue , green , red , light-red"
|
|
549
|
-
},
|
|
550
545
|
{
|
|
551
546
|
"name": "$theme-indigo-50",
|
|
552
547
|
"value": "#f1f1ff",
|
|
@@ -1432,12 +1427,12 @@
|
|
|
1432
1427
|
{
|
|
1433
1428
|
"name": "$gl-monospace-font",
|
|
1434
1429
|
"value": "'Menlo', 'DejaVu Sans Mono', 'Liberation Mono', 'Consolas', 'Ubuntu Mono', 'Courier New', 'andale mono', 'lucida console', monospace",
|
|
1435
|
-
"compiledValue": "
|
|
1430
|
+
"compiledValue": ""
|
|
1436
1431
|
},
|
|
1437
1432
|
{
|
|
1438
1433
|
"name": "$gl-regular-font",
|
|
1439
1434
|
"value": "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Noto Sans', Ubuntu, Cantarell, 'Helvetica Neue', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'",
|
|
1440
|
-
"compiledValue": "
|
|
1435
|
+
"compiledValue": ""
|
|
1441
1436
|
},
|
|
1442
1437
|
{
|
|
1443
1438
|
"name": "$gl-fonts",
|
|
@@ -1446,15 +1441,15 @@
|
|
|
1446
1441
|
{
|
|
1447
1442
|
"name": "monospace",
|
|
1448
1443
|
"value": "$gl-monospace-font",
|
|
1449
|
-
"compiledValue": "Menlo, DejaVu Sans Mono, Liberation Mono, Consolas, Ubuntu Mono, Courier New, andale mono, lucida console, monospace"
|
|
1444
|
+
"compiledValue": "\"Menlo\", \"DejaVu Sans Mono\", \"Liberation Mono\", \"Consolas\", \"Ubuntu Mono\", \"Courier New\", \"andale mono\", \"lucida console\", monospace"
|
|
1450
1445
|
},
|
|
1451
1446
|
{
|
|
1452
1447
|
"name": "regular",
|
|
1453
1448
|
"value": "$gl-regular-font",
|
|
1454
|
-
"compiledValue": "-apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Noto Sans, Ubuntu, Cantarell, Helvetica Neue, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji"
|
|
1449
|
+
"compiledValue": "-apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, \"Noto Sans\", Ubuntu, Cantarell, \"Helvetica Neue\", sans-serif, \"Apple Color Emoji\", \"Segoe UI Emoji\", \"Segoe UI Symbol\", Noto Color Emoji"
|
|
1455
1450
|
}
|
|
1456
1451
|
],
|
|
1457
|
-
"compiledValue": "(\"monospace\": \"Menlo\", \"DejaVu Sans Mono\", \"Liberation Mono\", \"Consolas\", \"Ubuntu Mono\", \"Courier New\", \"andale mono\", \"lucida console\", monospace, \"regular\": -apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, \"Noto Sans\", Ubuntu, Cantarell, \"Helvetica Neue\", sans-serif, \"Apple Color Emoji\", \"Segoe UI Emoji\", \"Segoe UI Symbol\", \"Noto Color Emoji\")"
|
|
1452
|
+
"compiledValue": "(\"monospace\": (\"Menlo\", \"DejaVu Sans Mono\", \"Liberation Mono\", \"Consolas\", \"Ubuntu Mono\", \"Courier New\", \"andale mono\", \"lucida console\", monospace), \"regular\": (-apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, \"Noto Sans\", Ubuntu, Cantarell, \"Helvetica Neue\", sans-serif, \"Apple Color Emoji\", \"Segoe UI Emoji\", \"Segoe UI Symbol\", \"Noto Color Emoji\"))"
|
|
1458
1453
|
},
|
|
1459
1454
|
{
|
|
1460
1455
|
"name": "$border-color",
|
|
@@ -1549,17 +1544,17 @@
|
|
|
1549
1544
|
{
|
|
1550
1545
|
"name": "$focus-ring",
|
|
1551
1546
|
"value": "0 0 0 $outline-offset $white, 0 0 0 #{$outline-offset + $outline-width} $blue-400",
|
|
1552
|
-
"compiledValue": "
|
|
1547
|
+
"compiledValue": ""
|
|
1553
1548
|
},
|
|
1554
1549
|
{
|
|
1555
1550
|
"name": "$focus-ring-inset",
|
|
1556
1551
|
"value": "inset 0 0 0 #{$outline-width + $outline-offset} $white, inset 0 0 0 $outline-offset $white",
|
|
1557
|
-
"compiledValue": "
|
|
1552
|
+
"compiledValue": ""
|
|
1558
1553
|
},
|
|
1559
1554
|
{
|
|
1560
1555
|
"name": "$focus-ring-dark",
|
|
1561
1556
|
"value": "0 0 0 $outline-offset rgba($black, 0.6), 0 0 0 #{$outline-offset + $outline-width} $blue-300",
|
|
1562
|
-
"compiledValue": "
|
|
1557
|
+
"compiledValue": ""
|
|
1563
1558
|
},
|
|
1564
1559
|
{
|
|
1565
1560
|
"name": "$focus-ring-outline",
|
|
@@ -1596,7 +1591,7 @@
|
|
|
1596
1591
|
"compiledValue": "image"
|
|
1597
1592
|
}
|
|
1598
1593
|
],
|
|
1599
|
-
"compiledValue": "
|
|
1594
|
+
"compiledValue": ""
|
|
1600
1595
|
},
|
|
1601
1596
|
{
|
|
1602
1597
|
"name": "$gl-icon-chevron-right",
|
|
@@ -1608,7 +1603,7 @@
|
|
|
1608
1603
|
"compiledValue": "image"
|
|
1609
1604
|
}
|
|
1610
1605
|
],
|
|
1611
|
-
"compiledValue": "
|
|
1606
|
+
"compiledValue": ""
|
|
1612
1607
|
},
|
|
1613
1608
|
{
|
|
1614
1609
|
"name": "$gl-icon-chevron-down",
|
|
@@ -1620,7 +1615,7 @@
|
|
|
1620
1615
|
"compiledValue": "image"
|
|
1621
1616
|
}
|
|
1622
1617
|
],
|
|
1623
|
-
"compiledValue": "
|
|
1618
|
+
"compiledValue": ""
|
|
1624
1619
|
},
|
|
1625
1620
|
{
|
|
1626
1621
|
"name": "$gl-icon-select-chevron-down",
|
|
@@ -1632,7 +1627,7 @@
|
|
|
1632
1627
|
"compiledValue": "image"
|
|
1633
1628
|
}
|
|
1634
1629
|
],
|
|
1635
|
-
"compiledValue": "
|
|
1630
|
+
"compiledValue": ""
|
|
1636
1631
|
},
|
|
1637
1632
|
{
|
|
1638
1633
|
"name": "$default-icon-size",
|
|
@@ -1747,12 +1742,12 @@
|
|
|
1747
1742
|
{
|
|
1748
1743
|
"name": "$font-family-sans-serif",
|
|
1749
1744
|
"value": "$gl-regular-font",
|
|
1750
|
-
"compiledValue": "-apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Noto Sans, Ubuntu, Cantarell, Helvetica Neue, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji"
|
|
1745
|
+
"compiledValue": "-apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, \"Noto Sans\", Ubuntu, Cantarell, \"Helvetica Neue\", sans-serif, \"Apple Color Emoji\", \"Segoe UI Emoji\", \"Segoe UI Symbol\", Noto Color Emoji"
|
|
1751
1746
|
},
|
|
1752
1747
|
{
|
|
1753
1748
|
"name": "$font-family-monospace",
|
|
1754
1749
|
"value": "$gl-monospace-font",
|
|
1755
|
-
"compiledValue": "Menlo, DejaVu Sans Mono, Liberation Mono, Consolas, Ubuntu Mono, Courier New, andale mono, lucida console, monospace"
|
|
1750
|
+
"compiledValue": "\"Menlo\", \"DejaVu Sans Mono\", \"Liberation Mono\", \"Consolas\", \"Ubuntu Mono\", \"Courier New\", \"andale mono\", \"lucida console\", monospace"
|
|
1756
1751
|
},
|
|
1757
1752
|
{
|
|
1758
1753
|
"name": "$h1-font-size",
|
|
@@ -1792,6 +1787,53 @@
|
|
|
1792
1787
|
{
|
|
1793
1788
|
"name": "$spacers",
|
|
1794
1789
|
"value": "( 1: $gl-spacing-scale-2, 2: $gl-spacing-scale-3, 3: $gl-spacing-scale-5, 4: $gl-spacing-scale-6, 5: $gl-spacing-scale-7, 6: $gl-spacing-scale-8, 7: $gl-spacing-scale-9, 8: $gl-spacing-scale-10, 9: $gl-spacing-scale-11, )",
|
|
1790
|
+
"mapValue": [
|
|
1791
|
+
{
|
|
1792
|
+
"name": "1",
|
|
1793
|
+
"value": "$gl-spacing-scale-2",
|
|
1794
|
+
"compiledValue": "0.25rem"
|
|
1795
|
+
},
|
|
1796
|
+
{
|
|
1797
|
+
"name": "2",
|
|
1798
|
+
"value": "$gl-spacing-scale-3",
|
|
1799
|
+
"compiledValue": "0.5rem"
|
|
1800
|
+
},
|
|
1801
|
+
{
|
|
1802
|
+
"name": "3",
|
|
1803
|
+
"value": "$gl-spacing-scale-5",
|
|
1804
|
+
"compiledValue": "1rem"
|
|
1805
|
+
},
|
|
1806
|
+
{
|
|
1807
|
+
"name": "4",
|
|
1808
|
+
"value": "$gl-spacing-scale-6",
|
|
1809
|
+
"compiledValue": "1.5rem"
|
|
1810
|
+
},
|
|
1811
|
+
{
|
|
1812
|
+
"name": "5",
|
|
1813
|
+
"value": "$gl-spacing-scale-7",
|
|
1814
|
+
"compiledValue": "2rem"
|
|
1815
|
+
},
|
|
1816
|
+
{
|
|
1817
|
+
"name": "6",
|
|
1818
|
+
"value": "$gl-spacing-scale-8",
|
|
1819
|
+
"compiledValue": "2.5rem"
|
|
1820
|
+
},
|
|
1821
|
+
{
|
|
1822
|
+
"name": "7",
|
|
1823
|
+
"value": "$gl-spacing-scale-9",
|
|
1824
|
+
"compiledValue": "3rem"
|
|
1825
|
+
},
|
|
1826
|
+
{
|
|
1827
|
+
"name": "8",
|
|
1828
|
+
"value": "$gl-spacing-scale-10",
|
|
1829
|
+
"compiledValue": "3.5rem"
|
|
1830
|
+
},
|
|
1831
|
+
{
|
|
1832
|
+
"name": "9",
|
|
1833
|
+
"value": "$gl-spacing-scale-11",
|
|
1834
|
+
"compiledValue": "4rem"
|
|
1835
|
+
}
|
|
1836
|
+
],
|
|
1795
1837
|
"compiledValue": "(1: 0.25rem, 2: 0.5rem, 3: 1rem, 4: 1.5rem, 5: 2rem, 6: 2.5rem, 7: 3rem, 8: 3.5rem, 9: 4rem)"
|
|
1796
1838
|
},
|
|
1797
1839
|
{
|
|
@@ -54,15 +54,15 @@ describe('GlAccordionItem', () => {
|
|
|
54
54
|
it('renders the appropriate header element', () => {
|
|
55
55
|
createComponent({}, { defaultHeaderLevel: 3 });
|
|
56
56
|
|
|
57
|
-
expect(wrapper.find('h3.gl-accordion-item-header').exists()).
|
|
58
|
-
expect(wrapper.find('h4.gl-accordion-item-header').exists()).
|
|
57
|
+
expect(wrapper.find('h3.gl-accordion-item-header').exists()).toBe(true);
|
|
58
|
+
expect(wrapper.find('h4.gl-accordion-item-header').exists()).toBe(false);
|
|
59
59
|
});
|
|
60
60
|
|
|
61
61
|
it('renders the appropriate header element when overridden', () => {
|
|
62
62
|
createComponent({ headerLevel: 4 }, { defaultHeaderLevel: 3 });
|
|
63
63
|
|
|
64
|
-
expect(wrapper.find('h3.gl-accordion-item-header').exists()).
|
|
65
|
-
expect(wrapper.find('h4.gl-accordion-item-header').exists()).
|
|
64
|
+
expect(wrapper.find('h3.gl-accordion-item-header').exists()).toBe(false);
|
|
65
|
+
expect(wrapper.find('h4.gl-accordion-item-header').exists()).toBe(true);
|
|
66
66
|
});
|
|
67
67
|
|
|
68
68
|
it.each(['custom-header-class', ['custom-header-class'], { 'custom-header-class': true }])(
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
}
|
|
11
11
|
@include expect {
|
|
12
12
|
// prettier-ignore
|
|
13
|
-
font-size: clamp(2rem, calc(#{-0.
|
|
13
|
+
font-size: clamp(2rem, #{calc(#{-0.6666666667rem} + #{5.5555555556vw})}, 3.5rem);
|
|
14
14
|
}
|
|
15
15
|
}
|
|
16
16
|
}
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
}
|
|
25
25
|
@include expect {
|
|
26
26
|
// prettier-ignore
|
|
27
|
-
line-height: clamp(2rem, calc(#{-0.
|
|
27
|
+
line-height: clamp(2rem, #{calc(#{-0.6666666667rem} + #{5.5555555556vw})}, 3.5rem);
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
30
|
}
|
|
@@ -1,3 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @jest-environment node
|
|
3
|
+
*
|
|
4
|
+
* sassTrue.runSass cannot find the file when testEnvironment is set to `test`
|
|
5
|
+
* only with dart-sass.
|
|
6
|
+
* See https://github.com/oddbird/true/issues/156
|
|
7
|
+
*/
|
|
8
|
+
|
|
1
9
|
const fs = require('fs');
|
|
2
10
|
const path = require('path');
|
|
3
11
|
const sassTrue = require('sass-true');
|
package/src/scss/utilities.scss
CHANGED
|
@@ -3136,6 +3136,18 @@
|
|
|
3136
3136
|
}
|
|
3137
3137
|
}
|
|
3138
3138
|
|
|
3139
|
+
.gl-sm-align-items-flex-start {
|
|
3140
|
+
@include gl-media-breakpoint-up(sm) {
|
|
3141
|
+
align-items: flex-start;
|
|
3142
|
+
}
|
|
3143
|
+
}
|
|
3144
|
+
|
|
3145
|
+
.gl-sm-align-items-flex-start\! {
|
|
3146
|
+
@include gl-media-breakpoint-up(sm) {
|
|
3147
|
+
align-items: flex-start !important;
|
|
3148
|
+
}
|
|
3149
|
+
}
|
|
3150
|
+
|
|
3139
3151
|
.gl-sm-align-items-flex-end {
|
|
3140
3152
|
@include gl-media-breakpoint-up(sm) {
|
|
3141
3153
|
align-items: flex-end;
|
|
@@ -45,6 +45,12 @@
|
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
47
|
|
|
48
|
+
@mixin gl-sm-align-items-flex-start {
|
|
49
|
+
@include gl-media-breakpoint-up(sm) {
|
|
50
|
+
@include gl-align-items-flex-start;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
|
|
48
54
|
@mixin gl-sm-align-items-flex-end {
|
|
49
55
|
@include gl-media-breakpoint-up(sm) {
|
|
50
56
|
@include gl-align-items-flex-end;
|
package/src/scss/variables.scss
CHANGED
|
@@ -149,10 +149,6 @@ $gray-800: #404040 !default;
|
|
|
149
149
|
$gray-900: #303030 !default;
|
|
150
150
|
$gray-950: #1f1f1f !default;
|
|
151
151
|
|
|
152
|
-
// GitLab themes
|
|
153
|
-
|
|
154
|
-
$gl-themes: 'indigo', 'blue', 'light-blue', 'green', 'red', 'light-red';
|
|
155
|
-
|
|
156
152
|
// The indigo light and indigo dark use $theme-indigo variables.
|
|
157
153
|
$theme-indigo-50: #f1f1ff !default;
|
|
158
154
|
$theme-indigo-100: #dbdbf8 !default;
|
package/src/utils/constants.js
CHANGED
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
glThemes as glThemesVariable,
|
|
3
|
-
glIconSizes as glIconSizesVariable,
|
|
4
|
-
} from '../../scss_to_js/scss_variables'; // eslint-disable-line import/no-unresolved
|
|
1
|
+
import { glIconSizes as glIconSizesVariable } from '../../scss_to_js/scss_variables'; // eslint-disable-line import/no-unresolved
|
|
5
2
|
|
|
6
3
|
import { POSITION } from '../components/utilities/truncate/constants';
|
|
7
4
|
|
|
@@ -11,7 +8,7 @@ function appendDefaultOption(options) {
|
|
|
11
8
|
|
|
12
9
|
export const COMMA = ',';
|
|
13
10
|
|
|
14
|
-
export const glThemes =
|
|
11
|
+
export const glThemes = ['indigo', 'blue', 'light-blue', 'green', 'red', 'light-red'];
|
|
15
12
|
|
|
16
13
|
export const variantOptions = {
|
|
17
14
|
primary: 'primary',
|