Merge pull request OpenUserJS#875 from Martii/Issue-874dumpServingGly…

…phicons Remove any of OUJS usage of glyphicons Auto-merge
Martii · Jan 14, 2016 · e3290bf · e3290bf
2 parents f877b8a + d458872
commit e3290bf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/public/less/bootstrap/oujs.less b/public/less/bootstrap/oujs.less
@@ -1,4 +1,10 @@
-// This is a modified version of upstream `bootstrap.less` 3.1.1 for OpenUserJS.org
+// This is a modified version of upstream `bootstrap.less` 3.3.6 for OpenUserJS.org
+
+/*!
+ * Bootstrap v3.3.6 (http://getbootstrap.com)
+ * Copyright 2011-2016 Twitter, Inc.
+ * Some portions Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
 
 // Core variables and mixins
 @import "variables.less";
@@ -8,9 +14,10 @@
 @import "mixins.less";
 // OUJS overrides to upstream mixins
 
-// Reset
+// Reset and dependencies
 @import "normalize.less";
 @import "print.less";
+@import "glyphicons.less";
 
 // Core CSS
 @import "scaffolding.less";
@@ -23,7 +30,6 @@
 
 // Components
 @import "component-animations.less";
-@import "glyphicons.less";
 @import "dropdowns.less";
 @import "button-groups.less";
 @import "input-groups.less";
@@ -41,6 +47,7 @@
 @import "media.less";
 @import "list-group.less";
 @import "panels.less";
+@import "responsive-embed.less";
 @import "wells.less";
 @import "close.less";
 

diff --git a/routesStatic.js b/routesStatic.js
@@ -45,12 +45,7 @@ module.exports = function (aApp) {
   serveModule('/redist/npm/', 'ace-builds/src/', 7);
 
   serveModule('/redist/npm/', 'bootstrap/', {
-    'dist/js/bootstrap.js': { maxage: day * 1 },
-    'dist/fonts/glyphicons-halflings-regular.eot': { maxage: day * 7 },
-    'dist/fonts/glyphicons-halflings-regular.svg': { maxage: day * 7 },
-    'dist/fonts/glyphicons-halflings-regular.ttf': { maxage: day * 7 },
-    'dist/fonts/glyphicons-halflings-regular.woff': { maxage: day * 7 },
-    'dist/fonts/glyphicons-halflings-regular.woff2': { maxage: day * 7 }
+    'dist/js/bootstrap.js': { maxage: day * 1 }
   });
 
   serveModule('/redist/npm/', 'bootstrap-markdown/', {

diff --git a/views/pages/scriptPage.html b/views/pages/scriptPage.html
@@ -17,8 +17,8 @@
             <div class="form-group">
               <div class="input-group col-xs-12">
                 <span class="input-group-btn">
-                  <button class="btn btn-info" id="require-raw" data-clipboard-text="// @require {{{script.scriptPermalinkInstallPageUrl}}}" title="Copy key and raw URL to clipboard"><i class="glyphicon glyphicon-copy"></i> // @require</button>
-                  <button class="btn btn-warning" id="require-min" data-clipboard-text="// @require {{{script.scriptPermalinkInstallPageXUrl}}}.min.js" title="EXPERIMENTAL: Copy key and minified URL to clipboard"><i class="octicon octicon-clippy"></i></button>
+                  <button class="btn btn-info" id="require-raw" data-clipboard-text="// @require {{{script.scriptPermalinkInstallPageUrl}}}" title="Copy key and raw URL to clipboard"><i class="octicon octicon-clippy"></i> // @require</button>
+                  <button class="btn btn-warning" id="require-min" data-clipboard-text="// @require {{{script.scriptPermalinkInstallPageXUrl}}}.min.js" title="EXPERIMENTAL: Copy key and minified URL to clipboard"><i class="fa fa-clipboard"></i></button>
                 </span>
                 <input type="text" class="form-control" id="require" value="{{{script.scriptPermalinkInstallPageUrl}}}" readonly="readonly">
               </div>