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
7287e8ef
Commit
7287e8ef
authored
Dec 12, 2016
by
Andy Armstrong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a number of styling bugs
parent
dcafb1e4
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
44 deletions
+16
-44
common/static/common/js/discussion/views/discussion_thread_list_view.js
+5
-2
lms/djangoapps/discussion/static/discussion/js/views/discussion_board_view.js
+2
-1
lms/static/sass/discussion/elements/_labels.scss
+1
-1
lms/static/sass/discussion/elements/_navigation.scss
+5
-37
lms/static/sass/discussion/utilities/_variables-v1.scss
+2
-2
lms/static/sass/discussion/utilities/_variables-v2.scss
+1
-1
No files found.
common/static/common/js/discussion/views/discussion_thread_list_view.js
View file @
7287e8ef
...
...
@@ -91,6 +91,7 @@
DiscussionThreadListView
.
prototype
.
initialize
=
function
(
options
)
{
var
self
=
this
;
this
.
courseSettings
=
options
.
courseSettings
;
this
.
supportsActiveThread
=
options
.
supportsActiveThread
;
this
.
displayedCollection
=
new
Discussion
(
this
.
collection
.
models
,
{
pages
:
this
.
collection
.
pages
});
...
...
@@ -164,7 +165,7 @@
active
=
$currentElement
.
has
(
'.forum-nav-thread-link.is-active'
).
length
!==
0
;
$currentElement
.
replaceWith
(
$content
);
this
.
showMetadataAccordingToSort
();
if
(
active
)
{
if
(
this
.
supportsActiveThread
&&
active
)
{
this
.
setActiveThread
(
threadId
);
}
};
...
...
@@ -347,7 +348,9 @@
DiscussionThreadListView
.
prototype
.
threadSelected
=
function
(
e
)
{
var
threadId
;
threadId
=
$
(
e
.
target
).
closest
(
'.forum-nav-thread'
).
attr
(
'data-id'
);
this
.
setActiveThread
(
threadId
);
if
(
this
.
supportsActiveThread
)
{
this
.
setActiveThread
(
threadId
);
}
this
.
trigger
(
'thread:selected'
,
threadId
);
return
false
;
};
...
...
lms/djangoapps/discussion/static/discussion/js/views/discussion_board_view.js
View file @
7287e8ef
...
...
@@ -45,7 +45,8 @@
this
.
discussionThreadListView
=
new
DiscussionThreadListView
({
collection
:
this
.
discussion
,
el
:
this
.
$
(
'.discussion-thread-list-container'
),
courseSettings
:
this
.
courseSettings
courseSettings
:
this
.
courseSettings
,
supportsActiveThread
:
true
}).
render
();
this
.
searchView
=
new
DiscussionSearchView
({
el
:
this
.
$
(
'.forum-search'
)
...
...
lms/static/sass/discussion/elements/_labels.scss
View file @
7287e8ef
// discussion - elements - labels
// ====================
body
.discussion
,
.discussion-module
{
.forum-nav-thread
{
.post-label
{
@include
margin
(
$baseline
/
4
,
$baseline
/
2
,
0
,
0
);
@extend
%t-weight4
;
...
...
lms/static/sass/discussion/elements/_navigation.scss
View file @
7287e8ef
...
...
@@ -205,7 +205,7 @@
@include
padding-left
(
0
);
list-style
:
none
;
li
{
.forum-nav-thread
{
margin
:
0
;
}
}
...
...
@@ -239,6 +239,10 @@
background-color
:
$forum-color-hover-thread
;
}
&
.is-active
{
background-color
:
$forum-color-reading-thread
;
}
.forum-nav-thread-unread-comments-count
{
display
:
inline-block
;
font-size
:
$forum-small-font-size
;
...
...
@@ -246,8 +250,6 @@
}
}
.discussion
:not
(
.inline-discussion
)
&
.never-read
{
.forum-nav-thread-link
{
@include
border-left
(
3px
solid
$forum-color-never-read-post
);
...
...
@@ -256,40 +258,6 @@
}
}
.discussion.discussion-board
{
.forum-nav-thread
{
.forum-nav-thread-link.is-active
{
color
:
$forum-color-background
;
background-color
:
$forum-color-reading-thread
;
.forum-nav-thread-labels
>
li
{
border-color
:
$forum-color-background
;
color
:
$forum-color-background
;
}
.forum-nav-thread-votes-count
{
color
:
$forum-color-background
;
}
.forum-nav-thread-comments-count
{
color
:
$base-font-color
;
&
:after
{
@include
border-right-color
(
$forum-color-border
);
}
}
span
.icon
{
color
:
$forum-color-background
;
}
.thread-preview-body
{
color
:
$forum-color-background
;
}
}
}
}
%forum-nav-thread-wrapper
{
display
:
inline-block
;
vertical-align
:
middle
;
...
...
lms/static/sass/discussion/utilities/_variables-v1.scss
View file @
7287e8ef
...
...
@@ -20,8 +20,8 @@ $forum-color-border: $gray-l3 !default;
$forum-color-error
:
$red
!
default
;
$forum-color-hover-thread
:
#f6f6f6
!
default
;
$forum-color-reading-thread
:
$gray-d3
!
default
;
$forum-color-read-post
:
$
forum-color-primary
!
default
;
$forum-color-never-read-post
:
$
gray-d3
!
default
;
$forum-color-read-post
:
$
gray-d3
!
default
;
$forum-color-never-read-post
:
$
forum-color-primary
!
default
;
$forum-color-editor-preview-label
:
$gray-d2
!
default
;
$forum-color-response-count
:
$gray-d2
!
default
;
$forum-color-navigation-bar
:
#f6f6f6
!
default
;
...
...
lms/static/sass/discussion/utilities/_variables-v2.scss
View file @
7287e8ef
...
...
@@ -19,7 +19,7 @@ $forum-color-marked-answer: palette(success, text) !default;
$forum-color-border
:
palette
(
grayscale
,
back
)
!
default
;
$forum-color-error
:
palette
(
error
,
accent
)
!
default
;
$forum-color-hover-thread
:
palette
(
grayscale
,
x-back
)
!
default
;
$forum-color-reading-thread
:
$forum-color-primary
!
default
;
$forum-color-reading-thread
:
palette
(
grayscale
,
x-back
)
!
default
;
$forum-color-read-post
:
palette
(
grayscale
,
base
)
!
default
;
$forum-color-never-read-post
:
$forum-color-primary
!
default
;
$forum-color-editor-preview-label
:
palette
(
grayscale
,
base
)
!
default
;
...
...
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