aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2015-09-06 14:03:10 -0700
committerChris Rebert <[email protected]>2015-09-06 14:03:10 -0700
commitefac54c2a4d9c1d4c183768ed65ca610c4b19bfc (patch)
treef20da3670c4c4a7e24802fda6baba673081247b9
parent85ab83136ea4276f762cdbbb1fb598fd09201820 (diff)
parentde44d2a3dd629ff9396ce9aacf4c1da4c7187434 (diff)
downloadbootstrap-efac54c2a4d9c1d4c183768ed65ca610c4b19bfc.tar.xz
bootstrap-efac54c2a4d9c1d4c183768ed65ca610c4b19bfc.zip
Merge pull request #17495 from vsn4ik/mv_text_hide
v4 - Rename file with text-hide mixin
-rw-r--r--scss/_mixins.scss2
-rw-r--r--scss/mixins/_text-hide.scss (renamed from scss/mixins/_hide-text.scss)0
2 files changed, 1 insertions, 1 deletions
diff --git a/scss/_mixins.scss b/scss/_mixins.scss
index 4caee21fb..90a48cf89 100644
--- a/scss/_mixins.scss
+++ b/scss/_mixins.scss
@@ -22,7 +22,6 @@
// Utilities
@import "mixins/breakpoints";
-@import "mixins/hide-text";
@import "mixins/hover";
@import "mixins/image";
@import "mixins/label";
@@ -33,6 +32,7 @@
@import "mixins/tab-focus";
@import "mixins/reset-text";
@import "mixins/text-emphasis";
+@import "mixins/text-hide";
@import "mixins/text-truncate";
// // Components
diff --git a/scss/mixins/_hide-text.scss b/scss/mixins/_text-hide.scss
index daed5fb7a..daed5fb7a 100644
--- a/scss/mixins/_hide-text.scss
+++ b/scss/mixins/_text-hide.scss