Skip to content

Commit

Permalink
update bootswatch to 3.0.0 final
Browse files Browse the repository at this point in the history
  • Loading branch information
@thomaspark
thomaspark committed Aug 20, 2013
1 parent 424dd8b commit 2532ecb
Show file tree
Hide file tree
Showing 57 changed files with 33,849 additions and 21,200 deletions.
4,880 changes: 3,009 additions & 1,871 deletions amelia/bootstrap.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion amelia/bootstrap.min.css
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions amelia/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<body>
<script src="../assets/js/bsa.js"></script>

<div class="navbar navbar-fixed-top">
<div class="navbar navbar-default navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<a href="../" class="navbar-brand">Bootswatch</a>
Expand Down Expand Up @@ -116,7 +116,7 @@ <h1 id="navbar">Navbar</h1>
</div>

<div class="bs-example">
<div class="navbar">
<div class="navbar navbar-default">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
Expand Down Expand Up @@ -851,7 +851,7 @@ <h1 id="indicators">Indicators</h1>
<div class="col-lg-12">
<h2>Alerts</h2>
<div class="bs-example">
<div class="alert alert-dismissable">
<div class="alert alert-dismissable alert-warning">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<h4>Warning!</h4>
<p>Best check yo self, you're not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, <a href="#" class="alert-link">vel scelerisque nisl consectetur et</a>.</p>
Expand Down Expand Up @@ -1054,18 +1054,18 @@ <h2>Panels</h2>
</div>
<div class="row">
<div class="col-lg-4">
<div class="panel">
<div class="panel panel-default">
<div class="panel-body">
Basic panel
</div>
</div>
<div class="panel">
<div class="panel panel-default">
<div class="panel-heading">Panel heading</div>
<div class="panel-body">
Panel content
</div>
</div>
<div class="panel">
<div class="panel panel-default">
<div class="panel-body">
Panel content
</div>
Expand Down
101 changes: 56 additions & 45 deletions amelia/variables.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@
@headings-font-weight: 500;
@headings-line-height: 1.1;

// Iconography
// -------------------------

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


// Components
// -------------------------
Expand Down Expand Up @@ -98,7 +104,7 @@
// Buttons
// -------------------------

@btn-font-weight: bold;
@btn-font-weight: normal;

@btn-default-color: @gray-dark;
@btn-default-bg: @gray-lighter;
Expand Down Expand Up @@ -182,6 +188,7 @@
// Used for a bird's eye view of components dependent on the z-axis
// Try to avoid customizing these :)

@zindex-navbar: 1000;
@zindex-dropdown: 1000;
@zindex-popover: 1010;
@zindex-tooltip: 1030;
Expand All @@ -193,26 +200,25 @@
// --------------------------------------------------

// Extra small screen / phone
@screen-xsmall: 480px;
@screen-phone: @screen-xsmall;
@screen-xs: 480px;
@screen-phone: @screen-xs;

// Small screen / tablet
@screen-small: 768px;
@screen-tablet: @screen-small;
@screen-sm: 768px;
@screen-tablet: @screen-sm;

// Medium screen / desktop
@screen-medium: 992px;
@screen-desktop: @screen-medium;
@screen-md: 992px;
@screen-desktop: @screen-md;

// Large screen / wide desktop
@screen-large: 1200px;
@screen-large-desktop: @screen-large;
@screen-lg: 1200px;
@screen-lg-desktop: @screen-lg;

// So media queries don't overlap when required, provide a maximum
@screen-phone-max: (@screen-small - 1);
@screen-small-max: (@screen-medium - 1);
@screen-tablet-max: (@screen-desktop - 1);
@screen-desktop-max: (@screen-large-desktop - 1);
@screen-xs-max: (@screen-sm - 1);
@screen-sm-max: (@screen-md - 1);
@screen-md-max: (@screen-lg - 1);


// Grid system
Expand All @@ -232,31 +238,31 @@
// Basics of a navbar
@navbar-height: 50px;
@navbar-margin-bottom: @line-height-computed;
@navbar-color: @gray-light;
@navbar-bg: @brand-primary;
@navbar-border: darken(@navbar-bg, 6.5%);
@navbar-default-color: @gray-light;
@navbar-default-bg: @brand-primary;
@navbar-default-border: darken(@navbar-default-bg, 6.5%);
@navbar-border-radius: @border-radius-base;
@navbar-padding-horizontal: floor(@grid-gutter-width / 2); // ~15px
@navbar-padding-horizontal: floor(@grid-gutter-width / 2);
@navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);

