Commit 1fe54ba0 by marco

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 0812867a
...@@ -731,10 +731,10 @@ body.discussion { ...@@ -731,10 +731,10 @@ body.discussion {
position: absolute; position: absolute;
top: 30%; top: 30%;
left: 30%; left: 30%;
font-size: 28px;
z-index: 100; z-index: 100;
width: 25px; width: 25px;
height: 25px; height: 25px;
//margin-left: -17px;
opacity: 1; opacity: 1;
@include transition(none); @include transition(none);
} }
...@@ -1286,6 +1286,7 @@ body.discussion { ...@@ -1286,6 +1286,7 @@ body.discussion {
section { section {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
margin: $baseline $baseline $baseline 0;
} }
.label { .label {
...@@ -1294,7 +1295,7 @@ body.discussion { ...@@ -1294,7 +1295,7 @@ body.discussion {
} }
.home-header { .home-header {
//nothing here margin: 0;
} }
.home-title { .home-title {
...@@ -1310,7 +1311,6 @@ body.discussion { ...@@ -1310,7 +1311,6 @@ body.discussion {
.home-stats { .home-stats {
.label-area { .label-area {
padding: $baseline;
display: inline-block; display: inline-block;
min-width: $baseline*5; min-width: $baseline*5;
width: 25%; width: 25%;
...@@ -1369,6 +1369,13 @@ body.discussion { ...@@ -1369,6 +1369,13 @@ body.discussion {
font-size: 12px; font-size: 12px;
width: 20%; width: 20%;
vertical-align: middle; vertical-align: middle;
i.icon {
padding: 0 $baseline/2;
font-size: 24px;
display: inline-block;
}
} }
} }
} }
......
@import 'bourbon/bourbon'; // lms - css application architecture
// ====================
// libs and resets *do not edit*
@import 'bourbon/bourbon'; // lib - bourbon
// VENDOR + REBASE *referenced/used vendor presentation and reset*
// ====================
@import 'base/reset'; @import 'base/reset';
@import 'base/font_face'; @import 'vendor/font-awesome';
// BASE *default edX offerings*
// ====================
// base - utilities
@import 'base/mixins'; @import 'base/mixins';
@import 'base/variables'; @import 'base/variables';
...@@ -19,10 +32,16 @@ ...@@ -19,10 +32,16 @@
% endif % endif
@import 'base/base'; @import 'base/base';
// base - assets
@import 'base/font_face';
@import 'base/extends'; @import 'base/extends';
@import 'base/animations'; @import 'base/animations';
// Multicourse styles // base - starter
@import 'base/base';
// shared - course
@import 'shared/forms'; @import 'shared/forms';
@import 'shared/footer'; @import 'shared/footer';
@import 'shared/header'; @import 'shared/header';
...@@ -31,6 +50,7 @@ ...@@ -31,6 +50,7 @@
@import 'shared/modal'; @import 'shared/modal';
@import 'shared/activation_messages'; @import 'shared/activation_messages';
// shared - platform
@import 'multicourse/home'; @import 'multicourse/home';
@import 'multicourse/dashboard'; @import 'multicourse/dashboard';
@import 'multicourse/account'; @import 'multicourse/account';
...@@ -46,7 +66,9 @@ ...@@ -46,7 +66,9 @@
@import 'multicourse/help'; @import 'multicourse/help';
@import 'multicourse/edge'; @import 'multicourse/edge';
// applications
@import 'discussion'; @import 'discussion';
@import 'news'; @import 'news';
@import 'shame'; @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/)
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
%if flag_moderator: %if flag_moderator:
<li> <li>
<a href="#"> <a href="#">
<span class="board-name" data-discussion_id='#flagged'>Show Flagged Discussions</span> <span class="board-name" data-discussion_id='#flagged'><i class="icon-flag" style="padding-right:5px;"></i>Show Flagged Discussions</span>
</a> </a>
</li> </li>
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<div class="stats-grouping"> <div class="stats-grouping">
<div class="profile-stat profile-stat-posts"><span class="count count-posts">5</span>POSTS</div> <div class="profile-stat profile-stat-posts"><span class="count count-posts">5</span>POSTS</div>
<div class="profile-stat profile-stat-comments"><span class="count count-comments">12</span> COMMENTS</div> <div class="profile-stat profile-stat-comments"><span class="count count-comments">12</span> COMMENTS</div>
<div class="profile-stat profile-stat-following"><span class="count count-following">9</span> POSTS I'M FOLLOWING</div> <div class="profile-stat profile-stat-following"><span class="count count-following">9</span> POSTS I FOLLOW</div>
</div> </div>
</section> </section>
<span class="label">HOW TO USE EDX DISCUSSIONS</span> <span class="label">HOW TO USE EDX DISCUSSIONS</span>
...@@ -47,16 +47,16 @@ ...@@ -47,16 +47,16 @@
<li class="helpgrid-row helpgrid-row-navigation"> <li class="helpgrid-row helpgrid-row-navigation">
<span class="row-title">Navigation</span> <span class="row-title">Navigation</span>
<div class="row-item"> <div class="row-item">
<i class="icon-home"></i>Focus in on specific topics <i class="icon icon-sort-down"></i>Focus in on specific topics
</div> </div>
<div class="row-item">Search for specific posts</div> <div class="row-item"><i class="icon icon-search"></i>Search for specific posts</div>
<div class="row-item">Sort by date, vote, or comments</div> <div class="row-item"><i class="icon icon-sort"></i>Sort by date, vote, or comments</div>
</li> </li>
<li class="helpgrid-row helpgrid-row-participation"> <li class="helpgrid-row helpgrid-row-participation">
<span class="row-title">Participation</span> <span class="row-title">Participation</span>
<div class="row-item">Upvote posts and good responses</div> <div class="row-item"><i class="icon icon-plus"></i>Upvote posts and good responses</div>
<div class="row-item">Report Forum Misuse</div> <div class="row-item"><i class="icon icon-flag"></i>Report Forum Misuse</div>
<div class="row-item">Follow posts for updates</div> <div class="row-item"><i class="icon icon-star"></i>Follow posts for updates</div>
</li> </li>
<li class="helpgrid-row helpgrid-row-notification"> <li class="helpgrid-row helpgrid-row-notification">
<span class="row-title">Notification</span> <span class="row-title">Notification</span>
......
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