-// Variables.less
-// Variables to customize the look and feel of Bootstrap
-// Swatch: Journal
-// Version: 2.0.2
-// -----------------------------------------------------
-
+// Journal 2.3.0
+// Variables
+// --------------------------------------------------
-// GLOBAL VALUES
+// Global values
// --------------------------------------------------
// -------------------------
@black: #000;
@grayDarker: #222;
-@grayDark: #333;
-@gray: #888;
-@grayLight: #999;
+@grayDark: #777;
+@gray: #999;
+@grayLight: #bbb;
@grayLighter: #eee;
@white: #fff;
// Scaffolding
// -------------------------
-@bodyBackground: #FCFBFD;
-@textColor: @grayDarker;
+@bodyBackground: @white;
+@textColor: @grayDark;
// Links
// -------------------------
@linkColor: @textColor;
-@linkColorHover: @gray;
+@linkColorHover: @linkColor;
// Typography
// -------------------------
+@sansFontFamily: "News Cycle", "Arial Narrow Bold", sans-serif;
+@serifFontFamily: Georgia, "Times New Roman", Times, serif;
+@monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace;
+
@baseFontSize: 14px;
-@baseFontFamily: 'Open Sans', sans-serif;
-@baseLineHeight: 18px;
-@altFontFamily: Georgia, "Times New Roman", Times, serif;
+@baseFontFamily: @serifFontFamily;
+@baseLineHeight: 20px;
+@altFontFamily: @sansFontFamily;
-@headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily
+@headingsFontFamily: @sansFontFamily; // empty to use BS default, @baseFontFamily
@headingsFontWeight: bold; // instead of browser default, bold
-@headingsColor: inherit; // empty to use BS default, @textColor
+@headingsColor: @black; // empty to use BS default, @textColor
+
+
+// Component sizing
+// -------------------------
+// Based on 14px font-size and 20px line-height
+
+@fontSizeLarge: @baseFontSize * 1.25; // ~18px
+@fontSizeSmall: @baseFontSize * 0.85; // ~12px
+@fontSizeMini: @baseFontSize * 0.75; // ~11px
+
+@paddingLarge: 11px 19px; // 44px
+@paddingSmall: 2px 10px; // 26px
+@paddingMini: 0px 6px; // 22px
+
+@baseBorderRadius: 4px;
+@borderRadiusLarge: 6px;
+@borderRadiusSmall: 3px;
// Tables
// -------------------------
@tableBackground: transparent; // overall background-color
-@tableBackgroundAccent: @grayLighter; // for striping
-@tableBackgroundHover: #f5f5f5; // for hover
+@tableBackgroundAccent: #f5f5f5; // for striping
+@tableBackgroundHover: @grayLighter; // for hover
@tableBorder: #ddd; // table and cell border
-
// Buttons
// -------------------------
@btnBackground: @white;
@btnBackgroundHighlight: darken(@white, 10%);
-@btnBorder: darken(@white, 20%);
+@btnBorder: darken(@white, 15%);
-@btnPrimaryBackground: @linkColor;
-@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%);
+@btnPrimaryBackground: lighten(@linkColor, 5%);
+@btnPrimaryBackgroundHighlight: @linkColor;
-@btnInfoBackground: #5bc0de;
-@btnInfoBackgroundHighlight: #2f96b4;
+@btnInfoBackground: lighten(@blue, 5%);
+@btnInfoBackgroundHighlight: @blue;
-@btnSuccessBackground: #62c462;
-@btnSuccessBackgroundHighlight: #51a351;
+@btnSuccessBackground: lighten(@green, 5%);
+@btnSuccessBackgroundHighlight: @green;
-@btnWarningBackground: lighten(@orange, 15%);
+@btnWarningBackground: lighten(@orange, 10%);
@btnWarningBackgroundHighlight: @orange;
-@btnDangerBackground: #ee5f5b;
-@btnDangerBackgroundHighlight: #bd362f;
+@btnDangerBackground: lighten(@red, 10%);
+@btnDangerBackgroundHighlight: @red;
-@btnInverseBackground: @gray;
-@btnInverseBackgroundHighlight: @grayDarker;
+@btnInverseBackground: lighten(@grayDark, 5%);
+@btnInverseBackgroundHighlight: @grayDark;
// Forms
// -------------------------
@inputBackground: @white;
@inputBorder: #ccc;
+@inputBorderRadius: @baseBorderRadius;
@inputDisabledBackground: @grayLighter;
+@formActionsBackground: @grayLighter;
+@inputHeight: @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
// Dropdowns
// -------------------------
@dropdownBackground: @bodyBackground;
@dropdownBorder: rgba(0,0,0,.2);
-@dropdownLinkColor: @textColor;
-@dropdownLinkColorHover: @textColor;
-@dropdownLinkBackgroundHover: #eee;
+@dropdownDividerTop: @grayLighter;
+@dropdownDividerBottom: @grayLighter;
+@dropdownLinkColor: @headingsColor;
+@dropdownLinkColorHover: @headingsColor;
+@dropdownLinkColorActive: @headingsColor;
+
+@dropdownLinkBackgroundActive: @dropdownLinkBackgroundHover;
+@dropdownLinkBackgroundHover: @grayLighter;
// COMPONENT VARIABLES
// --------------------------------------------------
+
// Z-index master list
// -------------------------
// Used for a bird's eye view of components dependent on the z-axis
@hrBorder: @grayLighter;
+// Horizontal forms & lists
+// -------------------------
+@horizontalComponentOffset: 180px;
+
+
+// Wells
+// -------------------------
+@wellBackground: @grayLighter;
+
+
// Navbar
// -------------------------
-@navbarHeight: 40px;
-@navbarBackground: @bodyBackground;
+@navbarCollapseWidth: 979px;
+@navbarCollapseDesktopWidth: @navbarCollapseWidth + 1;
+
+@navbarHeight: 60px;
@navbarBackgroundHighlight: @bodyBackground;
+@navbarBackground: @bodyBackground;
+@navbarBorder: darken(@navbarBackground, 12%);
@navbarText: @textColor;
-@navbarLinkColor: @linkColor;
-@navbarLinkColorHover: @linkColor;
-@navbarLinkColorActive: @navbarLinkColorHover;
+@navbarLinkColor: @headingsColor;
+@navbarLinkColorHover: @headingsColor;
+@navbarLinkColorActive: @headingsColor;
@navbarLinkBackgroundHover: transparent;
-@navbarLinkBackgroundActive: @navbarBackground;
+@navbarLinkBackgroundActive: transparent;
+
+@navbarBrandColor: @navbarLinkColor;
+
+// Inverted navbar
+@navbarInverseBackground: #111111;
+@navbarInverseBackgroundHighlight: #222222;
+@navbarInverseBorder: #252525;
+
+@navbarInverseText: @grayLight;
+@navbarInverseLinkColor: @grayLight;
+@navbarInverseLinkColorHover: @white;
+@navbarInverseLinkColorActive: @navbarInverseLinkColorHover;
+@navbarInverseLinkBackgroundHover: transparent;
+@navbarInverseLinkBackgroundActive: @navbarInverseBackground;
-@navbarSearchBackground: lighten(@navbarBackground, 25%);
-@navbarSearchBackgroundFocus: @white;
-@navbarSearchBorder: darken(@navbarSearchBackground, 30%);
-@navbarSearchPlaceholderColor: #ccc;
+@navbarInverseSearchBackground: lighten(@navbarInverseBackground, 25%);
+@navbarInverseSearchBackgroundFocus: @white;
+@navbarInverseSearchBorder: @navbarInverseBackground;
+@navbarInverseSearchPlaceholderColor: #ccc;
+
+@navbarInverseBrandColor: @navbarInverseLinkColor;
+
+
+// Pagination
+// -------------------------
+@paginationBackground: @bodyBackground;
+@paginationBorder: #ddd;
+@paginationActiveBackground: @grayLighter;
// Hero unit
// -------------------------
@heroUnitBackground: @grayLighter;
-@heroUnitHeadingColor: inherit;
+@heroUnitHeadingColor: @headingsColor;
@heroUnitLeadColor: inherit;
@infoBorder: darken(spin(@infoBackground, -10), 7%);
+// Tooltips and popovers
+// -------------------------
+@tooltipColor: #fff;
+@tooltipBackground: #000;
+@tooltipArrowWidth: 5px;
+@tooltipArrowColor: @tooltipBackground;
+
+@popoverBackground: #fff;
+@popoverArrowWidth: 10px;
+@popoverArrowColor: #fff;
+@popoverTitleBackground: darken(@popoverBackground, 3%);
+
+// Special enhancement for popovers
+@popoverArrowOuterWidth: @popoverArrowWidth + 1;
+@popoverArrowOuterColor: rgba(0,0,0,.25);
+
// GRID
// --------------------------------------------------
+
// Default 940px grid
// -------------------------
@gridColumns: 12;
@gridGutterWidth: 20px;
@gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+// 1200px min
+@gridColumnWidth1200: 70px;
+@gridGutterWidth1200: 30px;
+@gridRowWidth1200: (@gridColumns * @gridColumnWidth1200) + (@gridGutterWidth1200 * (@gridColumns - 1));
+
+// 768px-979px
+@gridColumnWidth768: 42px;
+@gridGutterWidth768: 20px;
+@gridRowWidth768: (@gridColumns * @gridColumnWidth768) + (@gridGutterWidth768 * (@gridColumns - 1));
+
// Fluid grid
// -------------------------
-@fluidGridColumnWidth: 6.382978723%;
-@fluidGridGutterWidth: 2.127659574%;
+@fluidGridColumnWidth: percentage(@gridColumnWidth/@gridRowWidth);
+@fluidGridGutterWidth: percentage(@gridGutterWidth/@gridRowWidth);
+
+// 1200px min
+@fluidGridColumnWidth1200: percentage(@gridColumnWidth1200/@gridRowWidth1200);
+@fluidGridGutterWidth1200: percentage(@gridGutterWidth1200/@gridRowWidth1200);
+
+// 768px-979px
+@fluidGridColumnWidth768: percentage(@gridColumnWidth768/@gridRowWidth768);
+@fluidGridGutterWidth768: percentage(@gridGutterWidth768/@gridRowWidth768);