Include bootstrap via sass

One less file to load on the options/register page.
2015-05-07 15:17:02 -07:00
parent 7da9a1d5a7
commit f8db7c606a
6 changed files with 6210 additions and 4 deletions
--- a/options.html
+++ b/options.html
@@ -18,7 +18,6 @@
  <title>Signal Options</title>
  <meta charset="utf-8">
  <link rel="stylesheet" href="stylesheets/options.css">
-  <link rel="stylesheet" href="stylesheets/bootstrap.css">
 </head>
 <body>
  <div id='init-setup' class='collapse'>
--- a/register.html
+++ b/register.html
@@ -18,7 +18,6 @@
  <title>Register for Signal</title>
  <meta charset="utf-8">
  <link rel="stylesheet" href="stylesheets/options.css">
-  <link rel="stylesheet" href="stylesheets/bootstrap.css">
  <link rel="stylesheet" href="components/intl-tel-input/build/css/intlTelInput.css">
 </head>
 <body>
--- a/stylesheets/_bootstrap.scss
+++ b/stylesheets/_bootstrap.scss
--- a/stylesheets/options.css
+++ b/stylesheets/options.css
--- a/stylesheets/options.css.map
+++ b/stylesheets/options.css.map
--- a/stylesheets/options.scss
+++ b/stylesheets/options.scss
@@ -14,6 +14,7 @@
 */

@import 'variables';
+@import 'bootstrap';

 html,body {
  height: 100%;