Merge pull request #571 from Martii/someDepUpdates

Some dep updates Auto-merge
OpenUserJS · Feb 7, 2015 · aad3c1d · aad3c1d
2 parents 60600d9 + 2e13ba8
commit aad3c1d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
  "async": "0.9.0",
  "aws-sdk": "2.0.21",
  "body-parser": "1.11.0",
- "bootstrap": "3.1.1",
+ "bootstrap": "3.3.2",
  "bootstrap-markdown": "2.8.0",
  "compression": "1.4.0",
  "connect-mongo": "0.7.0",
@@ -26,7 +26,7 @@
  "marked": "0.3.3",
  "method-override": "2.3.1",
  "moment": "2.9.0",
- "mongoose": "3.8.22",
+ "mongoose": "3.8.23",
  "morgan": "1.5.1",
  "mu2": "0.5.20",
  "octicons": "git://github.com/github/octicons.git#835ee02",
@@ -49,7 +49,7 @@
  "passport-windowslive": "1.0.1",
  "passport-yahoo": "0.3.0",
  "request": "2.53.0",
- "sanitize-html": "1.5.2",
+ "sanitize-html": "1.5.3",
  "select2": "3.5.2-browserify",
  "select2-bootstrap-css": "1.4.6",
  "serve-favicon": "2.2.0",

diff --git a/public/css/common.css b/public/css/common.css
@@ -126,7 +126,6 @@ h2.page-heading {
  transition: height 0.4s ease;
  width: 100%;
  z-index: 1039;
- height: 0;
  background-color: #ebebeb;
  bottom: 0;
  font-size: 14px;

diff --git a/public/less/bootstrap/oujs-bootswatch.less b/public/less/bootstrap/oujs-bootswatch.less
@@ -141,7 +141,8 @@ body > .navbar {
 
 .reminders .alert.small {
  margin-bottom: 0;
- padding: (@alert-padding * 0.66)
+ padding-top: floor((@alert-padding * 0.66));
+ padding-bottom: floor((@alert-padding * 0.66));
 }
 
 .reminders .alert.small .close {

diff --git a/views/pages/newScriptPage.html b/views/pages/newScriptPage.html
@@ -26,36 +26,36 @@ <h2><i class="fa fa-tags"></i> Script Metadata</h2>
  </div>
  <h3>OpenUserJS.org Supported</h3>
  <div class="list-group script-metadata-definitions">
- <div class="list-group-item active">
+ <div class="list-group-item">
  <h4 class="list-group-item-heading"><code>@description This script even does the laundry!</code></h4>
  <p class="list-group-item-text">Specially formatted on the script page. Last value shown.</p>
  </div>
 
- <div class="list-group-item active">
+ <div class="list-group-item">
  <h4 class="list-group-item-heading"><code>@copyright Year, Author (Author Website)</code></h4>
  <p class="list-group-item-text">Specially formatted on the script page. All values shown in reverse order.</p>
  </div>
- <div class="list-group-item active">
+ <div class="list-group-item">
  <h4 class="list-group-item-heading"><code>@icon url</code></h4>
  <p class="list-group-item-text">A url or data url. Resolution should be near 48px by 48px, Used in the script list page at 16px and on the script page at ~45px. Last value is shown.</p>
  </div>
- <div class="list-group-item active">
+ <div class="list-group-item">
  <h4 class="list-group-item-heading"><code>@license License Type; License Homepage</code></h4>
  <p class="list-group-item-text">Specially formatted on the script page. All values shown in reverse order. If absent MIT License (Expat) is implied. See <a href="/about/Terms-of-Service#licensing">licensing terms</a> for specifics.</p>
  </div>
- <div class="list-group-item active">
+ <div class="list-group-item">
  <h4 class="list-group-item-heading"><code>@homepageURL url</code></h4>
  <p class="list-group-item-text">A url of http, https or mailto protocol. Specially formatted on the script page. All values shown in reverse order.</p>
  </div>
- <div class="list-group-item active">
+ <div class="list-group-item">
  <h4 class="list-group-item-heading"><code>@supportURL url</code></h4>
  <p class="list-group-item-text">A url of http, https or mailto protocol. Specially formatted on the script page. Last value shown.</p>
  </div>
- <div class="list-group-item inactive">
+ <div class="list-group-item">
  <h4 class="list-group-item-heading"><code>@oujs:author {{#authedUser}}{{authedUser.name}}{{/authedUser}}{{^authedUser}}username{{/authedUser}}</code></h4>
  <p class="list-group-item-text">The author of the script. Required to enable <a href="#collaboration">Collaboration</a>. Last value shown. This key may be subject to change.</p>
  </div>
- <div class="list-group-item inactive">
+ <div class="list-group-item">
  <h4 class="list-group-item-heading"><code>@oujs:collaborator username</code></h4>
  <p class="list-group-item-text">May be defined multiple times. Required for <a href="#collaboration">Collaboration</a>. All values shown in reverse order. This key may be subject to change.</p>
  </div>