From 64cc16f1eca13d7ec5dff3e40d6e68ce4b5c07dc Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Tue, 12 Aug 2014 20:12:18 -0400
Subject: [PATCH] Studio: correcting reversion of _base.scss from poor previous
 rebase

---
 cms/static/sass/_base.scss            |  4 +++-
 cms/static/sass/elements/_layout.scss | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index 547d9b2e39..8f81ccbe10 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -661,6 +661,7 @@ hr.divide {
     text-align: center;
 
     .close-icon {
+      @extend %t-strong;
       @extend %t-action2;
       @extend %t-strong;
     }
@@ -775,6 +776,7 @@ hr.divide {
   @include transition(opacity $tmg-f3 ease-out 0s);
   @include font-size(12);
   @extend %t-regular;
+  @extend %t-regular;
   @extend %ui-depth5;
   position: absolute;
   top: 0;
@@ -789,7 +791,7 @@ hr.divide {
 
   &:after {
     @include font-size(20);
-    content: '▾';
+    content: '???';
     display: block;
     position: absolute;
     bottom: -14px;
diff --git a/cms/static/sass/elements/_layout.scss b/cms/static/sass/elements/_layout.scss
index 1dbd1b0b10..cc3324805c 100644
--- a/cms/static/sass/elements/_layout.scss
+++ b/cms/static/sass/elements/_layout.scss
@@ -141,6 +141,26 @@
     }
   }
 
+  // CASE: wizard-based mast
+  .mast-wizard {
+
+    .page-header-sub {
+      @extend %t-title4;
+      color: $gray;
+      font-weight: 300;
+    }
+
+    .page-header-super {
+      @extend %t-title4;
+      float: left;
+      width: flex-grid(12,12);
+      margin-top: ($baseline/2);
+      border-top: 1px solid $gray-l4;
+      padding-top: ($baseline/2);
+      font-weight: 600;
+    }
+  }
+
   // page metadata/action bar
   .metadata {