From 0b35b4e9b3a4d2da5283e5d3ba4b01a590379d42 Mon Sep 17 00:00:00 2001 From: Yuriy Artamonov Date: Mon, 20 Oct 2014 12:21:26 +0000 Subject: [PATCH] Fix table header font-size #PL-4277 --- build.gradle | 2 +- modules/web/themes/halo/app/app-window.scss | 4 ++++ modules/web/themes/halo/app/breadcrumbs.scss | 1 + modules/web/themes/halo/halo-defaults.scss | 5 ++++- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 7b19e11ea1..9110ff4596 100644 --- a/build.gradle +++ b/build.gradle @@ -60,7 +60,7 @@ def webToolkitLegacyModule = project(':cuba-web6-toolkit') def webModuleThemes = project(':cuba-web-themes') def webLegacyModuleThemes = project(':cuba-web6-themes') -def vaadinVersion = '7.3.2.cuba.2' +def vaadinVersion = '7.3.2.cuba.3' def vaadinLegacyVersion = '6.6.1.161' def springVersion = '3.2.8.RELEASE' def springSecurityVersion = '3.2.3.RELEASE' diff --git a/modules/web/themes/halo/app/app-window.scss b/modules/web/themes/halo/app/app-window.scss index ccb6188ff8..20bb5a05c8 100644 --- a/modules/web/themes/halo/app/app-window.scss +++ b/modules/web/themes/halo/app/app-window.scss @@ -95,4 +95,8 @@ .cuba-app-full-header .cuba-app-menubar { padding-left: $v-layout-spacing-horizontal/2; } + + .cuba-app-work-area-single { + background: $cuba-app-work-area-single-color; + } } \ No newline at end of file diff --git a/modules/web/themes/halo/app/breadcrumbs.scss b/modules/web/themes/halo/app/breadcrumbs.scss index acd40e53b2..06425677b6 100644 --- a/modules/web/themes/halo/app/breadcrumbs.scss +++ b/modules/web/themes/halo/app/breadcrumbs.scss @@ -13,6 +13,7 @@ .v-button.cuba-closetab-button { border: none; background: transparent none; + box-shadow: none; .v-button-wrap { background: transparent none; diff --git a/modules/web/themes/halo/halo-defaults.scss b/modules/web/themes/halo/halo-defaults.scss index 9959cb6b7d..aae59b095b 100644 --- a/modules/web/themes/halo/halo-defaults.scss +++ b/modules/web/themes/halo/halo-defaults.scss @@ -22,6 +22,8 @@ $v-layout-spacing-vertical: 10px; $v-layout-spacing-horizontal: 10px; $v-table-row-height: 30px; +$v-table-header-font-size: 13px; + $v-focus-style: inset 0px 0px 5px 1px rgba($v-focus-color, 0.5); $v-error-focus-style: inset 0px 0px 5px 1px rgba($v-error-indicator-color, 0.5); @@ -30,4 +32,5 @@ $v-error-focus-style: inset 0px 0px 5px 1px rgba($v-error-indicator-color, 0.5); $cuba-loginform-background-color: #fbfdff; $cuba-splitpanel-splitter-width: 3px; $cuba-searchselect-edit-color: #b6d2fa; -$cuba-folderspane-background-color: white; \ No newline at end of file +$cuba-folderspane-background-color: white; +$cuba-app-work-area-single-color: white; \ No newline at end of file