Merge pull request #187 from googlecodelabs/build-fixes

Slight build changes to allow SCSS imports into devsite

codelab-elements/google-codelab-index/BUILD.bazel

@@ -63,6 +63,7 @@ sass_library(
 sass_library(
     name = "cards_scss",
     srcs = ["_cards.scss"],
+    deps = [":categories_scss"],
 )
 
 sass_library(
@@ -73,10 +74,7 @@ sass_library(
 sass_binary(
     name = "google_codelab_index_scss_bin",
     src = "google_codelab_index.scss",
-    deps = [
-        ":cards_scss",
-        ":categories_scss",
-    ]
+    deps = [":cards_scss"],
 )
 
 closure_js_template_library(

codelab-elements/google-codelab/BUILD.bazel

@@ -43,6 +43,10 @@ closure_js_binary(
 sass_library(
     name = "google_codelab_scss",
     srcs = ["google_codelab.scss"],
+    deps = [
+        ":google_codelab_drawer_scss",
+        ":google_codelab_steps_scss",
+    ],
 )
 
 sass_library(
@@ -57,11 +61,8 @@ sass_library(
 
 sass_binary(
     name = "google_codelab_scss_bin",
-    src = "google_codelab.scss",
-    deps = [
-        ":google_codelab_drawer_scss",
-        ":google_codelab_steps_scss",
-    ]
+    src = "index.scss",
+    deps = [":google_codelab_scss"],
 )
 
 closure_js_template_library(

codelab-elements/google-codelab/google_codelab.scss

@@ -15,25 +15,6 @@
  * limitations under the License.
  */
 
-html, body {
-  height: 100%;
-  width: 100%;
-  margin: 0;
-  padding: 0;
-}
-body {
-  font-family: "Roboto",sans-serif;
-  transition: opacity ease-in 0.2s;
-}
-
-* {
-  box-sizing: border-box;
-}
-
-[hidden] {
-  display: none !important;
-}
-
 google-codelab {
   display: flex;
   width: 100%;

codelab-elements/google-codelab/index.scss

@@ -0,0 +1,37 @@
+/**
+ * @license
+ * Copyright 2018 Google Inc. All rights reserved.
+ *
+ * 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, body {
+  height: 100%;
+  width: 100%;
+  margin: 0;
+  padding: 0;
+}
+body {
+  font-family: "Roboto",sans-serif;
+  transition: opacity ease-in 0.2s;
+}
+
+* {
+  box-sizing: border-box;
+}
+
+[hidden] {
+  display: none !important;
+}
+
+@import "google_codelab.scss"