r/p5.js-web-editor
1
0
Fork 0
Code Issues 1 Pull requests Releases 1 Wiki Activity

fix merge conflicts

Browse source
This commit is contained in:
mathuramg 2016-07-12 12:28:10 -04:00
commit 0a1ef4e048
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
client/styles/abstracts/_variables.scss
View file

@ -9,6 +9,7 @@ $light-primary-text-color: #333;
$light-secondary-text-color: #6b6b6b; $light-secondary-text-color: #6b6b6b;
$light-inactive-text-color: #b5b5b5; $light-inactive-text-color: #b5b5b5;
$light-background-color: #fdfdfd; $light-background-color: #fdfdfd;
$light-sidebar-background: $white;
$light-button-background-color: #f4f4f4; $light-button-background-color: #f4f4f4;
$light-button-color: $black; $light-button-color: $black;