From 7598b2b7c900d878d354aab3dbd9a09b47fb9a83 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Mon, 23 Nov 2009 14:32:05 +0000 Subject: [PATCH] * Fixed link style for Reindeer (no double-underline) * Changed application cursor to "default", not only text inputs get the cursor: text; treatment (more application like, not webpage). svn changeset:9960/svn branch:6.2 --- .../VAADIN/themes/base/common/common.css | 8 +++++ WebContent/VAADIN/themes/base/styles.css | 14 +++++++++ .../VAADIN/themes/base/tabsheet/tabsheet.css | 6 ++++ .../VAADIN/themes/reindeer/link/link.css | 7 ++--- WebContent/VAADIN/themes/reindeer/styles.css | 21 +++++++++++--- WebContent/VAADIN/themes/runo/styles.css | 14 +++++++++ .../VAADIN/themes/sampler/sampler/styles.css | 29 ++++++++++++------- 7 files changed, 80 insertions(+), 19 deletions(-) diff --git a/WebContent/VAADIN/themes/base/common/common.css b/WebContent/VAADIN/themes/base/common/common.css index 3f44a8c897..c7d908b6c8 100644 --- a/WebContent/VAADIN/themes/base/common/common.css +++ b/WebContent/VAADIN/themes/base/common/common.css @@ -9,6 +9,14 @@ .v-app { height: 100%; } +/* Force arrow cursor for all elements inside the app */ +.v-app, +.v-window, +.v-popupview-popup, +.v-label, +.v-caption { + cursor: default; +} div.v-app-loading { /* You can use this to provide indication for the user that the application is loading. */ /* It is applied to the same element as .v-app */ diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css index 605523fd8c..4d31800322 100644 --- a/WebContent/VAADIN/themes/base/styles.css +++ b/WebContent/VAADIN/themes/base/styles.css @@ -233,6 +233,14 @@ .v-app { height: 100%; } +/* Force arrow cursor for all elements inside the app */ +.v-app, +.v-window, +.v-popupview-popup, +.v-label, +.v-caption { + cursor: default; +} div.v-app-loading { /* You can use this to provide indication for the user that the application is loading. */ /* It is applied to the same element as .v-app */ @@ -1445,10 +1453,16 @@ div.v-progressindicator-indeterminate-disabled { cursor: pointer; padding: 0.2em 0.5em; } +.v-tabsheet-tabitem .v-caption { + cursor: pointer; +} .v-tabsheet-tabitem-selected { cursor: default; border-bottom-color: #fff; } +.v-tabsheet-tabitem-selected .v-caption { + cursor: default; +} .v-tabsheet-content { border: 1px solid #aaa; /* Vertical borders are not supported, use v-tabsheet-tabcontainer and v-tabsheet-deco to present these borders */ diff --git a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css index 6fd1f1470a..79e1cdf267 100644 --- a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css +++ b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css @@ -94,10 +94,16 @@ cursor: pointer; padding: 0.2em 0.5em; } +.v-tabsheet-tabitem .v-caption { + cursor: pointer; +} .v-tabsheet-tabitem-selected { cursor: default; border-bottom-color: #fff; } +.v-tabsheet-tabitem-selected .v-caption { + cursor: default; +} .v-tabsheet-content { border: 1px solid #aaa; /* Vertical borders are not supported, use v-tabsheet-tabcontainer and v-tabsheet-deco to present these borders */ diff --git a/WebContent/VAADIN/themes/reindeer/link/link.css b/WebContent/VAADIN/themes/reindeer/link/link.css index 00423e978d..e3847f1180 100644 --- a/WebContent/VAADIN/themes/reindeer/link/link.css +++ b/WebContent/VAADIN/themes/reindeer/link/link.css @@ -1,10 +1,9 @@ -.v-link a:link { +.v-link a:link span { color: #1b699f; - text-decoration: underline; } -.v-link a:visited { +.v-link a:visited span { color: #5c7485; } -.v-link a:hover { +.v-link a:hover span { color: #2483c4; } \ No newline at end of file diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css index ed0b24374f..cddb80b6d2 100644 --- a/WebContent/VAADIN/themes/reindeer/styles.css +++ b/WebContent/VAADIN/themes/reindeer/styles.css @@ -233,6 +233,14 @@ .v-app { height: 100%; } +/* Force arrow cursor for all elements inside the app */ +.v-app, +.v-window, +.v-popupview-popup, +.v-label, +.v-caption { + cursor: default; +} div.v-app-loading { /* You can use this to provide indication for the user that the application is loading. */ /* It is applied to the same element as .v-app */ @@ -1445,10 +1453,16 @@ div.v-progressindicator-indeterminate-disabled { cursor: pointer; padding: 0.2em 0.5em; } +.v-tabsheet-tabitem .v-caption { + cursor: pointer; +} .v-tabsheet-tabitem-selected { cursor: default; border-bottom-color: #fff; } +.v-tabsheet-tabitem-selected .v-caption { + cursor: default; +} .v-tabsheet-content { border: 1px solid #aaa; /* Vertical borders are not supported, use v-tabsheet-tabcontainer and v-tabsheet-deco to present these borders */ @@ -3041,14 +3055,13 @@ td.v-datefield-calendarpanel-nextyear { background-color: #1e2022; } -.v-link a:link { +.v-link a:link span { color: #1b699f; - text-decoration: underline; } -.v-link a:visited { +.v-link a:visited span { color: #5c7485; } -.v-link a:hover { +.v-link a:hover span { color: #2483c4; } diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css index 42a5e7b5af..ef135129ae 100644 --- a/WebContent/VAADIN/themes/runo/styles.css +++ b/WebContent/VAADIN/themes/runo/styles.css @@ -233,6 +233,14 @@ .v-app { height: 100%; } +/* Force arrow cursor for all elements inside the app */ +.v-app, +.v-window, +.v-popupview-popup, +.v-label, +.v-caption { + cursor: default; +} div.v-app-loading { /* You can use this to provide indication for the user that the application is loading. */ /* It is applied to the same element as .v-app */ @@ -1445,10 +1453,16 @@ div.v-progressindicator-indeterminate-disabled { cursor: pointer; padding: 0.2em 0.5em; } +.v-tabsheet-tabitem .v-caption { + cursor: pointer; +} .v-tabsheet-tabitem-selected { cursor: default; border-bottom-color: #fff; } +.v-tabsheet-tabitem-selected .v-caption { + cursor: default; +} .v-tabsheet-content { border: 1px solid #aaa; /* Vertical borders are not supported, use v-tabsheet-tabcontainer and v-tabsheet-deco to present these borders */ diff --git a/WebContent/VAADIN/themes/sampler/sampler/styles.css b/WebContent/VAADIN/themes/sampler/sampler/styles.css index 9c65d6bb9b..5a0a2dac85 100644 --- a/WebContent/VAADIN/themes/sampler/sampler/styles.css +++ b/WebContent/VAADIN/themes/sampler/sampler/styles.css @@ -46,7 +46,6 @@ } .v-customcomponent-breadcrumbs .v-link a, -.v-customcomponent-breadcrumbs .v-link a:link, .v-customcomponent-breadcrumbs .v-label { text-decoration: none; color: #000; @@ -57,6 +56,10 @@ display: block; float: left; } +.v-customcomponent-breadcrumbs .v-link a:link span, +.v-customcomponent-breadcrumbs .v-link a:visited span { + color: #000; +} .v-customcomponent-breadcrumbs .v-label { } .v-sa .v-customcomponent-breadcrumbs .v-label { @@ -71,7 +74,7 @@ .v-customcomponent-breadcrumbs .v-link span { text-decoration: none; } -.v-customcomponent-breadcrumbs .v-link a:hover { +.v-customcomponent-breadcrumbs .v-link a:hover span { color: #000; text-decoration: underline; } @@ -84,18 +87,20 @@ .v-ie .v-customcomponent-breadcrumbs .v-link-bold { margin-top: 1px; } -.v-customcomponent-breadcrumbs .v-link-bold a, -.v-customcomponent-breadcrumbs .v-link-bold a:link { +.v-customcomponent-breadcrumbs .v-link-bold a { display: block; height: 16px; background: transparent url(breadcrumb-current-right.png) no-repeat right top; font-size: 10px; font-weight: bold; - color: #c2c4c6; - text-shadow: 0 1px 0 #3a3d43; padding: 4px 9px 0 0; cursor: default; } +.v-customcomponent-breadcrumbs .v-link-bold a:link span, +.v-customcomponent-breadcrumbs .v-link-bold a:visited span { + color: #c2c4c6; + text-shadow: 0 1px 0 #3a3d43; +} .v-sa .v-customcomponent-breadcrumbs .v-link-bold a { height: 17px; padding-top: 3px; @@ -108,7 +113,7 @@ padding-top: 2px; padding-bottom: 2px; } -.v-customcomponent-breadcrumbs .v-link-bold a:hover { +.v-customcomponent-breadcrumbs .v-link-bold a:hover span { color: #c2c4c6; text-decoration: none; } @@ -426,15 +431,17 @@ .v-sa .v-app-SamplerApplication .feature-info { font-family: helvetica, arial, verdana, sans-serif; } -.v-app-SamplerApplication .feature-info div.v-link a, -.v-app-SamplerApplication .feature-info div.v-link a:link { - color: #b7c0c7; +.v-app-SamplerApplication .feature-info div.v-link a { font-size: 11px; line-height: 18px; margin-left: 28px; +} +.v-app-SamplerApplication .feature-info div.v-link a span, +.v-app-SamplerApplication .feature-info div.v-link a:link span { + color: #b7c0c7; text-decoration: none; } -.v-app-SamplerApplication .feature-info div.v-link a:hover { +.v-app-SamplerApplication .feature-info div.v-link a:hover span { color: #dcebf6; } .v-app-SamplerApplication .feature-info div.v-link a span { -- 2.39.5