From 3137eec3706e8d5d3b03d7943e0693d19e9c4791 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@chrisrebert.com>
Date: Wed, 7 Oct 2015 00:05:38 -0700
Subject: [PATCH] Move border-radius mixin from scss/_mixins.scss to
scss/mixins/_border-radius.scss
Reunites the family.
Closes #17791
---
scss/_mixins.scss | 6 ------
scss/mixins/_border-radius.scss | 6 ++++++
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/scss/_mixins.scss b/scss/_mixins.scss
index 90a48cf89e..726beda73a 100644
--- a/scss/_mixins.scss
+++ b/scss/_mixins.scss
@@ -2,12 +2,6 @@
//
// Used in conjunction with global variables to enable certain theme features.
-@mixin border-radius($radius: $border-radius) {
- @if $enable-rounded {
- border-radius: $radius;
- }
-}
-
@mixin box-shadow($shadow...) {
@if $enable-shadows {
box-shadow: $shadow;
diff --git a/scss/mixins/_border-radius.scss b/scss/mixins/_border-radius.scss
index b1dfbbab68..54f29f41da 100644
--- a/scss/mixins/_border-radius.scss
+++ b/scss/mixins/_border-radius.scss
@@ -1,5 +1,11 @@
// Single side border-radius
+@mixin border-radius($radius: $border-radius) {
+ @if $enable-rounded {
+ border-radius: $radius;
+ }
+}
+
@mixin border-top-radius($radius) {
@if $enable-rounded {
border-top-right-radius: $radius;
--
GitLab