// Navbar links
@navbar-link-color: #fff;
@navbar-link-hover-color: #fff;
@navbar-link-hover-bg: lighten(@navbar-bg, 10%);
@navbar-link-active-color: #fff;
@navbar-link-active-bg: @navbar-link-hover-bg;
@navbar-link-disabled-color: #ccc;
@navbar-link-disabled-bg: transparent;
@navbar-default-link-color: #fff;
@navbar-default-link-hover-color: #fff;
@navbar-default-link-hover-bg: lighten(@navbar-default-bg, 10%);
@navbar-default-link-active-color: #fff;
@navbar-default-link-active-bg: @navbar-default-link-hover-bg;
@navbar-default-link-disabled-color: #ccc;
@navbar-default-link-disabled-bg: transparent;

// Navbar brand label
@navbar-brand-color: @navbar-link-color;
@navbar-brand-hover-color: @navbar-brand-color;
@navbar-brand-hover-bg: none;
@navbar-default-brand-color: @navbar-default-link-color;
@navbar-default-brand-hover-color: @navbar-default-brand-color;
@navbar-default-brand-hover-bg: none;

// Navbar toggle
@navbar-toggle-hover-bg: @navbar-link-hover-bg;
@navbar-toggle-icon-bar-bg: #fff;
@navbar-toggle-border-color: @navbar-link-hover-bg;
@navbar-default-toggle-hover-bg: @navbar-default-link-hover-bg;
@navbar-default-toggle-icon-bar-bg: #fff;
@navbar-default-toggle-border-color: @navbar-default-link-hover-bg;


// Inverted navbar
Expand Down Expand Up @@ -346,9 +352,11 @@
// Jumbotron
// -------------------------

@jumbotron-padding: 30px;
@jumbotron-color: inherit;
@jumbotron-bg: darken(@body-bg, 5%);

@jumbotron-heading-color: inherit;
@jumbotron-lead-color: inherit;


// Form states and alerts
Expand Down Expand Up @@ -434,22 +442,22 @@
@alert-border-radius: @border-radius-base;
@alert-link-font-weight: bold;

@alert-bg: @state-warning-bg;
@alert-text: @state-warning-text;
@alert-border: @state-warning-border;

@alert-success-bg: @state-success-bg;
@alert-success-text: @state-success-text;
@alert-success-border: @state-success-border;

@alert-danger-bg: @state-danger-bg;
@alert-danger-text: @state-danger-text;
@alert-danger-border: @state-danger-border;

@alert-info-bg: @state-info-bg;
@alert-info-text: @state-info-text;
@alert-info-border: @state-info-border;

@alert-warning-bg: @state-warning-bg;
@alert-warning-text: @state-warning-text;
@alert-warning-border: @state-warning-border;

@alert-danger-bg: @state-danger-bg;
@alert-danger-text: @state-danger-text;
@alert-danger-border: @state-danger-border;


// Progress bars
// -------------------------
Expand Down Expand Up @@ -481,10 +489,13 @@
// Panels
// -------------------------
@panel-bg: lighten(@body-bg, 5%);
@panel-border: darken(@body-bg, 5%);
@panel-inner-border: darken(@body-bg, 5%);
@panel-border-radius: @border-radius-base;
@panel-heading-bg: lighten(@body-bg, 15%);
@panel-footer-bg: @panel-heading-bg;
@panel-footer-bg: @panel-default-heading-bg;

@panel-default-text: @gray-dark;
@panel-default-border: darken(@body-bg, 5%);
@panel-default-heading-bg: lighten(@body-bg, 15%);

@panel-primary-text: #fff;
@panel-primary-border: @brand-primary;
Expand Down Expand Up @@ -600,10 +611,10 @@
// --------------------------------------------------

// Small screen / tablet
@container-tablet: 728px;
@container-tablet: ((720px + @grid-gutter-width));

// Medium screen / desktop
@container-desktop: 940px;
@container-desktop: ((940px + @grid-gutter-width));

// Large screen / wide desktop
@container-large-desktop: 1170px;
@container-lg-desktop: ((1140px + @grid-gutter-width));
2 changes: 1 addition & 1 deletion assets/css/bootswatch.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion assets/less/bootswatch.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ footer {

.alert {
margin: 4em 0 2em;
text-align: left;
}

h1 {
Expand Down
Loading

0 comments on commit 2532ecb

Please sign in to comment.