Commit b69aa64c by Brian Talbot

Merge pull request #4904 from edx/talbs/studio-fix-font-weight

Studio: FIX - Font Weights
parents a986b46c 66abd71f
......@@ -107,6 +107,23 @@ div.wrapper-comp-editor.is-inactive ~ div.launch-latex-compiler{
// ====================
// JQuery UI tabs font-weight override
.ui-tabs-nav {
.ui-state-default {
font-weight: normal;
}
}
// ====================
// xmodule editor tab font-weight override
.xmodule_edit.xmodule_VideoDescriptor .editor-with-tabs .editor-tabs .inner_tab_wrap a.tab {
font-weight: normal !important;
}
// ====================
// TODOs:
// * font-weight syncing
......
......@@ -170,6 +170,7 @@ $color-staff-only: $black;
$color-heading-base: $gray-d2;
$color-copy-base: $gray-l1;
$color-copy-emphasized: $gray-d2;
// ====================
......
......@@ -9,13 +9,14 @@ textarea.text {
@include box-sizing(border-box);
@include linear-gradient($gray-l5, $white);
@extend %t-copy-sub2;
@extend %t-demi-strong;
padding: 6px 8px 8px;
border: 1px solid $gray-l2;
border-radius: 2px;
background-color: $gray-l5;
box-shadow: inset 0 1px 2px $shadow-l1;
font-family: 'Open Sans', sans-serif;
color: $baseFontColor;
color: $color-copy-emphasized;
outline: 0;
&::-webkit-input-placeholder,
......
......@@ -25,7 +25,7 @@
.title {
@extend %t-title5;
@extend %t-strong;
@extend %t-demi-strong;
margin: ($baseline/4) ($baseline/2) ($baseline/2) ($baseline/2);
color: $black;
}
......
......@@ -198,7 +198,7 @@
a {
@include clearfix();
@include transition(none);
@extend %t-strong;
@extend %t-demi-strong;
display: block;
border: 0px;
padding: 7px $baseline;
......
......@@ -10,6 +10,9 @@
%t-strong {
font-weight: 600;
}
%t-demi-strong {
font-weight: 500;
}
%t-regular {
font-weight: 400;
}
......
......@@ -497,18 +497,21 @@
&:first-child {
border-top: 0;
}
}
&:hover {
opacity: 1.0;
}
&.is-set {
opacity: 1.0;
background-color: $white;
.setting-input {
color: $blue-l1;
// STATE: hover & focus
&:hover, &:focus {
opacity: 1.0;
}
&.is-set {
opacity: 1.0;
background-color: $white;
.setting-input {
color: $blue-l1;
}
}
}
......
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