Permalink
Browse files

Update all themes to latest versions (2.3.0+1)

  • Loading branch information...
1 parent 8e05ef2 commit c9ed458402bddebb5b968ec52d755fd3c2217bd5 @maxim committed Feb 22, 2013
Showing with 388 additions and 343 deletions.
  1. +1 −1 bootswatch
  2. +78 −61 vendor/assets/stylesheets/bootswatch/amelia/_bootswatch.scss
  3. +73 −73 vendor/assets/stylesheets/bootswatch/amelia/_variables.scss
  4. +2 −3 vendor/assets/stylesheets/bootswatch/cerulean/_bootswatch.scss
  5. +2 −2 vendor/assets/stylesheets/bootswatch/cerulean/_variables.scss
  6. +26 −6 vendor/assets/stylesheets/bootswatch/cosmo/_bootswatch.scss
  7. +2 −2 vendor/assets/stylesheets/bootswatch/cosmo/_variables.scss
  8. +11 −6 vendor/assets/stylesheets/bootswatch/cyborg/_bootswatch.scss
  9. +1 −1 vendor/assets/stylesheets/bootswatch/cyborg/_variables.scss
  10. +6 −4 vendor/assets/stylesheets/bootswatch/journal/_bootswatch.scss
  11. +1 −2 vendor/assets/stylesheets/bootswatch/journal/_variables.scss
  12. +2 −2 vendor/assets/stylesheets/bootswatch/readable/_bootswatch.scss
  13. +15 −15 vendor/assets/stylesheets/bootswatch/readable/_variables.scss
  14. +2 −1 vendor/assets/stylesheets/bootswatch/simplex/_bootswatch.scss
  15. +1 −1 vendor/assets/stylesheets/bootswatch/simplex/_variables.scss
  16. +11 −8 vendor/assets/stylesheets/bootswatch/slate/_bootswatch.scss
  17. +1 −1 vendor/assets/stylesheets/bootswatch/slate/_variables.scss
  18. +37 −9 vendor/assets/stylesheets/bootswatch/spacelab/_bootswatch.scss
  19. +68 −68 vendor/assets/stylesheets/bootswatch/spacelab/_variables.scss
  20. +26 −42 vendor/assets/stylesheets/bootswatch/spruce/_bootswatch.scss
  21. +4 −4 vendor/assets/stylesheets/bootswatch/spruce/_variables.scss
  22. +15 −28 vendor/assets/stylesheets/bootswatch/superhero/_bootswatch.scss
  23. +1 −1 vendor/assets/stylesheets/bootswatch/superhero/_variables.scss
  24. +1 −1 vendor/assets/stylesheets/bootswatch/united/_bootswatch.scss
  25. +1 −1 vendor/assets/stylesheets/bootswatch/united/_variables.scss
