Skip to content

Commit

Permalink
all: update to 2.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
thomaspark committed May 1, 2012
1 parent dea6ddc commit f92ce0f
Show file tree
Hide file tree
Showing 48 changed files with 10,967 additions and 7,981 deletions.
900 changes: 541 additions & 359 deletions amelia/bootstrap.css

Large diffs are not rendered by default.

346 changes: 186 additions & 160 deletions amelia/bootstrap.min.css

Large diffs are not rendered by default.

13 changes: 5 additions & 8 deletions amelia/bootswatch.less
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Bootswatch.less
// Swatch: Amelia
// Version: 2.0.2
// Version: 2.0.3
// -----------------------------------------------------

// TYPOGRAPHY
Expand Down Expand Up @@ -58,7 +58,7 @@ footer.footer {
}

.brand {
padding-top: 12px;
padding: 12px 20px 14px;
font-size: 24px;
font-weight: normal;
}
Expand All @@ -85,7 +85,6 @@ footer.footer {
padding: 4px 9px;
.box-shadow(none);
}

}
}

Expand All @@ -96,7 +95,7 @@ div.subnav {
.border-radius(0);
.box-shadow(none);

.nav > li.dropdown.open > a {
.nav > li.open > a {
border-color: transparent;
background-color: rgba(255, 255, 255, 0.4);
}
Expand Down Expand Up @@ -299,12 +298,10 @@ input, textarea, .search-query, .uneditable-input,
.input-append input, .input-append .uneditable-input,
.input-prepend input, .input-prepend .uneditable-input {
border-color: transparent;
.border-radius(0);
.box-shadow(none);
}

.form-actions {
background-color: transparent;
border-top: 0px solid transparent;
}

Expand Down Expand Up @@ -397,8 +394,8 @@ input, textarea, .search-query, .uneditable-input,

}

.nav-tabs .dropdown.open > .dropdown-toggle,
.nav-pills .dropdown.open > .dropdown-toggle {
.nav-tabs li.open > .dropdown-toggle,
.nav-pills li.open > .dropdown-toggle {
background-color: #8AD5DC;
color: @linkColor;
border-color: transparent;
Expand Down
18 changes: 10 additions & 8 deletions amelia/variables.less
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
// Variables.less
// Variables to customize the look and feel of Bootstrap
// Swatch: Amelia
// Version: 2.0.2
// Version: 2.0.3
// -----------------------------------------------------



// GLOBAL VALUES
// --------------------------------------------------

Expand Down Expand Up @@ -47,10 +45,14 @@

// Typography
// -------------------------
@sansFontFamily: 'Cabin', Verdana, sans-serif;
@serifFontFamily: Georgia, "Times New Roman", Times, serif;
@monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace;

@baseFontSize: 14px;
@baseFontFamily: 'Cabin', Verdana, sans-serif;
@baseFontFamily: @sansFontFamily;
@baseLineHeight: 20px;
@altFontFamily: Georgia, "Times New Roman", Times, serif;
@altFontFamily: @serifFontFamily;

@headingsFontFamily: 'Lobster', cursive; // empty to use BS default, @baseFontFamily
@headingsFontWeight: normal; // instead of browser default, bold
Expand Down Expand Up @@ -94,8 +96,9 @@
// -------------------------
@inputBackground: @white;
@inputBorder: transparent;
@inputBorderRadius: 0;
@inputDisabledBackground: @grayLighter;

@formActionsBackground: transparent;

// Dropdowns
// -------------------------
Expand Down Expand Up @@ -156,6 +159,7 @@
@navbarSearchBackgroundFocus: lighten(@navbarBackground, 25%);
@navbarSearchBorder: darken(@navbarSearchBackground, 30%);
@navbarSearchPlaceholderColor: @textColor;
@navbarBrandColor: @navbarLinkColor;


// Hero unit
Expand Down Expand Up @@ -185,7 +189,6 @@




// GRID
// --------------------------------------------------

Expand All @@ -196,7 +199,6 @@
@gridGutterWidth: 20px;
@gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));


// Fluid grid
// -------------------------
@fluidGridColumnWidth: 6.382978723%;
Expand Down
Loading

0 comments on commit f92ce0f

Please sign in to comment.