Skip to content

GitLab

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

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
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 30 deletions
htdocs/theme/modern/sass/components/_user-icon.scss
View file @ 34891d1e
......@@ -8,9 +8,9 @@
// turns thumbnail user-icons in grid back to rectangular
.user-thumbnails .user-icon {
border-radius: 3px;
border-radius: $border-radius;
img {
border-radius: 3px;
border-radius: $border-radius;
}
}
......
htdocs/theme/primaryschool/sass/components/_btn.scss
View file @ 34891d1e
......@@ -27,7 +27,7 @@
.persona-button,
.btn {
border-radius: 3px;
border-radius: $border-radius;
cursor: pointer;
display: inline-block;
font-size: 14px;
......
htdocs/theme/primaryschool/sass/components/_user-icon.scss
View file @ 34891d1e
......@@ -8,9 +8,9 @@
// turns thumbnail user-icons in grid back to rectangular
.user-thumbnails .user-icon {
border-radius: 3px;
border-radius: $border-radius;
img {
border-radius: 3px;
border-radius: $border-radius;
}
}
......
htdocs/theme/primaryschool/sass/features/_forum-post.scss
View file @ 34891d1e
......@@ -25,7 +25,7 @@
background-color: $btn-secondary-bg;
border: 1px solid $btn-secondary-border;
border-radius: 3px;
border-radius: $border-radius;
cursor: pointer;
display: inline-block;
font-size: $font-size-sm;
......
htdocs/theme/raw/sass/_custom.scss
View file @ 34891d1e
......@@ -100,12 +100,12 @@
line-height: $line-height-base;
background-color: transparent;
border: 1px solid $card-border-color;
border-radius: 2px;
border-radius: $border-radius-sm;
transition: border .2s ease-in-out;
}
#createcustomlayoutpane .layoutthumb {
border: 1px solid $card-border-color;
border-radius: 2px;
border-radius: $border-radius-sm;
padding: 4px;
display: table;
overflow: hidden;
......@@ -159,12 +159,12 @@
}
&.select2-dropdown-open {
.select2-choices {
border-radius: 4px 4px 0 0;
border-radius: $border-radius $border-radius 0 0;
}
}
.select2-choices {
@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.075) inset);
border-radius: 4px;
border-radius: $border-radius;
background-color: $body-bg;
border: 1px solid $input-border-color;
background-image: none;
......
htdocs/theme/raw/sass/components/_datepicker.scss
View file @ 34891d1e
......@@ -189,7 +189,7 @@
margin: 0;
td {
text-align: center;
border-radius: 0.25rem;
border-radius: $border-radius;
height: 54px;
line-height: 54px;
width: 54px;
......@@ -201,7 +201,7 @@
line-height: 54px;
margin: 2px 1.5px;
cursor: pointer;
border-radius: 0.25rem;
border-radius: $border-radius;
&:hover {
background: #e9ecef;
}
......@@ -227,7 +227,7 @@
}
th {
text-align: center;
border-radius: 0.25rem;
border-radius: $border-radius;
height: 20px;
line-height: 20px;
width: 20px;
......
htdocs/theme/raw/sass/components/_dropzone-previews.scss
View file @ 34891d1e
.dropzone-previews {
border-radius: 4px;
border-radius: $border-radius;
clear: both;
padding: 40px;
background-color: $gray-100;
......@@ -35,7 +35,7 @@
.block-placeholder,
.highlight {
border-radius: 4px;
border-radius: $border-radius;
width: 100%;
background-color: $state-warning-bg;
border: 2px dashed scale-color( $state-warning-border, $lightness: -9.50%);
......
htdocs/theme/raw/sass/components/_framework.scss
View file @ 34891d1e
......@@ -81,7 +81,7 @@
padding: 8px 14px;
background-color: scale-color($table-accent-bg, $lightness: -2%);
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 {
padding: 8px 14px;
......
htdocs/theme/raw/sass/components/_modal.scss
View file @ 34891d1e
......@@ -176,7 +176,7 @@ $width-sm: 90%;
}
.close {
@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;
position: absolute;
top: 1px;
......
htdocs/theme/raw/sass/components/_switch.scss
View file @ 34891d1e
......@@ -41,7 +41,7 @@ $indicator-total-width: $indicator-size + ($indicator-horizontal-margin * 2);
}
.switch-label {
border-radius: 3px;
border-radius: $border-radius;
display: block;
overflow: hidden;
cursor: pointer;
......
htdocs/theme/raw/sass/components/_toggles.scss
View file @ 34891d1e
......@@ -26,7 +26,7 @@
margin: 0;
border-color: transparent;
border-left-width: 0;
border-radius: 3px;
border-radius: $border-radius;
min-width: 45px;
color: $navbar-toggle-color;
padding: 6px 10px;
......
htdocs/theme/raw/sass/components/_user-icon.scss
View file @ 34891d1e
.user-icon {
border-radius: 3px;
border-radius: $border-radius;
background-color: $card-bg;
padding: 3px;
display: table;
......
htdocs/theme/raw/sass/features/_forum-post.scss
View file @ 34891d1e
......@@ -51,5 +51,5 @@
padding: 5px 10px;
color: $theme-text-midtone-color;
background: $gray-100;
border-radius: 5px;
border-radius: $border-radius-lg;
}
htdocs/theme/raw/sass/form/_input-group.scss
View file @ 34891d1e
......@@ -80,7 +80,7 @@
text-align: center;
background-color: $gray-100;
border: 1px solid $input-border-color;
border-radius: 2px;
border-radius: $border-radius-sm;
border-bottom-right-radius: 0;
border-top-right-radius: 0;
border-right: 0;
......
htdocs/theme/raw/sass/layout/_profile-block.scss
View file @ 34891d1e
......@@ -21,7 +21,7 @@
&:after {
@include transition(opacity 0.5s);
@include fa-icon();
border-radius: 3px;
border-radius: $border-radius;
bottom: 0;
background: $gray-100;
color: $gray-700;
......
htdocs/theme/raw/sass/layout/nav/_navbar.scss
View file @ 34891d1e
......@@ -111,7 +111,7 @@
top: -3px;
right: 5px;
background-color: $navbar-messages-count-bg;
border-radius: 3px;
border-radius: $border-radius;
padding: 0 3px;
color: $navbar-messages-count-color;
font-size: 12px;
......
htdocs/theme/raw/sass/lib/_graph.scss
View file @ 34891d1e
......@@ -10,7 +10,7 @@
padding-left: 30px;
position: relative;
margin-bottom: 4px;
border-radius: 3px;
border-radius: $border-radius;
padding: 2px 17px 2px 25px;
font-size: 0.9em;
cursor: default;
......@@ -25,7 +25,7 @@
top: 0;
width: 18px;
height: 100%;
border-radius: 3px;
border-radius: $border-radius;
}
}
}
htdocs/theme/raw/sass/lib/_mahara-select2.scss
View file @ 34891d1e
......@@ -104,12 +104,12 @@
}
&.select2-dropdown-open {
.select2-choices {
border-radius: 4px 4px 0 0;
border-radius: $border-radius $border-radius 0 0;
}
}
.select2-choices {
@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.075) inset);
border-radius: 4px;
border-radius: $border-radius;
background-image: none;
width: 100%;
.select2-search-choice {
......
htdocs/theme/raw/sass/typography/_typography.scss
View file @ 34891d1e
......@@ -293,7 +293,7 @@ pre {
word-wrap: break-word;
background-color: $pre-bg;
border: $border-width solid $card-border-color;
border-radius: 2px;
border-radius: $border-radius-sm;
span.wsname {
font-weight: bold;
}
......
htdocs/theme/raw/sass/utilities/_bootstrap-variables.scss
View file @ 34891d1e
......@@ -255,7 +255,7 @@ $line-height-sm: 1.5 !default;
$border-width: 1px !default;
$border-color: $gray-300 !default;
$border-radius: .25rem !default;
$border-radius: .25rem !default; // 4px
$border-radius-lg: .3rem !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