Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/ForkAwesome/Fork-Awesome.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Cranfill <scott.cranfill@cfpb.gov>2013-06-14 23:10:15 +0400
committerScott Cranfill <scott.cranfill@cfpb.gov>2013-06-14 23:10:15 +0400
commit3df2e4bfa1577201ba4bffc990118fecb3635d5e (patch)
treea7cce001d8a3fc6052e404f7d9f0dd6efe72386c
parenta9065a166ef908b080139cec41966f8b82cf0fdd (diff)
Stop linked stacks from going inline (fixes #1305)
-rw-r--r--css/font-awesome.css2
-rw-r--r--css/font-awesome.min.css2
-rw-r--r--less/extras.less3
-rw-r--r--scss/_extras.scss3
4 files changed, 9 insertions, 1 deletions
diff --git a/css/font-awesome.css b/css/font-awesome.css
index f9d4aa35c..228acdce0 100644
--- a/css/font-awesome.css
+++ b/css/font-awesome.css
@@ -278,6 +278,8 @@ a [class*=" icon-"] {
-webkit-animation: spin 2s infinite linear;
animation: spin 2s infinite linear;
}
+/* Prevent stack and spinners from being taken inline when inside a link */
+a .icon-stack,
a .icon-spin {
display: inline-block;
text-decoration: none;
diff --git a/css/font-awesome.min.css b/css/font-awesome.min.css
index 8f7fbfe2e..023d89b9e 100644
--- a/css/font-awesome.min.css
+++ b/css/font-awesome.min.css
@@ -32,7 +32,7 @@ a [class^="icon-"],a [class*=" icon-"]{display:inline;}
.icon-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:-35%;}.icon-stack [class^="icon-"],.icon-stack [class*=" icon-"]{display:block;text-align:center;position:absolute;width:100%;height:100%;font-size:1em;line-height:inherit;*line-height:2em;}
.icon-stack .icon-stack-base{font-size:2em;*line-height:1em;}
.icon-spin{display:inline-block;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;-webkit-animation:spin 2s infinite linear;animation:spin 2s infinite linear;}
-a .icon-spin{display:inline-block;text-decoration:none;}
+a .icon-stack,a .icon-spin{display:inline-block;text-decoration:none;}
@-moz-keyframes spin{0%{-moz-transform:rotate(0deg);} 100%{-moz-transform:rotate(359deg);}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg);} 100%{-webkit-transform:rotate(359deg);}}@-o-keyframes spin{0%{-o-transform:rotate(0deg);} 100%{-o-transform:rotate(359deg);}}@-ms-keyframes spin{0%{-ms-transform:rotate(0deg);} 100%{-ms-transform:rotate(359deg);}}@keyframes spin{0%{transform:rotate(0deg);} 100%{transform:rotate(359deg);}}.icon-rotate-90:before{-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg);filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);}
.icon-rotate-180:before{-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg);filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);}
.icon-rotate-270:before{-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg);filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);}
diff --git a/less/extras.less b/less/extras.less
index c71ac4d30..c93c260c8 100644
--- a/less/extras.less
+++ b/less/extras.less
@@ -12,6 +12,9 @@
-webkit-animation: spin 2s infinite linear;
animation: spin 2s infinite linear;
}
+
+/* Prevent stack and spinners from being taken inline when inside a link */
+a .icon-stack,
a .icon-spin {
display: inline-block;
text-decoration: none;
diff --git a/scss/_extras.scss b/scss/_extras.scss
index 9882cdc3c..9a25845d8 100644
--- a/scss/_extras.scss
+++ b/scss/_extras.scss
@@ -12,6 +12,9 @@
-webkit-animation: spin 2s infinite linear;
animation: spin 2s infinite linear;
}
+
+/* Prevent stack and spinners from being taken inline when inside a link */
+a .icon-stack,
a .icon-spin {
display: inline-block;
text-decoration: none;