Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:ibrahimkarahan/compass-twitter-bo…

…otstrap into ibrahimkarahan-master
  • Loading branch information...
commit 269cb5e048a1f60428d0f702c36f0cc9aafe8c45 2 parents 7e506c4 + c3040a3
@thetizzo thetizzo authored
View
232 stylesheets/compass_twitter_bootstrap/_font-awesome.scss
@@ -362,8 +362,8 @@ ul.icons-ul > li .icon-li {
-o-transform: scale(1, -1);
transform: scale(1, -1);
}
-/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
- readers do not read off random characters that represent icons */
+/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
+ readers do not read off random characters that represent icons */
.icon-glass:before {
content: "\f000";
}
@@ -373,7 +373,7 @@ ul.icons-ul > li .icon-li {
.icon-search:before {
content: "\f002";
}
-.icon-envelope:before {
+.icon-envelope-alt:before {
content: "\f003";
}
.icon-heart:before {
@@ -412,12 +412,14 @@ ul.icons-ul > li .icon-li {
.icon-zoom-out:before {
content: "\f010";
}
+.icon-power-off:before,
.icon-off:before {
content: "\f011";
}
.icon-signal:before {
content: "\f012";
}
+.icon-gear:before,
.icon-cog:before {
content: "\f013";
}
@@ -427,7 +429,7 @@ ul.icons-ul > li .icon-li {
.icon-home:before {
content: "\f015";
}
-.icon-file:before {
+.icon-file-alt:before {
content: "\f016";
}
.icon-time:before {
@@ -451,11 +453,10 @@ ul.icons-ul > li .icon-li {
.icon-play-circle:before {
content: "\f01d";
}
-.icon-repeat:before,
-.icon-rotate-right:before {
+.icon-rotate-right:before,
+.icon-repeat:before {
content: "\f01e";
}
-/* F020 doesn't work in Safari. all shifted one down */
.icon-refresh:before {
content: "\f021";
}
@@ -648,8 +649,8 @@ ul.icons-ul > li .icon-li {
.icon-arrow-down:before {
content: "\f063";
}
-.icon-share-alt:before,
-.icon-mail-forward:before {
+.icon-mail-forward:before,
+.icon-share-alt:before {
content: "\f064";
}
.icon-resize-full:before {
@@ -742,16 +743,17 @@ ul.icons-ul > li .icon-li {
.icon-key:before {
content: "\f084";
}
+.icon-gears:before,
.icon-cogs:before {
content: "\f085";
}
.icon-comments:before {
content: "\f086";
}
-.icon-thumbs-up:before {
+.icon-thumbs-up-alt:before {
content: "\f087";
}
-.icon-thumbs-down:before {
+.icon-thumbs-down-alt:before {
content: "\f088";
}
.icon-star-half:before {
@@ -790,6 +792,7 @@ ul.icons-ul > li .icon-li {
.icon-phone:before {
content: "\f095";
}
+.icon-unchecked:before,
.icon-check-empty:before {
content: "\f096";
}
@@ -889,6 +892,7 @@ ul.icons-ul > li .icon-li {
.icon-copy:before {
content: "\f0c5";
}
+.icon-paperclip:before,
.icon-paper-clip:before {
content: "\f0c6";
}
@@ -961,14 +965,14 @@ ul.icons-ul > li .icon-li {
.icon-sort-up:before {
content: "\f0de";
}
-.icon-envelope-alt:before {
+.icon-envelope:before {
content: "\f0e0";
}
.icon-linkedin:before {
content: "\f0e1";
}
-.icon-undo:before,
-.icon-rotate-left:before {
+.icon-rotate-left:before,
+.icon-undo:before {
content: "\f0e2";
}
.icon-legal:before {
@@ -1025,7 +1029,7 @@ ul.icons-ul > li .icon-li {
.icon-food:before {
content: "\f0f5";
}
-.icon-file-alt:before {
+.icon-file-text-alt:before {
content: "\f0f6";
}
.icon-building:before {
@@ -1103,10 +1107,13 @@ ul.icons-ul > li .icon-li {
.icon-circle:before {
content: "\f111";
}
-.icon-reply:before,
-.icon-mail-reply:before {
+.icon-mail-reply:before,
+.icon-reply:before {
content: "\f112";
}
+.icon-github-alt:before {
+ content: "\f113";
+}
.icon-folder-close-alt:before {
content: "\f114";
}
@@ -1146,12 +1153,6 @@ ul.icons-ul > li .icon-li {
.icon-code:before {
content: "\f121";
}
-.icon-reply-all:before {
- content: "\f122";
-}
-.icon-mail-reply-all:before {
- content: "\f122";
-}
.icon-star-half-full:before,
.icon-star-half-empty:before {
content: "\f123";
@@ -1276,3 +1277,188 @@ ul.icons-ul > li .icon-li {
.icon-share-sign:before {
content: "\f14d";
}
+.icon-compass:before {
+ content: "\f14e";
+}
+.icon-collapse:before {
+ content: "\f150";
+}
+.icon-collapse-top:before {
+ content: "\f151";
+}
+.icon-expand:before {
+ content: "\f152";
+}
+.icon-euro:before,
+.icon-eur:before {
+ content: "\f153";
+}
+.icon-gbp:before {
+ content: "\f154";
+}
+.icon-dollar:before,
+.icon-usd:before {
+ content: "\f155";
+}
+.icon-rupee:before,
+.icon-inr:before {
+ content: "\f156";
+}
+.icon-yen:before,
+.icon-jpy:before {
+ content: "\f157";
+}
+.icon-renminbi:before,
+.icon-cny:before {
+ content: "\f158";
+}
+.icon-won:before,
+.icon-krw:before {
+ content: "\f159";
+}
+.icon-bitcoin:before,
+.icon-btc:before {
+ content: "\f15a";
+}
+.icon-file:before {
+ content: "\f15b";
+}
+.icon-file-text:before {
+ content: "\f15c";
+}
+.icon-sort-by-alphabet:before {
+ content: "\f15d";
+}
+.icon-sort-by-alphabet-alt:before {
+ content: "\f15e";
+}
+.icon-sort-by-attributes:before {
+ content: "\f160";
+}
+.icon-sort-by-attributes-alt:before {
+ content: "\f161";
+}
+.icon-sort-by-order:before {
+ content: "\f162";
+}
+.icon-sort-by-order-alt:before {
+ content: "\f163";
+}
+.icon-thumbs-up:before {
+ content: "\f164";
+}
+.icon-thumbs-down:before {
+ content: "\f165";
+}
+.icon-youtube-sign:before {
+ content: "\f166";
+}
+.icon-youtube:before {
+ content: "\f167";
+}
+.icon-xing:before {
+ content: "\f168";
+}
+.icon-xing-sign:before {
+ content: "\f169";
+}
+.icon-youtube-play:before {
+ content: "\f16a";
+}
+.icon-dropbox:before {
+ content: "\f16b";
+}
+.icon-stackexchange:before {
+ content: "\f16c";
+}
+.icon-instagram:before {
+ content: "\f16d";
+}
+.icon-flickr:before {
+ content: "\f16e";
+}
+.icon-adn:before {
+ content: "\f170";
+}
+.icon-bitbucket:before {
+ content: "\f171";
+}
+.icon-bitbucket-sign:before {
+ content: "\f172";
+}
+.icon-tumblr:before {
+ content: "\f173";
+}
+.icon-tumblr-sign:before {
+ content: "\f174";
+}
+.icon-long-arrow-down:before {
+ content: "\f175";
+}
+.icon-long-arrow-up:before {
+ content: "\f176";
+}
+.icon-long-arrow-left:before {
+ content: "\f177";
+}
+.icon-long-arrow-right:before {
+ content: "\f178";
+}
+.icon-apple:before {
+ content: "\f179";
+}
+.icon-windows:before {
+ content: "\f17a";
+}
+.icon-android:before {
+ content: "\f17b";
+}
+.icon-linux:before {
+ content: "\f17c";
+}
+.icon-dribbble:before {
+ content: "\f17d";
+}
+.icon-skype:before {
+ content: "\f17e";
+}
+.icon-foursquare:before {
+ content: "\f180";
+}
+.icon-trello:before {
+ content: "\f181";
+}
+.icon-female:before {
+ content: "\f182";
+}
+.icon-male:before {
+ content: "\f183";
+}
+.icon-gittip:before {
+ content: "\f184";
+}
+.icon-sun:before {
+ content: "\f185";
+}
+.icon-moon:before {
+ content: "\f186";
+}
+.icon-archive:before {
+ content: "\f187";
+}
+.icon-bug:before {
+ content: "\f188";
+}
+.icon-vk:before {
+ content: "\f189";
+}
+.icon-weibo:before {
+ content: "\f18a";
+}
+.icon-renren:before {
+ content: "\f18b";
+}
+.icon-reply-all:before,
+.icon-mail-reply-all:before {
+ content: "\f122";
+}
View
229 stylesheets_sass/compass_twitter_bootstrap/_font-awesome.sass
@@ -370,7 +370,7 @@ ul.icons-ul > li .icon-li
.icon-search:before
content: "\f002"
-.icon-envelope:before
+.icon-envelope-alt:before
content: "\f003"
.icon-heart:before
@@ -409,12 +409,14 @@ ul.icons-ul > li .icon-li
.icon-zoom-out:before
content: "\f010"
+.icon-power-off:before,
.icon-off:before
content: "\f011"
.icon-signal:before
content: "\f012"
+.icon-gear:before,
.icon-cog:before
content: "\f013"
@@ -424,7 +426,7 @@ ul.icons-ul > li .icon-li
.icon-home:before
content: "\f015"
-.icon-file:before
+.icon-file-alt:before
content: "\f016"
.icon-time:before
@@ -448,11 +450,10 @@ ul.icons-ul > li .icon-li
.icon-play-circle:before
content: "\f01d"
-.icon-repeat:before,
-.icon-rotate-right:before
+.icon-rotate-right:before,
+.icon-repeat:before
content: "\f01e"
-/* F020 doesn't work in Safari. all shifted one down
.icon-refresh:before
content: "\f021"
@@ -645,8 +646,8 @@ ul.icons-ul > li .icon-li
.icon-arrow-down:before
content: "\f063"
-.icon-share-alt:before,
-.icon-mail-forward:before
+.icon-mail-forward:before,
+.icon-share-alt:before
content: "\f064"
.icon-resize-full:before
@@ -739,16 +740,17 @@ ul.icons-ul > li .icon-li
.icon-key:before
content: "\f084"
+.icon-gears:before,
.icon-cogs:before
content: "\f085"
.icon-comments:before
content: "\f086"
-.icon-thumbs-up:before
+.icon-thumbs-up-alt:before
content: "\f087"
-.icon-thumbs-down:before
+.icon-thumbs-down-alt:before
content: "\f088"
.icon-star-half:before
@@ -787,6 +789,7 @@ ul.icons-ul > li .icon-li
.icon-phone:before
content: "\f095"
+.icon-unchecked:before,
.icon-check-empty:before
content: "\f096"
@@ -886,6 +889,7 @@ ul.icons-ul > li .icon-li
.icon-copy:before
content: "\f0c5"
+.icon-paperclip:before,
.icon-paper-clip:before
content: "\f0c6"
@@ -958,14 +962,14 @@ ul.icons-ul > li .icon-li
.icon-sort-up:before
content: "\f0de"
-.icon-envelope-alt:before
+.icon-envelope:before
content: "\f0e0"
.icon-linkedin:before
content: "\f0e1"
-.icon-undo:before,
-.icon-rotate-left:before
+.icon-rotate-left:before,
+.icon-undo:before
content: "\f0e2"
.icon-legal:before
@@ -1022,7 +1026,7 @@ ul.icons-ul > li .icon-li
.icon-food:before
content: "\f0f5"
-.icon-file-alt:before
+.icon-file-text-alt:before
content: "\f0f6"
.icon-building:before
@@ -1100,10 +1104,13 @@ ul.icons-ul > li .icon-li
.icon-circle:before
content: "\f111"
-.icon-reply:before,
-.icon-mail-reply:before
+.icon-mail-reply:before,
+.icon-reply:before
content: "\f112"
+.icon-github-alt:before
+ content: "\f113"
+
.icon-folder-close-alt:before
content: "\f114"
@@ -1143,12 +1150,6 @@ ul.icons-ul > li .icon-li
.icon-code:before
content: "\f121"
-.icon-reply-all:before
- content: "\f122"
-
-.icon-mail-reply-all:before
- content: "\f122"
-
.icon-star-half-full:before,
.icon-star-half-empty:before
content: "\f123"
@@ -1272,3 +1273,189 @@ ul.icons-ul > li .icon-li
.icon-share-sign:before
content: "\f14d"
+
+.icon-compass:before
+ content: "\f14e"
+
+.icon-collapse:before
+ content: "\f150"
+
+.icon-collapse-top:before
+ content: "\f151"
+
+.icon-expand:before
+ content: "\f152"
+
+.icon-euro:before,
+.icon-eur:before
+ content: "\f153"
+
+.icon-gbp:before
+ content: "\f154"
+
+.icon-dollar:before,
+.icon-usd:before
+ content: "\f155"
+
+.icon-rupee:before,
+.icon-inr:before
+ content: "\f156"
+
+.icon-yen:before,
+.icon-jpy:before
+ content: "\f157"
+
+.icon-renminbi:before,
+.icon-cny:before
+ content: "\f158"
+
+.icon-won:before,
+.icon-krw:before
+ content: "\f159"
+
+.icon-bitcoin:before,
+.icon-btc:before
+ content: "\f15a"
+
+.icon-file:before
+ content: "\f15b"
+
+.icon-file-text:before
+ content: "\f15c"
+
+.icon-sort-by-alphabet:before
+ content: "\f15d"
+
+.icon-sort-by-alphabet-alt:before
+ content: "\f15e"
+
+.icon-sort-by-attributes:before
+ content: "\f160"
+
+.icon-sort-by-attributes-alt:before
+ content: "\f161"
+
+.icon-sort-by-order:before
+ content: "\f162"
+
+.icon-sort-by-order-alt:before
+ content: "\f163"
+
+.icon-thumbs-up:before
+ content: "\f164"
+
+.icon-thumbs-down:before
+ content: "\f165"
+
+.icon-youtube-sign:before
+ content: "\f166"
+
+.icon-youtube:before
+ content: "\f167"
+
+.icon-xing:before
+ content: "\f168"
+
+.icon-xing-sign:before
+ content: "\f169"
+
+.icon-youtube-play:before
+ content: "\f16a"
+
+.icon-dropbox:before
+ content: "\f16b"
+
+.icon-stackexchange:before
+ content: "\f16c"
+
+.icon-instagram:before
+ content: "\f16d"
+
+.icon-flickr:before
+ content: "\f16e"
+
+.icon-adn:before
+ content: "\f170"
+
+.icon-bitbucket:before
+ content: "\f171"
+
+.icon-bitbucket-sign:before
+ content: "\f172"
+
+.icon-tumblr:before
+ content: "\f173"
+
+.icon-tumblr-sign:before
+ content: "\f174"
+
+.icon-long-arrow-down:before
+ content: "\f175"
+
+.icon-long-arrow-up:before
+ content: "\f176"
+
+.icon-long-arrow-left:before
+ content: "\f177"
+
+.icon-long-arrow-right:before
+ content: "\f178"
+
+.icon-apple:before
+ content: "\f179"
+
+.icon-windows:before
+ content: "\f17a"
+
+.icon-android:before
+ content: "\f17b"
+
+.icon-linux:before
+ content: "\f17c"
+
+.icon-dribbble:before
+ content: "\f17d"
+
+.icon-skype:before
+ content: "\f17e"
+
+.icon-foursquare:before
+ content: "\f180"
+
+.icon-trello:before
+ content: "\f181"
+
+.icon-female:before
+ content: "\f182"
+
+.icon-male:before
+ content: "\f183"
+
+.icon-gittip:before
+ content: "\f184"
+
+.icon-sun:before
+ content: "\f185"
+
+.icon-moon:before
+ content: "\f186"
+
+.icon-archive:before
+ content: "\f187"
+
+.icon-bug:before
+ content: "\f188"
+
+.icon-vk:before
+ content: "\f189"
+
+.icon-weibo:before
+ content: "\f18a"
+
+.icon-renren:before
+ content: "\f18b"
+
+.icon-reply-all:before,
+.icon-mail-reply-all:before
+ content: "\f122"
+
View
BIN  vendor/assets/fonts/FontAwesome.otf
Binary file not shown
View
BIN  vendor/assets/fonts/fontawesome-webfont.eot
Binary file not shown
View
191 vendor/assets/fonts/fontawesome-webfont.svg
153 additions, 38 deletions not shown
View
BIN  vendor/assets/fonts/fontawesome-webfont.ttf
Binary file not shown
View
BIN  vendor/assets/fonts/fontawesome-webfont.woff
Binary file not shown
Please sign in to comment.
Something went wrong with that request. Please try again.