library-mirrors/Font-Awesome
1
0
Fork 0
mirror of https://github.com/FortAwesome/Font-Awesome.git synced 2024-11-20 11:14:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

reorganizing variables to match bootstrap order

Browse Source
This commit is contained in:
davegandy 2013-10-19 14:48:29 -04:00
parent 3fe7253c63
commit a918c2ee6d
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/assets/less/site/bootstrap/variables.less
View File

@ -69,32 +69,28 @@
// BOOTSTRAP OVERRIDES // BOOTSTRAP OVERRIDES
// ------------------- // -------------------
// Brand colors
//@brand-primary: @blue-dark;
@brand-success: lighten(@jumbotron-bg, 5%);
//@brand-warning: @yellow-dark;
//@brand-danger: @red;
//@brand-info: @blue;
// Links // Links
@link-color: lighten(@jumbotron-bg, 5%); @link-color: lighten(@jumbotron-bg, 5%);
@link-hover-color: darken(@jumbotron-bg, 5%); @link-hover-color: darken(@jumbotron-bg, 5%);
// Typography // Typography
@font-family-sans-serif: proxima-nova, "Helvetica Neue", Helvetica, Arial, sans-serif; @font-family-sans-serif: proxima-nova, "Helvetica Neue", Helvetica, Arial, sans-serif;
@font-family-serif: museo-slab, Georgia, "Times New Roman", Times, serif; @font-family-serif: museo-slab, Georgia, "Times New Roman", Times, serif;
@headings-font-family: @font-family-serif; @headings-font-family: @font-family-serif;
// Form states and alerts // Components
@state-warning-text: mix(@yellow-dark, @yellow-darker, 80%); @component-active-bg: @jumbotron-bg;
@state-warning-bg: @yellow-lighter;
@state-warning-border: darken(spin(@state-warning-bg, -10), 7%);
@state-danger-text: @red;
@state-danger-bg: @red-lighter;
@state-danger-border: darken(spin(@state-danger-bg, -10), 4%);
@state-success-text: mix(@green-darker, @green-dark, 30%);
@state-success-bg: @green-lighter;
@state-success-border: darken(spin(@state-success-bg, -10), 13%);
@state-info-text: mix(@blue-dark, @blue, 50%);
@state-info-bg: @blue-lighter;
@state-info-border: darken(spin(@state-info-bg, -10), 7%);
// Navbar // Navbar
@navbar-height: 40px; @navbar-height: 40px;
@ -115,15 +111,24 @@
@navbar-inverse-toggle-icon-bar-bg: @jumbotron-text; @navbar-inverse-toggle-icon-bar-bg: @jumbotron-text;
@navbar-inverse-toggle-border-color: mix(@jumbotron-text, @jumbotron-bg, 75%); @navbar-inverse-toggle-border-color: mix(@jumbotron-text, @jumbotron-bg, 75%);
//@brand-primary: @blue-dark;
//@brand-success: @green;
//@brand-warning: @yellow-dark;
//@brand-danger: @red;
//@brand-info: @blue;
// Form states and alerts
//@state-warning-text: mix(@yellow-dark, @yellow-darker, 80%);
//@state-warning-bg: @yellow-lighter;
//@state-warning-border: darken(spin(@state-warning-bg, -10), 7%);
//
//@state-danger-text: @red;
//@state-danger-bg: @red-lighter;
//@state-danger-border: darken(spin(@state-danger-bg, -10), 4%);
//
//@state-success-text: mix(@green-darker, @green-dark, 30%);
//@state-success-bg: @green-lighter;
//@state-success-border: darken(spin(@state-success-bg, -10), 13%);
@state-info-text: mix(@blue-dark, @blue, 50%);
@state-info-bg: @blue-lighter;
@state-info-border: darken(spin(@state-info-bg, -10), 7%);
// Components
@component-active-bg: @jumbotron-bg;
// Carousel // Carousel
@carousel-text-shadow: 0 1px 0 rgba(255,255,255,0.25); @carousel-text-shadow: 0 1px 0 rgba(255,255,255,0.25);