@primer/css 0.0.0-2021897830 → 0.0.0-20219128133

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 (138) hide show
  1. package/CHANGELOG.md +80 -12
  2. package/CONTRIBUTING.md +1 -1
  3. package/breadcrumb/breadcrumb.scss +5 -2
  4. package/buttons/button.scss +5 -5
  5. package/buttons/misc.scss +4 -3
  6. package/color-modes/index.scss +2 -0
  7. package/color-modes/themes/dark_colorblind.scss +7 -0
  8. package/color-modes/themes/light_colorblind.scss +7 -0
  9. package/deprecations.js +17 -742
  10. package/deprecations.json +539 -0
  11. package/dist/alerts.css +1 -2
  12. package/dist/alerts.css.map +1 -1
  13. package/dist/autocomplete.css +1 -2
  14. package/dist/autocomplete.css.map +1 -1
  15. package/dist/avatars.css +1 -2
  16. package/dist/avatars.css.map +1 -1
  17. package/dist/base.css +1 -2
  18. package/dist/base.css.map +1 -1
  19. package/dist/blankslate.css +0 -1
  20. package/dist/blankslate.css.map +1 -1
  21. package/dist/box.css +1 -2
  22. package/dist/box.css.map +1 -1
  23. package/dist/branch-name.css +0 -1
  24. package/dist/branch-name.css.map +1 -1
  25. package/dist/breadcrumb.css +1 -2
  26. package/dist/breadcrumb.css.map +1 -1
  27. package/dist/buttons.css +1 -2
  28. package/dist/buttons.css.map +1 -1
  29. package/dist/color-modes.css +1 -2
  30. package/dist/color-modes.css.map +1 -1
  31. package/dist/core.css +1 -2
  32. package/dist/core.css.map +1 -1
  33. package/dist/deprecations.json +534 -3112
  34. package/dist/dropdown.css +1 -2
  35. package/dist/dropdown.css.map +1 -1
  36. package/dist/forms.css +1 -2
  37. package/dist/forms.css.map +1 -1
  38. package/dist/header.css +1 -2
  39. package/dist/header.css.map +1 -1
  40. package/dist/labels.css +1 -2
  41. package/dist/labels.css.map +1 -1
  42. package/dist/layout.css +1 -2
  43. package/dist/layout.css.map +1 -1
  44. package/dist/links.css +1 -2
  45. package/dist/links.css.map +1 -1
  46. package/dist/loaders.css +0 -1
  47. package/dist/loaders.css.map +1 -1
  48. package/dist/markdown.css +1 -2
  49. package/dist/markdown.css.map +1 -1
  50. package/dist/marketing-buttons.css +1 -2
  51. package/dist/marketing-buttons.css.map +1 -1
  52. package/dist/marketing-support.css +1 -1
  53. package/dist/marketing-type.css +1 -2
  54. package/dist/marketing-type.css.map +1 -1
  55. package/dist/marketing-utilities.css +1 -2
  56. package/dist/marketing-utilities.css.map +1 -1
  57. package/dist/marketing.css +1 -2
  58. package/dist/marketing.css.map +1 -1
  59. package/dist/meta.json +330 -330
  60. package/dist/navigation.css +1 -2
  61. package/dist/navigation.css.map +1 -1
  62. package/dist/pagination.css +1 -2
  63. package/dist/pagination.css.map +1 -1
  64. package/dist/popover.css +1 -2
  65. package/dist/popover.css.map +1 -1
  66. package/dist/primer.css +4 -5
  67. package/dist/primer.css.map +1 -1
  68. package/dist/product.css +1 -2
  69. package/dist/product.css.map +1 -1
  70. package/dist/progress.css +0 -1
  71. package/dist/progress.css.map +1 -1
  72. package/dist/select-menu.css +1 -2
  73. package/dist/select-menu.css.map +1 -1
  74. package/dist/stats/alerts.json +1 -1
  75. package/dist/stats/autocomplete.json +1 -1
  76. package/dist/stats/avatars.json +1 -1
  77. package/dist/stats/base.json +1 -1
  78. package/dist/stats/box.json +1 -1
  79. package/dist/stats/breadcrumb.json +1 -1
  80. package/dist/stats/buttons.json +1 -1
  81. package/dist/stats/color-modes.json +1 -1
  82. package/dist/stats/core.json +1 -1
  83. package/dist/stats/dropdown.json +1 -1
  84. package/dist/stats/forms.json +1 -1
  85. package/dist/stats/header.json +1 -1
  86. package/dist/stats/labels.json +1 -1
  87. package/dist/stats/layout.json +1 -1
  88. package/dist/stats/links.json +1 -1
  89. package/dist/stats/markdown.json +1 -1
  90. package/dist/stats/marketing-buttons.json +1 -1
  91. package/dist/stats/marketing-type.json +1 -1
  92. package/dist/stats/marketing-utilities.json +1 -1
  93. package/dist/stats/marketing.json +1 -1
  94. package/dist/stats/navigation.json +1 -1
  95. package/dist/stats/pagination.json +1 -1
  96. package/dist/stats/popover.json +1 -1
  97. package/dist/stats/primer.json +1 -1
  98. package/dist/stats/product.json +1 -1
  99. package/dist/stats/select-menu.json +1 -1
  100. package/dist/stats/timeline.json +1 -1
  101. package/dist/stats/toasts.json +1 -1
  102. package/dist/stats/tooltips.json +1 -1
  103. package/dist/stats/utilities.json +1 -1
  104. package/dist/subhead.css +0 -1
  105. package/dist/subhead.css.map +1 -1
  106. package/dist/support.css +1 -1
  107. package/dist/table-object.css +0 -1
  108. package/dist/table-object.css.map +1 -1
  109. package/dist/timeline.css +1 -2
  110. package/dist/timeline.css.map +1 -1
  111. package/dist/toasts.css +1 -2
  112. package/dist/toasts.css.map +1 -1
  113. package/dist/tooltips.css +1 -2
  114. package/dist/tooltips.css.map +1 -1
  115. package/dist/truncate.css +0 -1
  116. package/dist/truncate.css.map +1 -1
  117. package/dist/utilities.css +1 -2
  118. package/dist/utilities.css.map +1 -1
  119. package/dist/variables.json +10 -10
  120. package/markdown/footnotes.scss +37 -0
  121. package/markdown/index.scss +1 -0
  122. package/markdown/markdown-body.scss +8 -2
  123. package/marketing/type/typography.scss +1 -1
  124. package/package.json +15 -15
  125. package/pagination/pagination.scss +1 -1
  126. package/postcss.config.cjs +13 -7
  127. package/select-menu/select-menu.scss +1 -1
  128. package/stylelint.config.cjs +2 -5
  129. package/support/mixins/misc.scss +1 -1
  130. package/support/variables/misc.scss +1 -1
  131. package/support/variables/typography.scss +1 -22
  132. package/utilities/box-shadow.scss +25 -0
  133. package/utilities/colors.scss +33 -37
  134. package/utilities/details.scss +1 -1
  135. package/utilities/index.scss +1 -0
  136. package/utilities/margin.scss +3 -0
  137. package/dist/marketing-support.css.map +0 -1
  138. package/dist/support.css.map +0 -1
package/CHANGELOG.md CHANGED
@@ -1,18 +1,88 @@
1
1
  # @primer/css
2
2
 
3
- ## 0.0.0-2021897830
3
+ ## 0.0.0-20219128133
4
+
5
+ ### Patch Changes
6
+
7
+ - Fake entry to force publishing
8
+
9
+ ## 18.0.1
10
+
11
+ ### Patch Changes
12
+
13
+ - [#1663](https://github.com/primer/css/pull/1663) [`87b0b1d4`](https://github.com/primer/css/commit/87b0b1d4c91959c284bd53a2009a182dc9ef9b6e) Thanks [@jonrohan](https://github.com/jonrohan)! - Removing the duplicate deprecation backgrounds
14
+
15
+ ## 18.0.0
4
16
 
5
17
  ### Major Changes
6
18
 
7
- - [#1541](https://github.com/primer/css/pull/1541) [`d24d3822`](https://github.com/primer/css/commit/d24d3822aee5c9b855d0b62ff960a87545221868) Thanks [@jonrohan](https://github.com/jonrohan)! - Removing the rem() mixin and usages. Placing the computed values in place.
19
+ - [#1599](https://github.com/primer/css/pull/1599) [`13de16c7`](https://github.com/primer/css/commit/13de16c7d6787d221216d8ff21afccf6f73f4221) Thanks [@jonrohan](https://github.com/jonrohan)! - Removing the rem() mixin and usages. Placing the computed values in place.
20
+
21
+ * [#1615](https://github.com/primer/css/pull/1615) [`612841f1`](https://github.com/primer/css/commit/612841f1bdd695aad2368a9f6817e6e0ee2c7a17) Thanks [@simurai](https://github.com/simurai)! - Update v1 deprecations
22
+
23
+ - [#1599](https://github.com/primer/css/pull/1599) [`13de16c7`](https://github.com/primer/css/commit/13de16c7d6787d221216d8ff21afccf6f73f4221) Thanks [@jonrohan](https://github.com/jonrohan)! - Rename `modes.scss` file to `color-modes.scss` and move from the `base/` folder to the `support/variables` folder.
24
+
25
+ * [#1599](https://github.com/primer/css/pull/1599) [`13de16c7`](https://github.com/primer/css/commit/13de16c7d6787d221216d8ff21afccf6f73f4221) Thanks [@jonrohan](https://github.com/jonrohan)! - Moving color modes to their own bundle, `./color-modes/` and separates color mode themes into their own scss file.
8
26
 
9
- * [#1462](https://github.com/primer/css/pull/1462) [`32040ff9`](https://github.com/primer/css/commit/32040ff9ca7df9cd6f9cca8124fb95bde0fa4834) Thanks [@jonrohan](https://github.com/jonrohan)! - Rename `modes.scss` file to `color-modes.scss` and move from the `base/` folder to the `support/variables` folder.
27
+ - [#1602](https://github.com/primer/css/pull/1602) [`852da9d5`](https://github.com/primer/css/commit/852da9d5e34a0ac622f089f34d314913282bda67) Thanks [@simurai](https://github.com/simurai)! - Remove V1 color utilities
10
28
 
11
- - [#1465](https://github.com/primer/css/pull/1465) [`53685d83`](https://github.com/primer/css/commit/53685d8321bfa5eb07d2feacd51ad27239cbcaba) Thanks [@jonrohan](https://github.com/jonrohan)! - Moving color modes to their own bundle, `./color-modes/` and separates color mode themes into their own scss file.
29
+ * [#1617](https://github.com/primer/css/pull/1617) [`e47324fa`](https://github.com/primer/css/commit/e47324faa436e892b8621a6dac1fcb2cbad3cdf1) Thanks [@jonrohan](https://github.com/jonrohan)! - Removing `<kbd>` import from markdown package. Going forward you'll need to include `@primer/css/base/kbd.scss` directly.
12
30
 
13
- * [#1574](https://github.com/primer/css/pull/1574) [`df19567d`](https://github.com/primer/css/commit/df19567dc6debc8aab0588756f95de3aaaa30962) Thanks [@simurai](https://github.com/simurai)! - V2 color utilities
31
+ - [#1630](https://github.com/primer/css/pull/1630) [`5f7bb45c`](https://github.com/primer/css/commit/5f7bb45c2172393b2f014442067d95b3145c7136) Thanks [@simurai](https://github.com/simurai)! - Update utilities
14
32
 
15
- - [#1566](https://github.com/primer/css/pull/1566) [`816a5d50`](https://github.com/primer/css/commit/816a5d5083dcd590f4bbac12e052815c0d1a9755) Thanks [@jonrohan](https://github.com/jonrohan)! - Remove break-word from utilities
33
+ * [#1599](https://github.com/primer/css/pull/1599) [`13de16c7`](https://github.com/primer/css/commit/13de16c7d6787d221216d8ff21afccf6f73f4221) Thanks [@jonrohan](https://github.com/jonrohan)! - Remove break-word from utilities
34
+
35
+ ### Minor Changes
36
+
37
+ - [#1601](https://github.com/primer/css/pull/1601) [`410c1d63`](https://github.com/primer/css/commit/410c1d638b7bec92798268dcf815f94b1dca7cff) Thanks [@jonrohan](https://github.com/jonrohan)! - Add light & dark colorblind themes
38
+
39
+ * [#1626](https://github.com/primer/css/pull/1626) [`4d00d51d`](https://github.com/primer/css/commit/4d00d51d00fd2c1d3efdd50b36e261c5cc15cb10) Thanks [@jonrohan](https://github.com/jonrohan)! - Changing to @primer/stylelint-config and upgrading @primer/primitives to 5.0 rc
40
+
41
+ - [#1616](https://github.com/primer/css/pull/1616) [`afac04bc`](https://github.com/primer/css/commit/afac04bcdf9c59e2768548069c8d6f7fd6f1e58c) Thanks [@talum](https://github.com/talum)! - Adding footnote styles to markdown-body.
42
+
43
+ * [#1617](https://github.com/primer/css/pull/1617) [`e47324fa`](https://github.com/primer/css/commit/e47324faa436e892b8621a6dac1fcb2cbad3cdf1) Thanks [@jonrohan](https://github.com/jonrohan)! - Convert postcss build tool, from node-sass to dart-sass.
44
+
45
+ - [#1603](https://github.com/primer/css/pull/1603) [`21c5ebc0`](https://github.com/primer/css/commit/21c5ebc01be58454735eb671e3adace0228ef548) Thanks [@simurai](https://github.com/simurai)! - Update docs with V2 colors
46
+
47
+ ### Patch Changes
48
+
49
+ - [#1628](https://github.com/primer/css/pull/1628) [`ce197c9f`](https://github.com/primer/css/commit/ce197c9ff18cedd842893186953b68805eed637d) Thanks [@edokoa](https://github.com/edokoa)! - Update flash alert icons
50
+
51
+ * [#1629](https://github.com/primer/css/pull/1629) [`54d3068b`](https://github.com/primer/css/commit/54d3068bd628f771aacae6b1ce269a5a2cc2d8a1) Thanks [@jdanyow](https://github.com/jdanyow)! - remove remaining color-border-primary refs
52
+
53
+ - [#1631](https://github.com/primer/css/pull/1631) [`5f3689b9`](https://github.com/primer/css/commit/5f3689b907163f7be9e78abb9fc762978beda06d) Thanks [@jonrohan](https://github.com/jonrohan)! - Updating @primer/stylelint-config and @primer/primitives to 5.0
54
+
55
+ * [#1659](https://github.com/primer/css/pull/1659) [`d32e42f9`](https://github.com/primer/css/commit/d32e42f9ca0ca4eef546d190171cd9e5b4ec8f3d) Thanks [@jonrohan](https://github.com/jonrohan)! - Rename protanopia themes to colorblind.
56
+
57
+ - [#1658](https://github.com/primer/css/pull/1658) [`0ed0307b`](https://github.com/primer/css/commit/0ed0307b7b79ae59a898c3e8b5e1c9bd2dcd4a7d) Thanks [@koddsson](https://github.com/koddsson)! - Increase the z-index value for the details dialog overlay.
58
+
59
+ * [#1661](https://github.com/primer/css/pull/1661) [`ebb573ff`](https://github.com/primer/css/commit/ebb573ff09a5ea4eef01e0ccbb7213defaa95321) Thanks [@simurai](https://github.com/simurai)! - Update bg deprecations
60
+
61
+ ## 17.11.0
62
+
63
+ ### Minor Changes
64
+
65
+ - [#1580](https://github.com/primer/css/pull/1580) [`4a1f09a7`](https://github.com/primer/css/commit/4a1f09a75e7666b46e68e96e6f485d9ff467fd01) Thanks [@simurai](https://github.com/simurai)! - Add V2 utilities
66
+
67
+ * [#1595](https://github.com/primer/css/pull/1595) [`5fb831cf`](https://github.com/primer/css/commit/5fb831cf5062baa4ffde4322a0035c144db1e70c) Thanks [@jonrohan](https://github.com/jonrohan)! - Adding directional margin classes to the margin utilities.
68
+
69
+ Adding: `ml-auto, mb-auto, mr-auto`
70
+
71
+ ### Patch Changes
72
+
73
+ - [#1594](https://github.com/primer/css/pull/1594) [`2cf661c4`](https://github.com/primer/css/commit/2cf661c4d95285d09d0f26ea6109d5aa9bbed552) Thanks [@jonrohan](https://github.com/jonrohan)! - Loosening the primer/primitives dependency to any minor.patch version
74
+
75
+ ## 17.10.0
76
+
77
+ ### Minor Changes
78
+
79
+ - [#1592](https://github.com/primer/css/pull/1592) [`39c9c928`](https://github.com/primer/css/commit/39c9c92874eb32b346256cbcc713b87767b319ef) Thanks [@simurai](https://github.com/simurai)! - Revert font stack changes
80
+
81
+ ### Patch Changes
82
+
83
+ - [#1590](https://github.com/primer/css/pull/1590) [`e3c8f90e`](https://github.com/primer/css/commit/e3c8f90e7f61e76d20650061da2dd93111814a8a) Thanks [@joelhawksley](https://github.com/joelhawksley)! - Update Breadcrumbs markup to match w3 aria example.
84
+
85
+ ## 17.9.0
16
86
 
17
87
  ### Minor Changes
18
88
 
@@ -26,11 +96,9 @@
26
96
  - This should have the effect that the browser will use `Meiryo` instead of `Yu Gothic UI` and should improve font rendering, especially for Japanese.
27
97
  - Note: In an earlier version, `Yu Gothic` was used. But with great [feedback](https://twitter.com/448jp/status/1435087523185758212) from @448jp and @hiloki https://github.com/primer/css/pull/1573#issuecomment-913973890 it seems `Meiryo` is the better default.
28
98
 
29
- - [#1579](https://github.com/primer/css/pull/1579) [`c3b4a0c3`](https://github.com/primer/css/commit/c3b4a0c36302af7bb06ca996f37a63470ab99c62) Thanks [@jonrohan](https://github.com/jonrohan)! - Removing v2 color mode css var fallbacks. `var(--color-v2, var(--color-v1))` becomes `var(--color-v2)`
99
+ - [#1581](https://github.com/primer/css/pull/1581) [`be518b80`](https://github.com/primer/css/commit/be518b8023b56802b1fc67ccc8a5b8398d1b279c) Thanks [@jonrohan](https://github.com/jonrohan)! - Updating deprecations.js file to be more straightforward
30
100
 
31
- ### Patch Changes
32
-
33
- - Fake entry to force publishing
101
+ * [#1579](https://github.com/primer/css/pull/1579) [`c3b4a0c3`](https://github.com/primer/css/commit/c3b4a0c36302af7bb06ca996f37a63470ab99c62) Thanks [@jonrohan](https://github.com/jonrohan)! - Removing v2 color mode css var fallbacks. `var(--color-v2, var(--color-v1))` becomes `var(--color-v2)`
34
102
 
35
103
  ## 17.8.0
36
104
 
@@ -1517,7 +1585,7 @@
1517
1585
 
1518
1586
  - Storybook. We've added a storybook prototyping environment for testing components in seclusion. To start the server run `npm start`
1519
1587
  - Adding yeoman generator for creating a primer module. `generator-primer-module`
1520
- - Importing `stylelint-config-primer` from https://github.com/primer/stylelint-config-primer/ into monorepo.
1588
+ - Importing `stylelint-config-primer` from https://github.com/primer/stylelint-config/ into monorepo.
1521
1589
  - Importing `stylelint-selector-no-utility` from https://github.com/primer/stylelint-selector-no-utility into monorepo.
1522
1590
 
1523
1591
  ### Changes
@@ -1607,7 +1675,7 @@ This release updates primer modules to use variables for spacing units instead o
1607
1675
 
1608
1676
  # 9.1.0
1609
1677
 
1610
- This release updates our [stylelint config](/primer/stylelint-config-primer) to [v2.0.0](https://github.com/primer/stylelint-config-primer/releases/tag/v2.0.0), and to stylelint v7.13.0. Each module also now has a `lint` npm script, and there are top-level `test` and `lint` scripts that you can use to lint and test all modules in one go.
1678
+ This release updates our [stylelint config](/primer/stylelint-config-primer) to [v2.0.0](https://github.com/primer/stylelint-config/releases/tag/v2.0.0), and to stylelint v7.13.0. Each module also now has a `lint` npm script, and there are top-level `test` and `lint` scripts that you can use to lint and test all modules in one go.
1611
1679
 
1612
1680
  This release also includes major improvements to our Travis build scripts to automatically publish PR builds, release candidates, and the "final" versions to npm.
1613
1681
 
package/CONTRIBUTING.md CHANGED
@@ -58,7 +58,7 @@ Anyone can open a pull request on Primer CSS. You do not need to work at GitHub
58
58
  2. Configure and install the dependencies: `npm install`
59
59
  3. Create a new branch from main `git checkout -b my-branch-name`
60
60
  4. Make your changes and commit them.
61
- 5. Push your branch and open a pull request. Add a comment describing your proposed changes and request a review from `@primer/ds-core`.
61
+ 5. Push your branch and open a pull request. Add a comment describing your proposed changes and request a review from `@primer/css-reviewers`.
62
62
  6. Wait for CI tests to finish.
63
63
  - If the tests pass, you should see a status check telling you which alpha version of `@primer/css` you can install with npm to test your work in other projects.
64
64
  - If the tests fail, review the logs and address any issues.
@@ -22,9 +22,12 @@
22
22
 
23
23
  .breadcrumb-item-selected,
24
24
  .breadcrumb-item[aria-current]:not([aria-current=false]) {
25
- color: var(--color-fg-default);
26
-
27
25
  &::after {
28
26
  content: none;
29
27
  }
30
28
  }
29
+
30
+ // stylelint-disable selector-max-type
31
+ .breadcrumb-item-selected a {
32
+ color: var(--color-fg-default);
33
+ }
@@ -26,10 +26,6 @@
26
26
  &.disabled,
27
27
  &[aria-disabled=true] {
28
28
  cursor: default;
29
-
30
- .octicon {
31
- color: var(--color-fg-muted);
32
- }
33
29
  }
34
30
 
35
31
  i {
@@ -96,9 +92,13 @@
96
92
  &:disabled,
97
93
  &.disabled,
98
94
  &[aria-disabled=true] {
99
- color: var(--color-fg-muted);
95
+ color: var(--color-primer-fg-disabled);
100
96
  background-color: var(--color-btn-bg);
101
97
  border-color: var(--color-btn-border);
98
+
99
+ .octicon {
100
+ color: var(--color-primer-fg-disabled);
101
+ }
102
102
  }
103
103
 
104
104
  // Keep :focus after :disabled. Allows to see the focus ring even on disabled buttons
package/buttons/misc.scss CHANGED
@@ -24,7 +24,7 @@
24
24
  &[aria-disabled=true] {
25
25
  &,
26
26
  &:hover {
27
- color: var(--color-fg-muted);
27
+ color: var(--color-primer-fg-disabled);
28
28
  cursor: default;
29
29
  }
30
30
  }
@@ -63,6 +63,7 @@
63
63
  &:disabled,
64
64
  &.disabled,
65
65
  &[aria-disabled=true] {
66
+ color: var(--color-primer-fg-disabled);
66
67
  background-color: transparent;
67
68
  }
68
69
  }
@@ -89,10 +90,10 @@
89
90
 
90
91
  &.disabled,
91
92
  &[aria-disabled=true] {
92
- color: var(--color-fg-muted);
93
+ color: var(--color-primer-fg-disabled);
93
94
  cursor: default;
94
95
 
95
- &:hover { color: var(--color-fg-muted); }
96
+ &:hover { color: var(--color-primer-fg-disabled); }
96
97
  }
97
98
  }
98
99
 
@@ -1,7 +1,9 @@
1
1
  // All themes
2
2
 
3
3
  @import "./themes/light.scss";
4
+ @import "./themes/light_colorblind.scss";
4
5
  @import "./themes/dark.scss";
5
6
  @import "./themes/dark_dimmed.scss";
6
7
  @import "./themes/dark_high_contrast.scss";
8
+ @import "./themes/dark_colorblind.scss";
7
9
  @import "./native.scss";
@@ -0,0 +1,7 @@
1
+ @import "../../support/index.scss";
2
+
3
+ @import "@primer/primitives/dist/scss/colors/_dark_protanopia.scss";
4
+
5
+ @include color-mode-theme(dark_colorblind) {
6
+ @include primer-colors-dark_protanopia;
7
+ }
@@ -0,0 +1,7 @@
1
+ @import "../../support/index.scss";
2
+
3
+ @import "@primer/primitives/dist/scss/colors/_light_protanopia.scss";
4
+
5
+ @include color-mode-theme(light_colorblind) {
6
+ @include primer-colors-light_protanopia;
7
+ }