From e3ed0af0f975206dedefb33ea3dc4b26ab3933d8 Mon Sep 17 00:00:00 2001
From: Juan Cruz Viotti <jviottidc@gmail.com>
Date: Wed, 30 Mar 2016 16:04:35 -0400
Subject: [PATCH] Move Boostrap style customisations to a boostrap.scss file

---
 build/css/main.css               | 35 +++++++++++++++++++++++---------
 lib/scss/main.scss               | 16 +--------------
 lib/scss/modules/_bootstrap.scss | 33 ++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 25 deletions(-)
 create mode 100644 lib/scss/modules/_bootstrap.scss

diff --git a/build/css/main.css b/build/css/main.css
index 173d2a20..cb08d536 100644
--- a/build/css/main.css
+++ b/build/css/main.css
@@ -5887,6 +5887,31 @@ button.close {
   .hidden-print {
     display: none !important; } }
 
+/*
+ * Copyright 2016 Resin.io
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+html {
+  background-color: #535760; }
+
+.checkbox input[type="checkbox"] {
+  position: initial;
+  margin-right: 2px; }
+
+.checkbox input[type="checkbox"]:not(:checked) + * {
+  color: #ddd; }
+
 /*
  * Copyright 2016 Resin.io
  *
@@ -6083,9 +6108,6 @@ button.btn:focus, button.progress-button:focus {
   height: 100%;
   transition: width 0.3s, opacity 0.3s; }
 
-html {
-  background-color: #535760; }
-
 hero-icon[disabled] .caption {
   color: #787c7f; }
 
@@ -6155,13 +6177,6 @@ body {
   margin: 0 auto 15px;
   max-width: 165px; }
 
-.checkbox input[type="checkbox"] {
-  position: initial;
-  margin-right: 2px; }
-
-.checkbox input[type="checkbox"]:not(:checked) + * {
-  color: #ddd; }
-
 .wrapper {
   height: 100%;
   margin: 20px 60px; }
diff --git a/lib/scss/main.scss b/lib/scss/main.scss
index 77f4dfa3..6fad10a7 100644
--- a/lib/scss/main.scss
+++ b/lib/scss/main.scss
@@ -29,6 +29,7 @@ $link-hover-decoration: none;
 
 @import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap";
 
+@import "./modules/bootstrap";
 @import "./modules/space";
 @import "./components/badge";
 @import "./components/caption";
@@ -36,11 +37,6 @@ $link-hover-decoration: none;
 @import "./components/tick";
 @import "./components/progress-button";
 
-// Prevent white flash when running application
-html {
-  background-color: $body-bg;
-}
-
 hero-icon[disabled] .caption {
   color: $color-disabled;
 }
@@ -138,16 +134,6 @@ body {
   max-width: $btn-min-width - 5px;
 }
 
-// Fix slighly checkbox vertical alignment issue
-.checkbox input[type="checkbox"] {
-  position: initial;
-  margin-right: 2px;
-}
-
-.checkbox input[type="checkbox"]:not(:checked) + * {
-  color: $gray-light;
-}
-
 .wrapper {
   height: 100%;
   margin: 20px 60px;
diff --git a/lib/scss/modules/_bootstrap.scss b/lib/scss/modules/_bootstrap.scss
new file mode 100644
index 00000000..d78ae8fe
--- /dev/null
+++ b/lib/scss/modules/_bootstrap.scss
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2016 Resin.io
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// This file is meant to hold Bootstrap modifications
+// that don't qualify as separate UI components.
+
+// Prevent white flash when running application
+html {
+  background-color: $body-bg;
+}
+
+// Fix slighly checkbox vertical alignment issue
+.checkbox input[type="checkbox"] {
+  position: initial;
+  margin-right: 2px;
+}
+
+.checkbox input[type="checkbox"]:not(:checked) + * {
+  color: $gray-light;
+}