Skip to content

E
edx-platform
Commit 37c9de7a by marco
Options

cleaned up font-awesome integration to work with new mako file .scss compiling,… 

cleaned up font-awesome integration to work with new mako file .scss compiling, added in initial icon references
parent 2c9e4ca5
Showing with 53 additions and 33 deletions
lms/static/sass/_discussion.scss
......@@ -733,7 +733,10 @@ body.discussion {
position: absolute;
top: 30%;
left: 30%;
<<<<<<< HEAD
color: $gray-l1;
=======
>>>>>>> cleaned up font-awesome integration to work with new mako file .scss compiling, added in initial icon references
font-size: 28px;
z-index: 100;
<<<<<<< HEAD
......@@ -742,7 +745,6 @@ body.discussion {
=======
width: 25px;
height: 25px;
//margin-left: -17px;
opacity: 1;
@include transition(none);
>>>>>>> basic shell for discussion home page with both profile information and email notification settings
......@@ -1304,6 +1306,7 @@ body.discussion {
section {
border-bottom: 1px solid #ccc;
margin: $baseline $baseline $baseline 0;
}
.label {
......@@ -1346,7 +1349,6 @@ body.discussion {
>>>>>>> basic shell for discussion home page with both profile information and email notification settings
.label-area {
padding: $baseline;
display: inline-block;
min-width: $baseline*5;
<<<<<<< HEAD
......@@ -1520,6 +1522,13 @@ body.discussion {
font-size: 12px;
width: 20%;
vertical-align: middle;
i.icon {
padding: 0 $baseline/2;
font-size: 24px;
display: inline-block;
}
}
}
}
......
lms/static/sass/application.scss.mako
......@@ -37,10 +37,17 @@
@import 'base/font_face';
@import 'base/extends';
@import 'base/animations';
<<<<<<< HEAD
// base - starter
@import 'base/base';
=======
// base - starter
@import 'base/base';
>>>>>>> cleaned up font-awesome integration to work with new mako file .scss compiling, added in initial icon references
// shared - course
@import 'shared/forms';
@import 'shared/footer';
......@@ -70,5 +77,9 @@
@import 'discussion';
@import 'news';
<<<<<<< HEAD
@import 'shame'; // shame file - used for any bad-form/orphaned scss that knowingly violate edX FED architecture/standards (see - http://csswizardry.com/2013/04/shame-css/)
=======
@import 'shame'; // shame file - used for any bad-form/orphaned scss that knowingly violate edX FED architecture/standards (see - http://csswizardry.com/2013/04/shame-css/)
>>>>>>> cleaned up font-awesome integration to work with new mako file .scss compiling, added in initial icon references
lms/templates/discussion/index.html
......@@ -22,37 +22,37 @@
<%include file="_new_post.html" />
<section class="discussion container" id="discussion-container" data-roles="${roles}" data-course-id="${course_id}" data-user-info="${user_info}" data-threads="${threads}" data-thread-pages="${thread_pages}" data-content-info="${annotated_content_info}" data-flag-moderator="${flag_moderator}">
<div class="discussion-body">
<div class="sidebar"></div>
<div class="discussion-column">
<div class="discussion-article blank-slate">
<section class="home-header">
<span class="label">DISCUSSION HOME:</span>
<h1 class="home-title">${course.display_name_with_default}</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>
</section>
<section class="home-stats">
<div class="label-area">
<span class="label"> PROFILE, PARTICIPATION</span>
<a href="#" class="profile-link">Your profile Name</a>
</div>
<div class="stats-grouping">
<div class="profile-stat profile-stat-posts">
<div class="discussion-body">
<div class="sidebar"></div>
<div class="discussion-column">
<div class="discussion-article blank-slate">
<section class="home-header">
<span class="label">DISCUSSION HOME:</span>
<h1 class="home-title">${course.display_name_with_default}</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>
</section>
<section class="home-stats">
<div class="label-area">
<span class="label"> PROFILE, PARTICIPATION</span>
<a href="#" class="profile-link">Your profile Name</a>
</div>
<div class="stats-grouping">
<div class="profile-stat profile-stat-posts">
<span class="count count-posts">5</span>
<span class="profile-stat-label">POSTS</span>
</div>
<div class="profile-stat profile-stat-comments">
<span class="count count-comments">12</span>
<span class="profile-stat-label">COMMENTS</span>
</div>
<div class="profile-stat profile-stat-following">
<span class="count count-following">9</span>
<span class="profile-stat-label">FOLLOWING</span>
</div>
</div>
</section>
<span class="label label-settings">HOW TO USE EDX DISCUSSIONS</span>
</div>
<div class="profile-stat profile-stat-comments">
<span class="count count-comments">12</span>
<span class="profile-stat-label">COMMENTS</span>
</div>
<div class="profile-stat profile-stat-following">
<span class="count count-following">9</span>
<span class="profile-stat-label">FOLLOWING</span>
</div>
</div>
</section>
<span class="label label-settings">HOW TO USE EDX DISCUSSIONS</span>
<section class="home-helpgrid">
<ul class="helpgrid-list">
<li class="helpgrid-row helpgrid-row-navigation">
......@@ -81,8 +81,8 @@
<span class="row-description">Report Forum Misuse</span>
</div>
<div class="row-item">
<i class="icon icon-star"></i>
<span class="row-description">Follow posts for updates</span>
<i class="icon icon-star"></i>
<span class="row-description">Follow posts for updates</span>
</div>
</li>
<li class="helpgrid-row helpgrid-row-notification">
......
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