Merge branch 'stable' into develop

This commit is contained in:
Jonne Haß 2015-09-15 09:52:12 +02:00
commit 70b200e10d

View file

@ -1,5 +1,3 @@
$highlight-white: #FAFAFA;
$background-white: #FFFFFF;
$background-grey: #EEEEEE;
$background-blue: #E7F2F7;
@ -28,12 +26,3 @@ $dark-blue: darken(#0984C8,10%);
$sidebars-background: #f0f0f0;
$sidebars-sub-background: darken($sidebars-background, 12%);
$left-navbar-drawer-background: darken($sidebars-background, 6%);
/* colors : http://www.colourlovers.com/palette/2134203/Awezome_in_argyle */
$cyan : rgb(8,204,249);
$yellow : rgb(242,244,9);
$purple : rgb(220,23,166);
$lime-green : rgb(143, 199,10);
$orange : rgb(237, 165, 13);
$turquoise : rgb(8, 224, 173);
$sand : rgb(245, 239, 237);