Commit 34891d1e authored by Evonne's avatar Evonne Committed by Robert Lyon
Browse files

Bug 1836676: Using border-radius variable in theme

Replacing manually entered values for border-radius to use bootstrap
variable. Visually nothing should be different, just easier long term
maintenance.

behatnotneeded

Change-Id: I68aeb998cd43f3a9c7b1b9b770d6d30a20612c63
parent e06f74d7
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
// turns thumbnail user-icons in grid back to rectangular // turns thumbnail user-icons in grid back to rectangular
.user-thumbnails .user-icon { .user-thumbnails .user-icon {
border-radius: 3px; border-radius: $border-radius;
img { img {
border-radius: 3px; border-radius: $border-radius;
} }
} }
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
.persona-button, .persona-button,
.btn { .btn {
border-radius: 3px; border-radius: $border-radius;
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
font-size: 14px; font-size: 14px;
......
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
// turns thumbnail user-icons in grid back to rectangular // turns thumbnail user-icons in grid back to rectangular
.user-thumbnails .user-icon { .user-thumbnails .user-icon {
border-radius: 3px; border-radius: $border-radius;
img { img {
border-radius: 3px; border-radius: $border-radius;
} }
} }
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
background-color: $btn-secondary-bg; background-color: $btn-secondary-bg;
border: 1px solid $btn-secondary-border; border: 1px solid $btn-secondary-border;
border-radius: 3px; border-radius: $border-radius;
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
font-size: $font-size-sm; font-size: $font-size-sm;
......
...@@ -100,12 +100,12 @@ ...@@ -100,12 +100,12 @@
line-height: $line-height-base; line-height: $line-height-base;
background-color: transparent; background-color: transparent;
border: 1px solid $card-border-color; border: 1px solid $card-border-color;
border-radius: 2px; border-radius: $border-radius-sm;
transition: border .2s ease-in-out; transition: border .2s ease-in-out;
} }
#createcustomlayoutpane .layoutthumb { #createcustomlayoutpane .layoutthumb {
border: 1px solid $card-border-color; border: 1px solid $card-border-color;
border-radius: 2px; border-radius: $border-radius-sm;
padding: 4px; padding: 4px;
display: table; display: table;
overflow: hidden; overflow: hidden;
...@@ -159,12 +159,12 @@ ...@@ -159,12 +159,12 @@
} }
&.select2-dropdown-open { &.select2-dropdown-open {
.select2-choices { .select2-choices {
border-radius: 4px 4px 0 0; border-radius: $border-radius $border-radius 0 0;
} }
} }
.select2-choices { .select2-choices {
@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.075) inset); @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.075) inset);
border-radius: 4px; border-radius: $border-radius;
background-color: $body-bg; background-color: $body-bg;
border: 1px solid $input-border-color; border: 1px solid $input-border-color;
background-image: none; background-image: none;
......
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
margin: 0; margin: 0;
td { td {
text-align: center; text-align: center;
border-radius: 0.25rem; border-radius: $border-radius;
height: 54px; height: 54px;
line-height: 54px; line-height: 54px;
width: 54px; width: 54px;
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
line-height: 54px; line-height: 54px;
margin: 2px 1.5px; margin: 2px 1.5px;
cursor: pointer; cursor: pointer;
border-radius: 0.25rem; border-radius: $border-radius;
&:hover { &:hover {
background: #e9ecef; background: #e9ecef;
} }
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
} }
th { th {
text-align: center; text-align: center;
border-radius: 0.25rem; border-radius: $border-radius;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
width: 20px; width: 20px;
......
.dropzone-previews { .dropzone-previews {
border-radius: 4px; border-radius: $border-radius;
clear: both; clear: both;
padding: 40px; padding: 40px;
background-color: $gray-100; background-color: $gray-100;
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
.block-placeholder, .block-placeholder,
.highlight { .highlight {
border-radius: 4px; border-radius: $border-radius;
width: 100%; width: 100%;
background-color: $state-warning-bg; background-color: $state-warning-bg;
border: 2px dashed scale-color( $state-warning-border, $lightness: -9.50%); border: 2px dashed scale-color( $state-warning-border, $lightness: -9.50%);
......
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
padding: 8px 14px; padding: 8px 14px;
background-color: scale-color($table-accent-bg, $lightness: -2%); background-color: scale-color($table-accent-bg, $lightness: -2%);
border-bottom: 1px solid scale-color($gray-100, $lightness: -3.78); border-bottom: 1px solid scale-color($gray-100, $lightness: -3.78);
border-radius: 3px 3px 0 0; border-radius: $border-radius $border-radius 0 0;
} }
.popover-content { .popover-content {
padding: 8px 14px; padding: 8px 14px;
......
...@@ -176,7 +176,7 @@ $width-sm: 90%; ...@@ -176,7 +176,7 @@ $width-sm: 90%;
} }
.close { .close {
@include box-shadow(-2px 0 2px rgba(0,0,0,0.3)); @include box-shadow(-2px 0 2px rgba(0,0,0,0.3));
border-radius:3px 0 0 3px; border-radius: $border-radius 0 0 $border-radius;
opacity: 1; opacity: 1;
position: absolute; position: absolute;
top: 1px; top: 1px;
......
...@@ -41,7 +41,7 @@ $indicator-total-width: $indicator-size + ($indicator-horizontal-margin * 2); ...@@ -41,7 +41,7 @@ $indicator-total-width: $indicator-size + ($indicator-horizontal-margin * 2);
} }
.switch-label { .switch-label {
border-radius: 3px; border-radius: $border-radius;
display: block; display: block;
overflow: hidden; overflow: hidden;
cursor: pointer; cursor: pointer;
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
margin: 0; margin: 0;
border-color: transparent; border-color: transparent;
border-left-width: 0; border-left-width: 0;
border-radius: 3px; border-radius: $border-radius;
min-width: 45px; min-width: 45px;
color: $navbar-toggle-color; color: $navbar-toggle-color;
padding: 6px 10px; padding: 6px 10px;
......
.user-icon { .user-icon {
border-radius: 3px; border-radius: $border-radius;
background-color: $card-bg; background-color: $card-bg;
padding: 3px; padding: 3px;
display: table; display: table;
......
...@@ -51,5 +51,5 @@ ...@@ -51,5 +51,5 @@
padding: 5px 10px; padding: 5px 10px;
color: $theme-text-midtone-color; color: $theme-text-midtone-color;
background: $gray-100; background: $gray-100;
border-radius: 5px; border-radius: $border-radius-lg;
} }
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
text-align: center; text-align: center;
background-color: $gray-100; background-color: $gray-100;
border: 1px solid $input-border-color; border: 1px solid $input-border-color;
border-radius: 2px; border-radius: $border-radius-sm;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
border-right: 0; border-right: 0;
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
&:after { &:after {
@include transition(opacity 0.5s); @include transition(opacity 0.5s);
@include fa-icon(); @include fa-icon();
border-radius: 3px; border-radius: $border-radius;
bottom: 0; bottom: 0;
background: $gray-100; background: $gray-100;
color: $gray-700; color: $gray-700;
......
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
top: -3px; top: -3px;
right: 5px; right: 5px;
background-color: $navbar-messages-count-bg; background-color: $navbar-messages-count-bg;
border-radius: 3px; border-radius: $border-radius;
padding: 0 3px; padding: 0 3px;
color: $navbar-messages-count-color; color: $navbar-messages-count-color;
font-size: 12px; font-size: 12px;
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
padding-left: 30px; padding-left: 30px;
position: relative; position: relative;
margin-bottom: 4px; margin-bottom: 4px;
border-radius: 3px; border-radius: $border-radius;
padding: 2px 17px 2px 25px; padding: 2px 17px 2px 25px;
font-size: 0.9em; font-size: 0.9em;
cursor: default; cursor: default;
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
top: 0; top: 0;
width: 18px; width: 18px;
height: 100%; height: 100%;
border-radius: 3px; border-radius: $border-radius;
} }
} }
} }
...@@ -104,12 +104,12 @@ ...@@ -104,12 +104,12 @@
} }
&.select2-dropdown-open { &.select2-dropdown-open {
.select2-choices { .select2-choices {
border-radius: 4px 4px 0 0; border-radius: $border-radius $border-radius 0 0;
} }
} }
.select2-choices { .select2-choices {
@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.075) inset); @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.075) inset);
border-radius: 4px; border-radius: $border-radius;
background-image: none; background-image: none;
width: 100%; width: 100%;
.select2-search-choice { .select2-search-choice {
......
...@@ -293,7 +293,7 @@ pre { ...@@ -293,7 +293,7 @@ pre {
word-wrap: break-word; word-wrap: break-word;
background-color: $pre-bg; background-color: $pre-bg;
border: $border-width solid $card-border-color; border: $border-width solid $card-border-color;
border-radius: 2px; border-radius: $border-radius-sm;
span.wsname { span.wsname {
font-weight: bold; font-weight: bold;
} }
......
...@@ -255,7 +255,7 @@ $line-height-sm: 1.5 !default; ...@@ -255,7 +255,7 @@ $line-height-sm: 1.5 !default;
$border-width: 1px !default; $border-width: 1px !default;
$border-color: $gray-300 !default; $border-color: $gray-300 !default;
$border-radius: .25rem !default; $border-radius: .25rem !default; // 4px
$border-radius-lg: .3rem !default; $border-radius-lg: .3rem !default;
$border-radius-sm: .2rem !default; $border-radius-sm: .2rem !default;
......
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