Commit 22ba9049 authored by Thomas Park's avatar Thomas Park
Browse files

updated to 2.2.1

parent 6b5f9a06
This diff is collapsed.
This diff is collapsed.
// Bootswatch.less // Amelia 2.2.1
// Swatch: Amelia // Bootswatch
// Version: 2.1.1
// ----------------------------------------------------- // -----------------------------------------------------
// TYPOGRAPHY // TYPOGRAPHY
// ----------------------------------------------------- // -----------------------------------------------------
......
// Amelia 2.2.1
// Variables // Variables
// Swatch: Amelia
// Version: 2.1.1
// -------------------------------------------------- // --------------------------------------------------
// Global values // Global values
// -------------------------------------------------- // --------------------------------------------------
...@@ -57,6 +57,24 @@ ...@@ -57,6 +57,24 @@
@headingsFontWeight: normal; // instead of browser default, bold @headingsFontWeight: normal; // instead of browser default, bold
@headingsColor: inherit; // empty to use BS default, @textColor @headingsColor: inherit; // 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: 1px 6px; // 24px
@baseBorderRadius: 0;
@borderRadiusLarge: 6px;
@borderRadiusSmall: 3px;
// Tables // Tables
// ------------------------- // -------------------------
@tableBackground: lighten(#147E88, 10%); // overall background-color @tableBackground: lighten(#147E88, 10%); // overall background-color
...@@ -93,9 +111,10 @@ ...@@ -93,9 +111,10 @@
// ------------------------- // -------------------------
@inputBackground: @white; @inputBackground: @white;
@inputBorder: transparent; @inputBorder: transparent;
@inputBorderRadius: 0; @inputBorderRadius: @baseBorderRadius;
@inputDisabledBackground: @grayLighter; @inputDisabledBackground: @grayLighter;
@formActionsBackground: transparent; @formActionsBackground: transparent;
@inputHeight: @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
// Dropdowns // Dropdowns
// ------------------------- // -------------------------
...@@ -116,6 +135,7 @@ ...@@ -116,6 +135,7 @@
// COMPONENT VARIABLES // COMPONENT VARIABLES
// -------------------------------------------------- // --------------------------------------------------
// Z-index master list // Z-index master list
// ------------------------- // -------------------------
// Used for a bird's eye view of components dependent on the z-axis // Used for a bird's eye view of components dependent on the z-axis
...@@ -157,6 +177,7 @@ ...@@ -157,6 +177,7 @@
// Navbar // Navbar
// ------------------------- // -------------------------
@navbarCollapseWidth: 979px; @navbarCollapseWidth: 979px;
@navbarCollapseDesktopWidth: @navbarCollapseWidth + 1;
@navbarHeight: 50px; @navbarHeight: 50px;
@navbarBackgroundHighlight: @red; @navbarBackgroundHighlight: @red;
......
This diff is collapsed.
This diff is collapsed.
// Bootswatch.less // Cerulean 2.2.1
// Swatch: Cerulean // Bootswatch
// Version: 2.1.1
// ----------------------------------------------------- // -----------------------------------------------------
// TYPOGRAPHY // TYPOGRAPHY
// ----------------------------------------------------- // -----------------------------------------------------
......
// Cerulean 2.2.1
// Variables // Variables
// Swatch: Cerulean
// Version: 2.1.1
// -------------------------------------------------- // --------------------------------------------------
// GLOBAL VALUES // GLOBAL VALUES
// -------------------------------------------------- // --------------------------------------------------
...@@ -57,6 +57,24 @@ ...@@ -57,6 +57,24 @@
@headingsFontWeight: bold; // instead of browser default, bold @headingsFontWeight: bold; // instead of browser default, bold
@headingsColor: #317EAC; // empty to use BS default, @textColor @headingsColor: #317EAC; // 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: 1px 6px; // 24px
@baseBorderRadius: 4px;
@borderRadiusLarge: 6px;
@borderRadiusSmall: 3px;
// Tables // Tables
// ------------------------- // -------------------------
@tableBackground: transparent; // overall background-color @tableBackground: transparent; // overall background-color
...@@ -93,9 +111,11 @@ ...@@ -93,9 +111,11 @@
// ------------------------- // -------------------------
@inputBackground: @white; @inputBackground: @white;
@inputBorder: #ccc; @inputBorder: #ccc;
@inputBorderRadius: 3px; @inputBorderRadius: @baseBorderRadius;
@inputDisabledBackground: @grayLighter; @inputDisabledBackground: @grayLighter;
@formActionsBackground: #f5f5f5; @formActionsBackground: #f5f5f5;
@inputHeight: @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
// Dropdowns // Dropdowns
// ------------------------- // -------------------------
...@@ -116,6 +136,7 @@ ...@@ -116,6 +136,7 @@
// COMPONENT VARIABLES // COMPONENT VARIABLES
// -------------------------------------------------- // --------------------------------------------------
// Z-index master list // Z-index master list
// ------------------------- // -------------------------
// Used for a bird's eye view of components dependent on the z-axis // Used for a bird's eye view of components dependent on the z-axis
...@@ -157,6 +178,7 @@ ...@@ -157,6 +178,7 @@
// Navbar // Navbar
// ------------------------- // -------------------------
@navbarCollapseWidth: 979px; @navbarCollapseWidth: 979px;
@navbarCollapseDesktopWidth: @navbarCollapseWidth + 1;
@navbarHeight: 50px; @navbarHeight: 50px;
@navbarBackgroundHighlight: lighten(@navbarBackground, 8%); @navbarBackgroundHighlight: lighten(@navbarBackground, 8%);
......
This diff is collapsed.
This diff is collapsed.
// Bootswatch.less // Cyborg 2.2.1
// Swatch: Cyborg // Bootswatch
// Version: 2.1.1
// ----------------------------------------------------- // -----------------------------------------------------
// TYPOGRAPHY // TYPOGRAPHY
// ----------------------------------------------------- // -----------------------------------------------------
......
// Cyborg 2.2.1
// Variables // Variables
// Swatch: Cyborg
// Version: 2.1.1
// -------------------------------------------------- // --------------------------------------------------
// Global values // Global values
// -------------------------------------------------- // --------------------------------------------------
...@@ -57,6 +57,24 @@ ...@@ -57,6 +57,24 @@
@headingsFontWeight: normal; // instead of browser default, bold @headingsFontWeight: normal; // instead of browser default, bold
@headingsColor: @white; // empty to use BS default, @textColor @headingsColor: @white; // 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: 1px 6px; // 24px
@baseBorderRadius: 4px;
@borderRadiusLarge: 6px;
@borderRadiusSmall: 3px;
// Tables // Tables
// ------------------------- // -------------------------
@tableBackground: transparent; // overall background-color @tableBackground: transparent; // overall background-color
...@@ -93,9 +111,11 @@ ...@@ -93,9 +111,11 @@
// ------------------------- // -------------------------
@inputBackground: #ccc; @inputBackground: #ccc;
@inputBorder: #bbb; @inputBorder: #bbb;
@inputBorderRadius: 3px; @inputBorderRadius: @baseBorderRadius;
@inputDisabledBackground: @grayLighter; @inputDisabledBackground: @grayLighter;
@formActionsBackground: transparent; @formActionsBackground: transparent;
@inputHeight: @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
// Dropdowns // Dropdowns
// ------------------------- // -------------------------
...@@ -116,6 +136,7 @@ ...@@ -116,6 +136,7 @@
// COMPONENT VARIABLES // COMPONENT VARIABLES
// -------------------------------------------------- // --------------------------------------------------
// Z-index master list // Z-index master list
// ------------------------- // -------------------------
// Used for a bird's eye view of components dependent on the z-axis // Used for a bird's eye view of components dependent on the z-axis
...@@ -157,6 +178,7 @@ ...@@ -157,6 +178,7 @@
// Navbar // Navbar
// ------------------------- // -------------------------
@navbarCollapseWidth: 979px; @navbarCollapseWidth: 979px;
@navbarCollapseDesktopWidth: @navbarCollapseWidth + 1;
@navbarHeight: 40px; @navbarHeight: 40px;
@navbarBackgroundHighlight: @grayDarker; @navbarBackgroundHighlight: @grayDarker;
......
/*! /*!
* Bootstrap Responsive v2.1.1 * Bootstrap Responsive v2.2.1
* *
* Copyright 2012 Twitter, Inc * Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0 * Licensed under the Apache License v2.0
...@@ -215,6 +215,9 @@ ...@@ -215,6 +215,9 @@
.row-fluid [class*="span"]:first-child { .row-fluid [class*="span"]:first-child {
margin-left: 0; margin-left: 0;
} }
.row-fluid .controls-row [class*="span"] + [class*="span"] {
margin-left: 2.564102564102564%;
}
.row-fluid .span12 { .row-fluid .span12 {
width: 100%; width: 100%;
*width: 99.94680851063829%; *width: 99.94680851063829%;
...@@ -562,6 +565,9 @@ ...@@ -562,6 +565,9 @@
.row-fluid [class*="span"]:first-child { .row-fluid [class*="span"]:first-child {
margin-left: 0; margin-left: 0;
} }
.row-fluid .controls-row [class*="span"] + [class*="span"] {
margin-left: 2.7624309392265194%;
}
.row-fluid .span12 { .row-fluid .span12 {
width: 100%; width: 100%;
*width: 99.94680851063829%; *width: 99.94680851063829%;
...@@ -814,6 +820,7 @@ ...@@ -814,6 +820,7 @@
margin-left: 0; margin-left: 0;
} }
[class*="span"], [class*="span"],
.uneditable-input[class*="span"],
.row-fluid [class*="span"] { .row-fluid [class*="span"] {
display: block; display: block;
float: none; float: none;
...@@ -830,6 +837,9 @@ ...@@ -830,6 +837,9 @@
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
} }
.row-fluid [class*="offset"]:first-child {
margin-left: 0;
}
.input-large, .input-large,
.input-xlarge, .input-xlarge,
.input-xxlarge, .input-xxlarge,
...@@ -862,8 +872,11 @@ ...@@ -862,8 +872,11 @@
width: auto; width: auto;
margin: 0; margin: 0;
} }
.modal.fade {
top: -100px;
}
.modal.fade.in { .modal.fade.in {
top: auto; top: 20px;
} }
} }
...@@ -895,6 +908,16 @@ ...@@ -895,6 +908,16 @@
padding-right: 10px; padding-right: 10px;
padding-left: 10px; padding-left: 10px;
} }
.media .pull-left,
.media .pull-right {
display: block;
float: none;
margin-bottom: 10px;
}
.media-object {
margin-right: 0;
margin-left: 0;
}
.modal { .modal {
top: 10px; top: 10px;
right: 10px; right: 10px;
...@@ -979,6 +1002,10 @@ ...@@ -979,6 +1002,10 @@
.nav-collapse .dropdown-menu a:hover { .nav-collapse .dropdown-menu a:hover {
background-color: #f2f2f2; background-color: #f2f2f2;
} }
.navbar-inverse .nav-collapse .nav > li > a,
.navbar-inverse .nav-collapse .dropdown-menu a {
color: #999999;
}
.navbar-inverse .nav-collapse .nav > li > a:hover, .navbar-inverse .nav-collapse .nav > li > a:hover,
.navbar-inverse .nav-collapse .dropdown-menu a:hover { .navbar-inverse .nav-collapse .dropdown-menu a:hover {
background-color: #111111; background-color: #111111;
...@@ -991,7 +1018,7 @@ ...@@ -991,7 +1018,7 @@
position: static; position: static;
top: auto; top: auto;
left: auto; left: auto;
display: block; display: none;
float: none; float: none;
max-width: none; max-width: none;
padding: 0; padding: 0;
...@@ -1005,6 +1032,9 @@ ...@@ -1005,6 +1032,9 @@
-moz-box-shadow: none; -moz-box-shadow: none;
box-shadow: none; box-shadow: none;
} }
.nav-collapse .open > .dropdown-menu {
display: block;
}
.nav-collapse .dropdown-menu:before, .nav-collapse .dropdown-menu:before,
.nav-collapse .dropdown-menu:after { .nav-collapse .dropdown-menu:after {
display: none; display: none;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
// Bootswatch.less // Journal 2.2.1
// Swatch: Journal // Bootswatch
// Version: 2.1.1
// ----------------------------------------------------- // -----------------------------------------------------
// TYPOGRAPHY // TYPOGRAPHY
// ----------------------------------------------------- // -----------------------------------------------------
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment