diff --git a/bootstrap_themes/static/bootstrap/themes/amelia/less/bootswatch.less b/bootstrap_themes/static/bootstrap/themes/amelia/less/bootswatch.less index 968f5b2..cd49e62 100644 --- a/bootstrap_themes/static/bootstrap/themes/amelia/less/bootswatch.less +++ b/bootstrap_themes/static/bootstrap/themes/amelia/less/bootswatch.less @@ -1,4 +1,4 @@ -// Amelia 3.0.0 +// Amelia 3.0.2 // Bootswatch // ----------------------------------------------------- @@ -35,32 +35,37 @@ // Typography ================================================================= -h1, h2, h3, h4, h5, h6 { - font-family: 'Lobster', cursive; -} - -.text-primary { +.text-primary, +.text-primary:hover { color: lighten(@brand-primary, 40%); } -.text-success { +.text-success, +.text-success:hover { color: lighten(@brand-success, 20%); } -.text-danger { +.text-danger, +.text-danger:hover { color: lighten(@brand-danger, 20%); } -.text-warning { +.text-warning, +.text-warning:hover { color: lighten(@brand-warning, 20%); } -.text-info { +.text-info, +.text-info:hover { color: lighten(@brand-info, 40%); } // Tables ===================================================================== +.table-responsive > .table { + background-color: @table-bg; +} + // Forms ====================================================================== .has-warning { diff --git a/bootstrap_themes/static/bootstrap/themes/amelia/less/variables.less b/bootstrap_themes/static/bootstrap/themes/amelia/less/variables.less index 672cb42..10fc6d2 100644 --- a/bootstrap_themes/static/bootstrap/themes/amelia/less/variables.less +++ b/bootstrap_themes/static/bootstrap/themes/amelia/less/variables.less @@ -1,4 +1,4 @@ -// Amelia 3.0.0 +// Amelia 3.0.2 // Variables // -------------------------------------------------- @@ -48,12 +48,21 @@ @font-size-large: ceil(@font-size-base * 1.25); // ~18px @font-size-small: ceil(@font-size-base * 0.85); // ~12px +@font-size-h1: floor(@font-size-base * 2.6); // ~36px +@font-size-h2: floor(@font-size-base * 2.15); // ~30px +@font-size-h3: ceil(@font-size-base * 1.7); // ~24px +@font-size-h4: ceil(@font-size-base * 1.25); // ~18px +@font-size-h5: @font-size-base; +@font-size-h6: ceil(@font-size-base * 0.85); // ~12px + @line-height-base: 1.428571429; // 20/14 @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px -@headings-font-family: @font-family-base; +@headings-font-family: 'Lobster', cursive; @headings-font-weight: 500; @headings-line-height: 1.1; +@headings-color: inherit; + // Iconography // ------------------------- @@ -82,6 +91,7 @@ @border-radius-large: 6px; @border-radius-small: 3px; +@component-active-color: #fff; @component-active-bg: lighten(@body-bg, 10%); @caret-width-base: 4px; @@ -165,14 +175,14 @@ @dropdown-fallback-border: #ccc; @dropdown-divider-bg: #e5e5e5; -@dropdown-link-active-color: #fff; -@dropdown-link-active-bg: @component-active-bg; - @dropdown-link-color: @gray-dark; @dropdown-link-hover-color: #fff; @dropdown-link-hover-bg: @dropdown-link-active-bg; -@dropdown-link-disabled-color: @text-muted; +@dropdown-link-active-color: #fff; +@dropdown-link-active-bg: @component-active-bg; + +@dropdown-link-disabled-color: @gray-lighter; @dropdown-header-color: @text-muted; @@ -200,25 +210,33 @@ // -------------------------------------------------- // Extra small screen / phone +// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1 @screen-xs: 480px; -@screen-phone: @screen-xs; +@screen-xs-min: @screen-xs; +@screen-phone: @screen-xs-min; // Small screen / tablet +// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1 @screen-sm: 768px; -@screen-tablet: @screen-sm; +@screen-sm-min: @screen-sm; +@screen-tablet: @screen-sm-min; // Medium screen / desktop +// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1 @screen-md: 992px; -@screen-desktop: @screen-md; +@screen-md-min: @screen-md; +@screen-desktop: @screen-md-min; // Large screen / wide desktop +// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1 @screen-lg: 1200px; -@screen-lg-desktop: @screen-lg; +@screen-lg-min: @screen-lg; +@screen-lg-desktop: @screen-lg-min; // So media queries don't overlap when required, provide a maximum -@screen-xs-max: (@screen-sm - 1); -@screen-sm-max: (@screen-md - 1); -@screen-md-max: (@screen-lg - 1); +@screen-xs-max: (@screen-sm-min - 1); +@screen-sm-max: (@screen-md-min - 1); +@screen-md-max: (@screen-lg-min - 1); // Grid system @@ -229,7 +247,7 @@ // Padding, to be divided by two and applied to the left and right of all columns @grid-gutter-width: 30px; // Point at which the navbar stops collapsing -@grid-float-breakpoint: @screen-tablet; +@grid-float-breakpoint: @screen-sm-min; // Navbar @@ -238,13 +256,14 @@ // Basics of a navbar @navbar-height: 50px; @navbar-margin-bottom: @line-height-computed; -@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); @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2); +@navbar-default-color: @gray-light; +@navbar-default-bg: @brand-primary; +@navbar-default-border: darken(@navbar-default-bg, 6.5%); + // Navbar links @navbar-default-link-color: #fff; @navbar-default-link-hover-color: #fff; @@ -286,13 +305,6 @@ @navbar-inverse-brand-hover-color: #fff; @navbar-inverse-brand-hover-bg: none; -// Inverted navbar search -// Normal navbar needs no special styles or vars -@navbar-inverse-search-bg: lighten(@navbar-inverse-bg, 25%); -@navbar-inverse-search-bg-focus: #fff; -@navbar-inverse-search-border: @navbar-inverse-bg; -@navbar-inverse-search-placeholder-color: #ccc; - // Inverted navbar toggle @navbar-inverse-toggle-hover-bg: @navbar-inverse-link-hover-bg; @navbar-inverse-toggle-icon-bar-bg: #fff; @@ -305,8 +317,8 @@ @nav-link-padding: 10px 15px; @nav-link-hover-bg: lighten(@body-bg, 10%); -@nav-disabled-link-color: @gray-light; -@nav-disabled-link-hover-color: @gray-light; +@nav-disabled-link-color: @gray-lighter; +@nav-disabled-link-hover-color: @gray-lighter; @nav-open-link-hover-color: @nav-link-hover-bg; @nav-open-caret-border-color: @nav-link-hover-bg; @@ -324,6 +336,7 @@ @nav-tabs-justified-active-link-border-color: transparent; // Pills +@nav-pills-border-radius: @border-radius-base; @nav-pills-active-link-hover-bg: @component-active-bg; @nav-pills-active-link-hover-color: #fff; @@ -334,7 +347,7 @@ @pagination-bg: lighten(@body-bg, 5%); @pagination-border: transparent; -@pagination-hover-bg: @gray-lighter; +@pagination-hover-bg: @component-active-bg; @pagination-active-bg: lighten(@body-bg, 10%); @pagination-active-color: #fff; @@ -346,7 +359,7 @@ // ------------------------- @pager-border-radius: 15px; -@pager-disabled-color: #fff; +@pager-disabled-color: @gray-lighter; // Jumbotron @@ -355,21 +368,13 @@ @jumbotron-padding: 30px; @jumbotron-color: inherit; @jumbotron-bg: darken(@body-bg, 5%); - @jumbotron-heading-color: inherit; +@jumbotron-font-size: ceil(@font-size-base * 1.5); // Form states and alerts // ------------------------- -@state-warning-text: #fff; -@state-warning-bg: @brand-warning; -@state-warning-border: darken(spin(@state-warning-bg, -10), 3%); - -@state-danger-text: #fff; -@state-danger-bg: @brand-danger; -@state-danger-border: darken(spin(@state-danger-bg, -10), 3%); - @state-success-text: #fff; @state-success-bg: @brand-success; @state-success-border: darken(spin(@state-success-bg, -10), 5%); @@ -378,6 +383,14 @@ @state-info-bg: @brand-info; @state-info-border: darken(spin(@state-info-bg, -10), 7%); +@state-warning-text: #fff; +@state-warning-bg: @brand-warning; +@state-warning-border: darken(spin(@state-warning-bg, -10), 3%); + +@state-danger-text: #fff; +@state-danger-bg: @brand-danger; +@state-danger-border: darken(spin(@state-danger-bg, -10), 3%); + // Tooltips // ------------------------- @@ -478,7 +491,7 @@ @list-group-border-radius: @border-radius-base; @list-group-hover-bg: lighten(@body-bg, 10%); -@list-group-active-color: #fff; +@list-group-active-color: @component-active-color; @list-group-active-bg: @component-active-bg; @list-group-active-border: @list-group-border; @@ -493,7 +506,7 @@ @panel-border-radius: @border-radius-base; @panel-footer-bg: @panel-default-heading-bg; -@panel-default-text: @gray-dark; +@panel-default-text: #fff; @panel-default-border: darken(@body-bg, 5%); @panel-default-heading-bg: lighten(@body-bg, 15%); @@ -551,8 +564,9 @@ // Breadcrumbs // ------------------------- @breadcrumb-bg: lighten(@body-bg, 5%); -@breadcrumb-color: #ccc; +@breadcrumb-color: @gray-lighter; @breadcrumb-active-color: #fff; +@breadcrumb-separator: "/"; // Carousel @@ -573,8 +587,8 @@ // Close // ------------------------ -@close-color: #000; @close-font-weight: bold; +@close-color: #000; @close-text-shadow: 0 1px 0 #fff; @@ -611,10 +625,13 @@ // -------------------------------------------------- // Small screen / tablet -@container-tablet: ((720px + @grid-gutter-width)); +@container-tablet: ((720px + @grid-gutter-width)); +@container-sm: @container-tablet; // Medium screen / desktop -@container-desktop: ((940px + @grid-gutter-width)); +@container-desktop: ((940px + @grid-gutter-width)); +@container-md: @container-desktop; // Large screen / wide desktop -@container-lg-desktop: ((1140px + @grid-gutter-width)); +@container-large-desktop: ((1140px + @grid-gutter-width)); +@container-lg: @container-large-desktop; diff --git a/bootstrap_themes/static/bootstrap/themes/cerulean/less/bootswatch.less b/bootstrap_themes/static/bootstrap/themes/cerulean/less/bootswatch.less index ce2b9fa..19c1a1c 100644 --- a/bootstrap_themes/static/bootstrap/themes/cerulean/less/bootswatch.less +++ b/bootstrap_themes/static/bootstrap/themes/cerulean/less/bootswatch.less @@ -1,9 +1,10 @@ -// Cerulean 3.0.0 +// Cerulean 3.0.2 // Bootswatch // ----------------------------------------------------- .btn-shadow(@color) { #gradient > .vertical-three-colors(lighten(@color, 8%), @color, 60%, darken(@color, 4%)); + filter: none; border-bottom: 1px solid darken(@color, 10%); } @@ -11,6 +12,7 @@ .navbar { .btn-shadow(@navbar-default-bg); + filter: none; .box-shadow(0 1px 10px rgba(0, 0, 0, 0.1)); .navbar-nav > li > a, @@ -20,7 +22,8 @@ } .navbar-inverse { - #gradient > .vertical-three-colors(lighten(@navbar-inverse-bg, 8%), @navbar-inverse-bg, 60%, darken(@navbar-inverse-bg, 4%)); + #gradient > .vertical-three-colors(lighten(@navbar-inverse-bg, 8%), lighten(@navbar-inverse-bg, 4%), 60%, darken(@navbar-inverse-bg, 2%)); + filter: none; border-bottom: 1px solid darken(@navbar-inverse-bg, 10%); } @@ -74,73 +77,34 @@ // Typography ================================================================= -h1, h2, h3, h4, h5, h6 { - color: #317EAC; -} - // Tables ===================================================================== // Forms ====================================================================== // Navs ======================================================================= -// Indicators ================================================================= - -// Progress bars ============================================================== +.pagination { -// Containers ================================================================= - -.panel-primary { - - .panel-title { - color: #fff; + .active > a, + .active > a:hover { + border-color: #ddd; } } -.panel-success { - - .panel-heading { - background-color: @brand-success; - color: #fff; - } - - .panel-title { - color: #fff; - } -} - -.panel-warning { - - .panel-heading { - background-color: @brand-warning; - color: #fff; - } - - .panel-title { - color: #fff; - } -} +// Indicators ================================================================= -.panel-danger { +// Progress bars ============================================================== - .panel-heading { - background-color: @brand-danger; - color: #fff; - } - - .panel-title { - color: #fff; - } -} +// Containers ================================================================= +.panel-primary, +.panel-success, +.panel-warning, +.panel-danger, .panel-info { - .panel-heading { - background-color: @brand-info; - color: #fff; - } - + .panel-heading, .panel-title { color: #fff; } -} \ No newline at end of file +} diff --git a/bootstrap_themes/static/bootstrap/themes/cerulean/less/variables.less b/bootstrap_themes/static/bootstrap/themes/cerulean/less/variables.less index 3ca45cc..1799f11 100644 --- a/bootstrap_themes/static/bootstrap/themes/cerulean/less/variables.less +++ b/bootstrap_themes/static/bootstrap/themes/cerulean/less/variables.less @@ -1,4 +1,4 @@ -// Cerulean 3.0.0 +// Cerulean 3.0.2 // Variables // -------------------------------------------------- @@ -48,12 +48,21 @@ @font-size-large: ceil(@font-size-base * 1.25); // ~18px @font-size-small: ceil(@font-size-base * 0.85); // ~12px +@font-size-h1: floor(@font-size-base * 2.6); // ~36px +@font-size-h2: floor(@font-size-base * 2.15); // ~30px +@font-size-h3: ceil(@font-size-base * 1.7); // ~24px +@font-size-h4: ceil(@font-size-base * 1.25); // ~18px +@font-size-h5: @font-size-base; +@font-size-h6: ceil(@font-size-base * 0.85); // ~12px + @line-height-base: 1.428571429; // 20/14 @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px @headings-font-family: @font-family-base; @headings-font-weight: 500; @headings-line-height: 1.1; +@headings-color: #317EAC; + // Iconography // ------------------------- @@ -82,6 +91,7 @@ @border-radius-large: 6px; @border-radius-small: 3px; +@component-active-color: #fff; @component-active-bg: @brand-primary; @caret-width-base: 4px; @@ -165,13 +175,13 @@ @dropdown-fallback-border: #ccc; @dropdown-divider-bg: #e5e5e5; -@dropdown-link-active-color: #fff; -@dropdown-link-active-bg: @component-active-bg; - @dropdown-link-color: @gray-dark; @dropdown-link-hover-color: #fff; @dropdown-link-hover-bg: @dropdown-link-active-bg; +@dropdown-link-active-color: #fff; +@dropdown-link-active-bg: @component-active-bg; + @dropdown-link-disabled-color: @text-muted; @dropdown-header-color: @text-muted; @@ -200,25 +210,33 @@ // -------------------------------------------------- // Extra small screen / phone +// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1 @screen-xs: 480px; -@screen-phone: @screen-xs; +@screen-xs-min: @screen-xs; +@screen-phone: @screen-xs-min; // Small screen / tablet +// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1 @screen-sm: 768px; -@screen-tablet: @screen-sm; +@screen-sm-min: @screen-sm; +@screen-tablet: @screen-sm-min; // Medium screen / desktop +// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1 @screen-md: 992px; -@screen-desktop: @screen-md; +@screen-md-min: @screen-md; +@screen-desktop: @screen-md-min; // Large screen / wide desktop +// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1 @screen-lg: 1200px; -@screen-lg-desktop: @screen-lg; +@screen-lg-min: @screen-lg; +@screen-lg-desktop: @screen-lg-min; // So media queries don't overlap when required, provide a maximum -@screen-xs-max: (@screen-sm - 1); -@screen-sm-max: (@screen-md - 1); -@screen-md-max: (@screen-lg - 1); +@screen-xs-max: (@screen-sm-min - 1); +@screen-sm-max: (@screen-md-min - 1); +@screen-md-max: (@screen-lg-min - 1); // Grid system @@ -229,7 +247,7 @@ // Padding, to be divided by two and applied to the left and right of all columns @grid-gutter-width: 30px; // Point at which the navbar stops collapsing -@grid-float-breakpoint: @screen-tablet; +@grid-float-breakpoint: @screen-sm-min; // Navbar @@ -238,13 +256,14 @@ // Basics of a navbar @navbar-height: 50px; @navbar-margin-bottom: @line-height-computed; -@navbar-default-color: #777; -@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); @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2); +@navbar-default-color: #777; +@navbar-default-bg: @brand-primary; +@navbar-default-border: darken(@navbar-default-bg, 6.5%); + // Navbar links @navbar-default-link-color: #fff; @navbar-default-link-hover-color: #fff; @@ -270,14 +289,14 @@ // Reset inverted navbar basics @navbar-inverse-color: #fff; @navbar-inverse-bg: @brand-info; -@navbar-inverse-border: darken(@navbar-inverse-bg, 10%); +@navbar-inverse-border: darken(@navbar-inverse-bg, 5%); // Inverted navbar links @navbar-inverse-link-color: #fff; @navbar-inverse-link-hover-color: #fff; -@navbar-inverse-link-hover-bg: darken(@navbar-inverse-bg, 10%); +@navbar-inverse-link-hover-bg: darken(@navbar-inverse-bg, 5%); @navbar-inverse-link-active-color: #fff; -@navbar-inverse-link-active-bg: darken(@navbar-inverse-bg, 10%); +@navbar-inverse-link-active-bg: darken(@navbar-inverse-bg, 5%); @navbar-inverse-link-disabled-color: #ccc; @navbar-inverse-link-disabled-bg: transparent; @@ -286,17 +305,10 @@ @navbar-inverse-brand-hover-color: #fff; @navbar-inverse-brand-hover-bg: none; -// Inverted navbar search -// Normal navbar needs no special styles or vars -@navbar-inverse-search-bg: lighten(@navbar-inverse-bg, 25%); -@navbar-inverse-search-bg-focus: #fff; -@navbar-inverse-search-border: @navbar-inverse-bg; -@navbar-inverse-search-placeholder-color: #ccc; - // Inverted navbar toggle -@navbar-inverse-toggle-hover-bg: darken(@navbar-inverse-bg, 10%); +@navbar-inverse-toggle-hover-bg: darken(@navbar-inverse-bg, 5%); @navbar-inverse-toggle-icon-bar-bg: #fff; -@navbar-inverse-toggle-border-color: darken(@navbar-inverse-bg, 10%); +@navbar-inverse-toggle-border-color: darken(@navbar-inverse-bg, 5%); // Navs @@ -324,8 +336,9 @@ @nav-tabs-justified-active-link-border-color: @body-bg; // Pills +@nav-pills-border-radius: @border-radius-base; @nav-pills-active-link-hover-bg: @component-active-bg; -@nav-pills-active-link-hover-color: #fff; +@nav-pills-active-link-hover-color: @component-active-color; // Pagination @@ -355,21 +368,13 @@ @jumbotron-padding: 30px; @jumbotron-color: inherit; @jumbotron-bg: @gray-lighter; - @jumbotron-heading-color: inherit; +@jumbotron-font-size: ceil(@font-size-base * 1.5); // Form states and alerts // ------------------------- -@state-warning-text: #c09853; -@state-warning-bg: #fcf8e3; -@state-warning-border: darken(spin(@state-warning-bg, -10), 3%); - -@state-danger-text: #b94a48; -@state-danger-bg: #f2dede; -@state-danger-border: darken(spin(@state-danger-bg, -10), 3%); - @state-success-text: #468847; @state-success-bg: #dff0d8; @state-success-border: darken(spin(@state-success-bg, -10), 5%); @@ -378,6 +383,14 @@ @state-info-bg: #d9edf7; @state-info-border: darken(spin(@state-info-bg, -10), 7%); +@state-warning-text: #c09853; +@state-warning-bg: #fcf8e3; +@state-warning-border: darken(spin(@state-warning-bg, -10), 3%); + +@state-danger-text: #b94a48; +@state-danger-bg: #f2dede; +@state-danger-border: darken(spin(@state-danger-bg, -10), 3%); + // Tooltips // ------------------------- @@ -478,7 +491,7 @@ @list-group-border-radius: @border-radius-base; @list-group-hover-bg: #f5f5f5; -@list-group-active-color: #fff; +@list-group-active-color: @component-active-color; @list-group-active-bg: @component-active-bg; @list-group-active-border: @list-group-active-bg; @@ -493,29 +506,29 @@ @panel-border-radius: @border-radius-base; @panel-footer-bg: #f5f5f5; -@panel-default-text: @gray-dark; +@panel-default-text: @text-color; @panel-default-border: #ddd; @panel-default-heading-bg: #f5f5f5; @panel-primary-text: #fff; -@panel-primary-border: @brand-primary; +@panel-primary-border: @panel-default-border; @panel-primary-heading-bg: @brand-primary; @panel-success-text: @state-success-text; -@panel-success-border: @state-success-border; -@panel-success-heading-bg: @state-success-bg; +@panel-success-border: @panel-default-border; +@panel-success-heading-bg: @brand-success; @panel-warning-text: @state-warning-text; -@panel-warning-border: @state-warning-border; -@panel-warning-heading-bg: @state-warning-bg; +@panel-warning-border: @panel-default-border; +@panel-warning-heading-bg: @brand-warning; @panel-danger-text: @state-danger-text; -@panel-danger-border: @state-danger-border; -@panel-danger-heading-bg: @state-danger-bg; +@panel-danger-border: @panel-default-border; +@panel-danger-heading-bg: @brand-danger; @panel-info-text: @state-info-text; -@panel-info-border: @state-info-border; -@panel-info-heading-bg: @state-info-bg; +@panel-info-border: @panel-default-border; +@panel-info-heading-bg: @brand-info; // Thumbnails @@ -553,6 +566,7 @@ @breadcrumb-bg: #f5f5f5; @breadcrumb-color: #ccc; @breadcrumb-active-color: @gray-light; +@breadcrumb-separator: "/"; // Carousel @@ -573,8 +587,8 @@ // Close // ------------------------ -@close-color: #000; @close-font-weight: bold; +@close-color: #000; @close-text-shadow: 0 1px 0 #fff; @@ -611,10 +625,13 @@ // -------------------------------------------------- // Small screen / tablet -@container-tablet: ((720px + @grid-gutter-width)); +@container-tablet: ((720px + @grid-gutter-width)); +@container-sm: @container-tablet; // Medium screen / desktop -@container-desktop: ((940px + @grid-gutter-width)); +@container-desktop: ((940px + @grid-gutter-width)); +@container-md: @container-desktop; // Large screen / wide desktop -@container-lg-desktop: ((1140px + @grid-gutter-width)); +@container-large-desktop: ((1140px + @grid-gutter-width)); +@container-lg: @container-large-desktop; diff --git a/bootstrap_themes/static/bootstrap/themes/cosmo/less/bootswatch.less b/bootstrap_themes/static/bootstrap/themes/cosmo/less/bootswatch.less index 8a629d4..e83611a 100644 --- a/bootstrap_themes/static/bootstrap/themes/cosmo/less/bootswatch.less +++ b/bootstrap_themes/static/bootstrap/themes/cosmo/less/bootswatch.less @@ -1,4 +1,4 @@ -// Cosmo 3.0.0 +// Cosmo 3.0.2 // Bootswatch // ----------------------------------------------------- @@ -14,22 +14,31 @@ // Typography ================================================================= -.text-primary { +.text-primary, +.text-primary:hover { color: @brand-primary; } -.text-success { +.text-success, +.text-success:hover { color: @brand-success; } -.text-danger { +.text-danger, +.text-danger:hover { color: @brand-danger; } -.text-warning { +.text-warning, +.text-warning:hover { color: @brand-warning; } +.text-info, +.text-info:hover { + color: @brand-info; +} + // Tables ===================================================================== .table { diff --git a/bootstrap_themes/static/bootstrap/themes/cosmo/less/variables.less b/bootstrap_themes/static/bootstrap/themes/cosmo/less/variables.less index 7df52e9..233eac9 100644 --- a/bootstrap_themes/static/bootstrap/themes/cosmo/less/variables.less +++ b/bootstrap_themes/static/bootstrap/themes/cosmo/less/variables.less @@ -1,4 +1,4 @@ -// Cosmo 3.0.0 +// Cosmo 3.0.2 // Variables // -------------------------------------------------- @@ -48,12 +48,21 @@ @font-size-large: ceil(@font-size-base * 1.25); // ~18px @font-size-small: ceil(@font-size-base * 0.85); // ~12px +@font-size-h1: floor(@font-size-base * 2.6); // ~36px +@font-size-h2: floor(@font-size-base * 2.15); // ~30px +@font-size-h3: ceil(@font-size-base * 1.7); // ~24px +@font-size-h4: ceil(@font-size-base * 1.25); // ~18px +@font-size-h5: @font-size-base; +@font-size-h6: ceil(@font-size-base * 0.85); // ~12px + @line-height-base: 1.428571429; // 20/14 @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px @headings-font-family: @font-family-base; @headings-font-weight: 300; @headings-line-height: 1.1; +@headings-color: inherit; + // Iconography // ------------------------- @@ -82,6 +91,7 @@ @border-radius-large: 0px; @border-radius-small: 0px; +@component-active-color: #fff; @component-active-bg: @brand-primary; @caret-width-base: 4px; @@ -165,13 +175,13 @@ @dropdown-fallback-border: #ccc; @dropdown-divider-bg: #e5e5e5; -@dropdown-link-active-color: #fff; -@dropdown-link-active-bg: @component-active-bg; - @dropdown-link-color: @gray-dark; @dropdown-link-hover-color: #fff; @dropdown-link-hover-bg: @dropdown-link-active-bg; +@dropdown-link-active-color: #fff; +@dropdown-link-active-bg: @component-active-bg; + @dropdown-link-disabled-color: @text-muted; @dropdown-header-color: @text-muted; @@ -200,25 +210,33 @@ // -------------------------------------------------- // Extra small screen / phone +// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1 @screen-xs: 480px; -@screen-phone: @screen-xs; +@screen-xs-min: @screen-xs; +@screen-phone: @screen-xs-min; // Small screen / tablet +// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1 @screen-sm: 768px; -@screen-tablet: @screen-sm; +@screen-sm-min: @screen-sm; +@screen-tablet: @screen-sm-min; // Medium screen / desktop +// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1 @screen-md: 992px; -@screen-desktop: @screen-md; +@screen-md-min: @screen-md; +@screen-desktop: @screen-md-min; // Large screen / wide desktop +// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1 @screen-lg: 1200px; -@screen-lg-desktop: @screen-lg; +@screen-lg-min: @screen-lg; +@screen-lg-desktop: @screen-lg-min; // So media queries don't overlap when required, provide a maximum -@screen-xs-max: (@screen-sm - 1); -@screen-sm-max: (@screen-md - 1); -@screen-md-max: (@screen-lg - 1); +@screen-xs-max: (@screen-sm-min - 1); +@screen-sm-max: (@screen-md-min - 1); +@screen-md-max: (@screen-lg-min - 1); // Grid system @@ -229,7 +247,7 @@ // Padding, to be divided by two and applied to the left and right of all columns @grid-gutter-width: 30px; // Point at which the navbar stops collapsing -@grid-float-breakpoint: @screen-tablet; +@grid-float-breakpoint: @screen-sm-min; // Navbar @@ -238,13 +256,14 @@ // Basics of a navbar @navbar-height: 50px; @navbar-margin-bottom: @line-height-computed; -@navbar-default-color: #fff; -@navbar-default-bg: @gray-darker; -@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-default-color: #fff; +@navbar-default-bg: @gray-darker; +@navbar-default-border: darken(@navbar-default-bg, 6.5%); + // Navbar links @navbar-default-link-color: #fff; @navbar-default-link-hover-color: #fff; @@ -286,13 +305,6 @@ @navbar-inverse-brand-hover-color: #fff; @navbar-inverse-brand-hover-bg: none; -// Inverted navbar search -// Normal navbar needs no special styles or vars -@navbar-inverse-search-bg: lighten(@navbar-inverse-bg, 25%); -@navbar-inverse-search-bg-focus: #fff; -@navbar-inverse-search-border: @navbar-inverse-bg; -@navbar-inverse-search-placeholder-color: #ccc; - // Inverted navbar toggle @navbar-inverse-toggle-hover-bg: @navbar-inverse-link-hover-bg; @navbar-inverse-toggle-icon-bar-bg: #fff; @@ -324,8 +336,9 @@ @nav-tabs-justified-active-link-border-color: @body-bg; // Pills +@nav-pills-border-radius: @border-radius-base; @nav-pills-active-link-hover-bg: @component-active-bg; -@nav-pills-active-link-hover-color: #fff; +@nav-pills-active-link-hover-color: @component-active-color; // Pagination @@ -355,21 +368,13 @@ @jumbotron-padding: 30px; @jumbotron-color: inherit; @jumbotron-bg: @gray-lighter; - @jumbotron-heading-color: inherit; +@jumbotron-font-size: ceil(@font-size-base * 1.5); // Form states and alerts // ------------------------- -@state-warning-text: #fff; -@state-warning-bg: @brand-warning; -@state-warning-border: darken(spin(@state-warning-bg, -10), 3%); - -@state-danger-text: #fff; -@state-danger-bg: @brand-danger; -@state-danger-border: darken(spin(@state-danger-bg, -10), 3%); - @state-success-text: #fff; @state-success-bg: @brand-success; @state-success-border: darken(spin(@state-success-bg, -10), 5%); @@ -378,6 +383,14 @@ @state-info-bg: @brand-info; @state-info-border: darken(spin(@state-info-bg, -10), 7%); +@state-warning-text: #fff; +@state-warning-bg: @brand-warning; +@state-warning-border: darken(spin(@state-warning-bg, -10), 3%); + +@state-danger-text: #fff; +@state-danger-bg: @brand-danger; +@state-danger-border: darken(spin(@state-danger-bg, -10), 3%); + // Tooltips // ------------------------- @@ -478,7 +491,7 @@ @list-group-border-radius: @border-radius-base; @list-group-hover-bg: #f5f5f5; -@list-group-active-color: #fff; +@list-group-active-color: @component-active-color; @list-group-active-bg: @component-active-bg; @list-group-active-border: @list-group-active-bg; @@ -553,6 +566,7 @@ @breadcrumb-bg: #f5f5f5; @breadcrumb-color: #ccc; @breadcrumb-active-color: @gray-light; +@breadcrumb-separator: "/"; // Carousel @@ -573,8 +587,8 @@ // Close // ------------------------ -@close-color: #000; @close-font-weight: bold; +@close-color: #000; @close-text-shadow: 0 1px 0 #fff; @@ -611,10 +625,13 @@ // -------------------------------------------------- // Small screen / tablet -@container-tablet: ((720px + @grid-gutter-width)); +@container-tablet: ((720px + @grid-gutter-width)); +@container-sm: @container-tablet; // Medium screen / desktop -@container-desktop: ((940px + @grid-gutter-width)); +@container-desktop: ((940px + @grid-gutter-width)); +@container-md: @container-desktop; // Large screen / wide desktop -@container-lg-desktop: ((1140px + @grid-gutter-width)); +@container-large-desktop: ((1140px + @grid-gutter-width)); +@container-lg: @container-large-desktop; diff --git a/bootstrap_themes/static/bootstrap/themes/cyborg/less/bootswatch.less b/bootstrap_themes/static/bootstrap/themes/cyborg/less/bootswatch.less index 0afbdb8..f91b3c1 100644 --- a/bootstrap_themes/static/bootstrap/themes/cyborg/less/bootswatch.less +++ b/bootstrap_themes/static/bootstrap/themes/cyborg/less/bootswatch.less @@ -1,4 +1,4 @@ -// Cyborg 3.0.0 +// Cyborg 3.0.2 // Bootswatch // ----------------------------------------------------- @@ -15,27 +15,28 @@ // Typography ================================================================= -h1, h2, h3, h4, h5, h6 { - color: #fff; -} - -.text-primary { +.text-primary, +.text-primary:hover { color: @brand-primary; } -.text-success { +.text-success, +.text-success:hover { color: @brand-success; } -.text-danger { +.text-danger, +.text-danger:hover { color: @brand-danger; } -.text-warning { +.text-warning, +.text-warning:hover { color: @brand-warning; } -.text-info { +.text-info, +.text-info:hover { color: @brand-info; } @@ -50,6 +51,10 @@ h1, h2, h3, h4, h5, h6 { } } +.table-responsive > .table { + background-color: @table-bg; +} + // Forms ====================================================================== .has-warning { diff --git a/bootstrap_themes/static/bootstrap/themes/cyborg/less/variables.less b/bootstrap_themes/static/bootstrap/themes/cyborg/less/variables.less index 23ed64f..d06b702 100644 --- a/bootstrap_themes/static/bootstrap/themes/cyborg/less/variables.less +++ b/bootstrap_themes/static/bootstrap/themes/cyborg/less/variables.less @@ -1,4 +1,4 @@ -// Cyborg 3.0.0 +// Cyborg 3.0.2 // Variables // -------------------------------------------------- @@ -48,12 +48,21 @@ @font-size-large: ceil(@font-size-base * 1.25); // ~18px @font-size-small: ceil(@font-size-base * 0.85); // ~12px +@font-size-h1: floor(@font-size-base * 2.6); // ~36px +@font-size-h2: floor(@font-size-base * 2.15); // ~30px +@font-size-h3: ceil(@font-size-base * 1.7); // ~24px +@font-size-h4: ceil(@font-size-base * 1.25); // ~18px +@font-size-h5: @font-size-base; +@font-size-h6: ceil(@font-size-base * 0.85); // ~12px + @line-height-base: 1.428571429; // 20/14 @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px @headings-font-family: @font-family-base; @headings-font-weight: 500; @headings-line-height: 1.1; +@headings-color: #fff; + // Iconography // ------------------------- @@ -82,6 +91,7 @@ @border-radius-large: 6px; @border-radius-small: 3px; +@component-active-color: #fff; @component-active-bg: @brand-primary; @caret-width-base: 4px; @@ -165,13 +175,13 @@ @dropdown-fallback-border: #444; @dropdown-divider-bg: rgba(255,255,255,0.1); -@dropdown-link-active-color: #fff; -@dropdown-link-active-bg: @component-active-bg; - @dropdown-link-color: #fff; @dropdown-link-hover-color: #fff; @dropdown-link-hover-bg: @dropdown-link-active-bg; +@dropdown-link-active-color: #fff; +@dropdown-link-active-bg: @component-active-bg; + @dropdown-link-disabled-color: @text-muted; @dropdown-header-color: @text-muted; @@ -200,25 +210,33 @@ // -------------------------------------------------- // Extra small screen / phone +// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1 @screen-xs: 480px; -@screen-phone: @screen-xs; +@screen-xs-min: @screen-xs; +@screen-phone: @screen-xs-min; // Small screen / tablet +// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1 @screen-sm: 768px; -@screen-tablet: @screen-sm; +@screen-sm-min: @screen-sm; +@screen-tablet: @screen-sm-min; // Medium screen / desktop +// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1 @screen-md: 992px; -@screen-desktop: @screen-md; +@screen-md-min: @screen-md; +@screen-desktop: @screen-md-min; // Large screen / wide desktop +// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1 @screen-lg: 1200px; -@screen-lg-desktop: @screen-lg; +@screen-lg-min: @screen-lg; +@screen-lg-desktop: @screen-lg-min; // So media queries don't overlap when required, provide a maximum -@screen-xs-max: (@screen-sm - 1); -@screen-sm-max: (@screen-md - 1); -@screen-md-max: (@screen-lg - 1); +@screen-xs-max: (@screen-sm-min - 1); +@screen-sm-max: (@screen-md-min - 1); +@screen-md-max: (@screen-lg-min - 1); // Grid system @@ -229,7 +247,7 @@ // Padding, to be divided by two and applied to the left and right of all columns @grid-gutter-width: 30px; // Point at which the navbar stops collapsing -@grid-float-breakpoint: @screen-tablet; +@grid-float-breakpoint: @screen-sm-min; // Navbar @@ -238,13 +256,14 @@ // Basics of a navbar @navbar-height: 50px; @navbar-margin-bottom: @line-height-computed; -@navbar-default-color: @text-color; -@navbar-default-bg: @body-bg; -@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-default-color: @text-color; +@navbar-default-bg: @body-bg; +@navbar-default-border: darken(@navbar-default-bg, 6.5%); + // Navbar links @navbar-default-link-color: @text-color; @navbar-default-link-hover-color: #fff; @@ -286,13 +305,6 @@ @navbar-inverse-brand-hover-color: #fff; @navbar-inverse-brand-hover-bg: transparent; -// Inverted navbar search -// Normal navbar needs no special styles or vars -@navbar-inverse-search-bg: lighten(@navbar-inverse-bg, 25%); -@navbar-inverse-search-bg-focus: #fff; -@navbar-inverse-search-border: @navbar-inverse-bg; -@navbar-inverse-search-placeholder-color: #ccc; - // Inverted navbar toggle @navbar-inverse-toggle-hover-bg: #333; @navbar-inverse-toggle-icon-bar-bg: #fff; @@ -324,8 +336,9 @@ @nav-tabs-justified-active-link-border-color: @body-bg; // Pills +@nav-pills-border-radius: @border-radius-base; @nav-pills-active-link-hover-bg: @component-active-bg; -@nav-pills-active-link-hover-color: #fff; +@nav-pills-active-link-hover-color: @component-active-color; // Pagination @@ -334,7 +347,7 @@ @pagination-bg: @gray-darker; @pagination-border: @gray-dark; -@pagination-hover-bg: @gray-lighter; +@pagination-hover-bg: @component-active-bg; @pagination-active-bg: @brand-primary; @pagination-active-color: #fff; @@ -355,21 +368,13 @@ @jumbotron-padding: 30px; @jumbotron-color: inherit; @jumbotron-bg: darken(@gray-darker, 5%); - @jumbotron-heading-color: inherit; +@jumbotron-font-size: ceil(@font-size-base * 1.5); // Form states and alerts // ------------------------- -@state-warning-text: #fff; -@state-warning-bg: @brand-warning; -@state-warning-border: darken(spin(@state-warning-bg, -10), 3%); - -@state-danger-text: #fff; -@state-danger-bg: @brand-danger; -@state-danger-border: darken(spin(@state-danger-bg, -10), 3%); - @state-success-text: #fff; @state-success-bg: @brand-success; @state-success-border: darken(spin(@state-success-bg, -10), 5%); @@ -378,6 +383,14 @@ @state-info-bg: @brand-info; @state-info-border: darken(spin(@state-info-bg, -10), 7%); +@state-warning-text: #fff; +@state-warning-bg: @brand-warning; +@state-warning-border: darken(spin(@state-warning-bg, -10), 3%); + +@state-danger-text: #fff; +@state-danger-bg: @brand-danger; +@state-danger-border: darken(spin(@state-danger-bg, -10), 3%); + // Tooltips // ------------------------- @@ -478,7 +491,7 @@ @list-group-border-radius: @border-radius-base; @list-group-hover-bg: lighten(@list-group-bg, 15%); -@list-group-active-color: #fff; +@list-group-active-color: @component-active-color; @list-group-active-bg: @component-active-bg; @list-group-active-border: @list-group-active-bg; @@ -493,7 +506,7 @@ @panel-border-radius: @border-radius-base; @panel-footer-bg: @panel-default-heading-bg; -@panel-default-text: @gray-dark; +@panel-default-text: @text-color; @panel-default-border: @panel-inner-border; @panel-default-heading-bg: lighten(@gray-darker, 10%); @@ -553,6 +566,7 @@ @breadcrumb-bg: @gray-darker; @breadcrumb-color: #fff; @breadcrumb-active-color: @text-color; +@breadcrumb-separator: "/"; // Carousel @@ -573,8 +587,8 @@ // Close // ------------------------ -@close-color: #000; @close-font-weight: bold; +@close-color: #000; @close-text-shadow: 0 1px 0 #fff; @@ -611,10 +625,13 @@ // -------------------------------------------------- // Small screen / tablet -@container-tablet: ((720px + @grid-gutter-width)); +@container-tablet: ((720px + @grid-gutter-width)); +@container-sm: @container-tablet; // Medium screen / desktop -@container-desktop: ((940px + @grid-gutter-width)); +@container-desktop: ((940px + @grid-gutter-width)); +@container-md: @container-desktop; // Large screen / wide desktop -@container-lg-desktop: ((1140px + @grid-gutter-width)); +@container-large-desktop: ((1140px + @grid-gutter-width)); +@container-lg: @container-large-desktop; diff --git a/bootstrap_themes/static/bootstrap/themes/flatly/less/bootswatch.less b/bootstrap_themes/static/bootstrap/themes/flatly/less/bootswatch.less index c63981d..5e23ea5 100644 --- a/bootstrap_themes/static/bootstrap/themes/flatly/less/bootswatch.less +++ b/bootstrap_themes/static/bootstrap/themes/flatly/less/bootswatch.less @@ -1,4 +1,4 @@ -// Flatly 3.0.0 +// Flatly 3.0.2 // Bootswatch // ----------------------------------------------------- @@ -18,23 +18,28 @@ // Typography ================================================================= -.text-primary { +.text-primary, +.text-primary:hover { color: @brand-primary; } -.text-success { +.text-success, +.text-success:hover { color: @brand-success; } -.text-danger { +.text-danger, +.text-danger:hover { color: @brand-danger; } -.text-warning { +.text-warning, +.text-warning:hover { color: @brand-warning; } -.text-info { +.text-info, +.text-info:hover { color: @brand-info; } @@ -113,14 +118,19 @@ input[type="color"], // Navs ======================================================================= +.nav { + .open > a, + .open > a:hover, + .open > a:focus { + border-color: transparent; + } +} + .pagination { - a { + a, + a:hover { color: #fff; - - &:hover { - color: @text-color; - } } .disabled { @@ -134,11 +144,9 @@ input[type="color"], } .pager { - a { + a, + a:hover { color: #fff; - &:hover { - color: @text-color; - } } .disabled { diff --git a/bootstrap_themes/static/bootstrap/themes/flatly/less/variables.less b/bootstrap_themes/static/bootstrap/themes/flatly/less/variables.less index 54f05cf..f6751e4 100644 --- a/bootstrap_themes/static/bootstrap/themes/flatly/less/variables.less +++ b/bootstrap_themes/static/bootstrap/themes/flatly/less/variables.less @@ -1,4 +1,4 @@ -// Flatly 3.0.0 +// Flatly 3.0.2 // Variables // -------------------------------------------------- @@ -48,12 +48,21 @@ @font-size-large: ceil(@font-size-base * 1.25); // ~18px @font-size-small: ceil(@font-size-base * 0.85); // ~12px +@font-size-h1: floor(@font-size-base * 2.6); // ~36px +@font-size-h2: floor(@font-size-base * 2.15); // ~30px +@font-size-h3: ceil(@font-size-base * 1.7); // ~24px +@font-size-h4: ceil(@font-size-base * 1.25); // ~18px +@font-size-h5: @font-size-base; +@font-size-h6: ceil(@font-size-base * 0.85); // ~12px + @line-height-base: 1.428571429; // 20/14 @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px @headings-font-family: @font-family-base; @headings-font-weight: 500; @headings-line-height: 1.1; +@headings-color: inherit; + // Iconography // ------------------------- @@ -82,6 +91,7 @@ @border-radius-large: 6px; @border-radius-small: 3px; +@component-active-color: #fff; @component-active-bg: @brand-primary; @caret-width-base: 4px; @@ -165,13 +175,13 @@ @dropdown-fallback-border: #ccc; @dropdown-divider-bg: #e5e5e5; -@dropdown-link-active-color: #fff; -@dropdown-link-active-bg: @component-active-bg; - @dropdown-link-color: @gray-dark; @dropdown-link-hover-color: #fff; @dropdown-link-hover-bg: @dropdown-link-active-bg; +@dropdown-link-active-color: #fff; +@dropdown-link-active-bg: @component-active-bg; + @dropdown-link-disabled-color: @text-muted; @dropdown-header-color: @text-muted; @@ -200,25 +210,33 @@ // -------------------------------------------------- // Extra small screen / phone +// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1 @screen-xs: 480px; -@screen-phone: @screen-xs; +@screen-xs-min: @screen-xs; +@screen-phone: @screen-xs-min; // Small screen / tablet +// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1 @screen-sm: 768px; -@screen-tablet: @screen-sm; +@screen-sm-min: @screen-sm; +@screen-tablet: @screen-sm-min; // Medium screen / desktop +// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1 @screen-md: 992px; -@screen-desktop: @screen-md; +@screen-md-min: @screen-md; +@screen-desktop: @screen-md-min; // Large screen / wide desktop +// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1 @screen-lg: 1200px; -@screen-lg-desktop: @screen-lg; +@screen-lg-min: @screen-lg; +@screen-lg-desktop: @screen-lg-min; // So media queries don't overlap when required, provide a maximum -@screen-xs-max: (@screen-sm - 1); -@screen-sm-max: (@screen-md - 1); -@screen-md-max: (@screen-lg - 1); +@screen-xs-max: (@screen-sm-min - 1); +@screen-sm-max: (@screen-md-min - 1); +@screen-md-max: (@screen-lg-min - 1); // Grid system @@ -229,7 +247,7 @@ // Padding, to be divided by two and applied to the left and right of all columns @grid-gutter-width: 30px; // Point at which the navbar stops collapsing -@grid-float-breakpoint: @screen-tablet; +@grid-float-breakpoint: @screen-sm-min; // Navbar @@ -238,13 +256,14 @@ // Basics of a navbar @navbar-height: 60px; @navbar-margin-bottom: @line-height-computed; -@navbar-default-color: #777; -@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-vertical: ((@navbar-height - @line-height-computed) / 2); +@navbar-default-color: #777; +@navbar-default-bg: @brand-primary; +@navbar-default-border: darken(@navbar-default-bg, 6.5%); + // Navbar links @navbar-default-link-color: #fff; @navbar-default-link-hover-color: @brand-success; @@ -286,13 +305,6 @@ @navbar-inverse-brand-hover-color: @navbar-inverse-link-hover-color; @navbar-inverse-brand-hover-bg: transparent; -// Inverted navbar search -// Normal navbar needs no special styles or vars -@navbar-inverse-search-bg: lighten(@navbar-inverse-bg, 25%); -@navbar-inverse-search-bg-focus: #fff; -@navbar-inverse-search-border: @navbar-inverse-bg; -@navbar-inverse-search-placeholder-color: #ccc; - // Inverted navbar toggle @navbar-inverse-toggle-hover-bg: darken(@navbar-inverse-bg, 10%); @navbar-inverse-toggle-icon-bar-bg: #fff; @@ -317,15 +329,16 @@ @nav-tabs-link-hover-border-color: @gray-lighter; @nav-tabs-active-link-hover-bg: @body-bg; -@nav-tabs-active-link-hover-color: @gray; +@nav-tabs-active-link-hover-color: @brand-primary; @nav-tabs-active-link-hover-border-color: @gray-lighter; @nav-tabs-justified-link-border-color: @gray-lighter; @nav-tabs-justified-active-link-border-color: @body-bg; // Pills +@nav-pills-border-radius: @border-radius-base; @nav-pills-active-link-hover-bg: @component-active-bg; -@nav-pills-active-link-hover-color: #fff; +@nav-pills-active-link-hover-color: @component-active-color; // Pagination @@ -334,7 +347,7 @@ @pagination-bg: @brand-success; @pagination-border: transparent; -@pagination-hover-bg: @gray-lighter; +@pagination-hover-bg: darken(@brand-success, 15%); @pagination-active-bg: darken(@brand-success, 15%); @pagination-active-color: #fff; @@ -355,21 +368,13 @@ @jumbotron-padding: 30px; @jumbotron-color: inherit; @jumbotron-bg: @gray-lighter; - @jumbotron-heading-color: inherit; +@jumbotron-font-size: ceil(@font-size-base * 1.5); // Form states and alerts // ------------------------- -@state-warning-text: #fff; -@state-warning-bg: @brand-warning; -@state-warning-border: @brand-warning; - -@state-danger-text: #fff; -@state-danger-bg: @brand-danger; -@state-danger-border: @brand-danger; - @state-success-text: #fff; @state-success-bg: @brand-success; @state-success-border: @brand-success; @@ -378,6 +383,14 @@ @state-info-bg: @brand-info; @state-info-border: @brand-info; +@state-warning-text: #fff; +@state-warning-bg: @brand-warning; +@state-warning-border: @brand-warning; + +@state-danger-text: #fff; +@state-danger-bg: @brand-danger; +@state-danger-border: @brand-danger; + // Tooltips // ------------------------- @@ -478,7 +491,7 @@ @list-group-border-radius: @border-radius-base; @list-group-hover-bg: @gray-lighter; -@list-group-active-color: #fff; +@list-group-active-color: @component-active-color; @list-group-active-bg: @component-active-bg; @list-group-active-border: @list-group-active-bg; @@ -493,7 +506,7 @@ @panel-border-radius: @border-radius-base; @panel-footer-bg: @gray-lighter; -@panel-default-text: @gray-dark; +@panel-default-text: @text-color; @panel-default-border: @gray-lighter; @panel-default-heading-bg: @gray-lighter; @@ -553,6 +566,7 @@ @breadcrumb-bg: @gray-lighter; @breadcrumb-color: #ccc; @breadcrumb-active-color: @gray; +@breadcrumb-separator: "/"; // Carousel @@ -573,8 +587,8 @@ // Close // ------------------------ -@close-color: #000; @close-font-weight: bold; +@close-color: #000; @close-text-shadow: 0 1px 0 #fff; @@ -611,10 +625,13 @@ // -------------------------------------------------- // Small screen / tablet -@container-tablet: ((720px + @grid-gutter-width)); +@container-tablet: ((720px + @grid-gutter-width)); +@container-sm: @container-tablet; // Medium screen / desktop -@container-desktop: ((940px + @grid-gutter-width)); +@container-desktop: ((940px + @grid-gutter-width)); +@container-md: @container-desktop; // Large screen / wide desktop -@container-lg-desktop: ((1140px + @grid-gutter-width)); +@container-large-desktop: ((1140px + @grid-gutter-width)); +@container-lg: @container-large-desktop; diff --git a/bootstrap_themes/static/bootstrap/themes/journal/less/bootswatch.less b/bootstrap_themes/static/bootstrap/themes/journal/less/bootswatch.less index 572acef..d131ded 100644 --- a/bootstrap_themes/static/bootstrap/themes/journal/less/bootswatch.less +++ b/bootstrap_themes/static/bootstrap/themes/journal/less/bootswatch.less @@ -1,4 +1,4 @@ -// Journal 3.0.0 +// Journal 3.0.2 // Bootswatch // ----------------------------------------------------- @@ -7,16 +7,14 @@ // Navbar ===================================================================== .navbar { - border-bottom: 2px solid @gray-lighter; font-size: 18px; font-family: @font-family-sans-serif; - font-weight: bold; - color: #000; + font-weight: @headings-font-weight; } .navbar-brand { font-size: 18px; - font-weight: bold; + font-weight: @headings-font-weight; text-transform: uppercase; } @@ -24,12 +22,6 @@ // Typography ================================================================= -h1, h2, h3, h4, h5, h6 { - font-family: @font-family-sans-serif; - font-weight: bold; - color: #000; -} - // Tables ===================================================================== // Forms ====================================================================== @@ -72,6 +64,14 @@ h1, h2, h3, h4, h5, h6 { // Navs ======================================================================= +.pagination { + + .active > a, + .active > a:hover { + border-color: #ddd; + } +} + // Indicators ================================================================= // Progress bars ============================================================== @@ -82,7 +82,22 @@ h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 { font-family: @font-family-sans-serif; - font-weight: bold; + font-weight: @headings-font-weight; color: #000; } -} \ No newline at end of file +} + +.panel { + + &-primary, + &-success, + &-warning, + &-danger, + &-info { + .panel-title { + color: #fff; + } + } + + +} diff --git a/bootstrap_themes/static/bootstrap/themes/journal/less/variables.less b/bootstrap_themes/static/bootstrap/themes/journal/less/variables.less index b142908..75e4e8b 100644 --- a/bootstrap_themes/static/bootstrap/themes/journal/less/variables.less +++ b/bootstrap_themes/static/bootstrap/themes/journal/less/variables.less @@ -1,4 +1,4 @@ -// Journal 3.0.0 +// Journal 3.0.2 // Variables // -------------------------------------------------- @@ -48,12 +48,21 @@ @font-size-large: ceil(@font-size-base * 1.25); // ~18px @font-size-small: ceil(@font-size-base * 0.85); // ~12px +@font-size-h1: floor(@font-size-base * 2.6); // ~36px +@font-size-h2: floor(@font-size-base * 2.15); // ~30px +@font-size-h3: ceil(@font-size-base * 1.7); // ~24px +@font-size-h4: ceil(@font-size-base * 1.25); // ~18px +@font-size-h5: @font-size-base; +@font-size-h6: ceil(@font-size-base * 0.85); // ~12px + @line-height-base: 1.428571429; // 20/14 @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px -@headings-font-family: @font-family-base; -@headings-font-weight: 500; +@headings-font-family: @font-family-sans-serif; +@headings-font-weight: 700; @headings-line-height: 1.1; +@headings-color: #000; + // Iconography // ------------------------- @@ -82,6 +91,7 @@ @border-radius-large: 6px; @border-radius-small: 3px; +@component-active-color: #fff; @component-active-bg: @brand-primary; @caret-width-base: 4px; @@ -165,13 +175,13 @@ @dropdown-fallback-border: #ccc; @dropdown-divider-bg: #e5e5e5; -@dropdown-link-active-color: #fff; -@dropdown-link-active-bg: @component-active-bg; - @dropdown-link-color: @gray-dark; @dropdown-link-hover-color: #fff; @dropdown-link-hover-bg: @dropdown-link-active-bg; +@dropdown-link-active-color: #fff; +@dropdown-link-active-bg: @component-active-bg; + @dropdown-link-disabled-color: @text-muted; @dropdown-header-color: @text-muted; @@ -200,25 +210,33 @@ // -------------------------------------------------- // Extra small screen / phone +// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1 @screen-xs: 480px; -@screen-phone: @screen-xs; +@screen-xs-min: @screen-xs; +@screen-phone: @screen-xs-min; // Small screen / tablet +// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1 @screen-sm: 768px; -@screen-tablet: @screen-sm; +@screen-sm-min: @screen-sm; +@screen-tablet: @screen-sm-min; // Medium screen / desktop +// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1 @screen-md: 992px; -@screen-desktop: @screen-md; +@screen-md-min: @screen-md; +@screen-desktop: @screen-md-min; // Large screen / wide desktop +// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1 @screen-lg: 1200px; -@screen-lg-desktop: @screen-lg; +@screen-lg-min: @screen-lg; +@screen-lg-desktop: @screen-lg-min; // So media queries don't overlap when required, provide a maximum -@screen-xs-max: (@screen-sm - 1); -@screen-sm-max: (@screen-md - 1); -@screen-md-max: (@screen-lg - 1); +@screen-xs-max: (@screen-sm-min - 1); +@screen-sm-max: (@screen-md-min - 1); +@screen-md-max: (@screen-lg-min - 1); // Grid system @@ -229,7 +247,7 @@ // Padding, to be divided by two and applied to the left and right of all columns @grid-gutter-width: 30px; // Point at which the navbar stops collapsing -@grid-float-breakpoint: @screen-tablet; +@grid-float-breakpoint: @screen-sm-min; // Navbar @@ -238,26 +256,27 @@ // Basics of a navbar @navbar-height: 60px; @navbar-margin-bottom: @line-height-computed; -@navbar-default-color: #000; -@navbar-default-bg: #fff; -@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-default-color: #000; +@navbar-default-bg: #fff; +@navbar-default-border: darken(@navbar-default-bg, 6.5%); + // Navbar links @navbar-default-link-color: #000; @navbar-default-link-hover-color: #000; -@navbar-default-link-hover-bg: transparent; +@navbar-default-link-hover-bg: darken(@navbar-default-bg, 6.5%); @navbar-default-link-active-color: #000; -@navbar-default-link-active-bg: transparent; +@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-default-brand-color: @navbar-default-link-color; @navbar-default-brand-hover-color: @navbar-default-link-hover-color; -@navbar-default-brand-hover-bg: transparent; +@navbar-default-brand-hover-bg: darken(@navbar-default-bg, 6.5%); // Navbar toggle @navbar-default-toggle-hover-bg: #ddd; @@ -275,23 +294,16 @@ // Inverted navbar links @navbar-inverse-link-color: #fff; @navbar-inverse-link-hover-color: #fff; -@navbar-inverse-link-hover-bg: transparent; +@navbar-inverse-link-hover-bg: darken(@navbar-inverse-bg, 6.5%); @navbar-inverse-link-active-color: #fff; -@navbar-inverse-link-active-bg: transparent; +@navbar-inverse-link-active-bg: darken(@navbar-inverse-bg, 6.5%); @navbar-inverse-link-disabled-color: #444; @navbar-inverse-link-disabled-bg: transparent; // Inverted navbar brand label @navbar-inverse-brand-color: @navbar-inverse-link-color; @navbar-inverse-brand-hover-color: #fff; -@navbar-inverse-brand-hover-bg: transparent; - -// Inverted navbar search -// Normal navbar needs no special styles or vars -@navbar-inverse-search-bg: lighten(@navbar-inverse-bg, 25%); -@navbar-inverse-search-bg-focus: #fff; -@navbar-inverse-search-border: @navbar-inverse-bg; -@navbar-inverse-search-placeholder-color: #ccc; +@navbar-inverse-brand-hover-bg: darken(@navbar-inverse-bg, 6.5%); // Inverted navbar toggle @navbar-inverse-toggle-hover-bg: darken(@navbar-inverse-bg, 10%); @@ -324,8 +336,9 @@ @nav-tabs-justified-active-link-border-color: @body-bg; // Pills +@nav-pills-border-radius: @border-radius-base; @nav-pills-active-link-hover-bg: @component-active-bg; -@nav-pills-active-link-hover-color: #fff; +@nav-pills-active-link-hover-color: @component-active-color; // Pagination @@ -355,21 +368,13 @@ @jumbotron-padding: 30px; @jumbotron-color: inherit; @jumbotron-bg: @gray-lighter; - @jumbotron-heading-color: inherit; +@jumbotron-font-size: ceil(@font-size-base * 1.5); // Form states and alerts // ------------------------- -@state-warning-text: #c09853; -@state-warning-bg: #fcf8e3; -@state-warning-border: darken(spin(@state-warning-bg, -10), 3%); - -@state-danger-text: #b94a48; -@state-danger-bg: #f2dede; -@state-danger-border: darken(spin(@state-danger-bg, -10), 3%); - @state-success-text: #468847; @state-success-bg: #dff0d8; @state-success-border: darken(spin(@state-success-bg, -10), 5%); @@ -378,6 +383,14 @@ @state-info-bg: #d9edf7; @state-info-border: darken(spin(@state-info-bg, -10), 7%); +@state-warning-text: #c09853; +@state-warning-bg: #fcf8e3; +@state-warning-border: darken(spin(@state-warning-bg, -10), 3%); + +@state-danger-text: #b94a48; +@state-danger-bg: #f2dede; +@state-danger-border: darken(spin(@state-danger-bg, -10), 3%); + // Tooltips // ------------------------- @@ -478,7 +491,7 @@ @list-group-border-radius: @border-radius-base; @list-group-hover-bg: #f5f5f5; -@list-group-active-color: #fff; +@list-group-active-color: @component-active-color; @list-group-active-bg: @component-active-bg; @list-group-active-border: @list-group-active-bg; @@ -493,7 +506,7 @@ @panel-border-radius: @border-radius-base; @panel-footer-bg: #f5f5f5; -@panel-default-text: @gray-dark; +@panel-default-text: @text-color; @panel-default-border: #ddd; @panel-default-heading-bg: #f5f5f5; @@ -502,20 +515,20 @@ @panel-primary-heading-bg: @brand-primary; @panel-success-text: @state-success-text; -@panel-success-border: @state-success-border; -@panel-success-heading-bg: @state-success-bg; +@panel-success-border: @brand-success; +@panel-success-heading-bg: @brand-success; @panel-warning-text: @state-warning-text; -@panel-warning-border: @state-warning-border; -@panel-warning-heading-bg: @state-warning-bg; +@panel-warning-border: @brand-warning; +@panel-warning-heading-bg: @brand-warning; @panel-danger-text: @state-danger-text; -@panel-danger-border: @state-danger-border; -@panel-danger-heading-bg: @state-danger-bg; +@panel-danger-border: @brand-danger; +@panel-danger-heading-bg: @brand-danger; @panel-info-text: @state-info-text; -@panel-info-border: @state-info-border; -@panel-info-heading-bg: @state-info-bg; +@panel-info-border: @brand-info; +@panel-info-heading-bg: @brand-info; // Thumbnails @@ -553,6 +566,7 @@ @breadcrumb-bg: #f5f5f5; @breadcrumb-color: #ccc; @breadcrumb-active-color: @gray-light; +@breadcrumb-separator: "/"; // Carousel @@ -573,8 +587,8 @@ // Close // ------------------------ -@close-color: #000; @close-font-weight: bold; +@close-color: #000; @close-text-shadow: 0 1px 0 #fff; @@ -611,10 +625,13 @@ // -------------------------------------------------- // Small screen / tablet -@container-tablet: ((720px + @grid-gutter-width)); +@container-tablet: ((720px + @grid-gutter-width)); +@container-sm: @container-tablet; // Medium screen / desktop -@container-desktop: ((940px + @grid-gutter-width)); +@container-desktop: ((940px + @grid-gutter-width)); +@container-md: @container-desktop; // Large screen / wide desktop -@container-lg-desktop: ((1140px + @grid-gutter-width)); +@container-large-desktop: ((1140px + @grid-gutter-width)); +@container-lg: @container-large-desktop; diff --git a/bootstrap_themes/static/bootstrap/themes/readable/less/bootswatch.less b/bootstrap_themes/static/bootstrap/themes/readable/less/bootswatch.less index e468614..2a94bea 100644 --- a/bootstrap_themes/static/bootstrap/themes/readable/less/bootswatch.less +++ b/bootstrap_themes/static/bootstrap/themes/readable/less/bootswatch.less @@ -1,64 +1,52 @@ -// Readable 3.0.0 +// Readable 3.0.2 // Bootswatch // ----------------------------------------------------- -@import url("//fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic"); - -.btn-shadow(@color) { - #gradient > .vertical-three-colors(lighten(@color, 10%), @color, 6%, darken(@color, 4%)); - border: 1px solid darken(@color, 10%); -} +@import url("//fonts.googleapis.com/css?family=Raleway:700"); // Navbar ===================================================================== .navbar { - .box-shadow(0 1px 4px rgba(0, 0, 0, 0.2)); + font-family: @headings-font-family; + text-transform: uppercase; &-nav > li > a { padding-top: @navbar-padding-vertical + 6px; } - &-brand { - padding-top: @navbar-padding-vertical + 5px; + &-nav > .active > a, + &-nav > .active > a:hover { + text-decoration: underline; } -} - -// Buttons ==================================================================== - -.btn-default, -.btn-default:hover { - .btn-shadow(@btn-default-bg); -} -.btn-primary, -.btn-primary:hover { - .btn-shadow(@btn-primary-bg); -} + &-default .navbar-nav > .active > a:hover { + color: @navbar-default-link-hover-color; + } -.btn-success, -.btn-success:hover { - .btn-shadow(@btn-success-bg); -} + &-inverse .navbar-nav > .active > a:hover { + color: @navbar-inverse-link-hover-color; + } -.btn-info, -.btn-info:hover { - .btn-shadow(@btn-info-bg); + &-brand { + padding-top: @navbar-padding-vertical + 5px; + } } -.btn-warning, -.btn-warning:hover { - .btn-shadow(@btn-warning-bg); -} +// Buttons ==================================================================== -.btn-danger, -.btn-danger:hover { - .btn-shadow(@btn-danger-bg); +.btn { + font-family: @headings-font-family; + text-transform: uppercase; } // Typography ================================================================= h1, h2, h3, h4, h5, h6 { - font-weight: bold; + text-transform: uppercase; +} + +p { + margin-bottom: 1.4em; } // Tables ===================================================================== @@ -67,8 +55,42 @@ h1, h2, h3, h4, h5, h6 { // Navs ======================================================================= +.pagination { + + .active > a, + .active > a:hover { + border-color: #ddd; + } + + &-lg > li > a, + &-lg > li > span { + padding: 14px 24px; + } +} + // Indicators ================================================================= +.alert { + a, + .alert-link { + color: @alert-success-text; + text-decoration: underline; + } +} + // Progress bars ============================================================== -// Containers ================================================================= \ No newline at end of file +// Containers ================================================================= + +.panel { + + &-primary, + &-success, + &-warning, + &-danger, + &-info { + .panel-heading { + color: #fff; + } + } +} diff --git a/bootstrap_themes/static/bootstrap/themes/readable/less/variables.less b/bootstrap_themes/static/bootstrap/themes/readable/less/variables.less index 2952c04..9597e70 100644 --- a/bootstrap_themes/static/bootstrap/themes/readable/less/variables.less +++ b/bootstrap_themes/static/bootstrap/themes/readable/less/variables.less @@ -1,4 +1,4 @@ -// Readable 3.0.0 +// Readable 3.0.2 // Variables // -------------------------------------------------- @@ -12,13 +12,13 @@ @gray-darker: lighten(#000, 13.5%); // #222 @gray-dark: lighten(#000, 20%); // #333 @gray: lighten(#000, 33.5%); // #555 -@gray-light: lighten(#000, 60%); // #999 +@gray-light: lighten(#000, 70%); // #999 @gray-lighter: lighten(#000, 93.5%); // #eee // Brand colors // ------------------------- -@brand-primary: #428bca; +@brand-primary: #4582EC; @brand-success: #5cb85c; @brand-warning: #f0ad4e; @brand-danger: #d9534f; @@ -27,33 +27,42 @@ // Scaffolding // ------------------------- -@body-bg: #f9f9f9; +@body-bg: #fff; @text-color: @gray-dark; // Links // ------------------------- @link-color: @brand-primary; -@link-hover-color: @link-color; +@link-hover-color: darken(@link-color, 20%); // Typography // ------------------------- -@font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif; -@font-family-serif: "Lora", Georgia, "Times New Roman", Times, serif; +@font-family-sans-serif: "Raleway", "Helvetica Neue", Helvetica, Arial, sans-serif; +@font-family-serif: Georgia, "Times New Roman", Times, serif; @font-family-monospace: Monaco, Menlo, Consolas, "Courier New", monospace; @font-family-base: @font-family-serif; -@font-size-base: 17px; +@font-size-base: 16px; @font-size-large: ceil(@font-size-base * 1.25); // ~18px @font-size-small: ceil(@font-size-base * 0.85); // ~12px +@font-size-h1: floor(@font-size-base * 2.6); // ~36px +@font-size-h2: floor(@font-size-base * 2.15); // ~30px +@font-size-h3: ceil(@font-size-base * 1.7); // ~24px +@font-size-h4: ceil(@font-size-base * 1.25); // ~18px +@font-size-h5: @font-size-base; +@font-size-h6: ceil(@font-size-base * 0.85); // ~12px + @line-height-base: 1.428571429; // 20/14 @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px -@headings-font-family: @font-family-base; -@headings-font-weight: 500; +@headings-font-family: @font-family-sans-serif; +@headings-font-weight: bold; @headings-line-height: 1.1; +@headings-color: inherit; + // Iconography // ------------------------- @@ -82,6 +91,7 @@ @border-radius-large: 6px; @border-radius-small: 3px; +@component-active-color: #fff; @component-active-bg: @brand-primary; @caret-width-base: 4px; @@ -165,13 +175,13 @@ @dropdown-fallback-border: #ccc; @dropdown-divider-bg: #e5e5e5; -@dropdown-link-active-color: #fff; -@dropdown-link-active-bg: @component-active-bg; - @dropdown-link-color: @gray-dark; @dropdown-link-hover-color: #fff; @dropdown-link-hover-bg: @dropdown-link-active-bg; +@dropdown-link-active-color: #fff; +@dropdown-link-active-bg: @component-active-bg; + @dropdown-link-disabled-color: @text-muted; @dropdown-header-color: @text-muted; @@ -200,25 +210,33 @@ // -------------------------------------------------- // Extra small screen / phone +// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1 @screen-xs: 480px; -@screen-phone: @screen-xs; +@screen-xs-min: @screen-xs; +@screen-phone: @screen-xs-min; // Small screen / tablet +// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1 @screen-sm: 768px; -@screen-tablet: @screen-sm; +@screen-sm-min: @screen-sm; +@screen-tablet: @screen-sm-min; // Medium screen / desktop +// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1 @screen-md: 992px; -@screen-desktop: @screen-md; +@screen-md-min: @screen-md; +@screen-desktop: @screen-md-min; // Large screen / wide desktop +// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1 @screen-lg: 1200px; -@screen-lg-desktop: @screen-lg; +@screen-lg-min: @screen-lg; +@screen-lg-desktop: @screen-lg-min; // So media queries don't overlap when required, provide a maximum -@screen-xs-max: (@screen-sm - 1); -@screen-sm-max: (@screen-md - 1); -@screen-md-max: (@screen-lg - 1); +@screen-xs-max: (@screen-sm-min - 1); +@screen-sm-max: (@screen-md-min - 1); +@screen-md-max: (@screen-lg-min - 1); // Grid system @@ -229,7 +247,7 @@ // Padding, to be divided by two and applied to the left and right of all columns @grid-gutter-width: 30px; // Point at which the navbar stops collapsing -@grid-float-breakpoint: @screen-tablet; +@grid-float-breakpoint: @screen-sm-min; // Navbar @@ -238,19 +256,20 @@ // Basics of a navbar @navbar-height: 50px; @navbar-margin-bottom: @line-height-computed; -@navbar-default-color: @gray; -@navbar-default-bg: @body-bg; -@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-default-color: @text-color; +@navbar-default-bg: @body-bg; +@navbar-default-border: transparent; + // Navbar links -@navbar-default-link-color: @navbar-default-color; -@navbar-default-link-hover-color: @gray-dark; +@navbar-default-link-color: @link-color; +@navbar-default-link-hover-color: @link-hover-color; @navbar-default-link-hover-bg: transparent; -@navbar-default-link-active-color: @navbar-default-link-hover-color; -@navbar-default-link-active-bg: darken(@navbar-default-bg, 10%); +@navbar-default-link-active-color: @navbar-default-link-color; +@navbar-default-link-active-bg: transparent; @navbar-default-link-disabled-color: #333; @navbar-default-link-disabled-bg: transparent; @@ -270,14 +289,14 @@ // Reset inverted navbar basics @navbar-inverse-color: @gray-light; @navbar-inverse-bg: @text-color; -@navbar-inverse-border: darken(@navbar-inverse-bg, 10%); +@navbar-inverse-border: transparent; // Inverted navbar links @navbar-inverse-link-color: @gray-light; @navbar-inverse-link-hover-color: #fff; @navbar-inverse-link-hover-bg: transparent; -@navbar-inverse-link-active-color: @navbar-inverse-link-hover-color; -@navbar-inverse-link-active-bg: darken(@navbar-inverse-bg, 10%); +@navbar-inverse-link-active-color: @navbar-inverse-link-color; +@navbar-inverse-link-active-bg: transparent; @navbar-inverse-link-disabled-color: #ccc; @navbar-inverse-link-disabled-bg: transparent; @@ -286,13 +305,6 @@ @navbar-inverse-brand-hover-color: #fff; @navbar-inverse-brand-hover-bg: transparent; -// Inverted navbar search -// Normal navbar needs no special styles or vars -@navbar-inverse-search-bg: lighten(@navbar-inverse-bg, 25%); -@navbar-inverse-search-bg-focus: #fff; -@navbar-inverse-search-border: @navbar-inverse-bg; -@navbar-inverse-search-placeholder-color: #ccc; - // Inverted navbar toggle @navbar-inverse-toggle-hover-bg: #333; @navbar-inverse-toggle-icon-bar-bg: #fff; @@ -324,8 +336,9 @@ @nav-tabs-justified-active-link-border-color: @body-bg; // Pills +@nav-pills-border-radius: @border-radius-base; @nav-pills-active-link-hover-bg: @component-active-bg; -@nav-pills-active-link-hover-color: #fff; +@nav-pills-active-link-hover-color: @component-active-color; // Pagination @@ -355,28 +368,28 @@ @jumbotron-padding: 30px; @jumbotron-color: inherit; @jumbotron-bg: darken(@body-bg, 3%); - @jumbotron-heading-color: inherit; +@jumbotron-font-size: ceil(@font-size-base * 1.5); // Form states and alerts // ------------------------- -@state-warning-text: #c09853; -@state-warning-bg: #fcf8e3; -@state-warning-border: darken(spin(@state-warning-bg, -10), 3%); - -@state-danger-text: #b94a48; -@state-danger-bg: #f2dede; -@state-danger-border: darken(spin(@state-danger-bg, -10), 3%); - -@state-success-text: #468847; +@state-success-text: @brand-success; @state-success-bg: #dff0d8; -@state-success-border: darken(spin(@state-success-bg, -10), 5%); +@state-success-border: @brand-success; -@state-info-text: #3a87ad; +@state-info-text: @brand-info; @state-info-bg: #d9edf7; -@state-info-border: darken(spin(@state-info-bg, -10), 7%); +@state-info-border: @brand-info; + +@state-warning-text: @brand-warning; +@state-warning-bg: #fcf8e3; +@state-warning-border: @brand-warning; + +@state-danger-text: @brand-danger; +@state-danger-bg: #f2dede; +@state-danger-border: @brand-danger; // Tooltips @@ -442,20 +455,20 @@ @alert-border-radius: @border-radius-base; @alert-link-font-weight: bold; -@alert-success-bg: @state-success-bg; -@alert-success-text: @state-success-text; +@alert-success-bg: @state-success-border; +@alert-success-text: #fff; @alert-success-border: @state-success-border; -@alert-info-bg: @state-info-bg; -@alert-info-text: @state-info-text; +@alert-info-bg: @state-info-border; +@alert-info-text: #fff; @alert-info-border: @state-info-border; -@alert-warning-bg: @state-warning-bg; -@alert-warning-text: @state-warning-text; +@alert-warning-bg: @state-warning-border; +@alert-warning-text: #fff; @alert-warning-border: @state-warning-border; -@alert-danger-bg: @state-danger-bg; -@alert-danger-text: @state-danger-text; +@alert-danger-bg: @state-danger-border; +@alert-danger-text: #fff; @alert-danger-border: @state-danger-border; @@ -478,7 +491,7 @@ @list-group-border-radius: @border-radius-base; @list-group-hover-bg: #f5f5f5; -@list-group-active-color: #fff; +@list-group-active-color: @component-active-color; @list-group-active-bg: @component-active-bg; @list-group-active-border: @list-group-active-bg; @@ -503,19 +516,19 @@ @panel-success-text: @state-success-text; @panel-success-border: @state-success-border; -@panel-success-heading-bg: @state-success-bg; +@panel-success-heading-bg: @state-success-border; @panel-warning-text: @state-warning-text; @panel-warning-border: @state-warning-border; -@panel-warning-heading-bg: @state-warning-bg; +@panel-warning-heading-bg: @state-warning-border; @panel-danger-text: @state-danger-text; @panel-danger-border: @state-danger-border; -@panel-danger-heading-bg: @state-danger-bg; +@panel-danger-heading-bg: @state-danger-border; @panel-info-text: @state-info-text; @panel-info-border: @state-info-border; -@panel-info-heading-bg: @state-info-bg; +@panel-info-heading-bg: @state-info-border; // Thumbnails @@ -553,6 +566,7 @@ @breadcrumb-bg: #f5f5f5; @breadcrumb-color: #ccc; @breadcrumb-active-color: @gray-light; +@breadcrumb-separator: "/"; // Carousel @@ -573,8 +587,8 @@ // Close // ------------------------ -@close-color: #000; @close-font-weight: bold; +@close-color: #000; @close-text-shadow: 0 1px 0 #fff; @@ -611,10 +625,13 @@ // -------------------------------------------------- // Small screen / tablet -@container-tablet: ((720px + @grid-gutter-width)); +@container-tablet: ((720px + @grid-gutter-width)); +@container-sm: @container-tablet; // Medium screen / desktop -@container-desktop: ((940px + @grid-gutter-width)); +@container-desktop: ((940px + @grid-gutter-width)); +@container-md: @container-desktop; // Large screen / wide desktop -@container-lg-desktop: ((1140px + @grid-gutter-width)); +@container-large-desktop: ((1140px + @grid-gutter-width)); +@container-lg: @container-large-desktop; diff --git a/bootstrap_themes/static/bootstrap/themes/simplex/less/bootswatch.less b/bootstrap_themes/static/bootstrap/themes/simplex/less/bootswatch.less index c65dfea..e5f703d 100644 --- a/bootstrap_themes/static/bootstrap/themes/simplex/less/bootswatch.less +++ b/bootstrap_themes/static/bootstrap/themes/simplex/less/bootswatch.less @@ -1,4 +1,4 @@ -// Simplex 3.0.0 +// Simplex 3.0.2 // Bootswatch // ----------------------------------------------------- @@ -6,6 +6,7 @@ .btn-shadow(@color) { #gradient > .vertical-three-colors(lighten(@color, 15%), @color, 6%, darken(@color, 4%)); + filter: none; border: 1px solid darken(@color, 10%); } @@ -13,7 +14,7 @@ .navbar { border-bottom: 1px solid #dfdfdf; - font-family: @font-family-alt; + font-family: @headings-font-family; &-nav > li > a { padding-top: @navbar-padding-vertical + 2px; @@ -28,7 +29,7 @@ // Buttons ==================================================================== .btn { - font-family: @font-family-alt; + font-family: @headings-font-family; } .btn-default, @@ -63,12 +64,6 @@ // Typography ================================================================= -@font-family-alt: "Josefin Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; - -h1, h2, h3, h4, h5, h6 { - font-family: @font-family-alt; -} - // Tables ===================================================================== // Forms ====================================================================== @@ -111,6 +106,14 @@ h1, h2, h3, h4, h5, h6 { // Navs ======================================================================= +.pagination { + + .active > a, + .active > a:hover { + border-color: #ddd; + } +} + // Indicators ================================================================= // Progress bars ============================================================== diff --git a/bootstrap_themes/static/bootstrap/themes/simplex/less/variables.less b/bootstrap_themes/static/bootstrap/themes/simplex/less/variables.less index b2b026d..0b32cc2 100644 --- a/bootstrap_themes/static/bootstrap/themes/simplex/less/variables.less +++ b/bootstrap_themes/static/bootstrap/themes/simplex/less/variables.less @@ -1,4 +1,4 @@ -// Simplex 3.0.0 +// Simplex 3.0.2 // Variables // -------------------------------------------------- @@ -48,12 +48,21 @@ @font-size-large: ceil(@font-size-base * 1.25); // ~18px @font-size-small: ceil(@font-size-base * 0.85); // ~12px +@font-size-h1: floor(@font-size-base * 2.6); // ~36px +@font-size-h2: floor(@font-size-base * 2.15); // ~30px +@font-size-h3: ceil(@font-size-base * 1.7); // ~24px +@font-size-h4: ceil(@font-size-base * 1.25); // ~18px +@font-size-h5: @font-size-base; +@font-size-h6: ceil(@font-size-base * 0.85); // ~12px + @line-height-base: 1.428571429; // 20/14 @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px -@headings-font-family: @font-family-base; +@headings-font-family: "Josefin Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; @headings-font-weight: 500; @headings-line-height: 1.1; +@headings-color: inherit; + // Iconography // ------------------------- @@ -82,6 +91,7 @@ @border-radius-large: 6px; @border-radius-small: 3px; +@component-active-color: #fff; @component-active-bg: @brand-primary; @caret-width-base: 4px; @@ -165,13 +175,13 @@ @dropdown-fallback-border: #ccc; @dropdown-divider-bg: #e5e5e5; -@dropdown-link-active-color: #fff; -@dropdown-link-active-bg: @component-active-bg; - @dropdown-link-color: @gray-dark; @dropdown-link-hover-color: #fff; @dropdown-link-hover-bg: @dropdown-link-active-bg; +@dropdown-link-active-color: #fff; +@dropdown-link-active-bg: @component-active-bg; + @dropdown-link-disabled-color: @text-muted; @dropdown-header-color: @text-muted; @@ -200,25 +210,33 @@ // -------------------------------------------------- // Extra small screen / phone +// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1 @screen-xs: 480px; -@screen-phone: @screen-xs; +@screen-xs-min: @screen-xs; +@screen-phone: @screen-xs-min; // Small screen / tablet +// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1 @screen-sm: 768px; -@screen-tablet: @screen-sm; +@screen-sm-min: @screen-sm; +@screen-tablet: @screen-sm-min; // Medium screen / desktop +// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1 @screen-md: 992px; -@screen-desktop: @screen-md; +@screen-md-min: @screen-md; +@screen-desktop: @screen-md-min; // Large screen / wide desktop +// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1 @screen-lg: 1200px; -@screen-lg-desktop: @screen-lg; +@screen-lg-min: @screen-lg; +@screen-lg-desktop: @screen-lg-min; // So media queries don't overlap when required, provide a maximum -@screen-xs-max: (@screen-sm - 1); -@screen-sm-max: (@screen-md - 1); -@screen-md-max: (@screen-lg - 1); +@screen-xs-max: (@screen-sm-min - 1); +@screen-sm-max: (@screen-md-min - 1); +@screen-md-max: (@screen-lg-min - 1); // Grid system @@ -229,7 +247,7 @@ // Padding, to be divided by two and applied to the left and right of all columns @grid-gutter-width: 30px; // Point at which the navbar stops collapsing -@grid-float-breakpoint: @screen-tablet; +@grid-float-breakpoint: @screen-sm-min; // Navbar @@ -238,13 +256,14 @@ // Basics of a navbar @navbar-height: 40px; @navbar-margin-bottom: @line-height-computed; -@navbar-default-color: @gray-dark; -@navbar-default-bg: #fff; -@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-vertical: ((@navbar-height - @line-height-computed) / 2); +@navbar-default-color: @gray-dark; +@navbar-default-bg: #fff; +@navbar-default-border: darken(@navbar-default-bg, 6.5%); + // Navbar links @navbar-default-link-color: @gray-dark; @navbar-default-link-hover-color: @brand-primary; @@ -274,7 +293,7 @@ // Inverted navbar links @navbar-inverse-link-color: #fff; -@navbar-inverse-link-hover-color: #fff; +@navbar-inverse-link-hover-color: lighten(@brand-primary, 40%); @navbar-inverse-link-hover-bg: transparent; @navbar-inverse-link-active-color: @navbar-inverse-link-hover-color; @navbar-inverse-link-active-bg: transparent; @@ -286,13 +305,6 @@ @navbar-inverse-brand-hover-color: #fff; @navbar-inverse-brand-hover-bg: transparent; -// Inverted navbar search -// Normal navbar needs no special styles or vars -@navbar-inverse-search-bg: lighten(@navbar-inverse-bg, 25%); -@navbar-inverse-search-bg-focus: #fff; -@navbar-inverse-search-border: @navbar-inverse-bg; -@navbar-inverse-search-placeholder-color: #ccc; - // Inverted navbar toggle @navbar-inverse-toggle-hover-bg: darken(@navbar-inverse-bg, 10%); @navbar-inverse-toggle-icon-bar-bg: #fff; @@ -324,8 +336,9 @@ @nav-tabs-justified-active-link-border-color: @body-bg; // Pills +@nav-pills-border-radius: @border-radius-base; @nav-pills-active-link-hover-bg: @component-active-bg; -@nav-pills-active-link-hover-color: #fff; +@nav-pills-active-link-hover-color: @component-active-color; // Pagination @@ -355,21 +368,13 @@ @jumbotron-padding: 30px; @jumbotron-color: inherit; @jumbotron-bg: darken(@body-bg, 3%); - @jumbotron-heading-color: inherit; +@jumbotron-font-size: ceil(@font-size-base * 1.5); // Form states and alerts // ------------------------- -@state-warning-text: #c09853; -@state-warning-bg: #fcf8e3; -@state-warning-border: darken(spin(@state-warning-bg, -10), 3%); - -@state-danger-text: #b94a48; -@state-danger-bg: #f2dede; -@state-danger-border: darken(spin(@state-danger-bg, -10), 3%); - @state-success-text: #468847; @state-success-bg: #dff0d8; @state-success-border: darken(spin(@state-success-bg, -10), 5%); @@ -378,6 +383,14 @@ @state-info-bg: #d9edf7; @state-info-border: darken(spin(@state-info-bg, -10), 7%); +@state-warning-text: #c09853; +@state-warning-bg: #fcf8e3; +@state-warning-border: darken(spin(@state-warning-bg, -10), 3%); + +@state-danger-text: #b94a48; +@state-danger-bg: #f2dede; +@state-danger-border: darken(spin(@state-danger-bg, -10), 3%); + // Tooltips // ------------------------- @@ -478,7 +491,7 @@ @list-group-border-radius: @border-radius-base; @list-group-hover-bg: #f5f5f5; -@list-group-active-color: #fff; +@list-group-active-color: @component-active-color; @list-group-active-bg: @component-active-bg; @list-group-active-border: @list-group-active-bg; @@ -553,6 +566,7 @@ @breadcrumb-bg: transparent; @breadcrumb-color: #ccc; @breadcrumb-active-color: @gray-light; +@breadcrumb-separator: "/"; // Carousel @@ -573,8 +587,8 @@ // Close // ------------------------ -@close-color: #000; @close-font-weight: bold; +@close-color: #000; @close-text-shadow: 0 1px 0 #fff; @@ -611,10 +625,13 @@ // -------------------------------------------------- // Small screen / tablet -@container-tablet: ((720px + @grid-gutter-width)); +@container-tablet: ((720px + @grid-gutter-width)); +@container-sm: @container-tablet; // Medium screen / desktop -@container-desktop: ((940px + @grid-gutter-width)); +@container-desktop: ((940px + @grid-gutter-width)); +@container-md: @container-desktop; // Large screen / wide desktop -@container-lg-desktop: ((1140px + @grid-gutter-width)); +@container-large-desktop: ((1140px + @grid-gutter-width)); +@container-lg: @container-large-desktop; diff --git a/bootstrap_themes/static/bootstrap/themes/slate/less/bootswatch.less b/bootstrap_themes/static/bootstrap/themes/slate/less/bootswatch.less index bfcfd41..61bb260 100644 --- a/bootstrap_themes/static/bootstrap/themes/slate/less/bootswatch.less +++ b/bootstrap_themes/static/bootstrap/themes/slate/less/bootswatch.less @@ -1,13 +1,15 @@ -// Slate 3.0.0 +// Slate 3.0.2 // Bootswatch // ----------------------------------------------------- .btn-shadow(@color) { #gradient > .vertical-three-colors(lighten(@color, 6%), @color, 60%, darken(@color, 4%)); + filter: none; } .btn-shadow-inverse(@color) { #gradient > .vertical-three-colors(darken(@color, 24%), darken(@color, 18%), 40%, darken(@color, 14%)); + filter: none; } // Navbar ===================================================================== @@ -108,23 +110,28 @@ h1, h2, h3, h4, h5, h6 { text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3); } -.text-primary { +.text-primary, +.text-primary:hover { color: @brand-primary; } -.text-success { +.text-success, +.text-success:hover { color: @brand-success; } -.text-danger { +.text-danger, +.text-danger:hover { color: @brand-danger; } -.text-warning { +.text-warning, +.text-warning:hover { color: @brand-warning; } -.text-info { +.text-info, +.text-info:hover { color: @brand-info; } @@ -152,6 +159,10 @@ h1, h2, h3, h4, h5, h6 { } } +.table-responsive > .table { + background-color: @table-bg; +} + // Forms ====================================================================== .has-warning { diff --git a/bootstrap_themes/static/bootstrap/themes/slate/less/variables.less b/bootstrap_themes/static/bootstrap/themes/slate/less/variables.less index 761f547..f4d0805 100644 --- a/bootstrap_themes/static/bootstrap/themes/slate/less/variables.less +++ b/bootstrap_themes/static/bootstrap/themes/slate/less/variables.less @@ -1,4 +1,4 @@ -// Slate 3.0.0 +// Slate 3.0.2 // Variables // -------------------------------------------------- @@ -48,12 +48,21 @@ @font-size-large: ceil(@font-size-base * 1.25); // ~18px @font-size-small: ceil(@font-size-base * 0.85); // ~12px +@font-size-h1: floor(@font-size-base * 2.6); // ~36px +@font-size-h2: floor(@font-size-base * 2.15); // ~30px +@font-size-h3: ceil(@font-size-base * 1.7); // ~24px +@font-size-h4: ceil(@font-size-base * 1.25); // ~18px +@font-size-h5: @font-size-base; +@font-size-h6: ceil(@font-size-base * 0.85); // ~12px + @line-height-base: 1.428571429; // 20/14 @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px @headings-font-family: @font-family-base; @headings-font-weight: 500; @headings-line-height: 1.1; +@headings-color: inherit; + // Iconography // ------------------------- @@ -82,6 +91,7 @@ @border-radius-large: 6px; @border-radius-small: 3px; +@component-active-color: #fff; @component-active-bg: transparent; @caret-width-base: 4px; @@ -165,13 +175,13 @@ @dropdown-fallback-border: @gray-darker; @dropdown-divider-bg: @gray-darker; -@dropdown-link-active-color: #fff; -@dropdown-link-active-bg: @gray-darker; - @dropdown-link-color: @text-color; @dropdown-link-hover-color: #fff; @dropdown-link-hover-bg: @dropdown-link-active-bg; +@dropdown-link-active-color: #fff; +@dropdown-link-active-bg: @gray-darker; + @dropdown-link-disabled-color: @text-muted; @dropdown-header-color: @text-muted; @@ -200,25 +210,33 @@ // -------------------------------------------------- // Extra small screen / phone +// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1 @screen-xs: 480px; -@screen-phone: @screen-xs; +@screen-xs-min: @screen-xs; +@screen-phone: @screen-xs-min; // Small screen / tablet +// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1 @screen-sm: 768px; -@screen-tablet: @screen-sm; +@screen-sm-min: @screen-sm; +@screen-tablet: @screen-sm-min; // Medium screen / desktop +// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1 @screen-md: 992px; -@screen-desktop: @screen-md; +@screen-md-min: @screen-md; +@screen-desktop: @screen-md-min; // Large screen / wide desktop +// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1 @screen-lg: 1200px; -@screen-lg-desktop: @screen-lg; +@screen-lg-min: @screen-lg; +@screen-lg-desktop: @screen-lg-min; // So media queries don't overlap when required, provide a maximum -@screen-xs-max: (@screen-sm - 1); -@screen-sm-max: (@screen-md - 1); -@screen-md-max: (@screen-lg - 1); +@screen-xs-max: (@screen-sm-min - 1); +@screen-sm-max: (@screen-md-min - 1); +@screen-md-max: (@screen-lg-min - 1); // Grid system @@ -229,7 +247,7 @@ // Padding, to be divided by two and applied to the left and right of all columns @grid-gutter-width: 30px; // Point at which the navbar stops collapsing -@grid-float-breakpoint: @screen-tablet; +@grid-float-breakpoint: @screen-sm-min; // Navbar @@ -238,13 +256,14 @@ // Basics of a navbar @navbar-height: 50px; @navbar-margin-bottom: @line-height-computed; -@navbar-default-color: @text-color; -@navbar-default-bg: @gray-dark; -@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-default-color: @text-color; +@navbar-default-bg: @gray-dark; +@navbar-default-border: darken(@navbar-default-bg, 6.5%); + // Navbar links @navbar-default-link-color: @text-color; @navbar-default-link-hover-color: #fff; @@ -286,13 +305,6 @@ @navbar-inverse-brand-hover-color: #fff; @navbar-inverse-brand-hover-bg: none; -// Inverted navbar search -// Normal navbar needs no special styles or vars -@navbar-inverse-search-bg: lighten(@navbar-inverse-bg, 25%); -@navbar-inverse-search-bg-focus: #fff; -@navbar-inverse-search-border: @navbar-inverse-bg; -@navbar-inverse-search-placeholder-color: #ccc; - // Inverted navbar toggle @navbar-inverse-toggle-hover-bg: darken(@navbar-inverse-bg, 12%); @navbar-inverse-toggle-icon-bar-bg: #fff; @@ -324,8 +336,9 @@ @nav-tabs-justified-active-link-border-color: @body-bg; // Pills +@nav-pills-border-radius: @border-radius-base; @nav-pills-active-link-hover-bg: @component-active-bg; -@nav-pills-active-link-hover-color: #fff; +@nav-pills-active-link-hover-color: @component-active-color; // Pagination @@ -355,21 +368,13 @@ @jumbotron-padding: 30px; @jumbotron-color: inherit; @jumbotron-bg: darken(@body-bg, 5%); - @jumbotron-heading-color: inherit; +@jumbotron-font-size: ceil(@font-size-base * 1.5); // Form states and alerts // ------------------------- -@state-warning-text: #fff; -@state-warning-bg: @brand-warning; -@state-warning-border: darken(spin(@state-warning-bg, -10), 3%); - -@state-danger-text: #fff; -@state-danger-bg: @brand-danger; -@state-danger-border: darken(spin(@state-danger-bg, -10), 3%); - @state-success-text: #fff; @state-success-bg: @brand-success; @state-success-border: darken(spin(@state-success-bg, -10), 5%); @@ -378,6 +383,14 @@ @state-info-bg: @brand-info; @state-info-border: darken(spin(@state-info-bg, -10), 7%); +@state-warning-text: #fff; +@state-warning-bg: @brand-warning; +@state-warning-border: darken(spin(@state-warning-bg, -10), 3%); + +@state-danger-text: #fff; +@state-danger-bg: @brand-danger; +@state-danger-border: darken(spin(@state-danger-bg, -10), 3%); + // Tooltips // ------------------------- @@ -478,7 +491,7 @@ @list-group-border-radius: @border-radius-base; @list-group-hover-bg: lighten(@body-bg, 10%); -@list-group-active-color: #fff; +@list-group-active-color: @component-active-color; @list-group-active-bg: lighten(@body-bg, 10%); @list-group-active-border: @list-group-border; @@ -493,7 +506,7 @@ @panel-border-radius: @border-radius-base; @panel-footer-bg: @panel-default-heading-bg; -@panel-default-text: @gray-dark; +@panel-default-text: @text-color; @panel-default-border: rgba(0, 0, 0, 0.6); @panel-default-heading-bg: lighten(@body-bg, 10%); @@ -553,6 +566,7 @@ @breadcrumb-bg: transparent; @breadcrumb-color: #ccc; @breadcrumb-active-color: @gray-light; +@breadcrumb-separator: "/"; // Carousel @@ -573,8 +587,8 @@ // Close // ------------------------ -@close-color: #000; @close-font-weight: bold; +@close-color: #000; @close-text-shadow: 0 1px 0 #fff; @@ -611,10 +625,13 @@ // -------------------------------------------------- // Small screen / tablet -@container-tablet: ((720px + @grid-gutter-width)); +@container-tablet: ((720px + @grid-gutter-width)); +@container-sm: @container-tablet; // Medium screen / desktop -@container-desktop: ((940px + @grid-gutter-width)); +@container-desktop: ((940px + @grid-gutter-width)); +@container-md: @container-desktop; // Large screen / wide desktop -@container-lg-desktop: ((1140px + @grid-gutter-width)); +@container-large-desktop: ((1140px + @grid-gutter-width)); +@container-lg: @container-large-desktop; diff --git a/bootstrap_themes/static/bootstrap/themes/spacelab/less/bootswatch.less b/bootstrap_themes/static/bootstrap/themes/spacelab/less/bootswatch.less index 73befa9..bfe288b 100644 --- a/bootstrap_themes/static/bootstrap/themes/spacelab/less/bootswatch.less +++ b/bootstrap_themes/static/bootstrap/themes/spacelab/less/bootswatch.less @@ -1,4 +1,4 @@ -// Spacelab 3.0.0 +// Spacelab 3.0.2 // Bootswatch // ----------------------------------------------------- @@ -6,6 +6,7 @@ .btn-shadow(@color) { #gradient > .vertical-three-colors(lighten(@color, 15%), @color, 50%, darken(@color, 4%)); + filter: none; border: 1px solid darken(@color, 10%); } @@ -81,18 +82,31 @@ // Typography ================================================================= -h1, h2, h3, h4, h5, h6 { - color: @gray-darker; -} - // Tables ===================================================================== // Forms ====================================================================== // Navs ======================================================================= +.pagination { + + .active > a, + .active > a:hover { + border-color: #ddd; + } +} + // Indicators ================================================================= // Progress bars ============================================================== -// Containers ================================================================= \ No newline at end of file +// Containers ================================================================= + +.panel { + + &-primary { + .panel-title { + color: #fff; + } + } +} \ No newline at end of file diff --git a/bootstrap_themes/static/bootstrap/themes/spacelab/less/variables.less b/bootstrap_themes/static/bootstrap/themes/spacelab/less/variables.less index 3b99899..6a3fa9d 100644 --- a/bootstrap_themes/static/bootstrap/themes/spacelab/less/variables.less +++ b/bootstrap_themes/static/bootstrap/themes/spacelab/less/variables.less @@ -1,4 +1,4 @@ -// Spacelab 3.0.0 +// Spacelab 3.0.2 // Variables // -------------------------------------------------- @@ -48,12 +48,21 @@ @font-size-large: ceil(@font-size-base * 1.25); // ~18px @font-size-small: ceil(@font-size-base * 0.85); // ~12px +@font-size-h1: floor(@font-size-base * 2.6); // ~36px +@font-size-h2: floor(@font-size-base * 2.15); // ~30px +@font-size-h3: ceil(@font-size-base * 1.7); // ~24px +@font-size-h4: ceil(@font-size-base * 1.25); // ~18px +@font-size-h5: @font-size-base; +@font-size-h6: ceil(@font-size-base * 0.85); // ~12px + @line-height-base: 1.428571429; // 20/14 @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px @headings-font-family: @font-family-base; @headings-font-weight: 500; @headings-line-height: 1.1; +@headings-color: @gray-darker; + // Iconography // ------------------------- @@ -82,6 +91,7 @@ @border-radius-large: 6px; @border-radius-small: 3px; +@component-active-color: #fff; @component-active-bg: @brand-primary; @caret-width-base: 4px; @@ -165,13 +175,13 @@ @dropdown-fallback-border: #ccc; @dropdown-divider-bg: #e5e5e5; -@dropdown-link-active-color: #fff; -@dropdown-link-active-bg: @component-active-bg; - @dropdown-link-color: @gray-dark; @dropdown-link-hover-color: #fff; @dropdown-link-hover-bg: @dropdown-link-active-bg; +@dropdown-link-active-color: #fff; +@dropdown-link-active-bg: @component-active-bg; + @dropdown-link-disabled-color: @text-muted; @dropdown-header-color: @text-muted; @@ -200,25 +210,33 @@ // -------------------------------------------------- // Extra small screen / phone +// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1 @screen-xs: 480px; -@screen-phone: @screen-xs; +@screen-xs-min: @screen-xs; +@screen-phone: @screen-xs-min; // Small screen / tablet +// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1 @screen-sm: 768px; -@screen-tablet: @screen-sm; +@screen-sm-min: @screen-sm; +@screen-tablet: @screen-sm-min; // Medium screen / desktop +// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1 @screen-md: 992px; -@screen-desktop: @screen-md; +@screen-md-min: @screen-md; +@screen-desktop: @screen-md-min; // Large screen / wide desktop +// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1 @screen-lg: 1200px; -@screen-lg-desktop: @screen-lg; +@screen-lg-min: @screen-lg; +@screen-lg-desktop: @screen-lg-min; // So media queries don't overlap when required, provide a maximum -@screen-xs-max: (@screen-sm - 1); -@screen-sm-max: (@screen-md - 1); -@screen-md-max: (@screen-lg - 1); +@screen-xs-max: (@screen-sm-min - 1); +@screen-sm-max: (@screen-md-min - 1); +@screen-md-max: (@screen-lg-min - 1); // Grid system @@ -229,7 +247,7 @@ // Padding, to be divided by two and applied to the left and right of all columns @grid-gutter-width: 30px; // Point at which the navbar stops collapsing -@grid-float-breakpoint: @screen-tablet; +@grid-float-breakpoint: @screen-sm-min; // Navbar @@ -238,13 +256,14 @@ // Basics of a navbar @navbar-height: 50px; @navbar-margin-bottom: @line-height-computed; -@navbar-default-color: #777; -@navbar-default-bg: #eee; -@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-vertical: ((@navbar-height - @line-height-computed) / 2); +@navbar-default-color: #777; +@navbar-default-bg: #eee; +@navbar-default-border: darken(@navbar-default-bg, 6.5%); + // Navbar links @navbar-default-link-color: #777; @navbar-default-link-hover-color: @brand-info; @@ -286,13 +305,6 @@ @navbar-inverse-brand-hover-color: #fff; @navbar-inverse-brand-hover-bg: transparent; -// Inverted navbar search -// Normal navbar needs no special styles or vars -@navbar-inverse-search-bg: lighten(@navbar-inverse-bg, 25%); -@navbar-inverse-search-bg-focus: #fff; -@navbar-inverse-search-border: @navbar-inverse-bg; -@navbar-inverse-search-placeholder-color: #ccc; - // Inverted navbar toggle @navbar-inverse-toggle-hover-bg: darken(@navbar-inverse-bg, 10%); @navbar-inverse-toggle-icon-bar-bg: #fff; @@ -324,8 +336,9 @@ @nav-tabs-justified-active-link-border-color: @body-bg; // Pills +@nav-pills-border-radius: @border-radius-base; @nav-pills-active-link-hover-bg: @component-active-bg; -@nav-pills-active-link-hover-color: #fff; +@nav-pills-active-link-hover-color: @component-active-color; // Pagination @@ -355,21 +368,13 @@ @jumbotron-padding: 30px; @jumbotron-color: inherit; @jumbotron-bg: @gray-lighter; - @jumbotron-heading-color: inherit; +@jumbotron-font-size: ceil(@font-size-base * 1.5); // Form states and alerts // ------------------------- -@state-warning-text: #c09853; -@state-warning-bg: #fcf8e3; -@state-warning-border: darken(spin(@state-warning-bg, -10), 3%); - -@state-danger-text: #b94a48; -@state-danger-bg: #f2dede; -@state-danger-border: darken(spin(@state-danger-bg, -10), 3%); - @state-success-text: #468847; @state-success-bg: #dff0d8; @state-success-border: darken(spin(@state-success-bg, -10), 5%); @@ -378,6 +383,14 @@ @state-info-bg: #d9edf7; @state-info-border: darken(spin(@state-info-bg, -10), 7%); +@state-warning-text: #c09853; +@state-warning-bg: #fcf8e3; +@state-warning-border: darken(spin(@state-warning-bg, -10), 3%); + +@state-danger-text: #b94a48; +@state-danger-bg: #f2dede; +@state-danger-border: darken(spin(@state-danger-bg, -10), 3%); + // Tooltips // ------------------------- @@ -478,7 +491,7 @@ @list-group-border-radius: @border-radius-base; @list-group-hover-bg: #f5f5f5; -@list-group-active-color: #fff; +@list-group-active-color: @component-active-color; @list-group-active-bg: @component-active-bg; @list-group-active-border: @list-group-active-bg; @@ -553,6 +566,7 @@ @breadcrumb-bg: #f5f5f5; @breadcrumb-color: #ccc; @breadcrumb-active-color: @gray-light; +@breadcrumb-separator: "/"; // Carousel @@ -573,8 +587,8 @@ // Close // ------------------------ -@close-color: #000; @close-font-weight: bold; +@close-color: #000; @close-text-shadow: 0 1px 0 #fff; @@ -611,10 +625,13 @@ // -------------------------------------------------- // Small screen / tablet -@container-tablet: ((720px + @grid-gutter-width)); +@container-tablet: ((720px + @grid-gutter-width)); +@container-sm: @container-tablet; // Medium screen / desktop -@container-desktop: ((940px + @grid-gutter-width)); +@container-desktop: ((940px + @grid-gutter-width)); +@container-md: @container-desktop; // Large screen / wide desktop -@container-lg-desktop: ((1140px + @grid-gutter-width)); \ No newline at end of file +@container-large-desktop: ((1140px + @grid-gutter-width)); +@container-lg: @container-large-desktop; diff --git a/bootstrap_themes/static/bootstrap/themes/united/less/bootswatch.less b/bootstrap_themes/static/bootstrap/themes/united/less/bootswatch.less index 684010c..9be6232 100644 --- a/bootstrap_themes/static/bootstrap/themes/united/less/bootswatch.less +++ b/bootstrap_themes/static/bootstrap/themes/united/less/bootswatch.less @@ -1,4 +1,4 @@ -// United 3.0.0 +// United 3.0.2 // Bootswatch // ----------------------------------------------------- @@ -16,6 +16,14 @@ // Navs ======================================================================= +.pagination { + + .active > a, + .active > a:hover { + border-color: #ddd; + } +} + // Indicators ================================================================= // Progress bars ============================================================== diff --git a/bootstrap_themes/static/bootstrap/themes/united/less/variables.less b/bootstrap_themes/static/bootstrap/themes/united/less/variables.less index a600d56..839ddc1 100644 --- a/bootstrap_themes/static/bootstrap/themes/united/less/variables.less +++ b/bootstrap_themes/static/bootstrap/themes/united/less/variables.less @@ -1,4 +1,4 @@ -// United 3.0.0 +// United 3.0.2 // Variables // -------------------------------------------------- @@ -48,12 +48,21 @@ @font-size-large: ceil(@font-size-base * 1.25); // ~18px @font-size-small: ceil(@font-size-base * 0.85); // ~12px +@font-size-h1: floor(@font-size-base * 2.6); // ~36px +@font-size-h2: floor(@font-size-base * 2.15); // ~30px +@font-size-h3: ceil(@font-size-base * 1.7); // ~24px +@font-size-h4: ceil(@font-size-base * 1.25); // ~18px +@font-size-h5: @font-size-base; +@font-size-h6: ceil(@font-size-base * 0.85); // ~12px + @line-height-base: 1.428571429; // 20/14 @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px @headings-font-family: @font-family-base; @headings-font-weight: 500; @headings-line-height: 1.1; +@headings-color: inherit; + // Iconography // ------------------------- @@ -82,6 +91,7 @@ @border-radius-large: 6px; @border-radius-small: 3px; +@component-active-color: #fff; @component-active-bg: @brand-primary; @caret-width-base: 4px; @@ -165,13 +175,13 @@ @dropdown-fallback-border: #ccc; @dropdown-divider-bg: #e5e5e5; -@dropdown-link-active-color: #fff; -@dropdown-link-active-bg: @component-active-bg; - @dropdown-link-color: @gray-dark; @dropdown-link-hover-color: #fff; @dropdown-link-hover-bg: @dropdown-link-active-bg; +@dropdown-link-active-color: #fff; +@dropdown-link-active-bg: @component-active-bg; + @dropdown-link-disabled-color: @text-muted; @dropdown-header-color: @text-muted; @@ -200,25 +210,33 @@ // -------------------------------------------------- // Extra small screen / phone +// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1 @screen-xs: 480px; -@screen-phone: @screen-xs; +@screen-xs-min: @screen-xs; +@screen-phone: @screen-xs-min; // Small screen / tablet +// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1 @screen-sm: 768px; -@screen-tablet: @screen-sm; +@screen-sm-min: @screen-sm; +@screen-tablet: @screen-sm-min; // Medium screen / desktop +// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1 @screen-md: 992px; -@screen-desktop: @screen-md; +@screen-md-min: @screen-md; +@screen-desktop: @screen-md-min; // Large screen / wide desktop +// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1 @screen-lg: 1200px; -@screen-lg-desktop: @screen-lg; +@screen-lg-min: @screen-lg; +@screen-lg-desktop: @screen-lg-min; // So media queries don't overlap when required, provide a maximum -@screen-xs-max: (@screen-sm - 1); -@screen-sm-max: (@screen-md - 1); -@screen-md-max: (@screen-lg - 1); +@screen-xs-max: (@screen-sm-min - 1); +@screen-sm-max: (@screen-md-min - 1); +@screen-md-max: (@screen-lg-min - 1); // Grid system @@ -229,7 +247,7 @@ // Padding, to be divided by two and applied to the left and right of all columns @grid-gutter-width: 30px; // Point at which the navbar stops collapsing -@grid-float-breakpoint: @screen-tablet; +@grid-float-breakpoint: @screen-sm-min; // Navbar @@ -238,13 +256,14 @@ // Basics of a navbar @navbar-height: 50px; @navbar-margin-bottom: @line-height-computed; -@navbar-default-color: #fff; -@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-vertical: ((@navbar-height - @line-height-computed) / 2); +@navbar-default-color: #fff; +@navbar-default-bg: @brand-primary; +@navbar-default-border: darken(@navbar-default-bg, 6.5%); + // Navbar links @navbar-default-link-color: #fff; @navbar-default-link-hover-color: #fff; @@ -286,13 +305,6 @@ @navbar-inverse-brand-hover-color: #fff; @navbar-inverse-brand-hover-bg: none; -// Inverted navbar search -// Normal navbar needs no special styles or vars -@navbar-inverse-search-bg: lighten(@navbar-inverse-bg, 25%); -@navbar-inverse-search-bg-focus: #fff; -@navbar-inverse-search-border: @navbar-inverse-bg; -@navbar-inverse-search-placeholder-color: #ccc; - // Inverted navbar toggle @navbar-inverse-toggle-hover-bg: darken(@navbar-inverse-bg, 15%); @navbar-inverse-toggle-icon-bar-bg: #fff; @@ -324,8 +336,9 @@ @nav-tabs-justified-active-link-border-color: @body-bg; // Pills +@nav-pills-border-radius: @border-radius-base; @nav-pills-active-link-hover-bg: @component-active-bg; -@nav-pills-active-link-hover-color: #fff; +@nav-pills-active-link-hover-color: @component-active-color; // Pagination @@ -355,21 +368,13 @@ @jumbotron-padding: 30px; @jumbotron-color: inherit; @jumbotron-bg: @gray-lighter; - @jumbotron-heading-color: inherit; +@jumbotron-font-size: ceil(@font-size-base * 1.5); // Form states and alerts // ------------------------- -@state-warning-text: #c09853; -@state-warning-bg: #fcf8e3; -@state-warning-border: darken(spin(@state-warning-bg, -10), 3%); - -@state-danger-text: #b94a48; -@state-danger-bg: #f2dede; -@state-danger-border: darken(spin(@state-danger-bg, -10), 3%); - @state-success-text: #468847; @state-success-bg: #dff0d8; @state-success-border: darken(spin(@state-success-bg, -10), 5%); @@ -378,6 +383,14 @@ @state-info-bg: #d9edf7; @state-info-border: darken(spin(@state-info-bg, -10), 7%); +@state-warning-text: #c09853; +@state-warning-bg: #fcf8e3; +@state-warning-border: darken(spin(@state-warning-bg, -10), 3%); + +@state-danger-text: #b94a48; +@state-danger-bg: #f2dede; +@state-danger-border: darken(spin(@state-danger-bg, -10), 3%); + // Tooltips // ------------------------- @@ -478,7 +491,7 @@ @list-group-border-radius: @border-radius-base; @list-group-hover-bg: #f5f5f5; -@list-group-active-color: #fff; +@list-group-active-color: @component-active-color; @list-group-active-bg: @component-active-bg; @list-group-active-border: @list-group-active-bg; @@ -553,6 +566,7 @@ @breadcrumb-bg: #f5f5f5; @breadcrumb-color: #ccc; @breadcrumb-active-color: @gray-light; +@breadcrumb-separator: "/"; // Carousel @@ -573,8 +587,8 @@ // Close // ------------------------ -@close-color: #000; @close-font-weight: bold; +@close-color: #000; @close-text-shadow: 0 1px 0 #fff; @@ -611,10 +625,13 @@ // -------------------------------------------------- // Small screen / tablet -@container-tablet: ((720px + @grid-gutter-width)); +@container-tablet: ((720px + @grid-gutter-width)); +@container-sm: @container-tablet; // Medium screen / desktop -@container-desktop: ((940px + @grid-gutter-width)); +@container-desktop: ((940px + @grid-gutter-width)); +@container-md: @container-desktop; // Large screen / wide desktop -@container-lg-desktop: ((1140px + @grid-gutter-width)); +@container-large-desktop: ((1140px + @grid-gutter-width)); +@container-lg: @container-large-desktop; diff --git a/bootstrap_themes/static/bootstrap/themes/yeti/less/bootstrap.less b/bootstrap_themes/static/bootstrap/themes/yeti/less/bootstrap.less new file mode 100644 index 0000000..aaabcff --- /dev/null +++ b/bootstrap_themes/static/bootstrap/themes/yeti/less/bootstrap.less @@ -0,0 +1,5 @@ +@import "../../../less/bootstrap.less"; +@import "variables.less"; +@import "bootswatch.less"; + +@icon-font-path: "../../../fonts/"; diff --git a/bootstrap_themes/static/bootstrap/themes/yeti/less/bootswatch.less b/bootstrap_themes/static/bootstrap/themes/yeti/less/bootswatch.less new file mode 100644 index 0000000..d5fb987 --- /dev/null +++ b/bootstrap_themes/static/bootstrap/themes/yeti/less/bootswatch.less @@ -0,0 +1,283 @@ +// Yeti 3.0.2 +// Bootswatch +// ----------------------------------------------------- + +@import url("http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700"); + +// Navbar ===================================================================== + +.navbar { + border: none; + font-size: 13px; + font-weight: 300; + + .navbar-toggle:hover .icon-bar { + background-color: #b3b3b3; + } + + &-collapse { + border-top-color: @dropdown-divider-bg; + .box-shadow(none); + } + + .dropdown { + + &-menu { + padding: 0; + border: none; + + > li > a, + > li > a:focus { + padding: 12px 15px; + background-color: transparent; + font-size: 13px; + font-weight: 300; + } + } + + &-header { + color: rgba(255, 255, 255, 0.5); + } + + } + + &-default { + + .dropdown-menu { + background-color: @navbar-default-bg; + + > li > a, + > li > a:focus { + color: @navbar-default-color; + } + + > li > a:hover, + > .active > a, + > .active > a:hover { + background-color: @navbar-default-link-hover-bg; + } + } + } + + &-inverse { + + .dropdown-menu { + background-color: @navbar-inverse-bg; + + > li > a, + > li > a:focus { + color: @navbar-inverse-color; + } + + > li > a:hover, + > .active > a, + > .active > a:hover { + background-color: @navbar-inverse-link-hover-bg; + } + } + } +} + +// Buttons ==================================================================== + +.btn { + padding: 14px 28px; + + &-lg { + padding: 16px 32px; + } + + &-sm { + padding: 8px 16px; + } + + &-xs { + padding: 4px 8px; + } + + &-group > .btn + .dropdown-toggle { + padding-left: 16px; + padding-right: 16px; + } +} + +// Typography ================================================================= + +.lead { + color: @gray; +} + +cite { + font-style: italic; +} + +blockquote { + border-left-width: 1px; + color: @gray; + + &.pull-right { + border-right-width: 1px; + } + + small { + font-size: @font-size-small; + font-weight: 300; + } +} + +// Tables ===================================================================== + +table { + font-size: @font-size-small; +} + +// Forms ====================================================================== + +input, +.form-control { + padding: 7px; + font-size: @font-size-small; +} + +label, +.control-label, +.help-block, +.checkbox, +.radio { + font-size: @font-size-small; + font-weight: normal; +} + +.form-group .btn, +.input-group-addon, +.input-group-btn .btn { + padding: 8px 14px; + font-size: @font-size-small; +} + +// Navs ======================================================================= + +.nav-tabs { + > li > a { + background-color: @btn-default-bg; + color: @text-color; + } + + .caret { + border-top-color: @text-color; + border-bottom-color: @text-color; + } +} + +.nav-pills { + font-weight: 300; +} + +.breadcrumb { + border: 1px solid @table-border-color; + border-radius: 3px; + font-size: 10px; + font-weight: 300; + text-transform: uppercase; +} + +.pagination { + font-size: @font-size-small; + font-weight: 300; + color: @gray-light; + + > li, + > li, + > li:first-child, + > li:last-child { + > a, + > span { + margin-left: 4px; + border-radius: 3px; + color: @gray-light; + } + } + + &-lg > li > a { + padding-left: 22px; + padding-right: 22px; + } + + &-sm > li > a { + padding: 0 5px; + } +} + +.pager { + font-size: @font-size-small; + font-weight: 300; + color: @gray-light; +} + +.list-group { + font-size: @font-size-small; + font-weight: 300; +} + +// Indicators ================================================================= + +.alert { + font-size: @font-size-small; + font-weight: 300; + + a, + .alert-link { + font-weight: normal; + color: #fff; + text-decoration: underline; + } +} + +.label { + padding-left: 1em; + padding-right: 1em; + border-radius: 0; + font-weight: 300; + + &-default { + background-color: @btn-default-bg; + color: @btn-default-color; + } +} + +.badge { + font-weight: 300; +} + +// Progress bars ============================================================== + +.progress { + height: 22px; + padding: 2px; + background-color: #f6f6f6; + border: 1px solid #ccc; + .box-shadow(none); +} + +// Containers ================================================================= + +.dropdown { + + &-menu { + margin-top: 0; + font-size: @font-size-small; + } + + &-header { + padding-left: 15px; + padding-right: 15px; + font-size: 9px; + text-transform: uppercase; + } +} + +.popover { + color: #fff; + font-size: 12px; + font-weight: 300; +} diff --git a/bootstrap_themes/static/bootstrap/themes/yeti/less/variables.less b/bootstrap_themes/static/bootstrap/themes/yeti/less/variables.less new file mode 100644 index 0000000..355d381 --- /dev/null +++ b/bootstrap_themes/static/bootstrap/themes/yeti/less/variables.less @@ -0,0 +1,637 @@ +// Yeti 3.0.2 +// Variables +// -------------------------------------------------- + + +// Global values +// -------------------------------------------------- + +// Grays +// ------------------------- + +@gray-darker: lighten(#000, 13.5%); // #222 +@gray-dark: lighten(#000, 20%); // #333 +@gray: #6f6f6f; +@gray-light: lighten(#000, 60%); // #999 +@gray-lighter: lighten(#000, 93.5%); // #eee + +// Brand colors +// ------------------------- + +@brand-primary: #008cba; +@brand-success: #43ac6a; +@brand-warning: #E99002; +@brand-danger: #F04124; +@brand-info: #5bc0de; + +// Scaffolding +// ------------------------- + +@body-bg: #fff; +@text-color: @gray-darker; + +// Links +// ------------------------- + +@link-color: @brand-primary; +@link-hover-color: darken(@link-color, 15%); + +// Typography +// ------------------------- + +@font-family-sans-serif: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; +@font-family-serif: Georgia, "Times New Roman", Times, serif; +@font-family-monospace: Monaco, Menlo, Consolas, "Courier New", monospace; +@font-family-base: @font-family-sans-serif; + +@font-size-base: 15px; +@font-size-large: ceil(@font-size-base * 1.25); // ~18px +@font-size-small: 12px; + +@font-size-h1: floor(@font-size-base * 2.6); // ~36px +@font-size-h2: floor(@font-size-base * 2.15); // ~30px +@font-size-h3: ceil(@font-size-base * 1.7); // ~24px +@font-size-h4: ceil(@font-size-base * 1.25); // ~18px +@font-size-h5: @font-size-base; +@font-size-h6: ceil(@font-size-base * 0.85); // ~12px + +@line-height-base: 1.428571429; // 20/14 +@line-height-computed: floor(@font-size-base * @line-height-base); // ~20px + +@headings-font-family: @font-family-base; +@headings-font-weight: 300; +@headings-line-height: 1.1; +@headings-color: inherit; + + +// Iconography +// ------------------------- + +@icon-font-path: "../fonts/"; +@icon-font-name: "glyphicons-halflings-regular"; + + +// Components +// ------------------------- +// Based on 14px font-size and 1.428 line-height (~20px to start) + +@padding-base-vertical: 6px; +@padding-base-horizontal: 12px; + +@padding-large-vertical: 10px; +@padding-large-horizontal: 16px; + +@padding-small-vertical: 5px; +@padding-small-horizontal: 10px; + +@line-height-large: 1.33; +@line-height-small: 1.5; + +@border-radius-base: 0; +@border-radius-large: 0; +@border-radius-small: 0; + +@component-active-color: #fff; +@component-active-bg: @brand-primary; + +@caret-width-base: 4px; +@caret-width-large: 5px; + +// Tables +// ------------------------- + +@table-cell-padding: 8px; +@table-condensed-cell-padding: 5px; + +@table-bg: transparent; // overall background-color +@table-bg-accent: #f9f9f9; // for striping +@table-bg-hover: #f5f5f5; +@table-bg-active: @table-bg-hover; + +@table-border-color: #ddd; // table and cell border + + +// Buttons +// ------------------------- + +@btn-font-weight: normal; + +@btn-default-color: @gray-dark; +@btn-default-bg: #e7e7e7; +@btn-default-border: #dadada; + +@btn-primary-color: #fff; +@btn-primary-bg: @brand-primary; +@btn-primary-border: darken(@btn-primary-bg, 5%); + +@btn-success-color: #fff; +@btn-success-bg: @brand-success; +@btn-success-border: darken(@btn-success-bg, 5%); + +@btn-warning-color: #fff; +@btn-warning-bg: @brand-warning; +@btn-warning-border: darken(@btn-warning-bg, 5%); + +@btn-danger-color: #fff; +@btn-danger-bg: @brand-danger; +@btn-danger-border: darken(@btn-danger-bg, 5%); + +@btn-info-color: #fff; +@btn-info-bg: @brand-info; +@btn-info-border: darken(@btn-info-bg, 5%); + +@btn-link-disabled-color: @gray-light; + + +// Forms +// ------------------------- + +@input-bg: #fff; +@input-bg-disabled: @gray-lighter; + +@input-color: @gray; +@input-border: #ccc; +@input-border-radius: @border-radius-base; +@input-border-focus: #66afe9; + +@input-color-placeholder: @gray-light; + +@input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2); +@input-height-large: (floor(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2); +@input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2); + +@legend-color: @gray-dark; +@legend-border-color: #e5e5e5; + +@input-group-addon-bg: @gray-lighter; +@input-group-addon-border-color: @input-border; + + +// Dropdowns +// ------------------------- + +@dropdown-bg: #fff; +@dropdown-border: rgba(0,0,0,.15); +@dropdown-fallback-border: #ccc; +@dropdown-divider-bg: rgba(0,0,0,.2); + +@dropdown-link-color: #555; +@dropdown-link-hover-color: darken(@gray-dark, 5%); +@dropdown-link-hover-bg: #eee; + +@dropdown-link-active-color: @component-active-color; +@dropdown-link-active-bg: @component-active-bg; + +@dropdown-link-disabled-color: @gray-light; + +@dropdown-header-color: @gray-light; + +@dropdown-caret-color: #000; + + +// COMPONENT VARIABLES +// -------------------------------------------------- + + +// Z-index master list +// ------------------------- +// 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; +@zindex-navbar-fixed: 1030; +@zindex-modal-background: 1040; +@zindex-modal: 1050; + +// Media queries breakpoints +// -------------------------------------------------- + +// Extra small screen / phone +// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1 +@screen-xs: 480px; +@screen-xs-min: @screen-xs; +@screen-phone: @screen-xs-min; + +// Small screen / tablet +// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1 +@screen-sm: 768px; +@screen-sm-min: @screen-sm; +@screen-tablet: @screen-sm-min; + +// Medium screen / desktop +// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1 +@screen-md: 992px; +@screen-md-min: @screen-md; +@screen-desktop: @screen-md-min; + +// Large screen / wide desktop +// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1 +@screen-lg: 1200px; +@screen-lg-min: @screen-lg; +@screen-lg-desktop: @screen-lg-min; + +// So media queries don't overlap when required, provide a maximum +@screen-xs-max: (@screen-sm-min - 1); +@screen-sm-max: (@screen-md-min - 1); +@screen-md-max: (@screen-lg-min - 1); + + +// Grid system +// -------------------------------------------------- + +// Number of columns in the grid system +@grid-columns: 12; +// Padding, to be divided by two and applied to the left and right of all columns +@grid-gutter-width: 30px; +// Point at which the navbar stops collapsing +@grid-float-breakpoint: @screen-sm-min; + + +// Navbar +// ------------------------- + +// Basics of a navbar +@navbar-height: 45px; +@navbar-margin-bottom: @line-height-computed; +@navbar-border-radius: @border-radius-base; +@navbar-padding-horizontal: floor(@grid-gutter-width / 2); +@navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2); + +@navbar-default-color: #fff; +@navbar-default-bg: @gray-dark; +@navbar-default-border: darken(@navbar-default-bg, 6.5%); + +// Navbar links +@navbar-default-link-color: #fff; +@navbar-default-link-hover-color: #fff; +@navbar-default-link-hover-bg: #272727; +@navbar-default-link-active-color: #fff; +@navbar-default-link-active-bg: #272727; +@navbar-default-link-disabled-color: #ccc; +@navbar-default-link-disabled-bg: transparent; + +// Navbar brand label +@navbar-default-brand-color: @navbar-default-link-color; +@navbar-default-brand-hover-color: @navbar-default-brand-color; +@navbar-default-brand-hover-bg: transparent; + +// Navbar toggle +@navbar-default-toggle-hover-bg: transparent; +@navbar-default-toggle-icon-bar-bg: #fff; +@navbar-default-toggle-border-color: transparent; + + +// Inverted navbar +// +// Reset inverted navbar basics +@navbar-inverse-color: #fff; +@navbar-inverse-bg: @brand-primary; +@navbar-inverse-border: darken(@navbar-inverse-bg, 10%); + +// Inverted navbar links +@navbar-inverse-link-color: #fff; +@navbar-inverse-link-hover-color: #fff; +@navbar-inverse-link-hover-bg: darken(@navbar-inverse-bg, 10%); +@navbar-inverse-link-active-color: #fff; +@navbar-inverse-link-active-bg: darken(@navbar-inverse-bg, 10%); +@navbar-inverse-link-disabled-color: #444; +@navbar-inverse-link-disabled-bg: transparent; + +// Inverted navbar brand label +@navbar-inverse-brand-color: @navbar-inverse-link-color; +@navbar-inverse-brand-hover-color: #fff; +@navbar-inverse-brand-hover-bg: transparent; + +// Inverted navbar toggle +@navbar-inverse-toggle-hover-bg: transparent; +@navbar-inverse-toggle-icon-bar-bg: #fff; +@navbar-inverse-toggle-border-color: transparent; + + +// Navs +// ------------------------- + +@nav-link-padding: 10px 15px; +@nav-link-hover-bg: @gray-lighter; + +@nav-disabled-link-color: @gray-light; +@nav-disabled-link-hover-color: @gray-light; + +@nav-open-link-hover-color: #fff; +@nav-open-caret-border-color: #fff; + +// Tabs +@nav-tabs-border-color: #ddd; + +@nav-tabs-link-hover-border-color: @gray-lighter; + +@nav-tabs-active-link-hover-bg: @body-bg; +@nav-tabs-active-link-hover-color: @gray; +@nav-tabs-active-link-hover-border-color: #ddd; + +@nav-tabs-justified-link-border-color: #ddd; +@nav-tabs-justified-active-link-border-color: @body-bg; + +// Pills +@nav-pills-border-radius: @border-radius-base; +@nav-pills-active-link-hover-bg: @component-active-bg; +@nav-pills-active-link-hover-color: @component-active-color; + + +// Pagination +// ------------------------- + +@pagination-bg: transparent; +@pagination-border: transparent; + +@pagination-hover-bg: @gray-lighter; + +@pagination-active-bg: @brand-primary; +@pagination-active-color: #fff; + +@pagination-disabled-color: @gray-light; + + +// Pager +// ------------------------- + +@pager-border-radius: 3px; +@pager-disabled-color: @gray-light; + + +// Jumbotron +// ------------------------- + +@jumbotron-padding: 30px; +@jumbotron-color: inherit; +@jumbotron-bg: #fafafa; +@jumbotron-heading-color: inherit; +@jumbotron-font-size: ceil(@font-size-base * 1.5); + + +// Form states and alerts +// ------------------------- + +@state-success-text: @brand-success; +@state-success-bg: #dff0d8; +@state-success-border: darken(@state-success-text, 5%); + +@state-info-text: @brand-info; +@state-info-bg: #d9edf7; +@state-info-border: darken(@state-info-text, 7%); + +@state-warning-text: @brand-warning; +@state-warning-bg: #fcf8e3; +@state-warning-border: darken(@state-warning-text, 5%); + +@state-danger-text: @brand-danger; +@state-danger-bg: #f2dede; +@state-danger-border: darken(@state-danger-text, 5%); + + +// Tooltips +// ------------------------- +@tooltip-max-width: 200px; +@tooltip-color: #fff; +@tooltip-bg: @gray-dark; + +@tooltip-arrow-width: 5px; +@tooltip-arrow-color: @tooltip-bg; + + +// Popovers +// ------------------------- +@popover-bg: @gray-dark; +@popover-max-width: 276px; +@popover-border-color: transparent; +@popover-fallback-border-color: @gray-dark; + +@popover-title-bg: @popover-bg; + +@popover-arrow-width: 10px; +@popover-arrow-color: @popover-bg; + +@popover-arrow-outer-width: (@popover-arrow-width + 1); +@popover-arrow-outer-color: rgba(0,0,0,.25); +@popover-arrow-outer-fallback-color: #999; + + +// Labels +// ------------------------- + +@label-default-bg: @gray-light; +@label-primary-bg: @brand-primary; +@label-success-bg: @brand-success; +@label-info-bg: @brand-info; +@label-warning-bg: @brand-warning; +@label-danger-bg: @brand-danger; + +@label-color: #fff; +@label-link-hover-color: #fff; + + +// Modals +// ------------------------- +@modal-inner-padding: 20px; + +@modal-title-padding: 15px; +@modal-title-line-height: @line-height-base; + +@modal-content-bg: #fff; +@modal-content-border-color: rgba(0,0,0,.2); +@modal-content-fallback-border-color: #999; + +@modal-backdrop-bg: #000; +@modal-header-border-color: #e5e5e5; +@modal-footer-border-color: @modal-header-border-color; + + +// Alerts +// ------------------------- +@alert-padding: 15px; +@alert-border-radius: @border-radius-base; +@alert-link-font-weight: bold; + +@alert-success-bg: @brand-success; +@alert-success-text: #fff; +@alert-success-border: @state-success-border; + +@alert-info-bg: @brand-info; +@alert-info-text: #fff; +@alert-info-border: @state-info-border; + +@alert-warning-bg: @brand-warning; +@alert-warning-text: #fff; +@alert-warning-border: @state-warning-border; + +@alert-danger-bg: @brand-danger; +@alert-danger-text: #fff; +@alert-danger-border: @state-danger-border; + + +// Progress bars +// ------------------------- +@progress-bg: #f5f5f5; +@progress-bar-color: #fff; + +@progress-bar-bg: @brand-primary; +@progress-bar-success-bg: @brand-success; +@progress-bar-warning-bg: @brand-warning; +@progress-bar-danger-bg: @brand-danger; +@progress-bar-info-bg: @brand-info; + + +// List group +// ------------------------- +@list-group-bg: #fff; +@list-group-border: #ddd; +@list-group-border-radius: @border-radius-base; + +@list-group-hover-bg: #f5f5f5; +@list-group-active-color: @component-active-color; +@list-group-active-bg: @component-active-bg; +@list-group-active-border: @list-group-active-bg; + +@list-group-link-color: #555; +@list-group-link-heading-color: #333; + + +// Panels +// ------------------------- +@panel-bg: #fff; +@panel-inner-border: #ddd; +@panel-border-radius: @border-radius-base; +@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; + +@panel-success-text: @state-success-text; +@panel-success-border: @state-success-border; +@panel-success-heading-bg: @state-success-bg; + +@panel-warning-text: @state-warning-text; +@panel-warning-border: @state-warning-border; +@panel-warning-heading-bg: @state-warning-bg; + +@panel-danger-text: @state-danger-text; +@panel-danger-border: @state-danger-border; +@panel-danger-heading-bg: @state-danger-bg; + +@panel-info-text: @state-info-text; +@panel-info-border: @state-info-border; +@panel-info-heading-bg: @state-info-bg; + + +// Thumbnails +// ------------------------- +@thumbnail-padding: 4px; +@thumbnail-bg: @body-bg; +@thumbnail-border: #ddd; +@thumbnail-border-radius: @border-radius-base; + +@thumbnail-caption-color: @text-color; +@thumbnail-caption-padding: 9px; + + +// Wells +// ------------------------- +@well-bg: @jumbotron-bg; + + +// Badges +// ------------------------- +@badge-color: #777; +@badge-link-hover-color: #fff; +@badge-bg: @btn-default-bg; + +@badge-active-color: @link-color; +@badge-active-bg: #fff; + +@badge-font-weight: bold; +@badge-line-height: 1; +@badge-border-radius: 10px; + + +// Breadcrumbs +// ------------------------- +@breadcrumb-bg: #f5f5f5; +@breadcrumb-color: @gray-light; +@breadcrumb-active-color: @gray-dark; +@breadcrumb-separator: "/"; + + +// Carousel +// ------------------------ + +@carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6); + +@carousel-control-color: #fff; +@carousel-control-width: 15%; +@carousel-control-opacity: .5; +@carousel-control-font-size: 20px; + +@carousel-indicator-active-bg: #fff; +@carousel-indicator-border-color: #fff; + +@carousel-caption-color: #fff; + + +// Close +// ------------------------ +@close-font-weight: bold; +@close-color: #000; +@close-text-shadow: 0 1px 0 #fff; + + +// Code +// ------------------------ +@code-color: #c7254e; +@code-bg: #f9f2f4; + +@pre-bg: #f5f5f5; +@pre-color: @gray-dark; +@pre-border-color: #ccc; +@pre-scrollable-max-height: 340px; + +// Type +// ------------------------ +@text-muted: @gray-light; +@abbr-border-color: @gray-light; +@headings-small-color: @gray-light; +@blockquote-small-color: @gray; +@blockquote-border-color: @hr-border; +@page-header-border-color: @hr-border; + +// Miscellaneous +// ------------------------- + +// Hr border color +@hr-border: #ddd; + +// Horizontal forms & lists +@component-offset-horizontal: 180px; + + +// Container sizes +// -------------------------------------------------- + +// Small screen / tablet +@container-tablet: ((720px + @grid-gutter-width)); +@container-sm: @container-tablet; + +// Medium screen / desktop +@container-desktop: ((940px + @grid-gutter-width)); +@container-md: @container-desktop; + +// Large screen / wide desktop +@container-large-desktop: ((1140px + @grid-gutter-width)); +@container-lg: @container-large-desktop; diff --git a/bootstrap_themes/themes.py b/bootstrap_themes/themes.py index 3da3b8a..5e8a0d2 100644 --- a/bootstrap_themes/themes.py +++ b/bootstrap_themes/themes.py @@ -1 +1 @@ -theme_data = {"themes": [{"lessVariables": "http://bootswatch.com/amelia/variables.less", "name": "Amelia", "less": "http://bootswatch.com/amelia/bootswatch.less", "thumbnail": "http://bootswatch.com/amelia/thumbnail.png", "preview": "http://bootswatch.com/amelia/", "cssMin": "http://bootswatch.com/amelia/bootstrap.min.css", "css": "http://bootswatch.com/amelia/bootstrap.css", "description": "Sweet and cheery"}, {"lessVariables": "http://bootswatch.com/cerulean/variables.less", "name": "Cerulean", "less": "http://bootswatch.com/cerulean/bootswatch.less", "thumbnail": "http://bootswatch.com/cerulean/thumbnail.png", "preview": "http://bootswatch.com/cerulean/", "cssMin": "http://bootswatch.com/cerulean/bootstrap.min.css", "css": "http://bootswatch.com/cerulean/bootstrap.css", "description": "A calm blue sky"}, {"lessVariables": "http://bootswatch.com/cosmo/variables.less", "name": "Cosmo", "less": "http://bootswatch.com/cosmo/bootswatch.less", "thumbnail": "http://bootswatch.com/cosmo/thumbnail.png", "preview": "http://bootswatch.com/cosmo/", "cssMin": "http://bootswatch.com/cosmo/bootstrap.min.css", "css": "http://bootswatch.com/cosmo/bootstrap.css", "description": "An ode to Metro"}, {"lessVariables": "http://bootswatch.com/cyborg/variables.less", "name": "Cyborg", "less": "http://bootswatch.com/cyborg/bootswatch.less", "thumbnail": "http://bootswatch.com/cyborg/thumbnail.png", "preview": "http://bootswatch.com/cyborg/", "cssMin": "http://bootswatch.com/cyborg/bootstrap.min.css", "css": "http://bootswatch.com/cyborg/bootstrap.css", "description": "Jet black and electric blue"}, {"lessVariables": "http://bootswatch.com/flatly/variables.less", "name": "Flatly", "less": "http://bootswatch.com/flatly/bootswatch.less", "thumbnail": "http://bootswatch.com/flatly/thumbnail.png", "preview": "http://bootswatch.com/flatly/", "cssMin": "http://bootswatch.com/flatly/bootstrap.min.css", "css": "http://bootswatch.com/flatly/bootstrap.css", "description": "Flat and modern"}, {"lessVariables": "http://bootswatch.com/journal/variables.less", "name": "Journal", "less": "http://bootswatch.com/journal/bootswatch.less", "thumbnail": "http://bootswatch.com/journal/thumbnail.png", "preview": "http://bootswatch.com/journal/", "cssMin": "http://bootswatch.com/journal/bootstrap.min.css", "css": "http://bootswatch.com/journal/bootstrap.css", "description": "Crisp like a new sheet of paper."}, {"lessVariables": "http://bootswatch.com/readable/variables.less", "name": "Readable", "less": "http://bootswatch.com/readable/bootswatch.less", "thumbnail": "http://bootswatch.com/readable/thumbnail.png", "preview": "http://bootswatch.com/readable/", "cssMin": "http://bootswatch.com/readable/bootstrap.min.css", "css": "http://bootswatch.com/readable/bootstrap.css", "description": "Optimized for legibility"}, {"lessVariables": "http://bootswatch.com/simplex/variables.less", "name": "Simplex", "less": "http://bootswatch.com/simplex/bootswatch.less", "thumbnail": "http://bootswatch.com/simplex/thumbnail.png", "preview": "http://bootswatch.com/simplex/", "cssMin": "http://bootswatch.com/simplex/bootstrap.min.css", "css": "http://bootswatch.com/simplex/bootstrap.css", "description": "Mini and minimalist."}, {"lessVariables": "http://bootswatch.com/slate/variables.less", "name": "Slate", "less": "http://bootswatch.com/slate/bootswatch.less", "thumbnail": "http://bootswatch.com/slate/thumbnail.png", "preview": "http://bootswatch.com/slate/", "cssMin": "http://bootswatch.com/slate/bootstrap.min.css", "css": "http://bootswatch.com/slate/bootstrap.css", "description": "Shades of gunmetal gray"}, {"lessVariables": "http://bootswatch.com/spacelab/variables.less", "name": "Spacelab", "less": "http://bootswatch.com/spacelab/bootswatch.less", "thumbnail": "http://bootswatch.com/spacelab/thumbnail.png", "preview": "http://bootswatch.com/spacelab/", "cssMin": "http://bootswatch.com/spacelab/bootstrap.min.css", "css": "http://bootswatch.com/spacelab/bootstrap.css", "description": "Silvery and sleek."}, {"lessVariables": "http://bootswatch.com/united/variables.less", "name": "United", "less": "http://bootswatch.com/united/bootswatch.less", "thumbnail": "http://bootswatch.com/united/thumbnail.png", "preview": "http://bootswatch.com/united/", "cssMin": "http://bootswatch.com/united/bootstrap.min.css", "css": "http://bootswatch.com/united/bootstrap.css", "description": "Ubuntu orange and unique font"}], "version": "3.0.0"} \ No newline at end of file +theme_data = {"themes": [{"cssCdn": "//netdna.bootstrapcdn.com/bootswatch/latest/amelia/bootstrap.min.css", "lessVariables": "http://bootswatch.com/amelia/variables.less", "name": "Amelia", "less": "http://bootswatch.com/amelia/bootswatch.less", "thumbnail": "http://bootswatch.com/amelia/thumbnail.png", "preview": "http://bootswatch.com/amelia/", "cssMin": "http://bootswatch.com/amelia/bootstrap.min.css", "css": "http://bootswatch.com/amelia/bootstrap.css", "description": "Sweet and cheery"}, {"cssCdn": "//netdna.bootstrapcdn.com/bootswatch/latest/cerulean/bootstrap.min.css", "lessVariables": "http://bootswatch.com/cerulean/variables.less", "name": "Cerulean", "less": "http://bootswatch.com/cerulean/bootswatch.less", "thumbnail": "http://bootswatch.com/cerulean/thumbnail.png", "preview": "http://bootswatch.com/cerulean/", "cssMin": "http://bootswatch.com/cerulean/bootstrap.min.css", "css": "http://bootswatch.com/cerulean/bootstrap.css", "description": "A calm blue sky"}, {"cssCdn": "//netdna.bootstrapcdn.com/bootswatch/latest/cosmo/bootstrap.min.css", "lessVariables": "http://bootswatch.com/cosmo/variables.less", "name": "Cosmo", "less": "http://bootswatch.com/cosmo/bootswatch.less", "thumbnail": "http://bootswatch.com/cosmo/thumbnail.png", "preview": "http://bootswatch.com/cosmo/", "cssMin": "http://bootswatch.com/cosmo/bootstrap.min.css", "css": "http://bootswatch.com/cosmo/bootstrap.css", "description": "An ode to Metro"}, {"cssCdn": "//netdna.bootstrapcdn.com/bootswatch/latest/cyborg/bootstrap.min.css", "lessVariables": "http://bootswatch.com/cyborg/variables.less", "name": "Cyborg", "less": "http://bootswatch.com/cyborg/bootswatch.less", "thumbnail": "http://bootswatch.com/cyborg/thumbnail.png", "preview": "http://bootswatch.com/cyborg/", "cssMin": "http://bootswatch.com/cyborg/bootstrap.min.css", "css": "http://bootswatch.com/cyborg/bootstrap.css", "description": "Jet black and electric blue"}, {"cssCdn": "//netdna.bootstrapcdn.com/bootswatch/latest/flatly/bootstrap.min.css", "lessVariables": "http://bootswatch.com/flatly/variables.less", "name": "Flatly", "less": "http://bootswatch.com/flatly/bootswatch.less", "thumbnail": "http://bootswatch.com/flatly/thumbnail.png", "preview": "http://bootswatch.com/flatly/", "cssMin": "http://bootswatch.com/flatly/bootstrap.min.css", "css": "http://bootswatch.com/flatly/bootstrap.css", "description": "Flat and modern"}, {"cssCdn": "//netdna.bootstrapcdn.com/bootswatch/latest/journal/bootstrap.min.css", "lessVariables": "http://bootswatch.com/journal/variables.less", "name": "Journal", "less": "http://bootswatch.com/journal/bootswatch.less", "thumbnail": "http://bootswatch.com/journal/thumbnail.png", "preview": "http://bootswatch.com/journal/", "cssMin": "http://bootswatch.com/journal/bootstrap.min.css", "css": "http://bootswatch.com/journal/bootstrap.css", "description": "Crisp like a new sheet of paper."}, {"cssCdn": "//netdna.bootstrapcdn.com/bootswatch/latest/readable/bootstrap.min.css", "lessVariables": "http://bootswatch.com/readable/variables.less", "name": "Readable", "less": "http://bootswatch.com/readable/bootswatch.less", "thumbnail": "http://bootswatch.com/readable/thumbnail.png", "preview": "http://bootswatch.com/readable/", "cssMin": "http://bootswatch.com/readable/bootstrap.min.css", "css": "http://bootswatch.com/readable/bootstrap.css", "description": "Optimized for legibility"}, {"cssCdn": "//netdna.bootstrapcdn.com/bootswatch/latest/simplex/bootstrap.min.css", "lessVariables": "http://bootswatch.com/simplex/variables.less", "name": "Simplex", "less": "http://bootswatch.com/simplex/bootswatch.less", "thumbnail": "http://bootswatch.com/simplex/thumbnail.png", "preview": "http://bootswatch.com/simplex/", "cssMin": "http://bootswatch.com/simplex/bootstrap.min.css", "css": "http://bootswatch.com/simplex/bootstrap.css", "description": "Mini and minimalist."}, {"cssCdn": "//netdna.bootstrapcdn.com/bootswatch/latest/slate/bootstrap.min.css", "lessVariables": "http://bootswatch.com/slate/variables.less", "name": "Slate", "less": "http://bootswatch.com/slate/bootswatch.less", "thumbnail": "http://bootswatch.com/slate/thumbnail.png", "preview": "http://bootswatch.com/slate/", "cssMin": "http://bootswatch.com/slate/bootstrap.min.css", "css": "http://bootswatch.com/slate/bootstrap.css", "description": "Shades of gunmetal gray"}, {"cssCdn": "//netdna.bootstrapcdn.com/bootswatch/latest/spacelab/bootstrap.min.css", "lessVariables": "http://bootswatch.com/spacelab/variables.less", "name": "Spacelab", "less": "http://bootswatch.com/spacelab/bootswatch.less", "thumbnail": "http://bootswatch.com/spacelab/thumbnail.png", "preview": "http://bootswatch.com/spacelab/", "cssMin": "http://bootswatch.com/spacelab/bootstrap.min.css", "css": "http://bootswatch.com/spacelab/bootstrap.css", "description": "Silvery and sleek."}, {"cssCdn": "//netdna.bootstrapcdn.com/bootswatch/latest/united/bootstrap.min.css", "lessVariables": "http://bootswatch.com/united/variables.less", "name": "United", "less": "http://bootswatch.com/united/bootswatch.less", "thumbnail": "http://bootswatch.com/united/thumbnail.png", "preview": "http://bootswatch.com/united/", "cssMin": "http://bootswatch.com/united/bootstrap.min.css", "css": "http://bootswatch.com/united/bootstrap.css", "description": "Ubuntu orange and unique font"}, {"cssCdn": "//netdna.bootstrapcdn.com/bootswatch/latest/yeti/bootstrap.min.css", "lessVariables": "http://bootswatch.com/yeti/variables.less", "name": "Yeti", "less": "http://bootswatch.com/yeti/bootswatch.less", "thumbnail": "http://bootswatch.com/yeti/thumbnail.png", "preview": "http://bootswatch.com/yeti/", "cssMin": "http://bootswatch.com/yeti/bootstrap.min.css", "css": "http://bootswatch.com/yeti/bootstrap.css", "description": "A friendly foundation"}], "version": "3.0.2+1"} \ No newline at end of file diff --git a/setup.py b/setup.py index feb72e2..2ee4ebb 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages -version = '3.0.3' +version = '3.0.5' setup( name='django-bootstrap-themes', diff --git a/update_bootswatch.py b/update_bootswatch.py index 84d2a5e..0239428 100644 --- a/update_bootswatch.py +++ b/update_bootswatch.py @@ -6,19 +6,25 @@ data = json.load(theme_api) for theme in data['themes']: less_path = os.path.abspath(os.path.join(os.path.dirname(__file__), 'bootstrap_themes', 'static', 'bootstrap', 'themes', theme['name'].lower(), 'less')) + if not os.access(less_path, os.F_OK): + os.makedirs(less_path) if os.access(less_path, os.W_OK): - if os.access(os.path.join(less_path, 'bootswatch.less'), os.W_OK): + try: theme_less = urllib2.urlopen(theme['less']) theme_less_file = open(os.path.join(less_path, 'bootswatch.less'), 'w') theme_less_file.write(theme_less.read()) theme_less_file.close() theme_less.close() - if os.access(os.path.join(less_path, 'variables.less'), os.W_OK): + except IOError: + print "Writing to file " + os.path.join(less_path, 'bootswatch.less') + " failed!" + try: theme_less = urllib2.urlopen(theme['lessVariables']) theme_less_file = open(os.path.join(less_path, 'variables.less'), 'w') theme_less_file.write(theme_less.read()) theme_less_file.close() theme_less.close() + except IOError: + print "Writing to file " + os.path.join(less_path, 'variables.less') + " failed!" theme_list_file = open(os.path.abspath(os.path.join(os.path.dirname(__file__), 'bootstrap_themes', 'themes.py')), 'w') theme_list_file.write('theme_data = ') theme_list_file.write(json.dumps(data))