Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #377 from toadkicker/master

This fixes a bunch of stuff with Fontawesome
  • Loading branch information...
commit ac20f06d565099325abe38fa147a6aa2047248f4 2 parents 0214cd7 + 9fd5059
@seyhunak seyhunak authored
View
12 lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less
@@ -2,16 +2,16 @@
@import "twitter/bootstrap/responsive";
// Set the correct sprite paths
-@iconSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings.png');
-@iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.png');
+@iconSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings.png");
+@iconWhiteSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings-white.png");
// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
// Note: If you use asset_path() here, your compiled boostrap_and_overrides.css will not
// have the proper paths. So for now we use the absolute path.
-@fontAwesomeEotPath: '/assets/fontawesome-webfont.eot';
-@fontAwesomeWoffPath: '/assets/fontawesome-webfont.woff';
-@fontAwesomeTtfPath: '/assets/fontawesome-webfont.ttf';
-@fontAwesomeSvgPath: '/assets/fontawesome-webfont.svg';
+@fontAwesomeEotPath: "/assets/fontawesome-webfont.eot";
+@fontAwesomeWoffPath: "/assets/fontawesome-webfont.woff";
+@fontAwesomeTtfPath: "/assets/fontawesome-webfont.ttf";
+@fontAwesomeSvgPath: "/assets/fontawesome-webfont.svg";
// Font Awesome
@import "fontawesome";
View
30 lib/generators/bootstrap/layout/templates/layout.html.erb
@@ -75,24 +75,22 @@
</div>
</div><!--/row-->
<%- else -%>
- <div class="content">
<div class="row">
- <div class="span9">
- <%%= yield %>
- </div>
- <div class="span3">
- <div class="well sidebar-nav">
- <h3>Sidebar</h3>
- <ul class="nav nav-list">
- <li class="nav-header">Sidebar</li>
- <li><%%= link_to "Link1", "/path1" %></li>
- <li><%%= link_to "Link2", "/path2" %></li>
- <li><%%= link_to "Link3", "/path3" %></li>
- </ul>
- </div><!--/.well -->
- </div><!--/span-->
+ <div class="span9">
+ <%%= yield %>
+ </div>
+ <div class="span3">
+ <div class="well sidebar-nav">
+ <h3>Sidebar</h3>
+ <ul class="nav nav-list">
+ <li class="nav-header">Sidebar</li>
+ <li><%%= link_to "Link1", "/path1" %></li>
+ <li><%%= link_to "Link2", "/path2" %></li>
+ <li><%%= link_to "Link3", "/path3" %></li>
+ </ul>
+ </div><!--/.well -->
+ </div><!--/span-->
</div><!--/row-->
- </div><!--/content-->
<%- end -%>
<footer>
View
25 lib/generators/bootstrap/layout/templates/layout.html.haml
@@ -46,19 +46,18 @@
.span9
= yield
<% else %>
- .content
- .row
- .span9
- = bootstrap_flash
- = yield
- .span3
- .well.sidebar-nav
- %h3 Sidebar
- %ul.nav.nav-list
- %li.nav-header Sidebar
- %li= link_to "Link 1", "/path1"
- %li= link_to "Link 2", "/path2"
- %li= link_to "Link 3", "/path3"
+ .row
+ .span9
+ = bootstrap_flash
+ = yield
+ .span3
+ .well.sidebar-nav
+ %h3 Sidebar
+ %ul.nav.nav-list
+ %li.nav-header Sidebar
+ %li= link_to "Link 1", "/path1"
+ %li= link_to "Link 2", "/path2"
+ %li= link_to "Link 3", "/path3"
<% end %>
%footer
%p &copy; Company 2012
View
25 lib/generators/bootstrap/layout/templates/layout.html.slim
@@ -46,19 +46,18 @@ html lang="en"
.span9
= yield
<% else %>
- .content
- .row
- .span9
- = bootstrap_flash
- = yield
- .span3
- .well.sidebar-nav
- h3 Sidebar
- ul.nav.nav-list
- li.nav-header Sidebar
- li= link_to "Link 1", "/path1"
- li= link_to "Link 2", "/path2"
- li= link_to "Link 3", "/path3"
+ .row
+ .span9
+ = bootstrap_flash
+ = yield
+ .span3
+ .well.sidebar-nav
+ h3 Sidebar
+ ul.nav.nav-list
+ li.nav-header Sidebar
+ li= link_to "Link 1", "/path1"
+ li= link_to "Link 2", "/path2"
+ li= link_to "Link 3", "/path3"
<% end %>
footer
p &copy; Company 2012
View
245 vendor/toolkit/font-awesome-ie7.less
@@ -0,0 +1,245 @@
+[class^="icon-"],
+[class*=" icon-"] {
+ font-family: FontAwesome;
+ font-style: normal;
+ font-weight: normal;
+}
+
+.btn.dropdown-toggle [class^="icon-"], .btn.dropdown-toggle [class*=" icon-"] {
+/* keeps button heights with and without icons the same */
+ line-height: 1.4em;
+}
+
+.icon-large {
+ font-size: 1.3333em;
+}
+
+.ie7icon(@inner) {
+ *zoom: ~"expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '@{inner}&nbsp;')";
+}
+
+.icon-glass { .ie7icon('&#xf000;'); }
+.icon-music { .ie7icon('&#xf001;'); }
+.icon-search { .ie7icon('&#xf002;'); }
+.icon-envelope { .ie7icon('&#xf003;'); }
+.icon-heart { .ie7icon('&#xf004;'); }
+.icon-star { .ie7icon('&#xf005;'); }
+.icon-star-empty { .ie7icon('&#xf006;'); }
+.icon-user { .ie7icon('&#xf007;'); }
+.icon-film { .ie7icon('&#xf008;'); }
+.icon-th-large { .ie7icon('&#xf009;'); }
+.icon-th { .ie7icon('&#xf00a;'); }
+.icon-th-list { .ie7icon('&#xf00b;'); }
+.icon-ok { .ie7icon('&#xf00c;'); }
+.icon-remove { .ie7icon('&#xf00d;'); }
+.icon-zoom-in { .ie7icon('&#xf00e;'); }
+
+.icon-zoom-out { .ie7icon('&#xf010;'); }
+.icon-off { .ie7icon('&#xf011;'); }
+.icon-signal { .ie7icon('&#xf012;'); }
+.icon-cog { .ie7icon('&#xf013;'); }
+.icon-trash { .ie7icon('&#xf014;'); }
+.icon-home { .ie7icon('&#xf015;'); }
+.icon-file { .ie7icon('&#xf016;'); }
+.icon-time { .ie7icon('&#xf017;'); }
+.icon-road { .ie7icon('&#xf018;'); }
+.icon-download-alt { .ie7icon('&#xf019;'); }
+.icon-download { .ie7icon('&#xf01a;'); }
+.icon-upload { .ie7icon('&#xf01b;'); }
+.icon-inbox { .ie7icon('&#xf01c;'); }
+.icon-play-circle { .ie7icon('&#xf01d;'); }
+.icon-repeat { .ie7icon('&#xf01e;'); }
+
+.icon-refresh { .ie7icon('&#xf021;'); }
+.icon-list-alt { .ie7icon('&#xf022;'); }
+.icon-lock { .ie7icon('&#xf023;'); }
+.icon-flag { .ie7icon('&#xf024;'); }
+.icon-headphones { .ie7icon('&#xf025;'); }
+.icon-volume-off { .ie7icon('&#xf026;'); }
+.icon-volume-down { .ie7icon('&#xf027;'); }
+.icon-volume-up { .ie7icon('&#xf028;'); }
+.icon-qrcode { .ie7icon('&#xf029;'); }
+.icon-barcode { .ie7icon('&#xf02a;'); }
+.icon-tag { .ie7icon('&#xf02b;'); }
+.icon-tags { .ie7icon('&#xf02c;'); }
+.icon-book { .ie7icon('&#xf02d;'); }
+.icon-bookmark { .ie7icon('&#xf02e;'); }
+.icon-print { .ie7icon('&#xf02f;'); }
+
+.icon-camera { .ie7icon('&#xf030;'); }
+.icon-font { .ie7icon('&#xf031;'); }
+.icon-bold { .ie7icon('&#xf032;'); }
+.icon-italic { .ie7icon('&#xf033;'); }
+.icon-text-height { .ie7icon('&#xf034;'); }
+.icon-text-width { .ie7icon('&#xf035;'); }
+.icon-align-left { .ie7icon('&#xf036;'); }
+.icon-align-center { .ie7icon('&#xf037;'); }
+.icon-align-right { .ie7icon('&#xf038;'); }
+.icon-align-justify { .ie7icon('&#xf039;'); }
+.icon-list { .ie7icon('&#xf03a;'); }
+.icon-indent-left { .ie7icon('&#xf03b;'); }
+.icon-indent-right { .ie7icon('&#xf03c;'); }
+.icon-facetime-video { .ie7icon('&#xf03d;'); }
+.icon-picture { .ie7icon('&#xf03e;'); }
+
+.icon-pencil { .ie7icon('&#xf040;'); }
+.icon-map-marker { .ie7icon('&#xf041;'); }
+.icon-adjust { .ie7icon('&#xf042;'); }
+.icon-tint { .ie7icon('&#xf043;'); }
+.icon-edit { .ie7icon('&#xf044;'); }
+.icon-share { .ie7icon('&#xf045;'); }
+.icon-check { .ie7icon('&#xf046;'); }
+.icon-move { .ie7icon('&#xf047;'); }
+.icon-step-backward { .ie7icon('&#xf048;'); }
+.icon-fast-backward { .ie7icon('&#xf049;'); }
+.icon-backward { .ie7icon('&#xf04a;'); }
+.icon-play { .ie7icon('&#xf04b;'); }
+.icon-pause { .ie7icon('&#xf04c;'); }
+.icon-stop { .ie7icon('&#xf04d;'); }
+.icon-forward { .ie7icon('&#xf04e;'); }
+
+.icon-fast-forward { .ie7icon('&#xf050;'); }
+.icon-step-forward { .ie7icon('&#xf051;'); }
+.icon-eject { .ie7icon('&#xf052;'); }
+.icon-chevron-left { .ie7icon('&#xf053;'); }
+.icon-chevron-right { .ie7icon('&#xf054;'); }
+.icon-plus-sign { .ie7icon('&#xf055;'); }
+.icon-minus-sign { .ie7icon('&#xf056;'); }
+.icon-remove-sign { .ie7icon('&#xf057;'); }
+.icon-ok-sign { .ie7icon('&#xf058;'); }
+.icon-question-sign { .ie7icon('&#xf059;'); }
+.icon-info-sign { .ie7icon('&#xf05a;'); }
+.icon-screenshot { .ie7icon('&#xf05b;'); }
+.icon-remove-circle { .ie7icon('&#xf05c;'); }
+.icon-ok-circle { .ie7icon('&#xf05d;'); }
+.icon-ban-circle { .ie7icon('&#xf05e;'); }
+
+.icon-arrow-left { .ie7icon('&#xf060;'); }
+.icon-arrow-right { .ie7icon('&#xf061;'); }
+.icon-arrow-up { .ie7icon('&#xf062;'); }
+.icon-arrow-down { .ie7icon('&#xf063;'); }
+.icon-share-alt { .ie7icon('&#xf064;'); }
+.icon-resize-full { .ie7icon('&#xf065;'); }
+.icon-resize-small { .ie7icon('&#xf066;'); }
+.icon-plus { .ie7icon('&#xf067;'); }
+.icon-minus { .ie7icon('&#xf068;'); }
+.icon-asterisk { .ie7icon('&#xf069;'); }
+.icon-exclamation-sign { .ie7icon('&#xf06a;'); }
+.icon-gift { .ie7icon('&#xf06b;'); }
+.icon-leaf { .ie7icon('&#xf06c;'); }
+.icon-fire { .ie7icon('&#xf06d;'); }
+.icon-eye-open { .ie7icon('&#xf06e;'); }
+
+.icon-eye-close { .ie7icon('&#xf070;'); }
+.icon-warning-sign { .ie7icon('&#xf071;'); }
+.icon-plane { .ie7icon('&#xf072;'); }
+.icon-calendar { .ie7icon('&#xf073;'); }
+.icon-random { .ie7icon('&#xf074;'); }
+.icon-comment { .ie7icon('&#xf075;'); }
+.icon-magnet { .ie7icon('&#xf076;'); }
+.icon-chevron-up { .ie7icon('&#xf077;'); }
+.icon-chevron-down { .ie7icon('&#xf078;'); }
+.icon-retweet { .ie7icon('&#xf079;'); }
+.icon-shopping-cart { .ie7icon('&#xf07a;'); }
+.icon-folder-close { .ie7icon('&#xf07b;'); }
+.icon-folder-open { .ie7icon('&#xf07c;'); }
+.icon-resize-vertical { .ie7icon('&#xf07d;'); }
+.icon-resize-horizontal { .ie7icon('&#xf07e;'); }
+
+.icon-bar-chart { .ie7icon('&#xf080;'); }
+.icon-twitter-sign { .ie7icon('&#xf081;'); }
+.icon-facebook-sign { .ie7icon('&#xf082;'); }
+.icon-camera-retro { .ie7icon('&#xf083;'); }
+.icon-key { .ie7icon('&#xf084;'); }
+.icon-cogs { .ie7icon('&#xf085;'); }
+.icon-comments { .ie7icon('&#xf086;'); }
+.icon-thumbs-up { .ie7icon('&#xf087;'); }
+.icon-thumbs-down { .ie7icon('&#xf088;'); }
+.icon-star-half { .ie7icon('&#xf089;'); }
+.icon-heart-empty { .ie7icon('&#xf08a;'); }
+.icon-signout { .ie7icon('&#xf08b;'); }
+.icon-linkedin-sign { .ie7icon('&#xf08c;'); }
+.icon-pushpin { .ie7icon('&#xf08d;'); }
+.icon-external-link { .ie7icon('&#xf08e;'); }
+
+.icon-signin { .ie7icon('&#xf090;'); }
+.icon-trophy { .ie7icon('&#xf091;'); }
+.icon-github-sign { .ie7icon('&#xf092;'); }
+.icon-upload-alt { .ie7icon('&#xf093;'); }
+.icon-lemon { .ie7icon('&#xf094;'); }
+.icon-phone { .ie7icon('&#xf095;'); }
+.icon-check-empty { .ie7icon('&#xf096;'); }
+.icon-bookmark-empty { .ie7icon('&#xf097;'); }
+.icon-phone-sign { .ie7icon('&#xf098;'); }
+.icon-twitter { .ie7icon('&#xf099;'); }
+.icon-facebook { .ie7icon('&#xf09a;'); }
+.icon-github { .ie7icon('&#xf09b;'); }
+.icon-unlock { .ie7icon('&#xf09c;'); }
+.icon-credit-card { .ie7icon('&#xf09d;'); }
+.icon-rss { .ie7icon('&#xf09e;'); }
+
+.icon-hdd { .ie7icon('&#xf0a0;'); }
+.icon-bullhorn { .ie7icon('&#xf0a1;'); }
+.icon-bell { .ie7icon('&#xf0a2;'); }
+.icon-certificate { .ie7icon('&#xf0a3;'); }
+.icon-hand-right { .ie7icon('&#xf0a4;'); }
+.icon-hand-left { .ie7icon('&#xf0a5;'); }
+.icon-hand-up { .ie7icon('&#xf0a6;'); }
+.icon-hand-down { .ie7icon('&#xf0a7;'); }
+.icon-circle-arrow-left { .ie7icon('&#xf0a8;'); }
+.icon-circle-arrow-right { .ie7icon('&#xf0a9;'); }
+.icon-circle-arrow-up { .ie7icon('&#xf0aa;'); }
+.icon-circle-arrow-down { .ie7icon('&#xf0ab;'); }
+.icon-globe { .ie7icon('&#xf0ac;'); }
+.icon-wrench { .ie7icon('&#xf0ad;'); }
+.icon-tasks { .ie7icon('&#xf0ae;'); }
+
+.icon-filter { .ie7icon('&#xf0b0;'); }
+.icon-briefcase { .ie7icon('&#xf0b1;'); }
+.icon-fullscreen { .ie7icon('&#xf0b2;'); }
+
+.icon-group { .ie7icon('&#xf0c0;'); }
+.icon-link { .ie7icon('&#xf0c1;'); }
+.icon-cloud { .ie7icon('&#xf0c2;'); }
+.icon-beaker { .ie7icon('&#xf0c3;'); }
+.icon-cut { .ie7icon('&#xf0c4;'); }
+.icon-copy { .ie7icon('&#xf0c5;'); }
+.icon-paper-clip { .ie7icon('&#xf0c6;'); }
+.icon-save { .ie7icon('&#xf0c7;'); }
+.icon-sign-blank { .ie7icon('&#xf0c8;'); }
+.icon-reorder { .ie7icon('&#xf0c9;'); }
+.icon-list-ul { .ie7icon('&#xf0ca;'); }
+.icon-list-ol { .ie7icon('&#xf0cb;'); }
+.icon-strikethrough { .ie7icon('&#xf0cc;'); }
+.icon-underline { .ie7icon('&#xf0cd;'); }
+.icon-table { .ie7icon('&#xf0ce;'); }
+
+.icon-magic { .ie7icon('&#xf0d0;'); }
+.icon-truck { .ie7icon('&#xf0d1;'); }
+.icon-pinterest { .ie7icon('&#xf0d2;'); }
+.icon-pinterest-sign { .ie7icon('&#xf0d3;'); }
+.icon-google-plus-sign { .ie7icon('&#xf0d4;'); }
+.icon-google-plus { .ie7icon('&#xf0d5;'); }
+.icon-money { .ie7icon('&#xf0d6;'); }
+.icon-caret-down { .ie7icon('&#xf0d7;'); }
+.icon-caret-up { .ie7icon('&#xf0d8;'); }
+.icon-caret-left { .ie7icon('&#xf0d9;'); }
+.icon-caret-right { .ie7icon('&#xf0da;'); }
+.icon-columns { .ie7icon('&#xf0db;'); }
+.icon-sort { .ie7icon('&#xf0dc;'); }
+.icon-sort-down { .ie7icon('&#xf0dd;'); }
+.icon-sort-up { .ie7icon('&#xf0de;'); }
+
+.icon-envelope-alt { .ie7icon('&#xf0e0;'); }
+.icon-linkedin { .ie7icon('&#xf0e1;'); }
+.icon-undo { .ie7icon('&#xf0e2;'); }
+.icon-legal { .ie7icon('&#xf0e3;'); }
+.icon-dashboard { .ie7icon('&#xf0e4;'); }
+.icon-comment-alt { .ie7icon('&#xf0e5;'); }
+.icon-comments-alt { .ie7icon('&#xf0e6;'); }
+.icon-bolt { .ie7icon('&#xf0e7;'); }
+.icon-sitemap { .ie7icon('&#xf0e8;'); }
+.icon-umbrella { .ie7icon('&#xf0e9;'); }
+.icon-paste { .ie7icon('&#xf0ea;'); }
+
+.icon-user-md { .ie7icon('&#xf200;'); }
View
31 vendor/toolkit/fontawesome.less
@@ -23,33 +23,16 @@
*/
@font-face {
- font-family: 'FontAwesome';
- src: url(@fontAwesomeEotPath);
- src: url('@{fontAwesomeEotPath}?#iefix'),
- url(@fontAwesomeWoffPath),
- url(@fontAwesomeTtfPath),
- url('@{fontAwesomeSvgPath}#FontAwesome');
+ font-family: "FontAwesome";
+ src: url("@{fontAwesomeEotPath}");
+ src: url("@{fontAwesomeEotPath}?#iefix") format("embedded-opentype"),
+ url("@{fontAwesomeWoffPath}") format("woff"),
+ url("@{fontAwesomeTtfPath}") format("truetype"),
+ url("@{fontAwesomeSvgPath}") format("svg");
font-weight: normal;
font-style: normal;
}
-/* sprites.less reset */
-[class^="icon-"],
-[class*=" icon-"] {
- display: inline;
- width: auto;
- height: auto;
- line-height: inherit;
- vertical-align: baseline;
- background-image: none;
- background-position: 0% 0%;
- background-repeat: repeat;
-}
-li[class^="icon-"],
-li[class*=" icon-"] {
- display: block;
-}
-
/* Font Awesome styles
------------------------------------------------------- */
[class^="icon-"]:before,
@@ -148,7 +131,7 @@ ul.icons {
.icon-play-circle:before { content: "\f01d"; }
.icon-repeat:before { content: "\f01e"; }
-/* \f020 is not a valid unicode character. all shifted one down */
+/* \f020 doesn't work in Safari. all shifted one down */
.icon-refresh:before { content: "\f021"; }
.icon-list-alt:before { content: "\f022"; }
.icon-lock:before { content: "\f023"; }
Please sign in to comment.
Something went wrong with that request. Please try again.