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

merge conflicts resolved

Browse Source
This commit is contained in:
marco
2013-06-26 10:47:32 -04:00
parent 84d505e8cc 163610d557
commit f94ec6cf2a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1399,7 +1399,7 @@ body.discussion {
}
.row-item-full {
.row-setting {
display: table-cell;
vertical-align: middle;

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

@@ -70,4 +70,4 @@
@import 'discussion';
@import 'news';
@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/)