Studio: correcting reversion of _base.scss from poor previous rebase

This commit is contained in:
Brian Talbot
2014-08-12 20:12:18 -04:00
committed by Ben McMorran
parent 497bb39f88
commit 64cc16f1ec
2 changed files with 23 additions and 1 deletions

View File

@@ -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;

View File

@@ -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 {