Skip to content

E
edx-platform
Commit fe726ae4 by Matthew Mongeau
Options

Fix _modal.scss merge conflicts.

parent 7557f8a7
Showing with 1 additions and 5 deletions
lms/static/sass/shared/_modal.scss
...@@ -115,10 +115,7 @@ ...@@ -115,10 +115,7 @@
padding: 12px; padding: 12px;
} }
<<<<<<< HEAD .activation-message, .message, .notice {
.activation-message, .message {
=======
.notice {
background: $yellow; background: $yellow;
border: 1px solid darken($yellow, 60%); border: 1px solid darken($yellow, 60%);
color: darken($yellow, 60%); color: darken($yellow, 60%);
...@@ -128,7 +125,6 @@ ...@@ -128,7 +125,6 @@
} }
.activation-message { .activation-message {
>>>>>>> cb49d9c... Style notice.
padding: 0 40px 10px; padding: 0 40px 10px;
p { p {
......
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