PWV-1: Fixing merging issues

This commit is contained in:
Bruno Alves de Faria authored and Erik Ziegler committed 2016-11-15 08:24:30 +01:00
1 parent 481bf30a14
commit db0602def7
29 files changed
+392 -488

No files matched your search

@@ -8,7 +8,7 @@ $themes['tide'] = {
$uiStateErrorBorder: #993333
$uiStateErrorText: #661111
$uiLightGray: #516873
$uiGrayLight: #516873
$uiGray: #263340
$uiGrayDark: #16202B
$uiGrayDarker: #151A1F
@@ -8,7 +8,7 @@ $themes['tigerlilly'] = {
$uiStateErrorBorder: #CC6666
$uiStateErrorText: #661111
$uiLightGray: #516873
$uiGrayLight: #516873
$uiGray: #263340
$uiGrayDark: #16202B
$uiGrayDarker: #151A1F
@@ -6,6 +6,8 @@ $toolbarHeight = 78px
$toolbarDrawerHeight = 62px
$studiesSidebarMenuWidth = 307px
$lesionsSidebarMenuWidth = 323px
$studyListPadding = 8%
$studyListPaddingMediumScreen = 10px
// Fonts
$logoFontFamily = "Sanchez"