Skip to content

Commit

Permalink
3.1.0 -> 3.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
thomaspark committed Feb 13, 2014
1 parent b743ae3 commit 76c6df6
Show file tree
Hide file tree
Showing 67 changed files with 2,080 additions and 2,784 deletions.
246 changes: 100 additions & 146 deletions amelia/bootstrap.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions amelia/bootstrap.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion amelia/bootswatch.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Amelia 3.1.0
// Amelia 3.1.1
// Bootswatch
// -----------------------------------------------------

Expand Down
50 changes: 26 additions & 24 deletions amelia/variables.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Amelia 3.1.0
// Amelia 3.1.1
// Variables
// --------------------------------------------------

Expand Down Expand Up @@ -74,7 +74,7 @@

@icon-font-path: "../fonts/";
@icon-font-name: "glyphicons-halflings-regular";
@icon-font-svg-id: "glyphicons_halflingsregular";
@icon-font-svg-id: "glyphicons_halflingsregular";

//== Components
//
Expand Down Expand Up @@ -301,6 +301,26 @@
@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);


//== Container sizes
//
//## Define the maximum width of `.container` for different screen sizes.

// Small screen / tablet
@container-tablet: ((720px + @grid-gutter-width));
//** For `@screen-sm-min` and up.
@container-sm: @container-tablet;

// Medium screen / desktop
@container-desktop: ((940px + @grid-gutter-width));
//** For `@screen-md-min` and up.
@container-md: @container-desktop;

// Large screen / wide desktop
@container-large-desktop: ((1140px + @grid-gutter-width));
//** For `@screen-lg-min` and up.
@container-lg: @container-large-desktop;


//== Navbar
//
//##
Expand Down Expand Up @@ -505,9 +525,9 @@
//** Popover outer arrow width
@popover-arrow-outer-width: (@popover-arrow-width + 1);
//** Popover outer arrow color
@popover-arrow-outer-color: rgba(0,0,0,.25);
@popover-arrow-outer-color: fadein(@popover-border-color, 5%);
//** Popover outer arrow fallback color
@popover-arrow-outer-fallback-color: #999;
@popover-arrow-outer-fallback-color: darken(@popover-fallback-border-color, 20%);


//== Labels
Expand Down Expand Up @@ -790,6 +810,8 @@
@headings-small-color: @gray-light;
//** Blockquote small color
@blockquote-small-color: rgba(255, 255, 255, 0.6);
//** Blockquote font size
@blockquote-font-size: (@font-size-base * 1.25);
//** Blockquote border color
@blockquote-border-color: rgba(255, 255, 255, 0.6);
//** Page header border color
Expand All @@ -805,23 +827,3 @@

//** Horizontal offset for forms and lists.
@component-offset-horizontal: 180px;


//== Container sizes
//
//## Define the maximum width of `.container` for different screen sizes.

// Small screen / tablet
@container-tablet: ((720px + @grid-gutter-width));
//** For `@screen-sm-min` and up.
@container-sm: @container-tablet;

// Medium screen / desktop
@container-desktop: ((940px + @grid-gutter-width));
//** For `@screen-md-min` and up.
@container-md: @container-desktop;

// Large screen / wide desktop
@container-large-desktop: ((1140px + @grid-gutter-width));
//** For `@screen-lg-min` and up.
@container-lg: @container-large-desktop;
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bootswatch",
"description": "Bootswatch is a collection of themes for Bootstrap.",
"version": "3.1.0+1",
"version": "3.1.1",
"author": "Thomas Park",
"homepage": "http://bootswatch.com",
"repository": {
Expand Down Expand Up @@ -31,7 +31,7 @@
"*/thumbnail.png"
],
"dependencies": {
"bootstrap": "~3.1.0"
"bootstrap": "~3.1.1"
},
"devDependencies": {
"font-awesome": "~4.0.0",
Expand Down
Loading

0 comments on commit 76c6df6

Please sign in to comment.