Merge pull request #110 from alisman/bootstrap

sandbox the new implementation of bootstrap so that it applies only w… Former-commit-id: 5a13a79
cBioPortal · Dec 19, 2016 · 547a463 · 547a463
2 parents b39ecf8 + 35e167c
commit 547a463
Show file tree

Hide file tree

Showing 9 changed files with 4,306 additions and 16 deletions.
diff --git a/my-index.ejs b/my-index.ejs
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html class="cbioportal-frontend">
 <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <title><%= htmlWebpackPlugin.options.title %></title>
@@ -10,8 +10,8 @@
         // Set default API in case none is specified in .env
         __API_ROOT__ = 'cbioportal-rc.herokuapp.com/api';
     </script>
-    <script src="reactapp/js/common.bundle.js"></script>
-    <link href="reactapp/css/bootstrap.min.css" rel="stylesheet"></link>
+    <script src="reactapp/common.bundle.js"></script>
+    <link href="reactapp/prefixed-bootstrap.min.css" rel="stylesheet"></link>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
 </head>
 <body class="cbioOnePageApp">

diff --git a/package.json b/package.json
@@ -9,6 +9,7 @@
     "buildDLL:prod": "npm run clean && cross-env NODE_ENV=production webpack --config vendor-bundles.webpack.config.js",
     "buildDLL:dev": "npm run clean && cross-env NODE_ENV=development webpack --config vendor-bundles.webpack.config.js",
     "build:size": "npm run clean && cross-env NODE_ENV=production webpack --json > stats.json",
+    "buildBootstrap": "sass --style :compressed src/globalStyles/bootstrap-entry.scss src/globalStyles/prefixed-bootstrap.min.css",
     "heroku-postbuild": "npm run build && npm install http-server -g",
     "updateAPI": "npm run fetchAPI && npm run buildAPI",
     "fetchAPI": "curl http://cbioportal-rc.herokuapp.com/api/v2/api-docs > src/shared/api/CBioPortalAPI-docs.json",

diff --git a/src/globalStyles/bootstrap-entry.scss b/src/globalStyles/bootstrap-entry.scss
@@ -0,0 +1,7 @@
+.cbioportal-frontend {
+
+  @import '../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap';
+
+}
+
+