diff options
| author | Thomas Park <thomas@thomaspark.me> | 2013-08-20 00:20:18 -0400 |
|---|---|---|
| committer | Thomas Park <thomas@thomaspark.me> | 2013-08-20 00:20:18 -0400 |
| commit | 2532ecb878bd686b9cbb3959d2a2723d1b220c76 (patch) | |
| tree | 46534bb161dc6040bf87c2e2b54d9dc5cf3ac0a9 /custom | |
| parent | 424dd8bc118b36c9173dbdc05661086c8566fd17 (diff) | |
update bootswatch to 3.0.0 final
Diffstat (limited to 'custom')
| -rw-r--r-- | custom/index.html | 12 | ||||
| -rwxr-xr-x | custom/variables.less | 97 |
2 files changed, 60 insertions, 49 deletions
diff --git a/custom/index.html b/custom/index.html index c00a482f..1090f0a3 100644 --- a/custom/index.html +++ b/custom/index.html @@ -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> @@ -110,7 +110,7 @@ </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"> @@ -845,7 +845,7 @@ <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">×</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> @@ -1048,18 +1048,18 @@ </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> diff --git a/custom/variables.less b/custom/variables.less index 07a0227b..f89fcf02 100755 --- a/custom/variables.less +++ b/custom/variables.less @@ -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 // ------------------------- @@ -98,7 +104,7 @@ // Buttons // ------------------------- -@btn-font-weight: bold; +@btn-font-weight: normal; @btn-default-color: #333; @btn-default-bg: #fff; @@ -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; @@ -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 @@ -232,31 +238,31 @@ // Basics of a navbar @navbar-height: 50px; @navbar-margin-bottom: @line-height-computed; -@navbar-color: #777; -@navbar-bg: #f8f8f8; -@navbar-border: darken(@navbar-bg, 6.5%); +@navbar-default-color: #777; +@navbar-default-bg: #f8f8f8; +@navbar-default-border: darken(@navbar-default-bg, 6.5%); @navbar-border-radius: @border-radius-base; @navbar-padding-horizontal: floor(@grid-gutter-width / 2); @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2); // Navbar links -@navbar-link-color: #777; -@navbar-link-hover-color: #333; -@navbar-link-hover-bg: transparent; -@navbar-link-active-color: #555; -@navbar-link-active-bg: darken(@navbar-bg, 6.5%); -@navbar-link-disabled-color: #ccc; -@navbar-link-disabled-bg: transparent; +@navbar-default-link-color: #777; +@navbar-default-link-hover-color: #333; +@navbar-default-link-hover-bg: transparent; +@navbar-default-link-active-color: #555; +@navbar-default-link-active-bg: darken(@navbar-default-bg, 6.5%); +@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: darken(@navbar-link-color, 10%); -@navbar-brand-hover-bg: transparent; +@navbar-default-brand-color: @navbar-default-link-color; +@navbar-default-brand-hover-color: darken(@navbar-default-link-color, 10%); +@navbar-default-brand-hover-bg: transparent; // Navbar toggle -@navbar-toggle-hover-bg: #ddd; -@navbar-toggle-icon-bar-bg: #ccc; -@navbar-toggle-border-color: #ddd; +@navbar-default-toggle-hover-bg: #ddd; +@navbar-default-toggle-icon-bar-bg: #ccc; +@navbar-default-toggle-border-color: #ddd; // Inverted navbar @@ -346,9 +352,11 @@ // Jumbotron // ------------------------- +@jumbotron-padding: 30px; +@jumbotron-color: inherit; @jumbotron-bg: @gray-lighter; + @jumbotron-heading-color: inherit; -@jumbotron-lead-color: inherit; // Form states and alerts @@ -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 // ------------------------- @@ -481,11 +489,14 @@ // Panels // ------------------------- @panel-bg: #fff; -@panel-border: #ddd; +@panel-inner-border: #ddd; @panel-border-radius: @border-radius-base; -@panel-heading-bg: #f5f5f5; @panel-footer-bg: #f5f5f5; +@panel-default-text: @gray-dark; +@panel-default-border: #ddd; +@panel-default-heading-bg: #f5f5f5; + @panel-primary-text: #fff; @panel-primary-border: @brand-primary; @panel-primary-heading-bg: @brand-primary; @@ -600,10 +611,10 @@ // -------------------------------------------------- // Small screen / tablet -@container-tablet: 720px; +@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: 1140px; +@container-lg-desktop: ((1140px + @grid-gutter-width)); |