vendor/frameworks/twitter/bootstrap/variables.less in less-rails-bootstrap-2.0.10 vs vendor/frameworks/twitter/bootstrap/variables.less in less-rails-bootstrap-2.0.11

- old
+ new

@@ -43,14 +43,18 @@ @linkColorHover: darken(@linkColor, 15%); // Typography // ------------------------- +@sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif; +@serifFontFamily: Georgia, "Times New Roman", Times, serif; +@monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace; + @baseFontSize: 13px; -@baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif; +@baseFontFamily: @sansFontFamily; @baseLineHeight: 18px; -@altFontFamily: Georgia, "Times New Roman", Times, serif; +@altFontFamily: @serifFontFamily; @headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily @headingsFontWeight: bold; // instead of browser default, bold @headingsColor: inherit; // empty to use BS default, @textColor @@ -65,11 +69,11 @@ // Buttons // ------------------------- @btnBackground: @white; @btnBackgroundHighlight: darken(@white, 10%); -@btnBorder: darken(@white, 20%); +@btnBorder: #ccc; @btnPrimaryBackground: @linkColor; @btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%); @btnInfoBackground: #5bc0de; @@ -90,13 +94,14 @@ // Forms // ------------------------- @inputBackground: @white; @inputBorder: #ccc; +@inputBorderRadius: 3px; @inputDisabledBackground: @grayLighter; +@formActionsBackground: #f5f5f5; - // Dropdowns // ------------------------- @dropdownBackground: @white; @dropdownBorder: rgba(0,0,0,.2); @dropdownLinkColor: @grayDark; @@ -121,12 +126,12 @@ @zindexModal: 1050; // Sprite icons path // ------------------------- -@iconSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings.png"); -@iconWhiteSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings-white.png"); +@iconSpritePath: "twitter/bootstrap/glyphicons-halflings.png"; +@iconWhiteSpritePath: "twitter/bootstrap/glyphicons-halflings-white.png"; // Input placeholder text color // ------------------------- @placeholderText: @grayLight; @@ -152,10 +157,11 @@ @navbarSearchBackground: lighten(@navbarBackground, 25%); @navbarSearchBackgroundFocus: @white; @navbarSearchBorder: darken(@navbarSearchBackground, 30%); @navbarSearchPlaceholderColor: #ccc; +@navbarBrandColor: @navbarLinkColor; // Hero unit // ------------------------- @heroUnitBackground: @grayLighter; @@ -181,20 +187,18 @@ @infoBackground: #d9edf7; @infoBorder: darken(spin(@infoBackground, -10), 7%); - // GRID // -------------------------------------------------- // Default 940px grid // ------------------------- @gridColumns: 12; @gridColumnWidth: 60px; @gridGutterWidth: 20px; @gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); - // Fluid grid // ------------------------- @fluidGridColumnWidth: 6.382978723%; @fluidGridGutterWidth: 2.127659574%;