Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
b69aa64c
Commit
b69aa64c
authored
Aug 21, 2014
by
Brian Talbot
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4904 from edx/talbs/studio-fix-font-weight
Studio: FIX - Font Weights
parents
a986b46c
66abd71f
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
37 additions
and
12 deletions
+37
-12
cms/static/sass/_shame.scss
+17
-0
cms/static/sass/_variables.scss
+1
-0
cms/static/sass/elements/_forms.scss
+2
-1
cms/static/sass/elements/_modal-window.scss
+1
-1
cms/static/sass/elements/_modules.scss
+1
-1
cms/static/sass/elements/_typography.scss
+3
-0
cms/static/sass/elements/_xblocks.scss
+12
-9
No files found.
cms/static/sass/_shame.scss
View file @
b69aa64c
...
...
@@ -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
...
...
cms/static/sass/_variables.scss
View file @
b69aa64c
...
...
@@ -170,6 +170,7 @@ $color-staff-only: $black;
$color-heading-base
:
$gray-d2
;
$color-copy-base
:
$gray-l1
;
$color-copy-emphasized
:
$gray-d2
;
// ====================
...
...
cms/static/sass/elements/_forms.scss
View file @
b69aa64c
...
...
@@ -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
,
...
...
cms/static/sass/elements/_modal-window.scss
View file @
b69aa64c
...
...
@@ -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
;
}
...
...
cms/static/sass/elements/_modules.scss
View file @
b69aa64c
...
...
@@ -198,7 +198,7 @@
a
{
@include
clearfix
();
@include
transition
(
none
);
@extend
%t-strong
;
@extend
%t-
demi-
strong
;
display
:
block
;
border
:
0px
;
padding
:
7px
$baseline
;
...
...
cms/static/sass/elements/_typography.scss
View file @
b69aa64c
...
...
@@ -10,6 +10,9 @@
%t-strong
{
font-weight
:
600
;
}
%t-demi-strong
{
font-weight
:
500
;
}
%t-regular
{
font-weight
:
400
;
}
...
...
cms/static/sass/elements/_xblocks.scss
View file @
b69aa64c
...
...
@@ -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
;
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment