Skip to content

E
edx-platform
Commit 83b4dc63 by marco
Options

final cleanup from git rebase

parent 3495cebf
Showing with 0 additions and 16 deletions
lms/static/sass/_discussion.scss
...@@ -2683,36 +2683,20 @@ display:none; ...@@ -2683,36 +2683,20 @@ display:none;
opacity: 1.0; opacity: 1.0;
} }
} }
<<<<<<< HEAD
.notflagged .icon
{
display: block;
=======
}
.notflagged .icon { .notflagged .icon {
display: block; display: block;
>>>>>>> updated flag icons to be font-awesome based
float: left; float: left;
margin: 3px; margin: 3px;
width: 10px; width: 10px;
height: 14px; height: 14px;
padding-right: 3px; padding-right: 3px;
<<<<<<< HEAD
} }
.flagged .icon .flagged .icon
{ {
display: block; display: block;
color: $gray-l2; color: $gray-l2;
=======
color: $gray-l2;
}
.flagged .icon {
display: block;
>>>>>>> updated flag icons to be font-awesome based
float: left; float: left;
margin: 3px; margin: 3px;
width: 10px; width: 10px;
......
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