Commit progress on first-class Bootswatch support

f20b27f7 · kasperisager · 173fcb63 · f20b27f7 · f20b27f7 · f20b27f7
Commit f20b27f7 authored 11 years ago by kasperisager
--- a/about.php
+++ b/about.php
@@ -2,7 +2,7 @@

 $ThemeInfo['bootstrap'] = array(
  'Name'        => 'Bootstrap',
-  'Description' => "<strong>NOW INCLUDES ALL 15 BOOTSWATCHES!</strong> Bootstrap for Vanilla has been rewritten from scratch on top of <a href='http://getbootstrap.com'>Bootstrap 3.1</a> in this second installation of the most popular theme for Vanilla Forums. Kickstart your community with a fresh and solid theme that is ready to be customized to your heart's desires.",
+  'Description' => "<strong>NOW INCLUDES THE BOOTSWATCH THEMES!</strong> Bootstrap for Vanilla has been rewritten from scratch on top of <a href='http://getbootstrap.com'>Bootstrap 3.1</a> in this second installation of the most popular theme for Vanilla Forums. Kickstart your community with a fresh and solid theme that is ready to be customized to your heart's desires.",
  'Version'     => '2.0.5',
  'Author'      => 'Kasper K. Isager',
  'AuthorEmail' => 'kasperisager@gmail.com',
@@ -10,11 +10,38 @@ $ThemeInfo['bootstrap'] = array(
  'RequiredApplications' => array('Vanilla' => '2.2.x'),

  'Options' => array(
-    'Description' => '',
+    'Description' => <<<html
+<p><strong>Credits:</strong></p>
+
+<hr>
+
+<p><a href="http://getbootstrap.com"><strong>Bootstrap</strong></a></p>
+<p>The most popular front-end framework for developing responsive, mobile first projects on the web.</p>
+<p>By <strong><a href="http://twitter.com/mdo">@mdo</a></strong> and <strong><a href="http://twitter.com/fat">@fat</a></strong></p>
+<p>
+<iframe src="http://ghbtns.com/github-btn.html?user=twbs&amp;repo=bootstrap&amp;type=fork&amp" width="53" height="20"></iframe>
+<iframe src="http://ghbtns.com/github-btn.html?user=twbs&amp;repo=bootstrap&amp;type=watch&amp;count=true" width="100" height="20"></iframe>
+</p>
+
+<hr>
+
+<p><a href="http://bootswatch.com"><strong>Bootswatch</strong></a></p>
+<p>Bootswatch is a collection of free themes for Bootstrap. Check it out at <a href="http://bootswatch.com">bootswatch.com</a>.</p>
+<p>By <strong>Thomas Park</strong> - <a href="https://twitter.com/thomashpark">Twitter</a> | <a href="https://github.com/thomaspark">GitHub</a></p>
+<p>
+<iframe src="http://ghbtns.com/github-btn.html?user=thomaspark&amp;repo=bootswatch&amp;type=fork" width="53" height="20"></iframe>
+<iframe src="http://ghbtns.com/github-btn.html?user=thomaspark&amp;repo=bootswatch&amp;type=watch&amp;count=true" width="110" height="20"></iframe>
+</p>
+html
+    ,
    'Styles'      => array(
      'Default' => array(
-        'Basename' => '%s',
-        'Description' => 'Bootstrap look and feel'
+        'Basename' => '%s_default',
+        'Description' => 'Better, faster and stronger'
+      ),
+      'Bootstrap' => array(
+        'Basename' => '%s_bootstrap',
+        'Description' => 'A visually enhanced experience'
      ),
      'Amelia' => array(
        'Basename' => '%s_amelia',

--- a/design/custom_amelia.css
+++ b/design/custom_amelia.css
--- a/design/custom_bootstrap.css
+++ b/design/custom_bootstrap.css
--- a/design/custom_cerulean.css
+++ b/design/custom_cerulean.css
--- a/design/custom_cosmo.css
+++ b/design/custom_cosmo.css
--- a/design/custom_cyborg.css
+++ b/design/custom_cyborg.css
--- a/design/custom_flatly.css
+++ b/design/custom_flatly.css
--- a/design/custom_journal.css
+++ b/design/custom_journal.css
--- a/design/custom_lumen.css
+++ b/design/custom_lumen.css
--- a/design/custom_readable.css
+++ b/design/custom_readable.css
--- a/design/custom_simplex.css
+++ b/design/custom_simplex.css
--- a/design/custom_slate.css
+++ b/design/custom_slate.css
--- a/design/custom_spacelab.css
+++ b/design/custom_spacelab.css
--- a/design/custom_superhero.css
+++ b/design/custom_superhero.css
--- a/design/custom_united.css
+++ b/design/custom_united.css
--- a/design/custom_yeti.css
+++ b/design/custom_yeti.css
--- a/design/screenshot_bootstrap.png
+++ b/design/screenshot_bootstrap.png
--- a/design/screenshot_cerulean.png
+++ b/design/screenshot_cerulean.png
--- a/design/screenshot_default.png
+++ b/design/screenshot_default.png
--- a/design/style.css
+++ b/design/style.css
@@ -258,7 +258,7 @@ th {
  .Tag,
  .Note.Closed,
  .HasNew,
-  .Item .Meta .Category a,
+  .Item .Meta .MItem.Category a,
  .token-input-token {
    border: 1px solid #000;
  }
@@ -387,18 +387,20 @@ body {
 }
 .page-wrap {
  min-height: 100%;
-  margin-bottom: -101px;
+  margin-bottom: -60px;
 }
 .page-wrap > .push {
-  height: 101px;
+  height: 60px;
 }
-body > .footer {
+.page-footer {
+  height: 60px;
  padding: 20px;
  margin-top: 40px;
+  color: #999999;
  background-color: #f7f7f7;
  border-top: #eeeeee solid 1px;
 }
-body > .footer p {
+.page-footer p {
  margin-bottom: 0;
 }
 .PageDescription {
@@ -556,13 +558,10 @@ cite {
  text-align: justify;
 }
 .text-muted,
-body > .footer,
 .Gloss,
 .OptionsMenu .SpFlyoutHandle,
 .Item .Meta,
 .Conversation .Item .MItem,
-.Item .Meta,
-.Conversation .Item .MItem,
 .Item .Meta a,
 .Conversation .Item .MItem a,
 .Item .AuthorInfo {
@@ -1654,6 +1653,9 @@ select,
  transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
 }
 .form-control:focus,
+.InputBox:focus,
+.TextBox:focus,
+select:focus,
 .token-input-focused {
  border-color: #66afe9;
  outline: 0;
@@ -1955,14 +1957,6 @@ select[multiple].input-lg {
  top: 0;
  right: 15px;
 }
-.InputBox:focus,
-.TextBox:focus,
-select:focus {
-  border-color: #66afe9;
-  outline: 0;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
-  box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
-}
 .InputBox::-moz-placeholder,
 .TextBox::-moz-placeholder,
 select::-moz-placeholder {
@@ -2153,13 +2147,13 @@ fieldset[disabled] .Button.Danger:active {
  line-height: 1.5;
  border-radius: 3px;
 }
-.panel .BigButton {
+.sidebar .BigButton {
  display: block;
  width: 100%;
  padding-left: 0;
  padding-right: 0;
 }
-.panel .BigButton + .BigButton {
+.sidebar .BigButton + .BigButton {
  margin-top: 5px;
 }
 .Button:focus {
@@ -3230,7 +3224,7 @@ a.Bookmarked:before {
  border-top-right-radius: 0;
  border-top-left-radius: 0;
 }
-.panel .FilterMenu {
+.sidebar .FilterMenu {
  padding: 10px 0;
 }
 .content .FilterMenu {
@@ -3791,7 +3785,7 @@ a.Bookmarked:before {
 .Tag,
 .Note.Closed,
 .HasNew,
-.Item .Meta .Category a,
+.Item .Meta .MItem.Category a,
 .token-input-token {
  display: inline;
  padding: .2em .6em .3em;
@@ -3804,18 +3798,18 @@ a.Bookmarked:before {
  vertical-align: baseline;
  border-radius: .25em;
 }
-.Item .Meta .Category a:hover,
-.Item .Meta .Category a:focus {
+.Item .Meta .MItem.Category a:hover,
+.Item .Meta .MItem.Category a:focus {
  color: #ffffff;
  text-decoration: none;
  cursor: pointer;
 }
 .Tag,
-.Item .Meta .Category a {
+.Item .Meta .MItem.Category a {
  background-color: #999999;
 }
-.Item .Meta .Category a:hover,
-.Item .Meta .Category a:focus {
+.Item .Meta .MItem.Category a:hover,
+.Item .Meta .MItem.Category a:focus {
  background-color: #808080;
 }
 .token-input-token {
@@ -4266,6 +4260,22 @@ button.token-input-delete-token {
  font-size: 12px;
  line-height: 20px;
 }
+.DataList .Item .Meta,
+.DataList .Conversation .Item .MItem,
+.DataList .Item .Meta a,
+.DataList .Conversation .Item .MItem a {
+  color: #999999;
+}
+.MenuItems .Item .Meta,
+.MenuItems .Conversation .Item .MItem,
+.MenuItems .Item .Meta a,
+.MenuItems .Conversation .Item .MItem a,
+.FlyoutMenu .Item .Meta,
+.FlyoutMenu .Conversation .Item .MItem,
+.FlyoutMenu .Item .Meta a,
+.FlyoutMenu .Conversation .Item .MItem a {
+  color: #999999;
+}
 .Item .Meta .MItem {
  padding-right: 10px;
 }
@@ -4478,6 +4488,10 @@ tr.Item:after {
  height: 32px;
  vertical-align: top;
 }
+.MeBox .MenuItems,
+.MeBox .FlyoutMenu {
+  color: #333333;
+}
 .MeBox .ToggleFlyout {
  float: left !important;
 }