Skip to content

E
edx-platform
Commit 3df08dc1 by marco
Options

blankslate edited, header bar now with home button

parent dddfdc73
Showing with 93 additions and 20 deletions
lms/static/sass/_discussion.scss
......@@ -200,7 +200,7 @@ body.discussion {
z-index: 9999;
width: 100%;
@include box-sizing(border-box);
background: #737373;
background: #797979;
border: 1px solid #333;
box-shadow: 0 2px 50px rgba(0, 0, 0, .4);
}
......@@ -711,7 +711,7 @@ body.discussion {
border-radius: 3px 0 0 0;
.browse,
.home, .browse,
.search {
position: relative;
float: left;
......@@ -724,9 +724,29 @@ body.discussion {
&:hover {
background-color: #e9e9e9;
}
}
&.is-open {
width: 80%;
.home {
border-radius: 3px 0 0 0;
box-shadow: -1px 0 0 #aaa inset;
cursor: pointer;
.home-icon {
display: block;
position: absolute;
top: 30%;
left: 30%;
z-index: 100;
width: 25px;
height: 25px;
//margin-left: -17px;
background: url(../images/home-discussion-icon.png) no-repeat;
opacity: 1;
@include transition(none);
}
.home-btn {
//nothing here yet
}
}
......@@ -735,6 +755,7 @@ body.discussion {
box-shadow: -1px 0 0 #aaa inset;
&.is-open {
width:60%;
.browse-topic-drop-btn span {
opacity: 1.0;
}
......@@ -775,6 +796,11 @@ body.discussion {
&.is-open {
cursor: auto;
width: 60%;
.home {
width:0%;
}
.post-search {
padding: 0 10px;
......@@ -802,7 +828,7 @@ body.discussion {
z-index: 50;
width: 100%;
height: 100%;
border-radius: 3px 0 0 0;
border-radius: 0 0 0 0;
border: 1px solid transparent;
text-align: center;
overflow: hidden;
......@@ -821,6 +847,9 @@ body.discussion {
opacity: 0.0;
@include transition(opacity .2s);
}
.drop-arrow {
font-size:16px;
}
}
.browse-topic-drop-icon {
......@@ -844,7 +873,7 @@ body.discussion {
left: -1px;
z-index: 9999;
width: 100%;
background: #737373;
background: #797979;
border: 1px solid #4b4b4b;
border-left: none;
border-radius: 0 0 3px 3px;
......@@ -853,8 +882,16 @@ body.discussion {
.browse-topic-drop-menu {
max-height: 400px;
overflow-y: scroll;
.drop-menu-meta-category span,
.drop-menu-parent-category span {
margin: 10px 0;
font-size: 14px;
font-weight: 700;
}
}
ul {
position: inline;
}
......@@ -867,7 +904,7 @@ body.discussion {
display: block;
padding: 0 20px;
border-top: 1px solid #5f5f5f;
font-size: 14px;
font-size: 12px;
font-weight: 700;
line-height: 22px;
color: #fff;
......@@ -886,7 +923,7 @@ body.discussion {
.board-name {
float: left;
width: 80%;
margin: 13px 0;
margin: 5px 0;
color: #fff;
}
......@@ -904,14 +941,14 @@ body.discussion {
li li {
a {
padding-left: 44px;
background: url(../images/nested-icon.png) no-repeat 22px 14px;
background: url(../images/nested-icon.png) no-repeat 22px 5px;
}
}
li li li {
a {
padding-left: 68px;
background: url(../images/nested-icon.png) no-repeat 46px 14px;
background: url(../images/nested-icon.png) no-repeat 46px 5px;
}
}
}
......@@ -982,7 +1019,7 @@ body.discussion {
min-height: 27px;
border-bottom: 1px solid #a3a3a3;
@include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0));
background-color: #aeaeae;
background-color: #aaaaaa;
box-shadow: 0 1px 0 rgba(255, 255, 255, .2) inset;
span,
......@@ -1271,10 +1308,32 @@ body.discussion {
}
}
.blank-slate h1 {
margin-top: 195px;
text-align: center;
color: #ccc;
.blank-slate {
//nothing here
.section {
border-bottom: 1px solid #ccc;
margin-top: 15px;
}
.home-header {
//nothing here
}
.home-title {
font-size: 18px;
color: #000;
margin-bottom: 5px;
}
.home-description {
font-size: 12px;
line-height: 1;
margin-bottom: 10px;
}
.home-stats {
//nothing
}
.home-emailsettings {
//nothing here
}
}
.blank-slate,
......
lms/templates/discussion/_filter_dropdown.html
......@@ -11,12 +11,12 @@
</%def>
<%def name="render_entry(entries, entry)">
<li><a href="#"><span class="board-name" data-discussion_id='${json.dumps(entries[entry])}' cohorted = "${entries[entry]['id'] in cohorted_commentables}">${entry}</span></a></li>
<li><a href="#" class="drop-menu-entry"><span class="board-name" data-discussion_id='${json.dumps(entries[entry])}' cohorted = "${entries[entry]['id'] in cohorted_commentables}">${entry}</span></a></li>
</%def>
<%def name="render_category(categories, category)">
<li>
<a href="#"><span class="board-name">${category}</span></a>
<a href="#" class="drop-menu-parent-category"><span class="board-name">${category}</span></a>
<ul>
${render_dropdown(categories[category])}
</ul>
......@@ -29,7 +29,7 @@
</div>
<ul class="browse-topic-drop-menu">
<li>
<a href="#">
<a href="#" class="drop-menu-meta-category">
<span class="board-name" data-discussion_id='#all'>Show All Discussions</span>
</a>
</li>
......@@ -42,7 +42,7 @@
%endif
<li>
<a href="#">
<a href="#" class="drop-menu-meta-category">
<span class="board-name" data-discussion_id='#following'>Following</span>
</a>
</li>
......
lms/templates/discussion/_thread_list_template.html
<script type="text/template" id="thread-list-template">
<div class="browse-search">
<div class="home">
<a href="#" class="home-icon"></a>
<a href="#" class="home-btn"></a>
</div>
<div class="browse is-open">
<a href="#" class="browse-topic-drop-icon"></a>
<a href="#" class="browse-topic-drop-btn"><span class="current-board">Show All Discussions</span> <span class="drop-arrow">▾</span></a>
......
lms/templates/discussion/index.html
......@@ -26,7 +26,17 @@
<div class="sidebar"></div>
<div class="discussion-column">
<div class="discussion-article blank-slate">
<h1>${course.display_name_with_default} Discussion</h1>
<div class="home-header section">
<h1 class="home-title">${course.display_name_with_default} Discussion Home</h1>
<p class="home-description">Welcome to ${course.display_name_with_default}'s Discussion Home. Select a discussion from the left, or review your profile, participation and email notification settings below.
</p>
</div>
<div class="home-stats section">
The home-stats
</div>
<div class="home-emailsettings section">
The home-emailsettings
</div>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment