Fontawesome 3.2.1

tagliala · tagliala · commit 05f7e9fa7f1c · 2013-06-21T10:43:44.000+02:00
diff --git a/app/assets/stylesheets/twitter-bootstrap-static/fontawesome.css.erb b/app/assets/stylesheets/twitter-bootstrap-static/fontawesome.css.erb
@@ -1,5 +1,5 @@
 @font-face{font-family:'FontAwesome';src:url("<%= asset_path 'fontawesome-webfont.eot' %>");src:url("<%= asset_path 'fontawesome-webfont.eot#iefix' %>") format('embedded-opentype'),url("<%= asset_path 'fontawesome-webfont.woff' %>") format('woff'),url("<%= asset_path 'fontawesome-webfont.ttf' %>") format('truetype'),url("<%= asset_path 'fontawesome-webfont.svg#fontawesomeregular' %>") 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;*margin-right:.3em;}
-[class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;cursor:default;speak:none;}
+[class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none;}
 .icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em;}
 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:0.2857142857142857em;}[class^="icon-"].icon-fixed-width.icon-large,[class*=" icon-"].icon-fixed-width.icon-large{width:1.4285714285714286em;}
@@ -29,10 +29,11 @@ a [class^="icon-"],a [class*=" icon-"]{display:inline;}
 .btn.btn-large [class^="icon-"],.btn.btn-large [class*=" icon-"]{margin-top:0;}.btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x,.btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-top:.05em;}
 .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 .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);}
@@ -57,7 +58,7 @@ a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .
 .icon-zoom-out:before{content:"\f010";}
 .icon-power-off:before,.icon-off:before{content:"\f011";}
 .icon-signal:before{content:"\f012";}
-.icon-cog:before{content:"\f013";}
+.icon-gear:before,.icon-cog:before{content:"\f013";}
 .icon-trash:before{content:"\f014";}
 .icon-home:before{content:"\f015";}
 .icon-file-alt:before{content:"\f016";}
@@ -164,7 +165,7 @@ a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .
 .icon-facebook-sign:before{content:"\f082";}
 .icon-camera-retro:before{content:"\f083";}
 .icon-key:before{content:"\f084";}
-.icon-cogs:before{content:"\f085";}
+.icon-gears:before,.icon-cogs:before{content:"\f085";}
 .icon-comments:before{content:"\f086";}
 .icon-thumbs-up-alt:before{content:"\f087";}
 .icon-thumbs-down-alt:before{content:"\f088";}
@@ -386,7 +387,7 @@ a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .
 .icon-windows:before{content:"\f17a";}
 .icon-android:before{content:"\f17b";}
 .icon-linux:before{content:"\f17c";}
-.icon-dribble:before{content:"\f17d";}
+.icon-dribbble:before{content:"\f17d";}
 .icon-skype:before{content:"\f17e";}
 .icon-foursquare:before{content:"\f180";}
 .icon-trello:before{content:"\f181";}
@@ -426,6 +427,7 @@ a [class^="icon-"],a [class*=" icon-"]{cursor:pointer;}
 .icon-power-off{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf011;');}
 .icon-signal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf012;');}
 .icon-cog{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf013;');}
+.icon-gear{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf013;');}
 .icon-trash{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf014;');}
 .icon-home{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf015;');}
 .icon-file-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf016;');}
@@ -535,6 +537,7 @@ a [class^="icon-"],a [class*=" icon-"]{cursor:pointer;}
 .icon-camera-retro{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf083;');}
 .icon-key{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf084;');}
 .icon-cogs{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf085;');}
+.icon-gears{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf085;');}
 .icon-comments{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf086;');}
 .icon-thumbs-up-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf087;');}
 .icon-thumbs-down-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf088;');}
@@ -768,7 +771,7 @@ a [class^="icon-"],a [class*=" icon-"]{cursor:pointer;}
 .icon-windows{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf17a;');}
 .icon-android{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf17b;');}
 .icon-linux{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf17c;');}
-.icon-dribble{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf17d;');}
+.icon-dribbble{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf17d;');}
 .icon-skype{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf17e;');}
 .icon-foursquare{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf180;');}
 .icon-trello{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf181;');}
diff --git a/vendor/toolkit/fontawesome/bootstrap.less b/vendor/toolkit/fontawesome/bootstrap.less
@@ -76,3 +76,9 @@
     &.pull-right.icon-2x { margin-left: .2em; }
   }
 }
+
+/* Fixes alignment in nav lists */
+.nav-list [class^="icon-"],
+.nav-list [class*=" icon-"] {
+  line-height: inherit;
+}
diff --git a/vendor/toolkit/fontawesome/core.less b/vendor/toolkit/fontawesome/core.less
@@ -10,7 +10,6 @@
 [class*=" icon-"]:before {
   text-decoration: inherit;
   display: inline-block;
-  cursor: default;
   speak: none;
 }
 
diff --git a/vendor/toolkit/fontawesome/extras.less b/vendor/toolkit/fontawesome/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/vendor/toolkit/fontawesome/font-awesome-ie7.less b/vendor/toolkit/fontawesome/font-awesome-ie7.less
@@ -1,5 +1,5 @@
 /*!
- *  Font Awesome 3.2.0
+ *  Font Awesome 3.2.1
  *  the iconic font designed for Bootstrap
  *  ------------------------------------------------------------------------------
  *  The full suite of pictographic icons, examples, and documentation can be
@@ -176,6 +176,10 @@ a [class*=" icon-"] {
   .ie7icon('&#xf013;');
 }
 
+.icon-gear {
+  .ie7icon('&#xf013;');
+}
+
 
 .icon-trash {
   .ie7icon('&#xf014;');
@@ -719,6 +723,10 @@ a [class*=" icon-"] {
   .ie7icon('&#xf085;');
 }
 
+.icon-gears {
+  .ie7icon('&#xf085;');
+}
+
 
 .icon-comments {
   .ie7icon('&#xf086;');
@@ -1873,7 +1881,7 @@ a [class*=" icon-"] {
 }
 
 
-.icon-dribble {
+.icon-dribbble {
   .ie7icon('&#xf17d;');
 }
 
diff --git a/vendor/toolkit/fontawesome/font-awesome.less b/vendor/toolkit/fontawesome/font-awesome.less
@@ -1,5 +1,5 @@
 /*!
- *  Font Awesome 3.2.0
+ *  Font Awesome 3.2.1
  *  the iconic font designed for Bootstrap
  *  ------------------------------------------------------------------------------
  *  The full suite of pictographic icons, examples, and documentation can be
diff --git a/vendor/toolkit/fontawesome/icons.less b/vendor/toolkit/fontawesome/icons.less
@@ -20,6 +20,7 @@
 .icon-power-off:before,
 .icon-off:before { content: @off; }
 .icon-signal:before { content: @signal; }
+.icon-gear:before,
 .icon-cog:before { content: @cog; }
 .icon-trash:before { content: @trash; }
 .icon-home:before { content: @home; }
@@ -129,6 +130,7 @@
 .icon-facebook-sign:before { content: @facebook-sign; }
 .icon-camera-retro:before { content: @camera-retro; }
 .icon-key:before { content: @key; }
+.icon-gears:before,
 .icon-cogs:before { content: @cogs; }
 .icon-comments:before { content: @comments; }
 .icon-thumbs-up-alt:before { content: @thumbs-up-alt; }
@@ -363,7 +365,7 @@
 .icon-windows:before { content: @windows; }
 .icon-android:before { content: @android; }
 .icon-linux:before { content: @linux; }
-.icon-dribble:before { content: @dribble; }
+.icon-dribbble:before { content: @dribbble; }
 .icon-skype:before { content: @skype; }
 .icon-foursquare:before { content: @foursquare; }
 .icon-trello:before { content: @trello; }
diff --git a/vendor/toolkit/fontawesome/variables.less b/vendor/toolkit/fontawesome/variables.less
@@ -2,8 +2,8 @@
 // --------------------------
 
 @FontAwesomePath:    "../font";
-//@FontAwesomePath:    "//netdna.bootstrapcdn.com/font-awesome/3.2.0/font"; // for referencing Bootstrap CDN font files directly
-@FontAwesomeVersion: "3.2.0";
+//@FontAwesomePath:    "//netdna.bootstrapcdn.com/font-awesome/3.2.1/font"; // for referencing Bootstrap CDN font files directly
+@FontAwesomeVersion: "3.2.1";
 @borderColor:        #eee;
 @iconMuted:          #eee;
 @iconLight:          #fff;
@@ -705,7 +705,7 @@
 
   @linux: "\f17c";
 
-  @dribble: "\f17d";
+  @dribbble: "\f17d";
 
   @skype: "\f17e";
 

Original file line number	Diff line number	Diff line change
`@@ -76,3 +76,9 @@`
`76`	`76`	`&.pull-right.icon-2x { margin-left: .2em; }`
`77`	`77`	`}`
`78`	`78`	`}`
	`79`	`+`
	`80`	`+/* Fixes alignment in nav lists */`
	`81`	`+.nav-list [class^="icon-"],`
	`82`	`+.nav-list [class*=" icon-"] {`
	`83`	`+ line-height: inherit;`
	`84`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`[class*=" icon-"]:before {`
`11`	`11`	`text-decoration: inherit;`
`12`	`12`	`display: inline-block;`
`13`		`- cursor: default;`
`14`	`13`	`speak: none;`
`15`	`14`	`}`
`16`	`15`