vendor/toolkit/twitter/bootstrap/variables.less in twitter-bootstrap-rails-2.0rc0 vs vendor/toolkit/twitter/bootstrap/variables.less in twitter-bootstrap-rails-2.0

- old
+ new

@@ -28,18 +28,26 @@ @yellow: #ffc40d; @orange: #f89406; @pink: #c3325f; @purple: #7a43b6; +// Grid system +// Modify the grid styles in mixins.less +@gridColumns: 12; +@gridColumnWidth: 60px; +@gridGutterWidth: 20px; +@siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); +// Fluid width sidebar +@fluidSidebarWidth: 220px; + // Typography @baseFontSize: 13px; @baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif; @baseLineHeight: 18px; -@textColor: @grayDark; // Buttons -@primaryButtonBackground: @linkColor; +@primaryButtonColor: @blue; // COMPONENT VARIABLES // -------------------------------------------------- @@ -60,40 +68,23 @@ // Navbar @navbarHeight: 40px; @navbarBackground: @grayDarker; @navbarBackgroundHighlight: @grayDark; -@navbarText: @grayLight; -@navbarLinkColor: @grayLight; -@navbarLinkColorHover: @white; - // Form states and alerts @warningText: #c09853; @warningBackground: #fcf8e3; -@warningBorder: darken(spin(@warningBackground, -10), 3%); +@warningBorder: #f3edd2; @errorText: #b94a48; @errorBackground: #f2dede; -@errorBorder: darken(spin(@errorBackground, -10), 3%); +@errorBorder: #e9c7c7; @successText: #468847; @successBackground: #dff0d8; -@successBorder: darken(spin(@successBackground, -10), 5%); +@successBorder: #cfe8c4; @infoText: #3a87ad; @infoBackground: #d9edf7; -@infoBorder: darken(spin(@infoBackground, -10), 7%); +@infoBorder: #bfe1f2; - -// GRID -// -------------------------------------------------- - -// Default 940px grid -@gridColumns: 12; -@gridColumnWidth: 60px; -@gridGutterWidth: 20px; -@gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); - -// Fluid grid -@fluidGridColumnWidth: 6.382978723%; -@fluidGridGutterWidth: 2.127659574%;