Heroku can't find imported styles. Moving them to the main scss file …

…to see if that's good enough.
manderly · Aug 20, 2021 · 36fa3b5 · 36fa3b5
1 parent 66cc48f
commit 36fa3b5
Show file tree

Hide file tree

Showing 3 changed files with 124 additions and 122 deletions.
diff --git a/client/app/app.scss b/client/app/app.scss
@@ -38,9 +38,130 @@ body {
 @import '../components/modal/modal';
 /* endinject */
 
-@import 'main/main';
-@import '../components/footer/footer';
+:root {
+  --osuOrange: #dc4405;
+}
+
+.thing-form {
+  margin: 20px 0;
+}
+
+#banner {
+  border-bottom: none;
+  margin-top: -20px;
+}
+
+#banner h1 {
+  font-size: 52px;
+  line-height: 1;
+  letter-spacing: -1px;
+}
 
+#banner a {
+  color: #fff;
+  text-decoration: underline;
+}
+
+
+.hero-unit {
+  position: relative;
+  padding: 30px 15px;
+  color: #F5F5F5;
+  text-align: center;
+  text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
+  background: #4393B9;
+}
+
+.navbar-text {
+  margin-left: 15px;
+}
+
+
+/* OSU orange */
+.orange {
+  background-color: var(--osuOrange);
+}
+
+.light-gray {
+  background-color: #eee;
+}
+
+footer {
+  clear:both;
+  width:100%;
+  margin:auto;
+  display:inline-block;
+  padding:20px 0 20px 0;
+}
+
+.huge-text {
+  font-size:60px;
+}
+
+.span-block {
+  display:block;
+}
+
+.welcome-box {
+  text-align:center;
+  font-size:21px;
+  padding:5%;
+}
+
+.welcome-box-icon {
+  color: var(--osuOrange);
+  padding: 0 5px 5px 5px;
+  font-size:10em;
+}
+
+.pad-top {
+  padding-top: 30px;
+}
+
+.pad-bottom {
+  padding-bottom: 10px;
+}
+
+.margin-bottom {
+  margin-bottom: 30px;
+}
+
+.last-built {
+  color:#999;
+}
+
+.pull-right {
+  float:right;
+}
+
+.test {
+  border: solid red 1px;
+}
+
+.banner {
+  display:block;
+  text-align:center;
+}
+
+.ui-select-match-text {
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+@media screen and (max-width: 600px) {
+  .hide-on-mobile {
+    visibility: hidden;
+    display: none;
+  }
+}
+
+footer.footer {
+  text-align: center;
+  padding: 30px 0;
+  margin-top: 70px;
+  border-top: 1px solid #E5E5E5;
+}
 
 
 .donutLegend li {

diff --git a/client/app/main/main.scss b/client/app/main/main.scss
@@ -1,117 +1,3 @@
 :root {
   --osuOrange: #dc4405;
 }
-
-.thing-form {
-  margin: 20px 0;
-}
-
-#banner {
-  border-bottom: none;
-  margin-top: -20px;
-}
-
-#banner h1 {
-  font-size: 52px;
-  line-height: 1;
-  letter-spacing: -1px;
-}
-
-#banner a {
-  color: #fff;
-  text-decoration: underline;
-}
-
-
-.hero-unit {
-  position: relative;
-  padding: 30px 15px;
-  color: #F5F5F5;
-  text-align: center;
-  text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
-  background: #4393B9;
-}
-
-.navbar-text {
-  margin-left: 15px;
-}
-
-
-/* OSU orange */
-.orange {
-  background-color: var(--osuOrange);
-}
-
-.light-gray {
-  background-color: #eee;
-}
-
-footer {
-  clear:both;
-  width:100%;
-  margin:auto;
-  display:inline-block;
-  padding:20px 0 20px 0;
-}
-
-.huge-text {
-  font-size:60px;
-}
-
-.span-block {
-  display:block;
-}
-
-.welcome-box {
-  text-align:center;
-  font-size:21px;
-  padding:5%;
-}
-
-.welcome-box-icon {
-  color: var(--osuOrange);
-  padding: 0 5px 5px 5px;
-  font-size:10em;
-}
-
-.pad-top {
-  padding-top: 30px;
-}
-
-.pad-bottom {
-  padding-bottom: 10px;
-}
-
-.margin-bottom {
-  margin-bottom: 30px;
-}
-
-.last-built {
-  color:#999;
-}
-
-.pull-right {
-  float:right;
-}
-
-.test {
-  border: solid red 1px;
-}
-
-.banner {
-  display:block;
-  text-align:center;
-}
-
-.ui-select-match-text {
-  width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-@media screen and (max-width: 600px) {
-  .hide-on-mobile {
-    visibility: hidden;
-    display: none;
-  }
-}
diff --git a/client/components/footer/footer.scss b/client/components/footer/footer.scss
@@ -1,6 +1 @@
-footer.footer {
-  text-align: center;
-  padding: 30px 0;
-  margin-top: 70px;
-  border-top: 1px solid #E5E5E5;
-}
+