update to bootstrap v2.2.2

yenhoang · Dec 9, 2012 · 150ec4f · 150ec4f
1 parent fb52393
commit 150ec4f
Show file tree

Hide file tree

Showing 54 changed files with 4,610 additions and 2,764 deletions.
diff --git a/amelia/bootstrap.css b/amelia/bootstrap.css
diff --git a/amelia/bootstrap.min.css b/amelia/bootstrap.min.css
diff --git a/amelia/bootswatch.less b/amelia/bootswatch.less
@@ -1,4 +1,4 @@
-// Amelia 2.2.1
+// Amelia 2.2.2
 // Bootswatch
 // -----------------------------------------------------
 
@@ -447,18 +447,6 @@ div.subnav {
 	.buttonBackgroundCustom(@btnPrimaryBackground);
 }
 
-.btn-large {
-	padding: 20px 24px;
-}
-
-.btn-small {
-	padding: 8px 12px;
-}
-
-.btn-mini {
-	padding: 4px 8px;
-}
-
 [class^="icon-"], [class*=" icon-"] {
 	margin-top: 2px;
 	margin-right: 8px;

diff --git a/amelia/variables.less b/amelia/variables.less
@@ -1,4 +1,4 @@
-// Amelia 2.2.1
+// Amelia 2.2.2
 // Variables
 // --------------------------------------------------
 
@@ -66,9 +66,9 @@
 @fontSizeSmall:         @baseFontSize * 0.85; // ~12px
 @fontSizeMini:          @baseFontSize * 0.75; // ~11px
 
-@paddingLarge:          11px 19px; // 44px
-@paddingSmall:          2px 10px;  // 26px
-@paddingMini:           1px 6px;   // 24px
+@paddingLarge:          20px 24px; // 58px
+@paddingSmall:          8px 12px;  // 34px
+@paddingMini:           4px 8px;   // 28px
 
 @baseBorderRadius:      0;
 @borderRadiusLarge:     6px;
@@ -116,6 +116,7 @@
 @formActionsBackground:         transparent;
 @inputHeight:                   @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
 
+
 // Dropdowns
 // -------------------------
 @dropdownBackground:            @white;
@@ -125,7 +126,7 @@
 
 @dropdownLinkColor:             @grayDark;
 @dropdownLinkColorHover:        @white;
-@dropdownLinkColorActive:       @dropdownLinkColor;
+@dropdownLinkColorActive:       @white;
 
 @dropdownLinkBackgroundActive:  @red;
 @dropdownLinkBackgroundHover:   @red;