From a4de82e1c35f4790dfc66118f01b241985269ab9 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Thu, 3 Jul 2014 14:16:21 -0400 Subject: [PATCH] Remove sidebar class from forum nav This will enable much cleanup of the relevant SASS rules. --- .../view/discussion_thread_list_view_spec.coffee | 6 +++--- .../src/discussion/discussion_router.coffee | 2 +- .../views/discussion_thread_list_view.coffee | 2 +- common/test/acceptance/pages/lms/discussion.py | 2 +- lms/static/sass/discussion/_discussion.scss | 1 - .../sass/discussion/elements/_navigation.scss | 16 +++++++++++++++- .../sass/discussion/utilities/_developer.scss | 2 +- lms/static/sass/discussion/utilities/_shame.scss | 12 ++++++++++++ lms/templates/discussion/index.html | 2 +- 9 files changed, 35 insertions(+), 10 deletions(-) diff --git a/common/static/coffee/spec/discussion/view/discussion_thread_list_view_spec.coffee b/common/static/coffee/spec/discussion/view/discussion_thread_list_view_spec.coffee index 324d336e8e..ffb6c1b84b 100644 --- a/common/static/coffee/spec/discussion/view/discussion_thread_list_view_spec.coffee +++ b/common/static/coffee/spec/discussion/view/discussion_thread_list_view_spec.coffee @@ -147,7 +147,7 @@ describe "DiscussionThreadListView", -> -
+
""" @threads = [ makeThreadWithProps({ @@ -176,7 +176,7 @@ describe "DiscussionThreadListView", -> spyOn($, "ajax") @discussion = new Discussion([]) - @view = new DiscussionThreadListView({collection: @discussion, el: $(".sidebar")}) + @view = new DiscussionThreadListView({collection: @discussion, el: $(".forum-nav")}) @view.render() makeThreadWithProps = (props) -> @@ -196,7 +196,7 @@ describe "DiscussionThreadListView", -> makeView = (discussion) -> return new DiscussionThreadListView( - el: $(".sidebar"), + el: $(".forum-nav"), collection: discussion ) diff --git a/common/static/coffee/src/discussion/discussion_router.coffee b/common/static/coffee/src/discussion/discussion_router.coffee index 1477164e8a..e61a40e6a1 100644 --- a/common/static/coffee/src/discussion/discussion_router.coffee +++ b/common/static/coffee/src/discussion/discussion_router.coffee @@ -8,7 +8,7 @@ if Backbone? @discussion = options['discussion'] @course_settings = options['course_settings'] - @nav = new DiscussionThreadListView(collection: @discussion, el: $(".sidebar")) + @nav = new DiscussionThreadListView(collection: @discussion, el: $(".forum-nav")) @nav.on "thread:selected", @navigateToThread @nav.on "thread:removed", @navigateToAllThreads @nav.on "threads:rendered", @setActiveThread diff --git a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee index abf15d5758..23a090c8f5 100644 --- a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee +++ b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee @@ -89,7 +89,7 @@ if Backbone? discussionsBodyTop = if discussionBody[0] then discussionBody.offset().top discussionsBodyBottom = discussionsBodyTop + discussionBody.outerHeight() - sidebar = $(".sidebar") + sidebar = $(".forum-nav") if scrollTop > discussionsBodyTop - @sidebar_padding sidebar.css('top', scrollTop - discussionsBodyTop + @sidebar_padding); else diff --git a/common/test/acceptance/pages/lms/discussion.py b/common/test/acceptance/pages/lms/discussion.py index 6bcb96053d..7bcb84c52b 100644 --- a/common/test/acceptance/pages/lms/discussion.py +++ b/common/test/acceptance/pages/lms/discussion.py @@ -343,7 +343,7 @@ class DiscussionUserProfilePage(CoursePage): class DiscussionTabHomePage(CoursePage, DiscussionPageMixin): - ALERT_SELECTOR = ".discussion-body .sidebar .search-alert" + ALERT_SELECTOR = ".discussion-body .forum-nav .search-alert" def __init__(self, browser, course_id): super(DiscussionTabHomePage, self).__init__(browser, course_id) diff --git a/lms/static/sass/discussion/_discussion.scss b/lms/static/sass/discussion/_discussion.scss index 8b90dbf209..903ba66143 100644 --- a/lms/static/sass/discussion/_discussion.scss +++ b/lms/static/sass/discussion/_discussion.scss @@ -436,7 +436,6 @@ body.discussion { } section.user-profile { - @extend .sidebar; display: table-cell; border-right: 1px solid #ddd; border-radius: 3px 0 0 3px; diff --git a/lms/static/sass/discussion/elements/_navigation.scss b/lms/static/sass/discussion/elements/_navigation.scss index f70de1bbc8..ae72f8c1ad 100644 --- a/lms/static/sass/discussion/elements/_navigation.scss +++ b/lms/static/sass/discussion/elements/_navigation.scss @@ -1,6 +1,7 @@ .forum-nav { @include box-sizing(border-box); float: left; + position: relative; border: 1px solid #aaa; border-radius: 3px; } @@ -27,6 +28,7 @@ } .icon { + @include font-size(14); margin-right: ($baseline/4); } } @@ -87,7 +89,17 @@ } .forum-nav-browse-menu { + @include font-size(14); overflow-y: scroll; + list-style: none; +} + +.forum-nav-browse-submenu { + list-style: none; +} + +.forum-nav-browse-title { + display: block; } .forum-nav-browse-title .icon { @@ -130,6 +142,7 @@ // ----------- .forum-nav-thread-list { overflow-y: scroll; + list-style: none; } .forum-nav-thread { @@ -137,7 +150,7 @@ } .forum-nav-thread-link { - @include clearfix(); + display: block; } %forum-nav-thread-wrapper { @@ -269,6 +282,7 @@ } %forum-nav-load-more-content { + display: block; text-align: center; } diff --git a/lms/static/sass/discussion/utilities/_developer.scss b/lms/static/sass/discussion/utilities/_developer.scss index 8340a3a08f..c5be0700e2 100644 --- a/lms/static/sass/discussion/utilities/_developer.scss +++ b/lms/static/sass/discussion/utilities/_developer.scss @@ -19,7 +19,7 @@ // -------------------- body.discussion { - .sidebar { + .forum-nav { // wrapper for multiple alerts .search-alerts { diff --git a/lms/static/sass/discussion/utilities/_shame.scss b/lms/static/sass/discussion/utilities/_shame.scss index e45977183b..d91ca1667e 100644 --- a/lms/static/sass/discussion/utilities/_shame.scss +++ b/lms/static/sass/discussion/utilities/_shame.scss @@ -62,6 +62,12 @@ font-size: 12px !important; } +// Override global ul rules +.forum-nav-browse-menu, .forum-nav-browse-submenu { + margin: 0; + padding-left: 0; +} + // The sidebar class does a lot of things that we don't want in the thread list; // the following rules contain styling that is necessary and would otherwise // reside in elements/_navigation.scss if the sidebar styling did not make the @@ -138,6 +144,12 @@ li[class*=forum-nav-thread-label-] { // The following rules would be unnecessary but for broadly scoped rules defined // elsewhere in our CSS. +// Override global ul rules +.forum-nav-thread-list, .forum-nav-thread-labels { + margin: 0; + padding-left: 0; +} + li[class*=forum-nav-thread-label-] { // Override global span rules span { diff --git a/lms/templates/discussion/index.html b/lms/templates/discussion/index.html index 6ffaf6a842..1ed39aeede 100644 --- a/lms/templates/discussion/index.html +++ b/lms/templates/discussion/index.html @@ -37,7 +37,7 @@ data-user-cohort-id="${user_cohort}" data-course-settings="${course_settings}">
-
+