Merge branch 'master' into 72-main-nav

* master: Grids (#271) minor fixes to some of the comments in SCSS files. (#278) # Conflicts: # core/css/decanter.css # core/scss/core/index.scss
SU-SWS · Jan 16, 2019 · 58603a0 · 58603a0
2 parents 09238b7 + 5111eaa
commit 58603a0
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 329 deletions.
diff --git a/core/css/decanter.css b/core/css/decanter.css
diff --git a/core/scss/components/hero/_hero.scss b/core/scss/components/hero/_hero.scss
@@ -15,9 +15,9 @@ $_su-hero-height: (
 //
 // A hero block that can be either an image or a video with some overlay text.
 //
-// Experimental: The youtube player has not been finished.
+// Experimental: The YouTube player has not been finished.
 //
-// .su-hero--youtube - A youtube video in the background.
+// .su-hero--youtube - A YouTube video in the background.
 //
 // Markup: ../templates/components/hero/hero.twig
 //

diff --git a/core/scss/core/index.scss b/core/scss/core/index.scss
@@ -7,6 +7,20 @@
 //
 // Style guide: Core
 
+// Fonts
+//
+// Primary and secondary fonts from Stanford branding guidelines.
+//
+// Markup: ../../templates/core/fonts/fonts.twig
+//
+// Style guide: Core.Fonts
+
+// Grid
+//
+// Markup: ../../templates/core/grid/grid.twig
+//
+// Style guide: Core.Grid
+
 // Helpers
 //
 // Helper partials.

diff --git a/core/scss/utilities/mixins/cta/index.scss b/core/scss/utilities/mixins/cta/index.scss
@@ -3,7 +3,7 @@
 //
 // CTA
 //
-// Mixin for CTA
+// Mixins for Call-To-Action Block (CTA)
 //
 // Style guide: Mixins.CTA
 //

diff --git a/core/scss/utilities/mixins/icons-logos/index.scss b/core/scss/utilities/mixins/icons-logos/index.scss
@@ -3,7 +3,7 @@
 //
 // Icons and Logos
 //
-// A collection of mixins for icons and logos.
+// Mixins for Icons and Logos
 //
 // Styleguide: Mixins.Icons & Logos
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ @@
     //
     // CTA
     //
-    // Mixin for CTA
+    // Mixins for Call-To-Action Block (CTA)
     //
     // Style guide: Mixins.CTA
     //
@@ Expand Down @@