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
64cc16f1
Commit
64cc16f1
authored
Aug 12, 2014
by
Brian Talbot
Committed by
Ben McMorran
Aug 21, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Studio: correcting reversion of _base.scss from poor previous rebase
parent
497bb39f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
1 deletions
+23
-1
cms/static/sass/_base.scss
+3
-1
cms/static/sass/elements/_layout.scss
+20
-0
No files found.
cms/static/sass/_base.scss
View file @
64cc16f1
...
...
@@ -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
;
...
...
cms/static/sass/elements/_layout.scss
View file @
64cc16f1
...
...
@@ -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
{
...
...
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