Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleaned up font-awesome integration to work with new mako file .scss compiling, added in initial icon references

Browse Source
This commit is contained in:
marco
2013-06-04 15:15:12 -04:00
parent 2c9e4ca54a
commit 37c9de7a01
3 changed files with 53 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lms/static/sass/_discussion.scss
View File

@@ -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;
}
}
}
}

11
lms/static/sass/application.scss.mako
View File

@@ -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