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
0b9da334
Commit
0b9da334
authored
Dec 17, 2015
by
Frances Botsford
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adjusted styles for bookmarking
parent
27dcb811
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
117 additions
and
133 deletions
+117
-133
lms/static/sass/base/_extends.scss
+18
-0
lms/static/sass/course/courseware/_courseware.scss
+7
-11
lms/static/sass/elements/_pagination.scss
+20
-20
lms/static/sass/views/_bookmarks.scss
+72
-88
lms/static/sass/views/_teams.scss
+0
-14
No files found.
lms/static/sass/base/_extends.scss
View file @
0b9da334
...
...
@@ -101,6 +101,24 @@
}
}
// light button reset
%ui-clear-button
{
background
:
none
;
border-radius
:
(
$baseline
/
4
);
box-shadow
:
none
;
text-shadow
:
none
;
&
:hover
{
background-image
:
none
;
box-shadow
:
none
;
}
&
:focus
,
&
:active
{
box-shadow
:
none
;
}
}
// removes list styling/spacing when using uls, ols for navigation and less content-centric cases
%ui-no-list
{
list-style
:
none
;
...
...
lms/static/sass/course/courseware/_courseware.scss
View file @
0b9da334
...
...
@@ -97,11 +97,11 @@ html.video-fullscreen {
}
// TO-DO should this be content wrapper?
div
.course-wrapper
{
.course-wrapper
{
position
:
relative
;
section
.course-content
,
section
.courseware-results-wrapper
{
.course-content
,
.courseware-results-wrapper
{
@extend
.content
;
padding
:
(
$baseline
*
2
)
3%
;
// percent allows for smaller padding on mobile
line-height
:
1
.6
;
...
...
@@ -405,7 +405,10 @@ div.course-wrapper {
}
.sequence
.path
{
margin-bottom
:
(
$baseline
/
2
);
@extend
%t-copy-sub1
;
margin-top
:
-
(
$baseline
);
margin-bottom
:
$baseline
;
color
:
$gray
;
}
div
#seq_content
{
...
...
@@ -655,11 +658,4 @@ section.self-assessment {
}
}
.courseware-results-wrapper
{
display
:
none
;
&
.is-shown
{
display
:
table-cell
;
}
}
lms/static/sass/elements/_pagination.scss
View file @
0b9da334
...
...
@@ -54,16 +54,7 @@
}
.nav-label
{
/* This wasn't working for me, so I directly copied the rule
@extend %cont-text-sr; */
border
:
0
;
clip
:
rect
(
0
0
0
0
);
height
:
1px
;
margin
:
-1px
;
overflow
:
hidden
;
padding
:
0
;
position
:
absolute
;
width
:
1px
;
@extend
%text-sr
;
}
.pagination-form
,
...
...
@@ -105,16 +96,7 @@
.page-number-label
,
.submit-pagination-form
{
/* This wasn't working for me, so I directly copied the rule
@extend %cont-text-sr; */
border
:
0
;
clip
:
rect
(
0
0
0
0
);
height
:
1px
;
margin
:
-1px
;
overflow
:
hidden
;
padding
:
0
;
position
:
absolute
;
width
:
1px
;
@extend
%text-sr
;
}
.page-number-input
{
...
...
@@ -142,3 +124,21 @@
}
}
}
// styles for search/pagination metadata and sorting
.listing-tools
{
@extend
%t-copy-sub1
;
color
:
$gray-d1
;
label
{
// override
color
:
inherit
;
font-size
:
inherit
;
cursor
:
auto
;
}
.listing-sort-select
{
@extend
%t-copy-sub1
;
@extend
%t-regular
;
border
:
0
;
}
}
lms/static/sass/views/_bookmarks.scss
View file @
0b9da334
...
...
@@ -15,36 +15,23 @@
width
:
flex-grid
(
5
);
vertical-align
:
top
;
button
{
&
.is-active
{
background-color
:
$white
;
&
:before
{
content
:
"\f02e"
;
font-family
:
FontAwesome
;
}
}
&
.is-inactive
{
background
:
none
;
&
:before
{
content
:
"\f097"
;
font-family
:
FontAwesome
;
}
}
}
.bookmarks-list-button
{
background
:
none
;
border-radius
:
(
$baseline
/
4
);
padding
:
(
$baseline
/
2
);
@extend
%ui-clear-button
;
// set styles
@extend
%btn-pl-default-base
;
@include
font-size
(
13
);
width
:
100%
;
padding
:
(
$baseline
/
4
)
(
$baseline
/
2
);
&
:hover
{
background
:
none
;
&
:before
{
content
:
"\f02e"
;
font-family
:
FontAwesome
;
}
&
:focus
,
&
:active
{
box-shadow
:
none
;
&
.is-active
{
background-color
:
lighten
(
$action-primary-bg
,
10%
);
color
:
$white
;
}
}
}
...
...
@@ -52,7 +39,10 @@
// Rules for Bookmarks Results Header
.bookmarks-results-header
{
margin
:
0
;
@extend
%t-title4
;
letter-spacing
:
0
;
text-transform
:
none
;
margin-bottom
:
(
$baseline
/
2
);
}
// Rules for Bookmarks Results
...
...
@@ -60,15 +50,21 @@
padding-top
:
(
$baseline
/
2
);
.bookmarks-results-list-item
{
@include
padding
(
(
$baseline
/
4
)
,
$baseline
,
(
$baseline
/
2
)
,
$baseline
);
@include
padding
(
0
,
$baseline
,
(
$baseline
/
4
)
,
$baseline
);
display
:
block
;
border
:
1px
solid
$gray
;
border-radius
:
(
$baseline
/
4
);
border
:
1px
solid
$gray-l4
;
margin-bottom
:
$baseline
;
&
:hover
{
border-color
:
$m-blue
;
color
:
$m-blue
;
.list-item-breadcrumbtrail
{
color
:
$blue
;
}
}
.icon
{
@extend
%t-icon6
;
}
}
...
...
@@ -78,11 +74,12 @@
}
.list-item-date
{
@extend
%t-title7
;
@extend
%t-copy-sub2
;
margin-top
:
(
$baseline
/
4
);
color
:
$gray
;
}
a
.bookmarks-results-list-item
:before
{
.bookmarks-results-list-item
:before
{
content
:
"\f02e"
;
position
:
relative
;
top
:
-7px
;
...
...
@@ -95,17 +92,21 @@
}
.list-item-left-section
{
@include
float
(
left
);
display
:
inline-block
;
vertical-align
:
middle
;
width
:
90%
;
.list-item-breadcrumbtrail
,
.list-item-date
{
@extend
%t-ultralight
;
}
}
.list-item-right-section
{
@include
float
(
right
);
margin-top
:
7px
;
display
:
inline-block
;
vertical-align
:
middle
;
.fa-arrow-right
{
@include
rtl
{
@include
transform
(
rotate
(
180deg
));
}
}
}
}
...
...
@@ -129,61 +130,45 @@
// Rules for bookmark icon shown on each sequence nav item
i
.bookmarked
{
top
:
-3px
;
position
:
absolute
;
left
:
(
$baseline
/
4
);
}
.course-content
{
// Rules for bookmark button's different styles
.bookmark-button-wrapper
{
text-align
:
right
;
margin-bottom
:
10px
;
}
.bookmark-icon.bookmarked
{
top
:
-3px
;
position
:
absolute
;
left
:
(
$baseline
/
4
)
;
}
@mixin
base-style
(
$border-color
,
$content-color
)
{
background
:
none
;
border
:
1px
solid
$border-color
;
border-radius
:
(
$baseline
/
4
);
color
:
$content-color
;
&
:focus
,
&
:active
{
box-shadow
:
none
;
// Rules for bookmark button's different styles
.bookmark-button-wrapper
{
text-align
:
right
;
margin-bottom
:
10px
;
}
}
@mixin
icon-style
(
$content
,
$color
)
{
&
:before
{
content
:
$content
;
font-family
:
FontAwesome
;
color
:
$color
;
}
}
.bookmark-button
{
@extend
%ui-clear-button
;
@extend
%btn-pl-default-base
;
@include
font-size
(
13
);
padding
:
(
$baseline
/
4
)
(
$baseline
/
2
);
@mixin
hover-style
(
$border-color
,
$content-color
,
$icon-content
)
{
&
:hover
{
background
:
none
;
border
:
1px
solid
$border-color
;
color
:
$content-color
;
@include
icon-style
(
$icon-content
,
$content-color
);
}
}
&
:before
{
content
:
"\f02e"
;
font-family
:
FontAwesome
;
}
.bookmark-button.bookmarked
{
@include
base-style
(
$m-blue
,
$m-blue
);
@include
icon-style
(
"\f02e"
,
$m-blue
);
@include
hover-style
(
$light-gray
,
$black
,
"\f097"
);
}
&
.is-active
{
background-color
:
lighten
(
$action-primary-bg
,
10%
);
color
:
$white
;
}
.bookmark-button
:not
(
.bookmarked
)
{
@include
base-style
(
$light-gray
,
$black
);
@include
icon-style
(
"\f097"
,
$black
);
@include
hover-style
(
$m-blue
,
$m-blue
,
"\f02e"
);
}
&
.bookmarked
{
background-color
:
lighten
(
$action-primary-bg
,
10%
);
color
:
$white
;
.paging-header
{
.search-tools
{
margin
:
0
;
&
:before
{
content
:
"\f097"
;
font-family
:
FontAwesome
;
}
}
}
}
\ No newline at end of file
}
lms/static/sass/views/_teams.scss
View file @
0b9da334
...
...
@@ -177,21 +177,7 @@
}
.listing-tools
{
@extend
%t-copy-sub1
;
margin
:
(
$baseline
/
10
)
$baseline
;
color
:
$gray-d1
;
label
{
// override
color
:
inherit
;
font-size
:
inherit
;
cursor
:
auto
;
}
.listing-sort-select
{
@extend
%t-copy-sub1
;
@extend
%t-regular
;
border
:
0
;
}
}
// reset general ul styles
...
...
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