Submodule bootswatch updated 94 files
+2 −0 README.md
+2,120 −929 amelia/bootstrap.css
+9 −983 amelia/bootstrap.min.css
+76 −59 amelia/bootswatch.less
+9 −9 amelia/index.html
+9 −9 amelia/variables.less
+1 −1 api/themes.json
+1,804 −732 cerulean/bootstrap.css
+9 −881 cerulean/bootstrap.min.css
+2 −3 cerulean/bootswatch.less
+9 −9 cerulean/index.html
+2 −2 cerulean/variables.less
+2,062 −875 cosmo/bootstrap.css
+9 −940 cosmo/bootstrap.min.css
+26 −6 cosmo/bootswatch.less
+9 −9 cosmo/index.html
+2 −2 cosmo/variables.less
+182 −163 css/bootswatch.css
+33 −0 css/font-awesome.min.css
+1,931 −785 cyborg/bootstrap.css
+9 −948 cyborg/bootstrap.min.css
+11 −6 cyborg/bootswatch.less
+9 −9 cyborg/index.html
+1 −1 cyborg/variables.less
+24 −7 default/bootstrap-responsive.css
+2 −2 default/bootstrap-responsive.min.css
+238 −119 default/bootstrap.css
+2 −2 default/bootstrap.min.css
+9 −9 default/index.html
+4 −4 default/variables.less
+ favicon.ico
+ font/FontAwesome.otf
+ font/fontawesome-webfont.eot
+284 −0 font/fontawesome-webfont.svg
+ font/fontawesome-webfont.ttf
+ font/fontawesome-webfont.woff
+ img/glyphicons_023_cogwheels.png
+ img/glyphicons_032_wifi_alt.png
+ img/glyphicons_036_file.png
+ img/glyphicons_265_electrical_plug.png
+ img/glyphicons_280_settings.png
+ img/glyphicons_341_github.png
+ img/rss-icons.png
+119 −60 index.html
+1,840 −744 journal/bootstrap.css
+9 −896 journal/bootstrap.min.css
+6 −4 journal/bootswatch.less
+9 −9 journal/index.html
+1 −1 journal/variables.less
+0 −29 js/application.js
+2,268 −0 js/bootstrap.js
+6 −2,031 js/bootstrap.min.js
+88 −7 js/bootswatch.js
+1,851 −800 readable/bootstrap.css
+9 −863 readable/bootstrap.min.css
+2 −2 readable/bootswatch.less
+9 −9 readable/index.html
+15 −15 readable/variables.less
+1,858 −743 simplex/bootstrap.css
+9 −912 simplex/bootstrap.min.css
+2 −1 simplex/bootswatch.less
+9 −9 simplex/index.html
+1 −1 simplex/variables.less
+1,958 −814 slate/bootstrap.css
+9 −942 slate/bootstrap.min.css
+11 −8 slate/bootswatch.less
+9 −9 slate/index.html
+1 −1 slate/variables.less
+1,921 −793 spacelab/bootstrap.css
+9 −899 spacelab/bootstrap.min.css
+37 −9 spacelab/bootswatch.less
+9 −9 spacelab/index.html
+11 −11 spacelab/variables.less
+1,913 −806 spruce/bootstrap.css
+9 −945 spruce/bootstrap.min.css
+26 −42 spruce/bootswatch.less
+9 −9 spruce/index.html
+4 −4 spruce/variables.less
+1,965 −811 superhero/bootstrap.css
+9 −969 superhero/bootstrap.min.css
+10 −23 superhero/bootswatch.less
+9 −9 superhero/index.html
+1 −1 superhero/variables.less
+8 −8 swatchmaker/Makefile
+27 −173 swatchmaker/test/application.js
+58 −263 swatchmaker/test/bootswatch.css
+94 −0 swatchmaker/test/bootswatch.js
+42 −39 swatchmaker/test/test-full.html
+3 −3 swatchmaker/test/test.html
+1,761 −698 united/bootstrap.css
+9 −872 united/bootstrap.min.css
+1 −1 united/bootswatch.less
+9 −9 united/index.html
+1 −1 united/variables.less
@@ -1,4 +1,4 @@
-// Amelia 2.2.2
+// Amelia 2.3.0
// Bootswatch
// -----------------------------------------------------
@@ -151,6 +151,11 @@ hr {
.navbar-inverse .nav-collapse {
+ .nav > li > a,
+ .dropdown-menu a {
+ color: $navbarInverseLinkColor !important;
+ }
+
.nav li > a:hover,
.dropdown-menu a:hover {
background-color: lighten($navbarInverseBackground, 10%) !important;
@@ -160,17 +165,12 @@ hr {
div.subnav {
- background-color: rgba(42, 99, 105, 0.9);
- background-image: none;
- border: 0px solid transparent;
+ margin: 0 1px;
+ background: rgba(42, 99, 105, 0.9) none;
+ border: none;
@include border-radius(0);
@include box-shadow(none);
- .nav > li.open > a {
- border-color: transparent;
- background-color: rgba(255, 255, 255, 0.4);
- }
-
.nav > li > a {
color: $textColor;
border-color: transparent;
@@ -182,28 +182,27 @@ div.subnav {
}
.nav > .active > a {
- background-color: transparent;
+ background-color: rgba(255, 255, 255, 0.4);
border-color: transparent;
color: $textColor;
@include box-shadow(none);
}
- .nav > .active > a:hover,
.nav > li > a:hover,
- .nav > .active > a,
.nav > .active > a:hover, {
border-right-color: transparent;
background-color: rgba(255, 255, 255, 0.4);
color: $textColor;
}
- .nav > li:first-child > a:hover {
- border-left-color: rgba(255, 255, 255, 0.4);
- border-left-width: 1px;
+ .nav > li.open > a {
+ border-color: transparent;
+ background-color: rgba(255, 255, 255, 0.4);
}
div.subnav-fixed {
- top: 50px;
+ top: $navbarHeight + 1;
+ margin: 0;
}
}
@@ -396,6 +395,18 @@ div.subnav {
@include buttonBackgroundCustom($btnBackground)
}
+.btn-large {
+ padding: $paddingLarge;
+}
+
+.btn-small {
+ padding: $paddingSmall;
+}
+
+.btn-mini {
+ padding: $paddingMini;
+}
+
.btn-group .btn:first-child {
margin-left: 0;
@include border-radius(0);
@@ -440,11 +451,6 @@ div.subnav {
@include buttonBackgroundCustom($btnPrimaryBackground);
}
-[class^="icon-"], [class*=" icon-"] {
- margin-top: 2px;
- margin-right: 8px;
-}
-
.btn-small [class^="icon-"] {
margin-top: 1px;
}
@@ -520,19 +526,31 @@ input, textarea, .search-query, .uneditable-input,
border-top: 0px solid transparent;
}
-.control-group.warning > label,
-.control-group.warning .help-inline {
- color: lighten($orange, 30%);
+.control-group.warning {
+
+ .control-label,
+ .help-block,
+ .help-inline {
+ color: lighten($orange, 30%);
+ }
}
-.control-group.error > label,
-.control-group.error .help-inline {
- color: lighten($linkColor, 10%);
+.control-group.error {
+
+ .control-label,
+ .help-block,
+ .help-inline {
+ color: lighten($linkColor, 10%);
+ }
}
-.control-group.success > label,
-.control-group.success .help-inline {
- color: lighten($green, 20%);
+.control-group.success {
+
+ .control-label,
+ .help-block,
+ .help-inline {
+ color: lighten($green, 20%);
+ }
}
.input-prepend .add-on,
@@ -556,46 +574,45 @@ input, textarea, .search-query, .uneditable-input,
.alert {
- h1, h2, h3, h4, h5, h6 {
- color: $textColor;
- }
-}
-
-.alert, .label {
border-color: transparent;
@include border-radius(0);
@include box-shadow(none);
text-shadow: none;
-}
-.alert-heading {
- color: $textColor;
-}
+ h1, h2, h3, h4, h5, h6 {
+ color: $textColor;
+ }
-.label, .label:hover {
- background-color: $grayLighter;
- text-shadow: none;
- color: $grayDark;
+ .alert-heading {
+ color: $textColor;
+ }
}
-.label-warning, .label-warning:hover, .alert {
- background-color: $orange;
- color: $textColor;
-}
+.label,
+.badge {
-.label-important, .label-important:hover, .alert-error {
- background-color: darken($yellow, 3%);
- color: $textColor;
-}
+ background-color: $blue;
-.label-success, .label-success:hover, .alert-success {
- background-color: $green;
- color: $textColor;
-}
+ .badge-success {
+ background-color: $green;
+ }
+
+ .badge-important {
+ background-color: $red;
+ }
+
+ .badge-warning {
+ background-color: $orange;
+ }
+
+ .badge-info {
+ background-color: $purple;
+ }
+
+ .badge-inverse {
+ background-color: $btnInverseBackground;
+ }
-.label-info, .label-info:hover, .alert-info {
- background-color: $purple;
- color: $textColor;
}
// MISCELLANEOUS
@@ -684,7 +701,7 @@ input, textarea, .search-query, .uneditable-input,
}
.modal-body {
-
+
color: $grayDark;
h1, h2, h3, h4, h5, h6,
@@ -711,7 +728,7 @@ input, textarea, .search-query, .uneditable-input,
}
.popover {
-
+
padding: 0;
@include border-radius(0);
color: $grayDark;
Oops, something went wrong.

0 comments on commit c9ed458

Please sign in to comment.