Explorar o código

Using recess property order (Fixes #1157)
Rebuilt assets

Geremia Taglialatela %!s(int64=11) %!d(string=hai) anos
pai
achega
7f04830e12

+ 1 - 1
Gemfile.lock

@@ -43,4 +43,4 @@ PLATFORMS
 
 DEPENDENCIES
   debugger
-  jekyll (= 1.0)
+  jekyll (~> 1.0)

+ 18 - 17
css/font-awesome.css

@@ -28,7 +28,7 @@
 @font-face {
   font-family: 'FontAwesome';
   src: url('../font/fontawesome-webfont.eot?v=3.2.1');
-  src: url('../font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('../font/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('../font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');
+  src: url('../font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('../font/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('../font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('../font/fontawesome-webfont.svg?v=3.2.1#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -36,24 +36,24 @@
  * -------------------------- */
 [class^="icon-"],
 [class*=" icon-"] {
+  *margin-right: .3em;
   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;
 }
 [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 {
-  vertical-align: -10%;
   font-size: 1.3333333333333333em;
+  vertical-align: -10%;
 }
 /* makes sure icons active on rollover in links */
 a [class^="icon-"],
@@ -65,14 +65,15 @@ a [class*=" icon-"] {
 [class*=" icon-"].icon-fixed-width {
   display: inline-block;
   width: 1.1428571428571428em;
-  text-align: right;
   padding-right: 0.2857142857142857em;
+  text-align: right;
 }
 [class^="icon-"].icon-fixed-width.icon-large,
 [class*=" icon-"].icon-fixed-width.icon-large {
   width: 1.4285714285714286em;
 }
 .icons-ul {
+  padding-left: 0;
   margin-left: 2.142857142857143em;
   list-style-type: none;
 }
@@ -83,8 +84,8 @@ a [class*=" icon-"] {
   position: absolute;
   left: -2.142857142857143em;
   width: 2.142857142857143em;
-  text-align: center;
   line-height: inherit;
+  text-align: center;
 }
 [class^="icon-"].hide,
 [class*=" icon-"].hide {
@@ -100,8 +101,8 @@ a [class*=" icon-"] {
   color: #333333;
 }
 .icon-border {
-  border: solid 1px #eeeeee;
   padding: .2em .25em .15em;
+  border: solid 1px #eeeeee;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
@@ -164,12 +165,12 @@ a [class*=" icon-"] {
   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 */
 .icon-white,
@@ -262,14 +263,14 @@ a [class*=" icon-"] {
 }
 .icon-stack [class^="icon-"],
 .icon-stack [class*=" icon-"] {
-  display: block;
-  text-align: center;
   position: absolute;
+  display: block;
   width: 100%;
   height: 100%;
   font-size: 1em;
   line-height: inherit;
   *line-height: 2em;
+  text-align: center;
 }
 .icon-stack .icon-stack-base {
   font-size: 2em;
@@ -278,9 +279,9 @@ a [class*=" icon-"] {
 /* 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;
 }
 /* Prevent stack and spinners from being taken inline when inside a link */
@@ -331,28 +332,28 @@ 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 {
   -webkit-transform: scale(-1, 1);

+ 13 - 13
css/font-awesome.min.css

@@ -1,15 +1,15 @@
-@font-face{font-family:'FontAwesome';src:url('../font/fontawesome-webfont.eot?v=3.2.1');src:url('../font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'),url('../font/fontawesome-webfont.woff?v=3.2.1') format('woff'),url('../font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'),url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');font-weight:normal;font-style:normal}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;*margin-right:.3em}
-[class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none}
-.icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em}
+@font-face{font-family:'FontAwesome';src:url('../font/fontawesome-webfont.eot?v=3.2.1');src:url('../font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'),url('../font/fontawesome-webfont.woff?v=3.2.1') format('woff'),url('../font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'),url('../font/fontawesome-webfont.svg?v=3.2.1#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}[class^="icon-"],[class*=" icon-"]{*margin-right:.3em;font-family:FontAwesome;-webkit-font-smoothing:antialiased;font-style:normal;font-weight:normal;text-decoration:inherit;-moz-osx-font-smoothing:grayscale}
+[class^="icon-"]:before,[class*=" icon-"]:before{display:inline-block;text-decoration:inherit;speak:none}
+.icon-large:before{font-size:1.3333333333333333em;vertical-align:-10%}
 a [class^="icon-"],a [class*=" icon-"]{display:inline}
-[class^="icon-"].icon-fixed-width,[class*=" icon-"].icon-fixed-width{display:inline-block;width:1.1428571428571428em;text-align:right;padding-right:.2857142857142857em}[class^="icon-"].icon-fixed-width.icon-large,[class*=" icon-"].icon-fixed-width.icon-large{width:1.4285714285714286em}
-.icons-ul{margin-left:2.142857142857143em;list-style-type:none}.icons-ul>li{position:relative}
-.icons-ul .icon-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;text-align:center;line-height:inherit}
+[class^="icon-"].icon-fixed-width,[class*=" icon-"].icon-fixed-width{display:inline-block;width:1.1428571428571428em;padding-right:.2857142857142857em;text-align:right}[class^="icon-"].icon-fixed-width.icon-large,[class*=" icon-"].icon-fixed-width.icon-large{width:1.4285714285714286em}
+.icons-ul{padding-left:0;margin-left:2.142857142857143em;list-style-type:none}.icons-ul>li{position:relative}
+.icons-ul .icon-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;line-height:inherit;text-align:center}
 [class^="icon-"].hide,[class*=" icon-"].hide{display:none}
 .icon-muted{color:#eee}
 .icon-light{color:#fff}
 .icon-dark{color:#333}
-.icon-border{border:solid 1px #eee;padding:.2em .25em .15em;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}
+.icon-border{padding:.2em .25em .15em;border:solid 1px #eee;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}
 .icon-2x{font-size:2em}.icon-2x.icon-border{border-width:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}
 .icon-3x{font-size:3em}.icon-3x.icon-border{border-width:3px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}
 .icon-4x{font-size:4em}.icon-4x.icon-border{border-width:4px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}
@@ -18,7 +18,7 @@ a [class^="icon-"],a [class*=" icon-"]{display:inline}
 .pull-left{float:left}
 [class^="icon-"].pull-left,[class*=" icon-"].pull-left{margin-right:.3em}
 [class^="icon-"].pull-right,[class*=" icon-"].pull-right{margin-left:.3em}
-[class^="icon-"],[class*=" icon-"]{display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none;background-position:0 0;background-repeat:repeat;margin-top:0}
+[class^="icon-"],[class*=" icon-"]{display:inline;width:auto;height:auto;margin-top:0;line-height:normal;vertical-align:baseline;background-image:none;background-position:0 0;background-repeat:repeat}
 .icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:none}
 .btn [class^="icon-"].icon-large,.nav [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large,.nav [class*=" icon-"].icon-large{line-height:.9em}
 .btn [class^="icon-"].icon-spin,.nav [class^="icon-"].icon-spin,.btn [class*=" icon-"].icon-spin,.nav [class*=" icon-"].icon-spin{display:inline-block}
@@ -30,13 +30,13 @@ a [class^="icon-"],a [class*=" icon-"]{display:inline}
 .btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x{margin-right:.2em}
 .btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-left:.2em}
 .nav-list [class^="icon-"],.nav-list [class*=" icon-"]{line-height:inherit}
-.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{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:-35%}.icon-stack [class^="icon-"],.icon-stack [class*=" icon-"]{position:absolute;display:block;width:100%;height:100%;font-size:1em;line-height:inherit;*line-height:2em;text-align:center}
 .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}
+.icon-spin{display:inline-block;-webkit-animation:spin 2s infinite linear;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear}
 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)}
+@-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{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)}
+.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)}
+.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)}
 .icon-flip-horizontal:before{-webkit-transform:scale(-1, 1);-moz-transform:scale(-1, 1);-ms-transform:scale(-1, 1);-o-transform:scale(-1, 1);transform:scale(-1, 1)}
 .icon-flip-vertical:before{-webkit-transform:scale(1, -1);-moz-transform:scale(1, -1);-ms-transform:scale(1, -1);-o-transform:scale(1, -1);transform:scale(1, -1)}
 a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .icon-flip-horizontal:before,a .icon-flip-vertical:before{display:inline-block}

+ 2 - 2
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 */

+ 8 - 7
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);
 }
 

+ 4 - 4
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 {

+ 1 - 1
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;

+ 6 - 6
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);
     }
   }
 }

+ 1 - 1
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;

+ 1 - 1
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";

+ 2 - 2
scss/_bootstrap.scss

@@ -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 */

+ 6 - 5
scss/_core.scss

@@ -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 {
-  vertical-align: -10%;
   font-size: (4em/3);
+  vertical-align: -10%;
 }
 
 /* makes sure icons active on rollover in links */
@@ -33,8 +33,8 @@ a {
   &.icon-fixed-width {
     display: inline-block;
     width: (16em/14);
-    text-align: right;
     padding-right: (4em/14);
+    text-align: right;
     &.icon-large {
       width: (20em/14);
     }
@@ -42,6 +42,7 @@ a {
 }
 
 .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;
   @include border-radius(3px);
 }
 

+ 4 - 4
scss/_extras.scss

@@ -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 {

+ 5 - 5
scss/_mixins.scss

@@ -7,13 +7,13 @@
 }
 
 @mixin 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
 }
 
 @mixin border-radius($radius) {
@@ -32,14 +32,14 @@
     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;

+ 1 - 1
scss/_path.scss

@@ -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;

+ 2 - 2
src/assets/font-awesome/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 */

+ 6 - 6
src/assets/font-awesome/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 {
-  vertical-align: -10%;
   font-size: (4em / 3);
+  vertical-align: -10%;
 }
 
 /* makes sure icons active on rollover in links */
@@ -33,8 +33,8 @@ a {
   &.icon-fixed-width {
     display: inline-block;
     width: (16em / 14);
-    text-align: right;
     padding-right: (4em / 14);
+    text-align: right;
     &.icon-large {
       width: (20em / 14);
     }
@@ -42,8 +42,8 @@ a {
 }
 
 .icons-ul {
-  margin-left: @icons-li-width;
   padding-left: 0;
+  margin-left: @icons-li-width;
   list-style-type: none;
 
   > li { position: relative; }
@@ -52,8 +52,8 @@ a {
     position: absolute;
     left: -@icons-li-width;
     width: @icons-li-width;
-    text-align: center;
     line-height: inherit;
+    text-align: center;
   }
 }
 
@@ -73,8 +73,8 @@ a {
 // -------------------------
 
 .icon-border {
-  border: solid 1px @borderColor;
   padding: .2em .25em .15em;
+  border: solid 1px @borderColor;
   .border-radius(3px);
 }
 

+ 4 - 4
src/assets/font-awesome/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 {

+ 5 - 5
src/assets/font-awesome/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,14 +32,14 @@
     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;

+ 2 - 2
src/assets/font-awesome/scss/_bootstrap.scss

@@ -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 */

+ 6 - 6
src/assets/font-awesome/scss/_core.scss

@@ -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 {
-  vertical-align: -10%;
   font-size: (4em/3);
+  vertical-align: -10%;
 }
 
 /* makes sure icons active on rollover in links */
@@ -33,8 +33,8 @@ a {
   &.icon-fixed-width {
     display: inline-block;
     width: (16em/14);
-    text-align: right;
     padding-right: (4em/14);
+    text-align: right;
     &.icon-large {
       width: (20em/14);
     }
@@ -42,8 +42,8 @@ a {
 }
 
 .icons-ul {
-  margin-left: $icons-li-width;
   padding-left: 0;
+  margin-left: $icons-li-width;
   list-style-type: none;
 
   > li { position: relative; }
@@ -52,8 +52,8 @@ a {
     position: absolute;
     left: -$icons-li-width;
     width: $icons-li-width;
-    text-align: center;
     line-height: inherit;
+    text-align: center;
   }
 }
 
@@ -73,8 +73,8 @@ a {
 // -------------------------
 
 .icon-border {
-  border: solid 1px $borderColor;
   padding: .2em .25em .15em;
+  border: solid 1px $borderColor;
   @include border-radius(3px);
 }
 

+ 4 - 4
src/assets/font-awesome/scss/_extras.scss

@@ -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 {

+ 5 - 5
src/assets/font-awesome/scss/_mixins.scss

@@ -7,13 +7,13 @@
 }
 
 @mixin 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
 }
 
 @mixin border-radius($radius) {
@@ -32,14 +32,14 @@
     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;