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
388724c4
Commit
388724c4
authored
Jul 12, 2013
by
Brian Talbot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Studio: updates Sass mixins/extend references based on textbook/Sass cleanup
parent
19a7e63e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
8 deletions
+7
-8
cms/static/sass/_base.scss
+1
-1
cms/static/sass/elements/_sock.scss
+1
-1
cms/static/sass/views/_textbooks.scss
+2
-2
common/static/sass/_mixins.scss
+3
-4
No files found.
cms/static/sass/_base.scss
View file @
388724c4
...
...
@@ -877,7 +877,7 @@ body.js {
text-align
:
center
;
.label
{
@extend
.text-sr
;
@extend
.
cont-
text-sr
;
}
[
class
^=
"icon-"
]
{
...
...
cms/static/sass/elements/_sock.scss
View file @
388724c4
...
...
@@ -113,7 +113,7 @@
}
.action-primary
{
@extend
.
ui-
btn-primary-blue
;
@extend
.btn-primary-blue
;
@extend
.t-action3
;
}
}
...
...
cms/static/sass/views/_textbooks.scss
View file @
388724c4
...
...
@@ -188,7 +188,7 @@ body.course.textbooks {
.chapters-fields
,
.textbook-fields
{
@extend
.no-list
;
@extend
.
cont-
no-list
;
.field
{
margin
:
0
0
(
$baseline
*
0
.75
)
0
;
...
...
@@ -365,7 +365,7 @@ body.course.textbooks {
// dialog
.wrapper-dialog
{
@extend
.depth5
;
@extend
.
ui-
depth5
;
@include
transition
(
all
0
.05s
ease-in-out
);
position
:
fixed
;
top
:
0
;
...
...
common/static/sass/_mixins.scss
View file @
388724c4
...
...
@@ -53,8 +53,8 @@
// extends - UI - window
.ui-window
{
@include
clearfix
();
@include
border-radius
(
3px
)
;
@include
box-shadow
(
0
1px
1px
$shadow-l1
)
;
border-radius
:
3px
;
box-shadow
:
0
1px
1px
$shadow-l1
;
margin-bottom
:
$baseline
;
border
:
1px
solid
$gray-l2
;
background
:
$white
;
...
...
@@ -198,7 +198,7 @@
}
span
{
@extend
.text-sr
;
@extend
.
cont-
text-sr
;
}
}
...
...
@@ -257,4 +257,3 @@
white-space
:
nowrap
;
text-overflow
:
ellipsis
;
}
>>>>>>>
Studio
:
renames
and
re-orgs
app-wide
Sass
extends
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