Skip to content

E
edx-platform
Commit 18a497e1 by Diana Huang
Options

Fix merge conflict in sass

parent 03a4af7a
Showing with 0 additions and 4 deletions
lms/static/sass/base/_variables.scss
...@@ -64,9 +64,6 @@ $green: rgb(37, 184, 90); ...@@ -64,9 +64,6 @@ $green: rgb(37, 184, 90);
$light-gray: #ddd; $light-gray: #ddd;
$dark-gray: #333; $dark-gray: #333;
<<<<<<< HEAD
// COLORS: edx.org marketing site variables
=======
// used by descriptor css // used by descriptor css
$lightGrey: #edf1f5; $lightGrey: #edf1f5;
$darkGrey: #8891a1; $darkGrey: #8891a1;
...@@ -77,7 +74,6 @@ $shadow: rgba($black, 0.2); ...@@ -77,7 +74,6 @@ $shadow: rgba($black, 0.2);
$shadow-l1: rgba($black, 0.1); $shadow-l1: rgba($black, 0.1);
// edx.org marketing site variables // edx.org marketing site variables
>>>>>>> master
$m-gray: #8A8C8F; $m-gray: #8A8C8F;
$m-gray-l1: #97999B; $m-gray-l1: #97999B;
$m-gray-l2: #A4A6A8; $m-gray-l2: #A4A6A8;
......
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