Commit 88cb02ba authored by Clement Ho's avatar Clement Ho

Remove deprecated mixins

parent 36143d41
...@@ -11,3 +11,6 @@ $border-radius-base: 3px !default; ...@@ -11,3 +11,6 @@ $border-radius-base: 3px !default;
$modal-body-bg: $white-light; $modal-body-bg: $white-light;
$input-border: $border-color; $input-border: $border-color;
$input-border-focus: $focus-border-color; $input-border-focus: $focus-border-color;
$padding-base-vertical: $gl-vert-padding;
$padding-base-horizontal: $gl-padding;
// Override variables from bs4
html {
font-size: 14px;
}
@import "framework/variables"; @import "framework/variables";
@import "framework/mixins"; @import "framework/mixins";
@import "framework.bs4";
@import "../../../node_modules/bootstrap/scss/bootstrap"; @import "../../../node_modules/bootstrap/scss/bootstrap";
@import "framework.bs3"; @import "framework.bs3";
@import "framework/layout"; @import "framework/layout";
......
...@@ -317,7 +317,7 @@ ...@@ -317,7 +317,7 @@
} }
&.invalid { &.invalid {
@include status-color($gray-dark, $gray, $gray-darkest); @include status-color($gray-dark, color("gray"), $gray-darkest);
border-color: $gray-darkest; border-color: $gray-darkest;
} }
} }
......
...@@ -266,7 +266,9 @@ ...@@ -266,7 +266,9 @@
&.issue-title, &.issue-title,
&.commit-title, &.commit-title,
&.merge-merquest-title { &.merge-merquest-title {
@include text-overflow(); overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
max-width: 100%; max-width: 100%;
display: block; display: block;
......
...@@ -80,13 +80,13 @@ ...@@ -80,13 +80,13 @@
&.left-side-selected { &.left-side-selected {
td.line_content.parallel.right-side { td.line_content.parallel.right-side {
@include user-select(none); user-select: none;
} }
} }
&.right-side-selected { &.right-side-selected {
td.line_content.parallel.left-side { td.line_content.parallel.left-side {
@include user-select(none); user-select: none;
} }
} }
} }
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
.old_line, .old_line,
.new_line { .new_line {
@include user-select(none); user-select: none;
margin: 0; margin: 0;
border: 0; border: 0;
padding: 0 5px; padding: 0 5px;
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
.key { .key {
@extend .badge.badge-pill; @extend .badge.badge-pill;
@extend .badge.badge-pill-inverse; background-color: $label-inverse-bg;
font: 11px Consolas, "Liberation Mono", Menlo, Courier, monospace; font: 11px Consolas, "Liberation Mono", Menlo, Courier, monospace;
padding: 3px 5px; padding: 3px 5px;
} }
......
...@@ -419,7 +419,7 @@ table.u2f-registrations { ...@@ -419,7 +419,7 @@ table.u2f-registrations {
} }
&.unverified { &.unverified {
@include status-color($gray-dark, $gray, $common-gray-dark); @include status-color($gray-dark, color("gray"), $common-gray-dark);
} }
} }
} }
...@@ -14,7 +14,9 @@ ...@@ -14,7 +14,9 @@
} }
#contributors-master { #contributors-master {
@include make-md-column(12); @include media-breakpoint-up(md) {
@include make-col(12);
}
svg { svg {
width: 100%; width: 100%;
...@@ -33,7 +35,10 @@ ...@@ -33,7 +35,10 @@
} }
.person { .person {
@include make-md-column(6); @include media-breakpoint-up(md) {
@include make-col(6);
}
margin-top: 10px; margin-top: 10px;
@include media-breakpoint-down(xs) { @include media-breakpoint-down(xs) {
......
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