Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: ordered list styles in firefox #1047

Merged
merged 2 commits into from
Nov 3, 2020
Merged

fix: ordered list styles in firefox #1047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0831f13
chore: update carbon dep
jnm2377 Nov 2, 2020
e635041
feat: update ordered list styles
jnm2377 Nov 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/gatsby-theme-carbon/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"@reach/router": "^1.2.1",
"@vimeo/player": "^2.9.1",
"beautiful-react-hooks": "^0.23.1",
"carbon-components": "^10.16.0",
"carbon-components-react": "^7.16.0",
"carbon-components": "^10.23.2",
"carbon-components-react": "^7.23.2",
"carbon-icons": "^7.0.7",
"classnames": "^2.2.6",
"copy-to-clipboard": "^3.2.0",
Expand Down
13 changes: 4 additions & 9 deletions packages/gatsby-theme-carbon/src/components/markdown/Markdown.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,13 @@
width: 100%;
}

:global(.bx--list--ordered),
ol {
list-style: decimal;
}

ul :global(.bx--list--ordered),
ul :global(.bx--list--ordered--native),
ul :global(.bx--list--unordered) {
width: 100%;
padding-right: $spacing-05;
}

:global(.bx--list--ordered) .list-item,
:global(.bx--list--ordered--native) .list-item,
:global(.bx--list--unordered) .list-item {
@include carbon--type-style('body-long-02');
padding-right: 0;
Expand All @@ -103,12 +98,12 @@ ul :global(.bx--list--unordered) {
}

// aligns UNnested ordered list item to body copy
:global(.bx--list--ordered:not(.bx--list--nested)) {
:global(.bx--list--ordered--native:not(.bx--list--nested)) {
margin-left: 1ch;
}

// aligns NESTED ordered list item to parent list item text #993
:global(.bx--list--ordered.bx--list--nested) {
:global(.bx--list--ordered--native.bx--list--nested) {
margin-left: 0.5rem;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-theme-carbon/src/components/markdown/Ol.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import cx from 'classnames';
import { list } from './Markdown.module.scss';

const Ol = ({ children, nested, start, className, ...rest }) => {
const classNames = cx(className, list, 'bx--list--ordered', {
const classNames = cx(className, 'bx--list--ordered--native', list, {
'bx--list--nested': nested,
});

Expand Down
27 changes: 17 additions & 10 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1032,13 +1032,20 @@
resolved "https://registry.yarnpkg.com/@carbon/icon-helpers/-/icon-helpers-10.9.0.tgz#5aee08e9d253d3bf6f996bc61f739660c62cbb21"
integrity sha512-JtmCXV7iIc+N5RqQQy+MGT8T+5KcF7+BUKADvHnJKZ8o+ncF5gI4hmrP450dQD76mikI4fqQ0dQflaosesdSPw==

"@carbon/icons-react@^10.10.0", "@carbon/icons-react@^10.19.0":
"@carbon/icons-react@^10.10.0":
version "10.19.0"
resolved "https://registry.yarnpkg.com/@carbon/icons-react/-/icons-react-10.19.0.tgz#f5941db0673a669cdf4cf6602d30f006aa6192eb"
integrity sha512-pbAegbVe5geqmz36W//y99W4DV+WRyBvL/3733AgZ4vPuXKLrK9exOUp7C1O/NPWrxIhOppMc3QZRWuicMU31g==
dependencies:
"@carbon/icon-helpers" "^10.9.0"

"@carbon/icons-react@^10.20.0":
version "10.20.0"
resolved "https://registry.yarnpkg.com/@carbon/icons-react/-/icons-react-10.20.0.tgz#f69938a80bac78eee47ddd1c30e544f180d3e09b"
integrity sha512-xjdfCsbrgyWo5ykjmBYq/JZIfJ0rlhm2Da54gzNZjtHs416JFWYx0CbykEHzFwOulMOS8uba9uDyxtBUd1T3ew==
dependencies:
"@carbon/icon-helpers" "^10.9.0"

"@carbon/icons@^10.19.0":
version "10.19.0"
resolved "https://registry.yarnpkg.com/@carbon/icons/-/icons-10.19.0.tgz#4e7a27726df547a865297bcd3118fefe7c7a8476"
Expand Down Expand Up @@ -5057,12 +5064,12 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001135:
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001147.tgz#84d27e5b691a8da66e16887b34c78dacf3935f00"
integrity sha512-CPyN875geYk46eIqPl5jlmotCr5YZC2KxIVfb4z0FrNfLxPM+MyodWD2irJGDG8vUUE1fmg3De9vt8uaC6Nf6w==

carbon-components-react@^7.16.0:
version "7.21.0"
resolved "https://registry.yarnpkg.com/carbon-components-react/-/carbon-components-react-7.21.0.tgz#91b6e398fa7a87a8cc0b14a9fcc46b0cc5714a63"
integrity sha512-5nvA0yumy+hUF4p7u6ioV7boBsIK70d3EhR8xQS8gOhMzU5x4lO2SpE1w4+B/merhZUmBrfBUxOBN0ZY0/eYWQ==
carbon-components-react@^7.23.2:
version "7.23.2"
resolved "https://registry.yarnpkg.com/carbon-components-react/-/carbon-components-react-7.23.2.tgz#9d88800048e1fda705083a7b062fff5f361eeaa5"
integrity sha512-JKqR9JD55kKNtITWYwtSYdcjg+c5QE6rYBDfdJGdbOCxxHv5KFLTwWJ4jD6rD8h2KM45rPjDaIy+c35GkSluYQ==
dependencies:
"@carbon/icons-react" "^10.19.0"
"@carbon/icons-react" "^10.20.0"
classnames "2.2.6"
downshift "5.2.1"
flatpickr "4.6.1"
Expand All @@ -5077,10 +5084,10 @@ carbon-components-react@^7.16.0:
warning "^3.0.0"
window-or-global "^1.0.1"

carbon-components@^10.16.0:
version "10.21.0"
resolved "https://registry.yarnpkg.com/carbon-components/-/carbon-components-10.21.0.tgz#3e7f79530af79039aab7bf937f0f129642806316"
integrity sha512-IS8WPFGg74g6ZyWpJc4cDlkhqGeNZ1sJshAVTftkb7Nur9W58lSRcu6G9cRMgeL+I/YAia3Q+X4lPh/X16JsGw==
carbon-components@^10.23.2:
version "10.23.2"
resolved "https://registry.yarnpkg.com/carbon-components/-/carbon-components-10.23.2.tgz#bab68d7863cf30229a1db5da5f628e799faaca4a"
integrity sha512-rw/FzEEP4XILoz1S8a90k7xSNJR0Nrp1piSwAIj87OQp116Bui7tudAHq4gXZfgXF6OJaiOSKwnRA6kLBuMBUg==
dependencies:
flatpickr "4.6.1"
lodash.debounce "^4.0.8"
Expand Down