Skip to content

Commit

Permalink
fix: replace hard coded bx prefix with variable (#1381)
Browse files Browse the repository at this point in the history
* fix(notification): add correct icon svgs for different types

* fix: replace bx with prefix variable
  • Loading branch information
alisonjoseph authored and tw15egan committed Nov 2, 2018
1 parent e1c070e commit b431033
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/components/combo-box/_combo-box.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
@import '../list-box/list-box';

@include exports('combo-box') {
.bx--combo-box > .bx--list-box__field {
.#{$prefix}--combo-box > .#{$prefix}--list-box__field {
padding: 0;
}
}
4 changes: 2 additions & 2 deletions src/components/multi-select/_multi-select.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
@import '../list-box/list-box';

@include exports('multi-select') {
.bx--multi-select.bx--combo-box > .bx--list-box__field {
.#{$prefix}--multi-select.#{$prefix}--combo-box > .#{$prefix}--list-box__field {
padding: 0 1rem;
}

.bx--multi-select.bx--combo-box input[role='combobox'] {
.#{$prefix}--multi-select.#{$prefix}--combo-box input[role='combobox'] {
padding: 0;
outline: none;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/overflow-menu/_overflow-menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
}

.#{$prefix}--overflow-menu-options__option--danger {
.bx--overflow-menu-options__btn {
.#{$prefix}--overflow-menu-options__btn {
&:hover,
&:focus {
color: $inverse-01;
Expand Down
8 changes: 4 additions & 4 deletions src/components/select/_select.scss
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@
}
}

.#{$prefix}--select-input:disabled ~ .bx--select__arrow {
.#{$prefix}--select-input:disabled ~ .#{$prefix}--select__arrow {
fill: $disabled;
}

Expand Down Expand Up @@ -346,7 +346,7 @@
@include focus-outline('invalid');
}

.#{$prefix}--select--inline .bx--select-input:disabled {
.#{$prefix}--select--inline .#{$prefix}--select-input:disabled {
color: $disabled;
cursor: not-allowed;

Expand All @@ -369,15 +369,15 @@
}
}

.#{$prefix}--select--inline .bx--select-input:disabled {
.#{$prefix}--select--inline .#{$prefix}--select-input:disabled {
cursor: not-allowed;
// THIS SHOULD BE MOVED TO AN INLINE SVG IN NEXT MAJOR RELEASE
background-image: url("data:image/svg+xml;charset=UTF-8, %3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' width='16' height='16' class='ibm-icons ibm-icons--error--filled' fill='%23bebebe'%3e%3cpath d='M6.95 26.66A14 14 0 0 0 26.67 6.93zM16 2A14 14 0 0 0 5.35 25.07L25.08 5.34A13.93 13.93 0 0 0 16 2z'/%3e%3c/svg%3e");
background-repeat: no-repeat;
background-position: calc(100% - 8px) 50%;
}

.#{$prefix}--select--inline .bx--select-input:disabled ~ .#{$prefix}--select__arrow {
.#{$prefix}--select--inline .#{$prefix}--select-input:disabled ~ .#{$prefix}--select__arrow {
display: none;
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/structured-list/_structured-list.scss
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
}
}

.bx--structured-list-th span {
.#{$prefix}--structured-list-th span {
@include skeleton;
width: 75%;
height: 1rem;
Expand Down Expand Up @@ -316,7 +316,7 @@
}
}

.bx--structured-list-th span {
.#{$prefix}--structured-list-th span {
@include skeleton;
width: 75%;
height: 1rem;
Expand Down
2 changes: 1 addition & 1 deletion src/components/tile/_tile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
outline-offset: -1px;
}

.#{$prefix}--tile--is-selected .bx--tile__checkmark {
.#{$prefix}--tile--is-selected .#{$prefix}--tile__checkmark {
opacity: 1;
}

Expand Down

0 comments on commit b431033

Please sign in to comment.