Merge branch '4.0.0-wip' of https://github.com/FortAwesome/Font-Awesome into 4.0.0-wip

This commit is contained in:
davegandy 2013-10-19 09:54:46 -04:00
commit cb99fb3701
2 changed files with 3 additions and 1 deletions

View File

@ -26,7 +26,7 @@
<li><a href="{{ page.relative_path }}icons/#web-application"><i class="fa-icon fa-icon-camera-retro fa-icon-fixed-width"></i>&nbsp; Web Application Icons</a></li>
<li><a href="{{ page.relative_path }}icons/#currency"><i class="fa-icon fa-icon-won fa-icon-fixed-width"></i>&nbsp; Currency Icons</a></li>
<li><a href="{{ page.relative_path }}icons/#text-editor"><i class="fa-icon fa-icon-file-text-alt fa-icon-fixed-width"></i>&nbsp; Text Editor Icons</a></li>
<li><a href="{{ page.relative_path }}icons/#directional"><i class="fa-icon fa-icon-hand-right fa-icon-fixed-width"></i>&nbsp; Directional Icons</a></li>
<li><a href="{{ page.relative_path }}icons/#directional"><i class="fa-icon fa-icon-hand-alt-right fa-icon-fixed-width"></i>&nbsp; Directional Icons</a></li>
<li><a href="{{ page.relative_path }}icons/#video-player"><i class="fa-icon fa-icon-play-circle fa-icon-fixed-width"></i>&nbsp; Video Player Icons</a></li>
<li><a href="{{ page.relative_path }}icons/#brand"><i class="fa-icon fa-icon-github fa-icon-fixed-width"></i>&nbsp; Brand Icons</a></li>
<li><a href="{{ page.relative_path }}icons/#medical"><i class="fa-icon fa-icon-medkit fa-icon-fixed-width"></i>&nbsp; Medical Icons</a></li>

View File

@ -121,6 +121,8 @@
//@brand-danger: @red;
//@brand-info: @blue;
// Pills
@nav-pills-active-link-hover-bg: @link-color;
// Carousel
@carousel-text-shadow: 0 1px 0 rgba(255,255,255,0.25);