consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes conflicts

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2015-08-08 13:28:29 +02:00
parent fdfef95595 90a3dcdc16
commit c048f25941
38 changed files with 562 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/stylesheets/variables.scss
View File

@@ -26,7 +26,7 @@ $comments-info: #A5B2B9;
$comments-text: #3F4549;
$header-color: #292B33;
$link: #0077B9;
$link: #2895F1;//#0077B9;
$link-hover: #2178BF;
$tags-bg: #FAFAFA;
@@ -38,8 +38,8 @@ $text-medium: #999999;
$text-light: #A3A6AD;
$votes: #31708f;
$votes-background: #0081B3;
$votes-border: #005b80;
$votes-background: #26AEEE;//#0081B3;
$votes-border: #1F94CB;//#005b80;
$votes-like: #7BD2A8;
$votes-like-act: #5D9E7F;
$votes-neutral: #CCCCCC;
@@ -59,7 +59,7 @@ $success-bg: #DFF0D8;
$success-border: #D6E9C6;
$success-color: #3C763D;
$info-bg: #D9EDF7;
$info-bg: #D9EDF7;
$info-border: #BCE8F1;
$info-color: #31708F;