diff options
Diffstat (limited to 'less')
| -rw-r--r-- | less/bootstrap.less | 4 | ||||
| -rw-r--r-- | less/core.less | 15 | ||||
| -rw-r--r-- | less/extras.less | 8 | ||||
| -rw-r--r-- | less/font-awesome-ie7.less | 2 | ||||
| -rw-r--r-- | less/mixins.less | 12 | ||||
| -rw-r--r-- | less/path.less | 2 | ||||
| -rw-r--r-- | less/variables.less | 2 |
7 files changed, 23 insertions, 22 deletions
diff --git a/less/bootstrap.less b/less/bootstrap.less index a2c96046b..b39045b54 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -7,12 +7,12 @@ display: inline; width: auto; height: auto; + margin-top: 0; line-height: normal; vertical-align: baseline; background-image: none; - background-position: 0% 0%; + background-position: 0 0; background-repeat: repeat; - margin-top: 0; } /* more sprites.less reset */ diff --git a/less/core.less b/less/core.less index 1ef7e2235..b5eea3185 100644 --- a/less/core.less +++ b/less/core.less @@ -8,15 +8,15 @@ [class^="icon-"]:before, [class*=" icon-"]:before { - text-decoration: inherit; display: inline-block; + text-decoration: inherit; speak: none; } /* makes the font 33% larger relative to the icon container */ .icon-large:before { + font-size: (4em / 3); vertical-align: -10%; - font-size: 4/3em; } /* makes sure icons active on rollover in links */ @@ -32,16 +32,17 @@ a { [class*=" icon-"] { &.icon-fixed-width { display: inline-block; - width: 16/14em; + width: (16em / 14); + padding-right: (4em / 14); text-align: right; - padding-right: 4/14em; &.icon-large { - width: 20/14em; + width: (20em / 14); } } } .icons-ul { + padding-left: 0; margin-left: @icons-li-width; list-style-type: none; @@ -51,8 +52,8 @@ a { position: absolute; left: -@icons-li-width; width: @icons-li-width; - text-align: center; line-height: inherit; + text-align: center; } } @@ -72,8 +73,8 @@ a { // ------------------------- .icon-border { - border: solid 1px @borderColor; padding: .2em .25em .15em; + border: solid 1px @borderColor; .border-radius(3px); } diff --git a/less/extras.less b/less/extras.less index c93c260c8..fdc4697bd 100644 --- a/less/extras.less +++ b/less/extras.less @@ -7,9 +7,9 @@ /* Animated rotating icon */ .icon-spin { display: inline-block; + -webkit-animation: spin 2s infinite linear; -moz-animation: spin 2s infinite linear; -o-animation: spin 2s infinite linear; - -webkit-animation: spin 2s infinite linear; animation: spin 2s infinite linear; } @@ -43,30 +43,30 @@ a .icon-spin { /* Icon rotations and mirroring */ .icon-rotate-90:before { + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1); -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 { + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2); -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 { + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); -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); } .icon-flip-horizontal:before { diff --git a/less/font-awesome-ie7.less b/less/font-awesome-ie7.less index 269ab5f81..b4edd8ae7 100644 --- a/less/font-awesome-ie7.less +++ b/less/font-awesome-ie7.less @@ -25,7 +25,7 @@ */ .icon-large { - font-size: 4/3em; + font-size: (4em / 3); margin-top: -4px; padding-top: 3px; margin-bottom: -4px; diff --git a/less/mixins.less b/less/mixins.less index e41959936..976f0f185 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -7,13 +7,13 @@ } .icon-FontAwesome() { + *margin-right: .3em; // fixes ie7 issues font-family: FontAwesome; - font-weight: normal; + -webkit-font-smoothing: antialiased; font-style: normal; + font-weight: normal; text-decoration: inherit; - -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - *margin-right: .3em; // fixes ie7 issues } .border-radius(@radius) { @@ -32,18 +32,18 @@ vertical-align: -35%; [class^="icon-"], [class*=" icon-"] { - display: block; - text-align: center; position: absolute; + display: block; width: 100%; height: 100%; font-size: @top-font-size; line-height: inherit; *line-height: @height; + text-align: center; } .icon-stack-base { font-size: @base-font-size; - *line-height: @height / @base-font-size; + *line-height: (@height / @base-font-size); } } } diff --git a/less/path.less b/less/path.less index 8ccef8cf0..a8d87a71e 100644 --- a/less/path.less +++ b/less/path.less @@ -7,7 +7,7 @@ src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'), url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'), url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype'), - url('@{FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=@{FontAwesomeVersion}') format('svg'); + url('@{FontAwesomePath}/fontawesome-webfont.svg?v=@{FontAwesomeVersion}#fontawesomeregular') format('svg'); // src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts font-weight: normal; font-style: normal; diff --git a/less/variables.less b/less/variables.less index 9d0879b0d..305894138 100644 --- a/less/variables.less +++ b/less/variables.less @@ -8,7 +8,7 @@ @iconMuted: #eee; @iconLight: #fff; @iconDark: #333; -@icons-li-width: 30/14em; +@icons-li-width: (30em / 14); @glass: "\f000"; |