diff --git a/assets/font-awesome.zip b/assets/font-awesome.zip index 2baf2bf17..64301206c 100644 Binary files a/assets/font-awesome.zip and b/assets/font-awesome.zip differ diff --git a/assets/font-awesome/css/font-awesome-ie7.css b/assets/font-awesome/css/font-awesome-ie7.css index 645ff1e64..507ebeb3d 100644 --- a/assets/font-awesome/css/font-awesome-ie7.css +++ b/assets/font-awesome/css/font-awesome-ie7.css @@ -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 @@ -127,6 +127,9 @@ a [class*=" icon-"] { .icon-cog { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } +.icon-gear { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} .icon-trash { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } @@ -454,6 +457,9 @@ a [class*=" icon-"] { .icon-cogs { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } +.icon-gears { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} .icon-comments { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } @@ -1153,7 +1159,7 @@ a [class*=" icon-"] { .icon-linux { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } -.icon-dribble { +.icon-dribbble { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } .icon-skype { diff --git a/assets/font-awesome/css/font-awesome-ie7.min.css b/assets/font-awesome/css/font-awesome-ie7.min.css index 13410b2db..d3dae63bd 100644 --- a/assets/font-awesome/css/font-awesome-ie7.min.css +++ b/assets/font-awesome/css/font-awesome-ie7.min.css @@ -24,6 +24,7 @@ a [class^="icon-"],a [class*=" icon-"]{cursor:pointer;} .icon-power-off{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} .icon-signal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} .icon-cog{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-gear{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} .icon-trash{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} .icon-home{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} .icon-file-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} @@ -133,6 +134,7 @@ a [class^="icon-"],a [class*=" icon-"]{cursor:pointer;} .icon-camera-retro{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} .icon-key{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} .icon-cogs{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-gears{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} .icon-comments{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} .icon-thumbs-up-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} .icon-thumbs-down-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} @@ -366,7 +368,7 @@ a [class^="icon-"],a [class*=" icon-"]{cursor:pointer;} .icon-windows{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} .icon-android{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} .icon-linux{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-dribble{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-dribbble{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} .icon-skype{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} .icon-foursquare{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} .icon-trello{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} diff --git a/assets/font-awesome/css/font-awesome.css b/assets/font-awesome/css/font-awesome.css index f9d4aa35c..30a96b22b 100644 --- a/assets/font-awesome/css/font-awesome.css +++ b/assets/font-awesome/css/font-awesome.css @@ -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 @@ -27,8 +27,8 @@ * -------------------------- */ @font-face { font-family: 'FontAwesome'; - src: url('../font/fontawesome-webfont.eot?v=3.2.0'); - src: url('../font/fontawesome-webfont.eot?#iefix&v=3.2.0') format('embedded-opentype'), url('../font/fontawesome-webfont.woff?v=3.2.0') format('woff'), url('../font/fontawesome-webfont.ttf?v=3.2.0') format('truetype'), url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.0') format('svg'); + 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; } @@ -47,7 +47,6 @@ [class*=" icon-"]:before { text-decoration: inherit; display: inline-block; - cursor: default; speak: none; } /* makes the font 33% larger relative to the icon container */ @@ -244,6 +243,11 @@ a [class*=" icon-"] { .btn.btn-large [class*=" icon-"].pull-right.icon-2x { margin-left: .2em; } +/* Fixes alignment in nav lists */ +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { + line-height: inherit; +} /* EXTRAS * -------------------------- */ /* Stacked and layered icon */ @@ -278,6 +282,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; @@ -426,6 +432,7 @@ a .icon-flip-vertical:before { .icon-signal:before { content: "\f012"; } +.icon-gear:before, .icon-cog:before { content: "\f013"; } @@ -749,6 +756,7 @@ a .icon-flip-vertical:before { .icon-key:before { content: "\f084"; } +.icon-gears:before, .icon-cogs:before { content: "\f085"; } @@ -1427,7 +1435,7 @@ a .icon-flip-vertical:before { .icon-linux:before { content: "\f17c"; } -.icon-dribble:before { +.icon-dribbble:before { content: "\f17d"; } .icon-skype:before { diff --git a/assets/font-awesome/css/font-awesome.min.css b/assets/font-awesome/css/font-awesome.min.css index 8f7fbfe2e..866437fa4 100644 --- a/assets/font-awesome/css/font-awesome.min.css +++ b/assets/font-awesome/css/font-awesome.min.css @@ -1,5 +1,5 @@ -@font-face{font-family:'FontAwesome';src:url('../font/fontawesome-webfont.eot?v=3.2.0');src:url('../font/fontawesome-webfont.eot?#iefix&v=3.2.0') format('embedded-opentype'),url('../font/fontawesome-webfont.woff?v=3.2.0') format('woff'),url('../font/fontawesome-webfont.ttf?v=3.2.0') format('truetype'),url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.0') 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;} +@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;*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;} 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";} diff --git a/assets/font-awesome/less/bootstrap.less b/assets/font-awesome/less/bootstrap.less index 444e29804..a2c96046b 100644 --- a/assets/font-awesome/less/bootstrap.less +++ b/assets/font-awesome/less/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/assets/font-awesome/less/core.less b/assets/font-awesome/less/core.less index e4be78cd0..1ef7e2235 100644 --- a/assets/font-awesome/less/core.less +++ b/assets/font-awesome/less/core.less @@ -10,7 +10,6 @@ [class*=" icon-"]:before { text-decoration: inherit; display: inline-block; - cursor: default; speak: none; } diff --git a/assets/font-awesome/less/extras.less b/assets/font-awesome/less/extras.less index c71ac4d30..c93c260c8 100644 --- a/assets/font-awesome/less/extras.less +++ b/assets/font-awesome/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/assets/font-awesome/less/font-awesome-ie7.less b/assets/font-awesome/less/font-awesome-ie7.less index 1074bb94f..269ab5f81 100644 --- a/assets/font-awesome/less/font-awesome-ie7.less +++ b/assets/font-awesome/less/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(''); } +.icon-gear { + .ie7icon(''); +} + .icon-trash { .ie7icon(''); @@ -719,6 +723,10 @@ a [class*=" icon-"] { .ie7icon(''); } +.icon-gears { + .ie7icon(''); +} + .icon-comments { .ie7icon(''); @@ -1873,7 +1881,7 @@ a [class*=" icon-"] { } -.icon-dribble { +.icon-dribbble { .ie7icon(''); } diff --git a/assets/font-awesome/less/font-awesome.less b/assets/font-awesome/less/font-awesome.less index db6cac243..68376992c 100644 --- a/assets/font-awesome/less/font-awesome.less +++ b/assets/font-awesome/less/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/assets/font-awesome/less/icons.less b/assets/font-awesome/less/icons.less index 74a8f95c9..476d201ec 100644 --- a/assets/font-awesome/less/icons.less +++ b/assets/font-awesome/less/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/assets/font-awesome/less/variables.less b/assets/font-awesome/less/variables.less index 7136a1e3a..9d0879b0d 100644 --- a/assets/font-awesome/less/variables.less +++ b/assets/font-awesome/less/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"; diff --git a/assets/font-awesome/scss/_bootstrap.scss b/assets/font-awesome/scss/_bootstrap.scss index 43f8a2b89..837d2df65 100644 --- a/assets/font-awesome/scss/_bootstrap.scss +++ b/assets/font-awesome/scss/_bootstrap.scss @@ -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/assets/font-awesome/scss/_core.scss b/assets/font-awesome/scss/_core.scss index 2ae7d5577..0189c73df 100644 --- a/assets/font-awesome/scss/_core.scss +++ b/assets/font-awesome/scss/_core.scss @@ -10,7 +10,6 @@ [class*=" icon-"]:before { text-decoration: inherit; display: inline-block; - cursor: default; speak: none; } diff --git a/assets/font-awesome/scss/_extras.scss b/assets/font-awesome/scss/_extras.scss index 9882cdc3c..9a25845d8 100644 --- a/assets/font-awesome/scss/_extras.scss +++ b/assets/font-awesome/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; diff --git a/assets/font-awesome/scss/_icons.scss b/assets/font-awesome/scss/_icons.scss index 16179266e..eefda0c9e 100644 --- a/assets/font-awesome/scss/_icons.scss +++ b/assets/font-awesome/scss/_icons.scss @@ -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/assets/font-awesome/scss/_variables.scss b/assets/font-awesome/scss/_variables.scss index f918ec8d9..7d6bbc5b1 100644 --- a/assets/font-awesome/scss/_variables.scss +++ b/assets/font-awesome/scss/_variables.scss @@ -2,7 +2,7 @@ // -------------------------- $FontAwesomePath: "../font" !default; -$FontAwesomeVersion: "3.2.0" !default; +$FontAwesomeVersion: "3.2.1" !default; $borderColor: #eeeeee !default; $iconMuted: #eeeeee !default; $iconLight: white !default; @@ -704,7 +704,7 @@ $android: "\f17b"; $linux: "\f17c"; -$dribble: "\f17d"; +$dribbble: "\f17d"; $skype: "\f17e"; diff --git a/assets/font-awesome/scss/font-awesome-ie7.scss b/assets/font-awesome/scss/font-awesome-ie7.scss index 0d1e55247..223e5f4b8 100644 --- a/assets/font-awesome/scss/font-awesome-ie7.scss +++ b/assets/font-awesome/scss/font-awesome-ie7.scss @@ -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-"] { @include ie7icon(''); } +.icon-gear { + @include ie7icon(''); +} + .icon-trash { @include ie7icon(''); @@ -719,6 +723,10 @@ a [class*=" icon-"] { @include ie7icon(''); } +.icon-gears { + @include ie7icon(''); +} + .icon-comments { @include ie7icon(''); @@ -1873,7 +1881,7 @@ a [class*=" icon-"] { } -.icon-dribble { +.icon-dribbble { @include ie7icon(''); } diff --git a/assets/font-awesome/scss/font-awesome.scss b/assets/font-awesome/scss/font-awesome.scss index 74c80016f..b1f54516c 100644 --- a/assets/font-awesome/scss/font-awesome.scss +++ b/assets/font-awesome/scss/font-awesome.scss @@ -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/cheatsheet/index.html b/cheatsheet/index.html index 15bedc7ae..adb73e434 100644 --- a/cheatsheet/index.html +++ b/cheatsheet/index.html @@ -69,7 +69,7 @@