Commit 058352e4 authored by Simon Knox's avatar Simon Knox

Start removing some extends from SCSS

They are deprecated soon, and generally cause unexpected results
They are causing memory issues in the sassc gem upgrade
parent 7f422613
...@@ -198,7 +198,15 @@ h3.popover-header { ...@@ -198,7 +198,15 @@ h3.popover-header {
} }
.divider { .divider {
@extend .dropdown-divider; // copied rules from node_modules/bootstrap/scss/_dropdown.scss:116
// this might be safe to just remove instead
// most places that use divider add overrides to undo these things
// there is also a probably-unintentional use in deprecated_dropdown_divider.scss
// so we would end up with .gl-dropdown .dropdown-divider
height: 0;
margin: 4px 0;
overflow: hidden;
border-top: 1px solid $border-color;
} }
.info-well { .info-well {
...@@ -231,12 +239,9 @@ h3.popover-header { ...@@ -231,12 +239,9 @@ h3.popover-header {
} }
.card { .card {
&.card-without-border { &.card-without-border,
@extend .border-0;
}
&.bg-light { &.bg-light {
@extend .border-0; border: 0 !important;
} }
} }
......
...@@ -70,7 +70,8 @@ $avatar-sizes: ( ...@@ -70,7 +70,8 @@ $avatar-sizes: (
$identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $identicon-blue, $identicon-teal, $identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $identicon-blue, $identicon-teal,
$identicon-orange, $identicon-gray; $identicon-orange, $identicon-gray;
%avatar-circle { .avatar,
.avatar-container {
float: left; float: left;
margin-right: $gl-padding; margin-right: $gl-padding;
border-radius: $avatar-radius; border-radius: $avatar-radius;
...@@ -84,7 +85,6 @@ $identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $i ...@@ -84,7 +85,6 @@ $identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $i
} }
.avatar { .avatar {
@extend %avatar-circle;
transition-property: none; transition-property: none;
width: 40px; width: 40px;
...@@ -151,7 +151,6 @@ $identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $i ...@@ -151,7 +151,6 @@ $identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $i
} }
.avatar-container { .avatar-container {
@extend %avatar-circle;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
......
...@@ -437,7 +437,13 @@ ...@@ -437,7 +437,13 @@
} }
// All disabled buttons, regardless of color, type, etc // All disabled buttons, regardless of color, type, etc
%disabled { .btn.disabled,
.btn[disabled],
fieldset[disabled] .btn,
.dropdown-toggle[disabled],
[disabled].dropdown-menu-toggle {
&,
&:hover {
background-color: $gray-light; background-color: $gray-light;
border-color: $gray-100; border-color: $gray-100;
color: $gl-text-color-disabled; color: $gl-text-color-disabled;
...@@ -452,17 +458,6 @@ ...@@ -452,17 +458,6 @@
i { i {
color: $gl-text-color-disabled; color: $gl-text-color-disabled;
} }
}
.btn.disabled,
.btn[disabled],
fieldset[disabled] .btn,
.dropdown-toggle[disabled],
[disabled].dropdown-menu-toggle {
@extend %disabled;
&:hover {
@extend %disabled;
} }
&.btn-link { &.btn-link {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment