Commit 681438f0 by Brian Talbot

Merge pull request #4791 from edx/talbs/studio-stylesweep-fontsize

Studio: Refactoring font-size CSS rules to use Sass mixins/placeholders
parents 2edf1aef 998e33ec
...@@ -247,8 +247,8 @@ p, ul, ol, dl { ...@@ -247,8 +247,8 @@ p, ul, ol, dl {
.new-unit-item, .new-unit-item,
.new-subsection-item, .new-subsection-item,
.new-policy-item { .new-policy-item {
@include grey-button; @include grey-button();
@include font-size(10); @extend %t-action5;
margin: ($baseline/2); margin: ($baseline/2);
padding: 3px ($baseline/2) 4px ($baseline/2); padding: 3px ($baseline/2) 4px ($baseline/2);
...@@ -287,9 +287,9 @@ hr.divide { ...@@ -287,9 +287,9 @@ hr.divide {
} }
.details { .details {
@extend %t-copy-sub1;
display: none; display: none;
margin-bottom: 30px; margin-bottom: 30px;
font-size: 14px;
} }
.window { .window {
...@@ -304,13 +304,13 @@ hr.divide { ...@@ -304,13 +304,13 @@ hr.divide {
} }
.header { .header {
@include linear-gradient(top, rgba(255, 255, 255, .4), rgba(255, 255, 255, 0));
@extend %t-title7;
padding: 6px 14px; padding: 6px 14px;
border-bottom: 1px solid $mediumGrey; border-bottom: 1px solid $mediumGrey;
border-radius: 2px 2px 0 0; border-radius: 2px 2px 0 0;
@include linear-gradient(top, rgba(255, 255, 255, .4), rgba(255, 255, 255, 0));
background-color: $lightBluishGrey; background-color: $lightBluishGrey;
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset; box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset;
font-size: 14px;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.3); text-shadow: 0 1px 0 rgba(255, 255, 255, 0.3);
} }
...@@ -324,11 +324,10 @@ hr.divide { ...@@ -324,11 +324,10 @@ hr.divide {
} }
.description { .description {
@extend %t-copy-sub2;
@extend %t-regular; @extend %t-regular;
display: block; display: block;
font-size: 11px;
font-style: italic; font-style: italic;
line-height: 1.3;
color: #999; color: #999;
} }
} }
...@@ -345,6 +344,8 @@ hr.divide { ...@@ -345,6 +344,8 @@ hr.divide {
// system notifications // system notifications
.toast-notification { .toast-notification {
@include transition(all $tmg-f2 linear 0s); @include transition(all $tmg-f2 linear 0s);
@include linear-gradient(top, rgba(255, 255, 255, .1), rgba(255, 255, 255, 0));
@extend %t-copy-sub1;
display: none; display: none;
position: fixed; position: fixed;
top: 20px; top: 20px;
...@@ -354,10 +355,8 @@ hr.divide { ...@@ -354,10 +355,8 @@ hr.divide {
padding: 15px 20px 17px; padding: 15px 20px 17px;
border-radius: 3px; border-radius: 3px;
border: 1px solid #333; border: 1px solid #333;
@include linear-gradient(top, rgba(255, 255, 255, .1), rgba(255, 255, 255, 0));
background-color: rgba(30, 30, 30, .92); background-color: rgba(30, 30, 30, .92);
box-shadow: 0 1px 3px rgba(0, 0, 0, .3), 0 1px 0 rgba(255, 255, 255, .1) inset; box-shadow: 0 1px 3px rgba(0, 0, 0, .3), 0 1px 0 rgba(255, 255, 255, .1) inset;
font-size: 13px;
text-align: center; text-align: center;
color: #fff; color: #fff;
...@@ -366,37 +365,37 @@ hr.divide { ...@@ -366,37 +365,37 @@ hr.divide {
} }
strong { strong {
@extend %t-copy-base;
@extend %t-strong; @extend %t-strong;
display: block; display: block;
margin-bottom: 10px; margin-bottom: 10px;
font-size: 16px;
text-align: center; text-align: center;
} }
.close-button { .close-button {
@extend %t-action1;
@extend %t-strong; @extend %t-strong;
position: absolute; position: absolute;
top: 0; top: 0;
right: 0; right: 0;
width: 27px; width: 27px;
height: 27px; height: 27px;
font-size: 22px;
line-height: 25px; line-height: 25px;
color: #aaa; color: #aaa;
text-align: center; text-align: center;
.close-icon { .close-icon {
@extend %t-action2;
@extend %t-strong; @extend %t-strong;
font-size: 16px;
} }
} }
.action-button { .action-button {
@include blue-button; @include blue-button;
@include box-sizing(border-box); @include box-sizing(border-box);
@extend %t-action4;
width: 100%; width: 100%;
margin-top: 10px; margin-top: 10px;
font-size: 12px;
text-align: center; text-align: center;
} }
} }
...@@ -463,7 +462,7 @@ hr.divide { ...@@ -463,7 +462,7 @@ hr.divide {
} }
.icon-eye-open { .icon-eye-open {
@include font-size(16); @extend %t-action2;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
margin-right: 8px; margin-right: 8px;
...@@ -497,8 +496,8 @@ hr.divide { ...@@ -497,8 +496,8 @@ hr.divide {
} }
.tooltip { .tooltip {
@include font-size(12);
@include transition(opacity $tmg-f3 ease-out 0s); @include transition(opacity $tmg-f3 ease-out 0s);
@include font-size(12);
@extend %t-regular; @extend %t-regular;
@extend %ui-depth5; @extend %ui-depth5;
position: absolute; position: absolute;
...@@ -513,13 +512,13 @@ hr.divide { ...@@ -513,13 +512,13 @@ hr.divide {
opacity: 0.0; opacity: 0.0;
&:after { &:after {
@include font-size(20);
content: '▾'; content: '▾';
display: block; display: block;
position: absolute; position: absolute;
bottom: -14px; bottom: -14px;
left: 50%; left: 50%;
margin-left: -7px; margin-left: -7px;
font-size: 20px;
color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
} }
} }
...@@ -563,7 +562,7 @@ hr.divider { ...@@ -563,7 +562,7 @@ hr.divider {
// ui - skipnav // ui - skipnav
.nav-skip { .nav-skip {
@include font-size(13); @extend %t-action3;
display: block; display: block;
position: absolute; position: absolute;
left: 0px; left: 0px;
...@@ -615,7 +614,7 @@ body.js { ...@@ -615,7 +614,7 @@ body.js {
} }
[class^="icon-"] { [class^="icon-"] {
@include font-size(18); @extend %t-action1;
color: $white; color: $white;
} }
......
...@@ -58,6 +58,7 @@ q:before, q:after { ...@@ -58,6 +58,7 @@ q:before, q:after {
ins { ins {
text-decoration: none; text-decoration: none;
} }
del { del {
text-decoration: line-through; text-decoration: line-through;
} }
...@@ -72,93 +73,3 @@ abbr[title] { ...@@ -72,93 +73,3 @@ abbr[title] {
text-decoration: none; text-decoration: none;
cursor: help; cursor: help;
} }
// ====================
// grandfathered styles
// reset styles to remove ui-lightness jquery ui theme from the tabs component (used in the add component problem tab menu)
.ui-tabs {
padding: 0;
white-space: normal;
}
.ui-corner-all, .ui-corner-bottom, .ui-corner-left, ui-corner-top, .ui-corner-br, .ui-corner-right {
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
border-top-right-radius: 0;
border-top-left-radius: 0;
}
.ui-widget-content {
border: 0;
background: none;
}
.ui-widget {
font-family: 'Open Sans', sans-serif;
font-size: 16px;
}
.ui-widget-header {
border:none;
background: none;
}
.ui-tabs .ui-tabs-nav {
padding: 0;
}
.ui-tabs .ui-tabs-nav li {
margin: 0;
padding: 0;
border: none;
top: 0;
margin: 0;
float: none;
border-top-left-radius: 0;
border-top-right-radius: 0;
}
.ui-tabs-nav {
li {
top: 0;
margin: 0;
}
a {
@extend %t-regular;
float: none;
}
}
.ui-tabs .ui-tabs-panel {
padding: 0;
}
// reapplying the tab styles from unit.scss after removing jquery ui ui-lightness styling
.problem-type-tabs {
border:none;
list-style-type: none;
width: 100%;
@include linear-gradient(top, rgba(255, 255, 255, .4), rgba(255, 255, 255, 0));
//background-color: $lightBluishGrey;
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 -1px 0 rgba(0, 0, 0, 0.2) inset;
li:first-child {
margin-left: 20px;
}
li {
opacity: 0.8;
&:ui-state-active {
@extend %t-regular;
background-color: rgba(255, 255, 255, .3);
opacity: 1.0;
}
a:focus {
outline: none;
border: 0px;
}
}
}
...@@ -156,9 +156,9 @@ ...@@ -156,9 +156,9 @@
.draft-tag, .draft-tag,
.public-tag, .public-tag,
.private-tag { .private-tag {
@extend %t-action5;
@extend %t-strong; @extend %t-strong;
margin-left: 3px; margin-left: 3px;
font-size: 9px;
text-transform: uppercase; text-transform: uppercase;
color: #a4aab7; color: #a4aab7;
} }
......
...@@ -290,7 +290,7 @@ ...@@ -290,7 +290,7 @@
.ui-toggle-expansion { .ui-toggle-expansion {
@include transition(all $tmg-f2 ease-in-out 0s); @include transition(all $tmg-f2 ease-in-out 0s);
@include font-size(18); @extend %t-action1;
display: inline-block; display: inline-block;
margin-right: ($baseline/4); margin-right: ($baseline/4);
color: $gray-l3; color: $gray-l3;
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
[class^="icon-"] { [class^="icon-"] {
@include transition(top $tmg-f2 ease-in-out 0.25s); @include transition(top $tmg-f2 ease-in-out 0.25s);
@include font-size(15); @extend %t-action3;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
margin-right: ($baseline/4); margin-right: ($baseline/4);
......
...@@ -6,15 +6,15 @@ input[type="text"], ...@@ -6,15 +6,15 @@ input[type="text"],
input[type="email"], input[type="email"],
input[type="password"], input[type="password"],
textarea.text { textarea.text {
padding: 6px 8px 8px;
@include box-sizing(border-box); @include box-sizing(border-box);
@include linear-gradient($gray-l5, $white);
@extend %t-copy-sub2;
padding: 6px 8px 8px;
border: 1px solid $gray-l2; border: 1px solid $gray-l2;
border-radius: 2px; border-radius: 2px;
@include linear-gradient($gray-l5, $white);
background-color: $gray-l5; background-color: $gray-l5;
box-shadow: inset 0 1px 2px $shadow-l1; box-shadow: inset 0 1px 2px $shadow-l1;
font-family: 'Open Sans', sans-serif; font-family: 'Open Sans', sans-serif;
font-size: 11px;
color: $baseFontColor; color: $baseFontColor;
outline: 0; outline: 0;
...@@ -60,8 +60,7 @@ textarea.text { ...@@ -60,8 +60,7 @@ textarea.text {
form { form {
input[type=file] { input[type=file] {
@include font-size(14); @extend %t-copy-sub1;
line-height: 1;
} }
.note { .note {
...@@ -382,7 +381,7 @@ input.search { ...@@ -382,7 +381,7 @@ input.search {
} }
label { label {
font-size: 12px; @extend %t-copy-sub2;
} }
code { code {
...@@ -393,7 +392,7 @@ code { ...@@ -393,7 +392,7 @@ code {
} }
.CodeMirror { .CodeMirror {
font-size: 13px; @extend %t-copy-sub1;
background: #fff; background: #fff;
} }
......
...@@ -309,16 +309,16 @@ ...@@ -309,16 +309,16 @@
} }
.action-signup { .action-signup {
@include blue-button; @include blue-button();
@include font-size(14); @extend %t-action3;
@extend %t-strong; @extend %t-strong;
padding: ($baseline/4) ($baseline/2); padding: ($baseline/4) ($baseline/2);
text-transform: uppercase; text-transform: uppercase;
} }
.action-signin { .action-signin {
@include white-button; @include white-button();
@include font-size(14); @extend %t-action3;
@extend %t-strong; @extend %t-strong;
padding: ($baseline/4) ($baseline/2); padding: ($baseline/4) ($baseline/2);
text-transform: uppercase; text-transform: uppercase;
......
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
.action-primary { .action-primary {
@include blue-button(); @include blue-button();
@include font-size(14); // needed due to bad button mixins for now @extend %t-action3;
border-color: $blue-d1; border-color: $blue-d1;
color: $white; color: $white;
} }
......
...@@ -36,10 +36,10 @@ ...@@ -36,10 +36,10 @@
} }
h2 { h2 {
@extend %t-title5;
@extend %t-light; @extend %t-light;
margin: 0 10px 30px; margin: 0 10px 30px;
color: #646464; color: #646464;
font-size: 19px;
letter-spacing: 1px; letter-spacing: 1px;
text-transform: uppercase; text-transform: uppercase;
} }
......
...@@ -118,7 +118,7 @@ nav { ...@@ -118,7 +118,7 @@ nav {
.nav-item { .nav-item {
@extend %t-action3; @extend %t-action3;
@extend %t-strong; @extend %t-regular;
display: block; display: block;
margin: 0 0 ($baseline/4) 0; margin: 0 0 ($baseline/4) 0;
border-bottom: 1px solid $gray-l5; border-bottom: 1px solid $gray-l5;
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
color: $gray; color: $gray;
[class^="icon-"] { [class^="icon-"] {
@include font-size(14); @extend %t-icon6;
margin-right: ($baseline/4); margin-right: ($baseline/4);
} }
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
display: block; display: block;
[class^="icon-"] { [class^="icon-"] {
@include font-size(18); @extend %t-icon4;
vertical-align: middle; vertical-align: middle;
margin-right: $baseline/4; margin-right: $baseline/4;
......
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
color: $white; color: $white;
[class^="icon-"] { [class^="icon-"] {
@extend %t-icon5;
position: relative; position: relative;
top: 1px; top: 1px;
@include font-size(16);
display: inline-block; display: inline-block;
margin-right: ($baseline/2); margin-right: ($baseline/2);
} }
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
.nav-actions .action-primary { .nav-actions .action-primary {
@include blue-button(); @include blue-button();
@include font-size(12); // needed due to bad button mixins for now @extend %t-action4;
border-color: $blue-d2; border-color: $blue-d2;
} }
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
.nav-actions .action-primary { .nav-actions .action-primary {
@include orange-button(); @include orange-button();
@include font-size(12); // needed due to bad button mixins for now @extend %t-action4;
border-color: $orange-d2; border-color: $orange-d2;
color: $gray-d4; color: $gray-d4;
} }
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
.nav-actions .action-primary { .nav-actions .action-primary {
@include red-button(); @include red-button();
@include font-size(12); // needed due to bad button mixins for now @extend %t-action4;
border-color: $red-d2; border-color: $red-d2;
} }
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
.nav-actions .action-primary { .nav-actions .action-primary {
@include blue-button(); @include blue-button();
@include font-size(12); // needed due to bad button mixins for now @extend %t-action4;
border-color: $blue-d2; border-color: $blue-d2;
} }
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
.nav-actions .action-primary { .nav-actions .action-primary {
@include green-button(); @include green-button();
@include font-size(12); // needed due to bad button mixins for now @extend %t-action4;
border-color: $green-d2; border-color: $green-d2;
} }
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
.nav-actions .action-primary { .nav-actions .action-primary {
@include pink-button(); @include pink-button();
@include font-size(12); // needed due to bad button mixins for now @extend %t-action4;
border-color: $pink-d2; border-color: $pink-d2;
} }
...@@ -407,7 +407,7 @@ ...@@ -407,7 +407,7 @@
[class^="icon"] { [class^="icon"] {
@include transition (color 0.50s ease-in-out 0s); @include transition (color 0.50s ease-in-out 0s);
@include font-size(22); @extend %t-icon3;
width: flex-grid(1, 12); width: flex-grid(1, 12);
height: ($baseline*1.25); height: ($baseline*1.25);
margin-top: ($baseline/4); margin-top: ($baseline/4);
...@@ -585,7 +585,7 @@ ...@@ -585,7 +585,7 @@
[class^="icon"] { [class^="icon"] {
@include transition (color 0.50s ease-in-out 0s); @include transition (color 0.50s ease-in-out 0s);
@include font-size(22); @extend %t-icon3;
width: flex-grid(1, 12); width: flex-grid(1, 12);
margin: ($baseline/4) flex-gutter() 0 0; margin: ($baseline/4) flex-gutter() 0 0;
text-align: right; text-align: right;
...@@ -656,7 +656,7 @@ ...@@ -656,7 +656,7 @@
} }
[class^="icon"] { [class^="icon"] {
@include font-size(14); @extend %t-icon6;
color: $white; color: $white;
width: auto; width: auto;
margin: 0; margin: 0;
...@@ -845,7 +845,9 @@ body.uxdesign.alerts { ...@@ -845,7 +845,9 @@ body.uxdesign.alerts {
// artifact styles // artifact styles
.main-wrapper { .main-wrapper {
.alert { .alert {
@extend %t-copy-sub1;
padding: 15px 20px; padding: 15px 20px;
margin-bottom: 30px; margin-bottom: 30px;
border-radius: 3px; border-radius: 3px;
...@@ -853,7 +855,6 @@ body.uxdesign.alerts { ...@@ -853,7 +855,6 @@ body.uxdesign.alerts {
border-radius: 3px; border-radius: 3px;
background: #fbf6e1; background: #fbf6e1;
// background: #edbd3c; // background: #edbd3c;
font-size: 14px;
@include clearfix; @include clearfix;
.alert-message { .alert-message {
...@@ -894,21 +895,21 @@ body.error { ...@@ -894,21 +895,21 @@ body.error {
} }
h1 { h1 {
@extend %t-title1;
@extend %t-light; @extend %t-light;
float: none; float: none;
margin: 0; margin: 0;
font-size: 60px;
color: $gray-d3; color: $gray-d3;
} }
.description { .description {
@extend %t-copy-lead2;
margin-bottom: 50px; margin-bottom: 50px;
font-size: 21px;
} }
.back-button { .back-button {
@include blue-button; @include blue-button();
@extend %t-action1;
padding: 14px 40px 18px; padding: 14px 40px 18px;
font-size: 18px;
} }
} }
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
} }
.widget-layout .header h1 { .widget-layout .header h1 {
font-size: 22px; @extend %t-title4;
} }
.widget-layout .content { .widget-layout .content {
...@@ -86,15 +86,15 @@ ...@@ -86,15 +86,15 @@
} }
.widget-layout label { .widget-layout label {
@extend %t-copy-sub1;
@extend %t-strong; @extend %t-strong;
font-size: 14px;
margin-bottom: 5px; margin-bottom: 5px;
color: #4c4c4c; color: #4c4c4c;
} }
.widget-layout input[type="text"], .widget-layout textarea { .widget-layout input[type="text"], .widget-layout textarea {
@extend %t-copy-base;
padding: 10px; padding: 10px;
font-size: 16px;
color: rgb(0,0,0) !important; color: rgb(0,0,0) !important;
border: 1px solid #b0b6c2; border: 1px solid #b0b6c2;
border-radius: 2px; border-radius: 2px;
...@@ -177,10 +177,10 @@ ...@@ -177,10 +177,10 @@
} }
.widget-layout #discussion_body:before { .widget-layout #discussion_body:before {
@extend %t-copy-sub1;
@extend %t-strong; @extend %t-strong;
content: "What Question or Feedback Would You Like to Share?"; content: "What Question or Feedback Would You Like to Share?";
display: block; display: block;
font-size: 14px;
margin-bottom: 5px; margin-bottom: 5px;
color: #4c4c4c; color: #4c4c4c;
} }
...@@ -214,11 +214,11 @@ ...@@ -214,11 +214,11 @@
} }
.widget-layout .form-actions .btn-post_topic { .widget-layout .form-actions .btn-post_topic {
@extend %t-copy-base;
@extend %t-strong; @extend %t-strong;
display: block; display: block;
width: 100%; width: 100%;
height: auto !important; height: auto !important;
font-size: 16px;
-webkit-box-shadow: 0 1px 0 rgba(255,255,255,0.3) inset,0 0 0 rgba(0,0,0,0); -webkit-box-shadow: 0 1px 0 rgba(255,255,255,0.3) inset,0 0 0 rgba(0,0,0,0);
-moz-box-shadow: 0 1px 0 rgba(255,255,255,0.3) inset,0 0 0 rgba(0,0,0,0); -moz-box-shadow: 0 1px 0 rgba(255,255,255,0.3) inset,0 0 0 rgba(0,0,0,0);
box-shadow: 0 1px 0 rgba(255,255,255,0.3) inset,0 0 0 rgba(0,0,0,0); box-shadow: 0 1px 0 rgba(255,255,255,0.3) inset,0 0 0 rgba(0,0,0,0);
......
...@@ -138,6 +138,11 @@ ...@@ -138,6 +138,11 @@
@include line-height(12); @include line-height(12);
} }
%t-action5 {
@include font-size(10);
@include line-height(10);
}
// ==================== // ====================
......
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
// JQUI calendar // JQUI calendar
.ui-datepicker { .ui-datepicker {
@extend %t-copy-sub2;
border-color: $darkGrey; border-color: $darkGrey;
border-radius: 2px; border-radius: 2px;
background: #fff; background: #fff;
font-family: $f-sans-serif; font-family: $f-sans-serif;
font-size: 12px;
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.1); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.1);
z-index: 100000 !important; z-index: 100000 !important;
...@@ -72,3 +72,88 @@ ...@@ -72,3 +72,88 @@
} }
} }
// ==================== // ====================
// reset styles to remove ui-lightness jquery ui theme from the tabs component (used in the add component problem tab menu)
.ui-tabs {
padding: 0;
white-space: normal;
}
.ui-corner-all, .ui-corner-bottom, .ui-corner-left, ui-corner-top, .ui-corner-br, .ui-corner-right {
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
border-top-right-radius: 0;
border-top-left-radius: 0;
}
.ui-widget-content {
border: 0;
background: none;
}
.ui-widget {
@extend %t-copy-base;
}
.ui-widget-header {
border:none;
background: none;
}
.ui-tabs .ui-tabs-nav {
padding: 0;
}
.ui-tabs .ui-tabs-nav li {
margin: 0;
padding: 0;
border: none;
top: 0;
margin: 0;
float: none;
border-top-left-radius: 0;
border-top-right-radius: 0;
}
.ui-tabs-nav {
li {
top: 0;
margin: 0;
}
a {
@extend %t-regular;
float: none;
}
}
.ui-tabs .ui-tabs-panel {
padding: 0;
}
// reapplying the tab styles from unit.scss after removing jquery ui ui-lightness styling
.problem-type-tabs {
border:none;
list-style-type: none;
width: 100%;
@include linear-gradient(top, rgba(255, 255, 255, .4), rgba(255, 255, 255, 0));
//background-color: $lightBluishGrey;
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 -1px 0 rgba(0, 0, 0, 0.2) inset;
li:first-child {
margin-left: 20px;
}
li {
opacity: 0.8;
&:ui-state-active {
@extend %t-regular;
background-color: rgba(255, 255, 255, .3);
opacity: 1.0;
}
a:focus {
outline: none;
border: 0px;
}
}
}
...@@ -539,8 +539,8 @@ ...@@ -539,8 +539,8 @@
input, select, input[type="number"] { input, select, input[type="number"] {
@include placeholder($gray-l4); @include placeholder($gray-l4);
@include font-size(16);
@include size(100%,100%); @include size(100%,100%);
@extend %t-copy-base;
width: 45%; width: 45%;
min-width: 100px; min-width: 100px;
padding: ($baseline/2); padding: ($baseline/2);
...@@ -582,7 +582,7 @@ ...@@ -582,7 +582,7 @@
} }
.action.setting-clear { .action.setting-clear {
@include font-size(11); @extend %t-action4;
color: $gray; color: $gray;
width: 25px; width: 25px;
height: 25px; height: 25px;
...@@ -609,7 +609,7 @@ ...@@ -609,7 +609,7 @@
} }
.setting-help { .setting-help {
@include font-size(12); @extend %t-copy-sub2;
display: inline-block; display: inline-block;
font-color: $gray-l6; font-color: $gray-l6;
min-width: ($baseline*10); min-width: ($baseline*10);
...@@ -674,7 +674,7 @@ ...@@ -674,7 +674,7 @@
.remove-setting { .remove-setting {
@include transition(color 0.25s ease-in-out); @include transition(color 0.25s ease-in-out);
@include font-size(20); @extend %t-action1;
display: inline-block; display: inline-block;
background: transparent; background: transparent;
color: $blue-l3; color: $blue-l3;
...@@ -745,7 +745,7 @@ ...@@ -745,7 +745,7 @@
.remove-setting { .remove-setting {
@include transition(color 0.25s ease-in-out); @include transition(color 0.25s ease-in-out);
@include font-size(20); @extend %t-action1;
display: inline-block; display: inline-block;
background: transparent; background: transparent;
color: $blue-l3; color: $blue-l3;
......
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
margin-top: 10px; margin-top: 10px;
.transcripts-message { .transcripts-message {
@include font-size(12); @extend %t-copy-sub2;
} }
.transcripts-message-status { .transcripts-message-status {
...@@ -149,15 +149,15 @@ ...@@ -149,15 +149,15 @@
[class^="icon-"], [class^="icon-"],
[class*=" icon-"] { [class*=" icon-"] {
@extend %t-icon4;
margin-right: 5px; margin-right: 5px;
@include font-size(18);
} }
} }
.transcripts-error-message { .transcripts-error-message {
@extend %t-copy-sub1;
background: $red; background: $red;
color: $white; color: $white;
@include font-size(14);
padding: ($baseline/3); padding: ($baseline/3);
&.is-invisible { &.is-invisible {
...@@ -191,12 +191,12 @@ ...@@ -191,12 +191,12 @@
} }
.progress-bar { .progress-bar {
@extend %t-copy-lead1;
display: block; display: block;
height: 30px; height: 30px;
margin: 10px 0; margin: 10px 0;
border: 1px solid $blue; border: 1px solid $blue;
text-align: center; text-align: center;
font-size: 1.14em;
&.is-invisible { &.is-invisible {
display: none; display: none;
...@@ -318,7 +318,7 @@ ...@@ -318,7 +318,7 @@
.remove-setting { .remove-setting {
@include transition(color .25s ease-in-out); @include transition(color .25s ease-in-out);
@include font-size(20); @extend %t-action1;
display: inline-block; display: inline-block;
background: transparent; background: transparent;
color: $blue-l3; color: $blue-l3;
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
color: $gray; color: $gray;
.new-button { .new-button {
@include font-size(14); @extend %t-action3;
margin-left: $baseline; margin-left: $baseline;
[class^="icon-"] { [class^="icon-"] {
...@@ -414,9 +414,9 @@ ...@@ -414,9 +414,9 @@
} }
.choose-file-button { .choose-file-button {
@include blue-button; @include blue-button();
@extend %t-action2;
padding: 10px 82px 12px; padding: 10px 82px 12px;
font-size: 17px;
} }
.progress-bar { .progress-bar {
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
.ui-toggle-expansion { .ui-toggle-expansion {
@include transition(all $tmg-f2 ease-in-out 0s); @include transition(all $tmg-f2 ease-in-out 0s);
@include font-size(21); @extend %t-action1;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
margin-right: ($baseline/2); margin-right: ($baseline/2);
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
.icon-ok { .icon-ok {
@include font-size(20); @extend %t-icon4;
display: inline-block; display: inline-block;
margin-left: ($baseline/2); margin-left: ($baseline/2);
color: $gray-l4; color: $gray-l4;
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
float: left; float: left;
.icon-add { .icon-add {
@include font-size(12); @extend %t-icon7;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
margin-right: ($baseline/4); margin-right: ($baseline/4);
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
float: right; float: right;
.icon-delete { .icon-delete {
@include font-size(12); @extend %t-icon7;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
margin-right: ($baseline/4); margin-right: ($baseline/4);
......
...@@ -19,9 +19,7 @@ ...@@ -19,9 +19,7 @@
.page-header { .page-header {
.page-header-title { .page-header-title {
@include font-size(28); @extend %t-title4;
@include line-height(32);
@extend %t-title;
@extend %t-strong; @extend %t-strong;
} }
......
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
.icon-cog { .icon-cog {
@include transition(all $tmg-f1 ease-in-out $tmg-f1); @include transition(all $tmg-f1 ease-in-out $tmg-f1);
@include font-size(20); @extend %t-icon4;
position: absolute; position: absolute;
top: ($baseline/2); top: ($baseline/2);
left: -($baseline); left: -($baseline);
......
...@@ -23,20 +23,20 @@ ...@@ -23,20 +23,20 @@
} }
h3 { h3 {
@extend %t-title5;
@extend %t-strong; @extend %t-strong;
font-size: 19px;
} }
.export-git-info-block { .export-git-info-block {
dt { dt {
@extend %t-copy-lead1;
@extend %t-strong; @extend %t-strong;
font-size: 19px;
margin-top: 12px; margin-top: 12px;
} }
dd { dd {
font-size: 17px; @extend %t-copy-base;
margin-bottom: 20px; margin-bottom: 20px;
} }
......
...@@ -90,14 +90,14 @@ ...@@ -90,14 +90,14 @@
// OLD // OLD
.description { .description {
@extend %t-copy-sub1;
float: left; float: left;
width: 62%; width: 62%;
margin-right: 3%; margin-right: 3%;
font-size: 14px;
h2 { h2 {
@extend %t-title5;
@extend %t-strong; @extend %t-strong;
font-size: 19px;
margin-bottom: 20px; margin-bottom: 20px;
} }
...@@ -132,15 +132,15 @@ ...@@ -132,15 +132,15 @@
text-align: center; text-align: center;
h2 { h2 {
@extend %t-title4;
@extend %t-light; @extend %t-light;
margin-bottom: 30px; margin-bottom: 30px;
font-size: 26px;
} }
.error-block { .error-block {
@extend %t-copy-sub1;
display: none; display: none;
margin-bottom: 15px; margin-bottom: 15px;
font-size: 13px;
} }
.error-block { .error-block {
...@@ -148,14 +148,14 @@ ...@@ -148,14 +148,14 @@
} }
.button-export { .button-export {
@include green-button; @include green-button();
@extend %t-action1;
padding: 10px 50px 11px; padding: 10px 50px 11px;
font-size: 17px;
} }
.message-status { .message-status {
@extend %t-copy-sub2;
margin-top: 10px; margin-top: 10px;
font-size: 12px;
} }
.progress-bar { .progress-bar {
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
} }
.new-button { .new-button {
@include font-size(14); @extend %t-action3;
margin-left: $baseline; margin-left: $baseline;
[class^="icon-"] { [class^="icon-"] {
...@@ -51,10 +51,8 @@ ...@@ -51,10 +51,8 @@
} }
.group-configuration-title { .group-configuration-title {
@extend %t-title; @extend %t-title4;
@extend %t-strong; @extend %t-strong;
@include font-size(22);
@include line-height(22);
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
margin-right: ($baseline*14); margin-right: ($baseline*14);
...@@ -109,7 +107,7 @@ ...@@ -109,7 +107,7 @@
.ui-toggle-expansion { .ui-toggle-expansion {
@include transition(rotate .15s ease-in-out .25s); @include transition(rotate .15s ease-in-out .25s);
@include font-size(21); @extend %t-action1;
display: inline-block; display: inline-block;
width: ($baseline*0.75); width: ($baseline*0.75);
vertical-align: baseline; vertical-align: baseline;
...@@ -133,9 +131,7 @@ ...@@ -133,9 +131,7 @@
margin-bottom: ($baseline*0.75); margin-bottom: ($baseline*0.75);
.group { .group {
@extend %t-copy-sub2; @extend %t-copy-lead1;
@include font-size(18);
@include line-height(16);
padding: ($baseline/7) 0 ($baseline/4); padding: ($baseline/7) 0 ($baseline/4);
border-top: 1px solid $gray-l4; border-top: 1px solid $gray-l4;
white-space: nowrap; white-space: nowrap;
...@@ -193,7 +189,7 @@ ...@@ -193,7 +189,7 @@
} }
.wrapper-group-configuration-usages { .wrapper-group-configuration-usages {
@include font-size(14); @extend %t-copy-sub1;
background-color: #f8f8f8; background-color: #f8f8f8;
box-shadow: 0 2px 2px 0 $shadow inset; box-shadow: 0 2px 2px 0 $shadow inset;
padding: $baseline ($baseline*1.5) $baseline ($baseline*2.5); padding: $baseline ($baseline*1.5) $baseline ($baseline*2.5);
...@@ -445,7 +441,7 @@ ...@@ -445,7 +441,7 @@
.action-close { .action-close {
@include transition(color 0.25s ease-in-out); @include transition(color 0.25s ease-in-out);
@include font-size(22); @extend %t-action1;
display: inline-block; display: inline-block;
border: 0; border: 0;
padding: 0; padding: 0;
...@@ -471,8 +467,8 @@ ...@@ -471,8 +467,8 @@
.action-add-group { .action-add-group {
@extend %ui-btn-flat-outline; @extend %ui-btn-flat-outline;
@extend %t-action2;
@extend %t-strong; @extend %t-strong;
@include font-size(16);
display: block; display: block;
width: 100%; width: 100%;
margin: ($baseline*1.5) 0 0 0; margin: ($baseline*1.5) 0 0 0;
......
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
*[class^="icon-"] { *[class^="icon-"] {
@include transition(opacity $tmg-f1 ease-in-out 0); @include transition(opacity $tmg-f1 ease-in-out 0);
@include font-size(22); @extend %t-icon4;
position: absolute; position: absolute;
top: ($baseline/2); top: ($baseline/2);
left: $baseline; left: $baseline;
......
...@@ -163,8 +163,8 @@ ...@@ -163,8 +163,8 @@
opacity: 0.0; opacity: 0.0;
[class^="icon-"] { [class^="icon-"] {
@include font-size(18);
@include border-top-radius(3px); @include border-top-radius(3px);
@extend %t-icon4;
display: inline-block; display: inline-block;
padding: ($baseline/2); padding: ($baseline/2);
background: $blue; background: $blue;
......
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
// forms // forms
.new-section-name, .new-section-name,
.new-subsection-name-input { .new-subsection-name-input {
@include font-size(16); @extend %t-copy-base;
display: inline-block; display: inline-block;
width: 515px; width: 515px;
padding: ($baseline/4); padding: ($baseline/4);
...@@ -126,11 +126,11 @@ ...@@ -126,11 +126,11 @@
} }
.new-subsection-name-input { .new-subsection-name-input {
@include font-size(14); @extend %t-copy-sub1;
} }
.new-section-name-save, .new-section-name-save,
.new-subsection-name-save { .new-subsection-name-save {
@include blue-button; @include blue-button();
margin: 0 5px; margin: 0 5px;
padding: 4px 20px 7px; padding: 4px 20px 7px;
color: $white; color: $white;
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
.new-section-name-cancel, .new-section-name-cancel,
.new-subsection-name-cancel { .new-subsection-name-cancel {
@include white-button; @include white-button();
padding: 4px 20px 7px; padding: 4px 20px 7px;
color: $gray-l1; color: $gray-l1;
} }
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
// messages - should be synced up with global messages in the future // messages - should be synced up with global messages in the future
.message { .message {
@extend %t-copy-sub1;
display: block; display: block;
font-size: 14px;
} }
.message-status { .message-status {
...@@ -120,8 +120,7 @@ ...@@ -120,8 +120,7 @@
} }
.new-button { .new-button {
// @extend %t-action3; - bad buttons won't render this properly @extend %t-action3;
@include font-size(14);
} }
// form basics // form basics
...@@ -544,11 +543,11 @@ ...@@ -544,11 +543,11 @@
position: relative; position: relative;
li { li {
@include font-size(9);
position: absolute; position: absolute;
top: 52px; top: 52px;
width: 30px; width: 30px;
margin-left: -15px; margin-left: -15px;
font-size: 9px;
text-align: center; text-align: center;
&.increment-0 { &.increment-0 {
...@@ -623,12 +622,12 @@ ...@@ -623,12 +622,12 @@
} }
.remove-button { .remove-button {
@extend %t-action5;
display: none; display: none;
position: absolute; position: absolute;
top: -17px; top: -17px;
right: 1px; right: 1px;
height: 17px; height: 17px;
font-size: 10px;
} }
&:nth-child(1) { &:nth-child(1) {
...@@ -653,17 +652,16 @@ ...@@ -653,17 +652,16 @@
} }
.letter-grade { .letter-grade {
@extend %t-copy-base;
@extend %t-strong; @extend %t-strong;
display: block; display: block;
margin: 10px 15px 0 0; margin: 5px 15px 0 0;
font-size: 16px;
line-height: 14px;
} }
.range { .range {
@include font-size(10);
display: block; display: block;
margin-right: 15px; margin-right: 15px;
font-size: 10px;
line-height: 12px; line-height: 12px;
} }
......
...@@ -332,8 +332,8 @@ ...@@ -332,8 +332,8 @@
.xblock-student_view { .xblock-student_view {
@include transition(background-color $tmg-s3 linear 0s); @include transition(background-color $tmg-s3 linear 0s);
@extend %t-title4;
padding: 20px 20px 22px; padding: 20px 20px 22px;
font-size: 24px;
background: #fff; background: #fff;
} }
...@@ -347,8 +347,8 @@ ...@@ -347,8 +347,8 @@
box-shadow: 0 1px 2px rgba(0, 0, 0, .1); box-shadow: 0 1px 2px rgba(0, 0, 0, .1);
.page-name { .page-name {
@extend %t-title5;
@extend %t-strong; @extend %t-strong;
font-size: 19px;
} }
.item-actions { .item-actions {
...@@ -373,13 +373,14 @@ ...@@ -373,13 +373,14 @@
} }
.page-display-name-input { .page-display-name-input {
@extend %t-copy-lead1;
width: 100%; width: 100%;
font-size: 20px;
} }
.page-contents { .page-contents {
@include box-sizing(border-box); @include box-sizing(border-box);
@include linear-gradient(top, rgba(255, 255, 255, 0), rgba(255, 255, 255, .3)); @include linear-gradient(top, rgba(255, 255, 255, 0), rgba(255, 255, 255, .3));
@extend %t-copy-sub1;
width: 100%; width: 100%;
height: 360px; height: 360px;
padding: 15px; padding: 15px;
...@@ -388,7 +389,6 @@ ...@@ -388,7 +389,6 @@
background-color: #edf1f5; background-color: #edf1f5;
box-shadow: 0 1px 2px rgba(0, 0, 0, .1) inset; box-shadow: 0 1px 2px rgba(0, 0, 0, .1) inset;
font-family: Monaco, monospace; font-family: Monaco, monospace;
font-size: 13px;
color: #3c3c3c; color: #3c3c3c;
outline: 0; outline: 0;
} }
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
.ui-toggle-expansion { .ui-toggle-expansion {
@include transition(rotate .15s ease-in-out .25s); @include transition(rotate .15s ease-in-out .25s);
@include font-size(21); @extend %t-action1;
display: inline-block; display: inline-block;
width: ($baseline*0.75); width: ($baseline*0.75);
vertical-align: text-bottom; vertical-align: text-bottom;
...@@ -325,7 +325,7 @@ ...@@ -325,7 +325,7 @@
.action-close { .action-close {
@include transition(color 0.25s ease-in-out); @include transition(color 0.25s ease-in-out);
@include font-size(22); @extend %t-action1;
display: inline-block; display: inline-block;
float: right; float: right;
margin-top: ($baseline*2); margin-top: ($baseline*2);
...@@ -344,7 +344,7 @@ ...@@ -344,7 +344,7 @@
.action-add-chapter { .action-add-chapter {
@extend %ui-btn-flat-outline; @extend %ui-btn-flat-outline;
@include font-size(16); @extend %t-action1;
display: block; display: block;
width: 100%; width: 100%;
margin: ($baseline*1.5) 0 0 0; margin: ($baseline*1.5) 0 0 0;
......
...@@ -54,15 +54,15 @@ ...@@ -54,15 +54,15 @@
} }
h1 { h1 {
@extend %t-title4;
@extend %t-light; @extend %t-light;
float: none; float: none;
font-size: 24px;
} }
h2 { h2 {
@extend %t-title7;
@extend %t-strong; @extend %t-strong;
margin-bottom: 18px; margin-bottom: 18px;
font-size: 14px;
line-height: 30px; line-height: 30px;
color: #646464; color: #646464;
letter-spacing: 1px; letter-spacing: 1px;
...@@ -70,15 +70,15 @@ ...@@ -70,15 +70,15 @@
} }
h3 { h3 {
@extend %t-title6;
@extend %t-strong; @extend %t-strong;
margin: 34px 0 11px; margin: 34px 0 11px;
font-size: 16px;
} }
} }
.update-contents { .update-contents {
p { p {
font-size: 16px; @extend %t-copy-base;
line-height: 25px; line-height: 25px;
} }
...@@ -111,10 +111,10 @@ ...@@ -111,10 +111,10 @@
} }
pre { pre {
@extend %t-copy-base;
margin: 1em 0; margin: 1em 0;
color: $baseFontColor; color: $baseFontColor;
font-family: monospace, serif; font-family: monospace, serif;
font-size: 1em;
white-space: pre-wrap; white-space: pre-wrap;
word-wrap: break-word; word-wrap: break-word;
} }
...@@ -143,13 +143,13 @@ ...@@ -143,13 +143,13 @@
float: right; float: right;
.edit-button, .edit-button,
.delete-button{ .delete-button {
@include white-button; @include white-button();
@extend %t-action4;
@extend %t-regular; @extend %t-regular;
float: left; float: left;
padding: 3px 10px 4px; padding: 3px 10px 4px;
margin-left: 7px; margin-left: 7px;
font-size: 12px;
.edit-icon, .edit-icon,
.delete-icon { .delete-icon {
...@@ -169,18 +169,18 @@ ...@@ -169,18 +169,18 @@
background: $lightGrey; background: $lightGrey;
.title { .title {
@extend %t-title4;
@extend %t-light; @extend %t-light;
margin-bottom: 24px; margin-bottom: 24px;
font-size: 22px;
} }
.edit-button { .edit-button {
@include white-button; @include white-button();
@extend %t-action4;
@extend %t-regular; @extend %t-regular;
float: right; float: right;
padding: 3px 10px 4px; padding: 3px 10px 4px;
margin-left: 7px; margin-left: 7px;
font-size: 12px;
.edit-icon, .edit-icon,
.delete-icon { .delete-icon {
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
} }
.handouts-content { .handouts-content {
font-size: 14px; @extend %t-copy-sub1;
} }
.treeview-handoutsnav li { .treeview-handoutsnav li {
......
...@@ -119,8 +119,8 @@ ...@@ -119,8 +119,8 @@
// mixins - grandfathered // mixins - grandfathered
@mixin button { @mixin button {
@include font-size(14);
@include transition(background-color 0.15s, box-shadow 0.15s); @include transition(background-color 0.15s, box-shadow 0.15s);
@extend %t-action3;
@extend %t-strong; @extend %t-strong;
box-shadow: 0 1px 0 rgba(255, 255, 255, .3) inset, 0 0 0 rgba(0, 0, 0, 0); box-shadow: 0 1px 0 rgba(255, 255, 255, .3) inset, 0 0 0 rgba(0, 0, 0, 0);
display: inline-block; display: inline-block;
...@@ -367,11 +367,11 @@ ...@@ -367,11 +367,11 @@
.section-item { .section-item {
@include transition(background $tmg-avg ease-in-out 0); @include transition(background $tmg-avg ease-in-out 0);
@extend %t-action3;
position: relative; position: relative;
display: block; display: block;
padding: 6px 8px 8px 16px; padding: 6px 8px 8px 16px;
background: #edf1f5; background: #edf1f5;
font-size: 13px;
&:hover, &:focus { &:hover, &:focus {
background: $blue-l5; background: $blue-l5;
...@@ -389,8 +389,8 @@ ...@@ -389,8 +389,8 @@
.public-item:after, .public-item:after,
.private-item:after { .private-item:after {
@extend %t-strong; @extend %t-strong;
@extend %t-action5;
margin-left: 3px; margin-left: 3px;
font-size: 9px;
text-transform: uppercase; text-transform: uppercase;
} }
......
...@@ -297,7 +297,7 @@ ...@@ -297,7 +297,7 @@
.button, .button,
.action { .action {
@extend %btn-primary-green; @extend %btn-primary-green;
@include font-size(14); @extend %t-action3;
margin-left: $baseline; margin-left: $baseline;
[class^="icon-"] { [class^="icon-"] {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment