Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into progress-indicator--vertical
- Loading branch information
Showing
10 changed files
with
93 additions
and
83 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,38 @@ | ||
$feature-flags: ( | ||
components-x: true, | ||
ui-shell: true, | ||
css--body: false, // we're providing our own body styles | ||
css--reset: false // prevent thousands of resets being included... | ||
ui-shell: true | ||
); | ||
|
||
$css--body: false; // we're providing our own body styles | ||
$css--reset: false; // prevent thousands of resets being included... | ||
|
||
.experimental { | ||
@import '~carbon-components/scss/globals/scss/styles'; | ||
@import '~carbon-components/scss/globals/scss/css--typography'; | ||
|
||
// carbon body reset and styles | ||
// @include reset; | ||
@include typography; | ||
@include font-family; | ||
// reset | ||
color: $text-01; | ||
background-color: $ui-02; | ||
line-height: 1; | ||
box-sizing: border-box; | ||
margin: 0; | ||
padding: 0; | ||
border: 0; | ||
font-size: 100%; | ||
vertical-align: baseline; | ||
|
||
@include typography; | ||
& > *, | ||
& > *:before, | ||
& > *:after { | ||
box-sizing: inherit; | ||
} | ||
|
||
// padding/margin body reset | ||
padding: 0; | ||
margin: 0; | ||
ul { | ||
list-style: none; | ||
margin: 0; | ||
padding: 0; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,59 +1,37 @@ | ||
$feature-flags: ( | ||
components-x: false, | ||
ui-shell: true, | ||
css--body: false, // we're providing our own body styles | ||
css--reset: false // prevent thousands of resets being included... | ||
ui-shell: true | ||
); | ||
|
||
$css--body: false; // we're providing our own body styles | ||
$css--reset: false; // prevent thousands of resets being included... | ||
|
||
.carbon { | ||
@import '~carbon-components/scss/globals/scss/styles'; | ||
@import '~carbon-components/scss/globals/scss/css--typography'; | ||
|
||
// carbon body reset and styles | ||
// @include reset; | ||
@include typography; | ||
@include font-family; | ||
//reset | ||
color: $text-01; | ||
background-color: $ui-02; | ||
line-height: 1; | ||
|
||
@include typography; | ||
|
||
// padding/margin body reset | ||
padding: 0; | ||
box-sizing: border-box; | ||
margin: 0; | ||
|
||
// for some reason this isn't included when tabs are built. So lets just manually include it here. | ||
.bx--tabs__nav-item + .bx--tabs__nav-item { | ||
margin-left: 3rem; | ||
} | ||
|
||
// for some reason this isn't included when progress indicator is built. So lets just manually include it here. | ||
.bx--progress-step:first-child .bx--progress-line { | ||
display: none; | ||
} | ||
|
||
// for some reason all this isn't included when structured list is built. So lets just manually include it here. | ||
.bx--structured-list--selection .bx--structured-list-row:hover:not(.bx--structured-list-row--header-row) { | ||
background-color: $hover-row; | ||
cursor: pointer; | ||
} | ||
|
||
.bx--structured-list-row:focus:not(.bx--structured-list-row--header-row) { | ||
@include focus-outline('border'); | ||
} | ||
|
||
.bx--structured-list-svg { | ||
display: inline-block; | ||
fill: transparent; | ||
vertical-align: middle; | ||
transition: $transition--base $carbon--standard-easing; | ||
} | ||
|
||
.bx--structured-list-row:hover .bx--structured-list-svg { | ||
fill: $hover-row; | ||
padding: 0; | ||
border: 0; | ||
font-size: 100%; | ||
vertical-align: baseline; | ||
|
||
& > *, | ||
& > *:before, | ||
& > *:after { | ||
box-sizing: inherit; | ||
} | ||
|
||
.bx--structured-list-input:checked + .bx--structured-list-row .bx--structured-list-svg, | ||
.bx--structured-list-input:checked + .bx--structured-list-td .bx--structured-list-svg { | ||
fill: $brand-02; | ||
ul { | ||
list-style: none; | ||
margin: 0; | ||
padding: 0; | ||
} | ||
} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters