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

Fix merge conflict in sass

Browse Source
This commit is contained in:
Diana Huang
2013-09-04 11:22:52 -04:00
parent 03a4af7add
commit 18a497e150
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/static/sass/base/_variables.scss
View File

@@ -64,9 +64,6 @@ $green: rgb(37, 184, 90);
$light-gray: #ddd;
$dark-gray: #333;
<<<<<<< HEAD
// COLORS: edx.org marketing site variables
=======
// used by descriptor css
$lightGrey: #edf1f5;
$darkGrey: #8891a1;
@@ -77,7 +74,6 @@ $shadow: rgba($black, 0.2);
$shadow-l1: rgba($black, 0.1);
// edx.org marketing site variables
>>>>>>> master
$m-gray: #8A8C8F;
$m-gray-l1: #97999B;
$m-gray-l2: #A4A6A8;