Commit 150ec4fa authored by Thomas Park's avatar Thomas Park
Browse files

update to bootstrap v2.2.2

parent fb52393f
This diff is collapsed.
This diff is collapsed.
// Amelia 2.2.1 // Amelia 2.2.2
// Bootswatch // Bootswatch
// ----------------------------------------------------- // -----------------------------------------------------
...@@ -447,18 +447,6 @@ div.subnav { ...@@ -447,18 +447,6 @@ div.subnav {
.buttonBackgroundCustom(@btnPrimaryBackground); .buttonBackgroundCustom(@btnPrimaryBackground);
} }
.btn-large {
padding: 20px 24px;
}
.btn-small {
padding: 8px 12px;
}
.btn-mini {
padding: 4px 8px;
}
[class^="icon-"], [class*=" icon-"] { [class^="icon-"], [class*=" icon-"] {
margin-top: 2px; margin-top: 2px;
margin-right: 8px; margin-right: 8px;
......
// Amelia 2.2.1 // Amelia 2.2.2
// Variables // Variables
// -------------------------------------------------- // --------------------------------------------------
...@@ -66,9 +66,9 @@ ...@@ -66,9 +66,9 @@
@fontSizeSmall: @baseFontSize * 0.85; // ~12px @fontSizeSmall: @baseFontSize * 0.85; // ~12px
@fontSizeMini: @baseFontSize * 0.75; // ~11px @fontSizeMini: @baseFontSize * 0.75; // ~11px
@paddingLarge: 11px 19px; // 44px @paddingLarge: 20px 24px; // 58px
@paddingSmall: 2px 10px; // 26px @paddingSmall: 8px 12px; // 34px
@paddingMini: 1px 6px; // 24px @paddingMini: 4px 8px; // 28px
@baseBorderRadius: 0; @baseBorderRadius: 0;
@borderRadiusLarge: 6px; @borderRadiusLarge: 6px;
...@@ -116,6 +116,7 @@ ...@@ -116,6 +116,7 @@
@formActionsBackground: transparent; @formActionsBackground: transparent;
@inputHeight: @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border @inputHeight: @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
// Dropdowns // Dropdowns
// ------------------------- // -------------------------
@dropdownBackground: @white; @dropdownBackground: @white;
...@@ -125,7 +126,7 @@ ...@@ -125,7 +126,7 @@
@dropdownLinkColor: @grayDark; @dropdownLinkColor: @grayDark;
@dropdownLinkColorHover: @white; @dropdownLinkColorHover: @white;
@dropdownLinkColorActive: @dropdownLinkColor; @dropdownLinkColorActive: @white;
@dropdownLinkBackgroundActive: @red; @dropdownLinkBackgroundActive: @red;
@dropdownLinkBackgroundHover: @red; @dropdownLinkBackgroundHover: @red;
......
This diff is collapsed.
This diff is collapsed.
// Cerulean 2.2.1 // Cerulean 2.2.2
// Bootswatch // Bootswatch
// ----------------------------------------------------- // -----------------------------------------------------
......
// Cerulean 2.2.1 // Cerulean 2.2.2
// Variables // Variables
// -------------------------------------------------- // --------------------------------------------------
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
@paddingLarge: 11px 19px; // 44px @paddingLarge: 11px 19px; // 44px
@paddingSmall: 2px 10px; // 26px @paddingSmall: 2px 10px; // 26px
@paddingMini: 1px 6px; // 24px @paddingMini: 0px 6px; // 22px
@baseBorderRadius: 4px; @baseBorderRadius: 4px;
@borderRadiusLarge: 6px; @borderRadiusLarge: 6px;
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
@dropdownLinkColor: @grayDark; @dropdownLinkColor: @grayDark;
@dropdownLinkColorHover: @white; @dropdownLinkColorHover: @white;
@dropdownLinkColorActive: @dropdownLinkColor; @dropdownLinkColorActive: @white;
@dropdownLinkBackgroundActive: @linkColor; @dropdownLinkBackgroundActive: @linkColor;
@dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive; @dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive;
......
This diff is collapsed.
This diff is collapsed.
// Cosmo 2.2.1 // Cosmo 2.2.2
// Bootswatch // Bootswatch
// ----------------------------------------------------- // -----------------------------------------------------
...@@ -304,8 +304,6 @@ div.subnav { ...@@ -304,8 +304,6 @@ div.subnav {
// ----------------------------------------------------- // -----------------------------------------------------
.btn { .btn {
padding: 5px 12px;
background-image: none; background-image: none;
.box-shadow(none); .box-shadow(none);
border: none; border: none;
...@@ -315,14 +313,6 @@ div.subnav { ...@@ -315,14 +313,6 @@ div.subnav {
&.disabled { &.disabled {
box-shadow: inset 0 2px 4px rgba(0,0,0,.15),~" "0 1px 2px rgba(0,0,0,.05); box-shadow: inset 0 2px 4px rgba(0,0,0,.15),~" "0 1px 2px rgba(0,0,0,.05);
} }
&-large {
padding: 22px 30px;
}
&-mini {
padding: 2px 6px;
}
} }
.btn-group { .btn-group {
...@@ -385,7 +375,7 @@ input[type="search"], input[type="tel"], input[type="color"] { ...@@ -385,7 +375,7 @@ input[type="search"], input[type="tel"], input[type="color"] {
&.warning { &.warning {
& > label, .control-label,
.help-block, .help-block,
.help-inline { .help-inline {
color: @orange; color: @orange;
...@@ -401,7 +391,7 @@ input[type="search"], input[type="tel"], input[type="color"] { ...@@ -401,7 +391,7 @@ input[type="search"], input[type="tel"], input[type="color"] {
&.error { &.error {
& > label, .control-label,
.help-block, .help-block,
.help-inline { .help-inline {
color: @red; color: @red;
...@@ -417,7 +407,7 @@ input[type="search"], input[type="tel"], input[type="color"] { ...@@ -417,7 +407,7 @@ input[type="search"], input[type="tel"], input[type="color"] {
&.success { &.success {
& > label, .control-label,
.help-block, .help-block,
.help-inline { .help-inline {
color: @green; color: @green;
......
// Cosmo 2.2.1 // Cosmo 2.2.2
// Variables // Variables
// -------------------------------------------------- // --------------------------------------------------
...@@ -66,9 +66,9 @@ ...@@ -66,9 +66,9 @@
@fontSizeSmall: @baseFontSize * 0.85; // ~12px @fontSizeSmall: @baseFontSize * 0.85; // ~12px
@fontSizeMini: @baseFontSize * 0.75; // ~11px @fontSizeMini: @baseFontSize * 0.75; // ~11px
@paddingLarge: 11px 19px; // 44px @paddingLarge: 22px 30px; // 66px
@paddingSmall: 2px 10px; // 26px @paddingSmall: 2px 10px; // 26px
@paddingMini: 1px 6px; // 24px @paddingMini: 2px 6px; // 24px
@baseBorderRadius: 0px; @baseBorderRadius: 0px;
@borderRadiusLarge: 0px; @borderRadiusLarge: 0px;
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
@dropdownLinkColor: @grayDark; @dropdownLinkColor: @grayDark;
@dropdownLinkColorHover: @white; @dropdownLinkColorHover: @white;
@dropdownLinkColorActive: @dropdownLinkColor; @dropdownLinkColorActive: @white;
@dropdownLinkBackgroundActive: @blue; @dropdownLinkBackgroundActive: @blue;
@dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive; @dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive;
......
This diff is collapsed.
This diff is collapsed.
// Cyborg 2.2.1 // Cyborg 2.2.2
// Bootswatch // Bootswatch
// ----------------------------------------------------- // -----------------------------------------------------
......
// Cyborg 2.2.1 // Cyborg 2.2.2
// Variables // Variables
// -------------------------------------------------- // --------------------------------------------------
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
@paddingLarge: 11px 19px; // 44px @paddingLarge: 11px 19px; // 44px
@paddingSmall: 2px 10px; // 26px @paddingSmall: 2px 10px; // 26px
@paddingMini: 1px 6px; // 24px @paddingMini: 0px 6px; // 22px
@baseBorderRadius: 4px; @baseBorderRadius: 4px;
@borderRadiusLarge: 6px; @borderRadiusLarge: 6px;
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
@dropdownLinkColor: @textColor; @dropdownLinkColor: @textColor;
@dropdownLinkColorHover: @white; @dropdownLinkColorHover: @white;
@dropdownLinkColorActive: @dropdownLinkColor; @dropdownLinkColorActive: @white;
@dropdownLinkBackgroundActive: @linkColor; @dropdownLinkBackgroundActive: @linkColor;
@dropdownLinkBackgroundHover: @linkColor; @dropdownLinkBackgroundHover: @linkColor;
......
/*! /*!
* Bootstrap Responsive v2.2.1 * Bootstrap Responsive v2.2.2
* *
* Copyright 2012 Twitter, Inc * Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0 * Licensed under the Apache License v2.0
...@@ -8,6 +8,10 @@ ...@@ -8,6 +8,10 @@
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
*/ */
@-ms-viewport {
width: device-width;
}
.clearfix { .clearfix {
*zoom: 1; *zoom: 1;
} }
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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