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
88d06a16
Commit
88d06a16
authored
Jul 02, 2013
by
Brian Talbot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Studio: renames and re-orgs app-wide Sass extends
parent
f9f0d9cc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
89 additions
and
72 deletions
+89
-72
cms/static/sass/_mixins-inherited.scss
+0
-2
cms/static/sass/views/_textbooks.scss
+3
-3
common/static/sass/_mixins.scss
+86
-67
No files found.
cms/static/sass/_mixins-inherited.scss
deleted
120000 → 0
View file @
f9f0d9cc
..
/
..
/
..
/
common
/
static
/
sass
/
_mixins-inherited
.scss
\ No newline at end of file
cms/static/sass/views/_textbooks.scss
View file @
88d06a16
...
@@ -115,7 +115,7 @@ body.course.textbooks {
...
@@ -115,7 +115,7 @@ body.course.textbooks {
}
}
.delete
{
.delete
{
@extend
.btn-non
;
@extend
.
ui-
btn-non
;
}
}
}
}
...
@@ -320,7 +320,7 @@ body.course.textbooks {
...
@@ -320,7 +320,7 @@ body.course.textbooks {
}
}
.action-upload
{
.action-upload
{
@extend
.btn-flat-outline
;
@extend
.
ui-
btn-flat-outline
;
position
:
absolute
;
position
:
absolute
;
top
:
3px
;
top
:
3px
;
right
:
0
;
right
:
0
;
...
@@ -348,7 +348,7 @@ body.course.textbooks {
...
@@ -348,7 +348,7 @@ body.course.textbooks {
.action-add-chapter
{
.action-add-chapter
{
@extend
.btn-flat-outline
;
@extend
.
ui-
btn-flat-outline
;
@include
font-size
(
16
);
@include
font-size
(
16
);
display
:
block
;
display
:
block
;
width
:
100%
;
width
:
100%
;
...
...
common/static/sass/_mixins.scss
View file @
88d06a16
...
@@ -26,7 +26,6 @@
...
@@ -26,7 +26,6 @@
@include
size
(
$size
);
@include
size
(
$size
);
}
}
// ====================
// ====================
// mixins - placeholder styling
// mixins - placeholder styling
...
@@ -44,78 +43,45 @@
...
@@ -44,78 +43,45 @@
// ====================
// ====================
// extends - layout
// extends - UI - used for page/view-level wrappers (for centering/grids)
.ui-wrapper
{
// used for page/view-level wrappers (for centering/grids)
.wrapper
{
@include
clearfix
();
@include
clearfix
();
@include
box-sizing
(
border-box
);
@include
box-sizing
(
border-box
);
width
:
100%
;
width
:
100%
;
}
}
// removes list styling/spacing when using uls, ols for navigation and less content-centric cases
// extends - UI - window
.no-list
{
.ui-window
{
list-style
:
none
;
@include
clearfix
();
margin
:
0
;
@include
border-radius
(
3px
);
padding
:
0
;
@include
box-shadow
(
0
1px
1px
$shadow-l1
);
text-indent
:
0
;
margin-bottom
:
$baseline
;
border
:
1px
solid
$gray-l2
;
li
{
background
:
$white
;
margin
:
0
;
padding
:
0
;
}
}
// extends - image-replacement hidden text
.text-hide
{
text-indent
:
100%
;
white-space
:
nowrap
;
overflow
:
hidden
;
}
// extends - hidden elems - screenreaders
.text-sr
{
border
:
0
;
clip
:
rect
(
0
0
0
0
);
height
:
1px
;
margin
:
-1px
;
overflow
:
hidden
;
padding
:
0
;
position
:
absolute
;
width
:
1px
;
}
// extends - wrapping
.text-wrap
{
text-wrap
:
wrap
;
white-space
:
pre-wrap
;
white-space
:
-
moz-pre-wrap
;
word-wrap
:
break-word
;
}
}
// extends - visual link
// extends -
UI -
visual link
.fake-link
{
.
ui-
fake-link
{
cursor
:
pointer
;
cursor
:
pointer
;
}
}
// extends - functional disable
// extends -
UI -
functional disable
.disabled
{
.
ui-
disabled
{
pointer-events
:
none
;
pointer-events
:
none
;
outline
:
none
;
outline
:
none
;
}
}
// extends - depth levels
// extends -
UI -
depth levels
.depth0
{
z-index
:
0
;
}
.
ui-
depth0
{
z-index
:
0
;
}
.depth1
{
z-index
:
10
;
}
.
ui-
depth1
{
z-index
:
10
;
}
.depth2
{
z-index
:
100
;
}
.
ui-
depth2
{
z-index
:
100
;
}
.depth3
{
z-index
:
1000
;
}
.
ui-
depth3
{
z-index
:
1000
;
}
.depth4
{
z-index
:
10000
;
}
.
ui-
depth4
{
z-index
:
10000
;
}
.depth5
{
z-index
:
100000
;
}
.
ui-
depth5
{
z-index
:
100000
;
}
// ====================
// extends - buttons
// extends -
UI -
buttons
.btn
{
.
ui-
btn
{
@include
box-sizing
(
border-box
);
@include
box-sizing
(
border-box
);
@include
transition
(
color
0
.25s
ease-in-out
0s
,
border-color
0
.25s
ease-in-out
0s
,
background
0
.25s
ease-in-out
0s
,
box-shadow
0
.25s
ease-in-out
0s
);
@include
transition
(
color
0
.25s
ease-in-out
0s
,
border-color
0
.25s
ease-in-out
0s
,
background
0
.25s
ease-in-out
0s
,
box-shadow
0
.25s
ease-in-out
0s
);
display
:
inline-block
;
display
:
inline-block
;
...
@@ -139,18 +105,18 @@
...
@@ -139,18 +105,18 @@
}
}
// pill button
// pill button
.btn-pill
{
.
ui-
btn-pill
{
border-radius
:
(
$baseline
/
5
);
border-radius
:
(
$baseline
/
5
);
}
}
.btn-rounded
{
.
ui-
btn-rounded
{
border-radius
:
(
$baseline
/
2
);
border-radius
:
(
$baseline
/
2
);
}
}
// primary button
// primary button
.btn-primary
{
.
ui-
btn-primary
{
@extend
.btn
;
@extend
.
ui-
btn
;
@extend
.btn-pill
;
@extend
.
ui-
btn-pill
;
padding
:(
$baseline
/
2
)
$baseline
;
padding
:(
$baseline
/
2
)
$baseline
;
border-width
:
1px
;
border-width
:
1px
;
border-style
:
solid
;
border-style
:
solid
;
...
@@ -172,8 +138,8 @@
...
@@ -172,8 +138,8 @@
// secondary button
// secondary button
.btn-secondary
{
.btn-secondary
{
@extend
.btn
;
@extend
.
ui-
btn
;
@extend
.btn-pill
;
@extend
.
ui-
btn-pill
;
border-width
:
1px
;
border-width
:
1px
;
border-style
:
solid
;
border-style
:
solid
;
padding
:(
$baseline
/
2
)
$baseline
;
padding
:(
$baseline
/
2
)
$baseline
;
...
@@ -190,7 +156,7 @@
...
@@ -190,7 +156,7 @@
}
}
}
}
.btn-flat-outline
{
.
ui-
btn-flat-outline
{
@extend
.t-action4
;
@extend
.t-action4
;
@include
transition
(
all
.15s
);
@include
transition
(
all
.15s
);
font-weight
:
600
;
font-weight
:
600
;
...
@@ -217,7 +183,7 @@
...
@@ -217,7 +183,7 @@
}
}
// button with no button shell until hover for understated actions
// button with no button shell until hover for understated actions
.btn-non
{
.
ui-
btn-non
{
@include
transition
(
all
.15s
);
@include
transition
(
all
.15s
);
border
:
none
;
border
:
none
;
border-radius
:
(
$baseline
/
4
);
border-radius
:
(
$baseline
/
4
);
...
@@ -236,8 +202,61 @@
...
@@ -236,8 +202,61 @@
}
}
}
}
// UI archetypes - well
//
extends -
UI archetypes - well
.ui-well
{
.ui-well
{
box-shadow
:
inset
0
1px
2px
1px
$shadow
;
box-shadow
:
inset
0
1px
2px
1px
$shadow
;
padding
:
(
$baseline
*
0
.75
);
padding
:
(
$baseline
*
0
.75
);
}
}
// ====================
// extends - content - removes list styling/spacing when using uls, ols for navigation and less content-centric cases
.cont-no-list
{
list-style
:
none
;
margin
:
0
;
padding
:
0
;
text-indent
:
0
;
li
{
margin
:
0
;
padding
:
0
;
}
}
// extends - content - image-replacement hidden text
.cont-text-hide
{
text-indent
:
100%
;
white-space
:
nowrap
;
overflow
:
hidden
;
}
// extends - content - hidden elems - screenreaders
.cont-text-sr
{
border
:
0
;
clip
:
rect
(
0
0
0
0
);
height
:
1px
;
margin
:
-1px
;
overflow
:
hidden
;
padding
:
0
;
position
:
absolute
;
width
:
1px
;
}
// extends - content - wrapping
.cont-text-wrap
{
text-wrap
:
wrap
;
white-space
:
pre-wrap
;
white-space
:
-
moz-pre-wrap
;
word-wrap
:
break-word
;
}
// content - text overflow by ellipsis
.cont-overflow-elip
{
@include
box-sizing
(
border-box
);
display
:
block
;
width
:
auto
;
overflow
:
hidden
;
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