Skip to content

Commit

Permalink
updated to 2.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
thomaspark committed Nov 7, 2012
1 parent 6b5f9a0 commit 22ba904
Show file tree
Hide file tree
Showing 49 changed files with 5,786 additions and 4,076 deletions.
596 changes: 352 additions & 244 deletions amelia/bootstrap.css

Large diffs are not rendered by default.

234 changes: 122 additions & 112 deletions amelia/bootstrap.min.css

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions amelia/bootswatch.less
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Bootswatch.less
// Swatch: Amelia
// Version: 2.1.1
// Amelia 2.2.1
// Bootswatch
// -----------------------------------------------------


// TYPOGRAPHY
// -----------------------------------------------------

Expand Down
27 changes: 24 additions & 3 deletions amelia/variables.less
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Amelia 2.2.1
// Variables
// Swatch: Amelia
// Version: 2.1.1
// --------------------------------------------------


// Global values
// --------------------------------------------------

Expand Down Expand Up @@ -57,6 +57,24 @@
@headingsFontWeight: normal; // instead of browser default, bold
@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
// -------------------------
@tableBackground: lighten(#147E88, 10%); // overall background-color
Expand Down Expand Up @@ -93,9 +111,10 @@
// -------------------------
@inputBackground: @white;
@inputBorder: transparent;
@inputBorderRadius: 0;
@inputBorderRadius: @baseBorderRadius;
@inputDisabledBackground: @grayLighter;
@formActionsBackground: transparent;
@inputHeight: @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border

// Dropdowns
// -------------------------
Expand All @@ -116,6 +135,7 @@
// COMPONENT VARIABLES
// --------------------------------------------------


// Z-index master list
// -------------------------
// Used for a bird's eye view of components dependent on the z-axis
Expand Down Expand Up @@ -157,6 +177,7 @@
// Navbar
// -------------------------
@navbarCollapseWidth: 979px;
@navbarCollapseDesktopWidth: @navbarCollapseWidth + 1;

@navbarHeight: 50px;
@navbarBackgroundHighlight: @red;
Expand Down

0 comments on commit 22ba904

Please sign in to comment.