From 066cc7cf04478fb83d725b779970dc8e7c16acb7 Mon Sep 17 00:00:00 2001 From: rolux Date: Sun, 5 Jan 2014 16:20:21 +0530 Subject: [PATCH] update overlay css --- source/Ox.UI/css/theme.css | 7 ++--- source/Ox.UI/themes/aqua/json/theme.jsonc | 30 +++++++++---------- source/Ox.UI/themes/oxlight/json/theme.jsonc | 30 +++++++++---------- source/Ox.UI/themes/oxmedium/json/theme.jsonc | 20 ++++++------- 4 files changed, 42 insertions(+), 45 deletions(-) diff --git a/source/Ox.UI/css/theme.css b/source/Ox.UI/css/theme.css index 3376bad2..35815d18 100644 --- a/source/Ox.UI/css/theme.css +++ b/source/Ox.UI/css/theme.css @@ -658,11 +658,8 @@ ImageViewer box-shadow: 0 0 2px $formelementOverlayShadow; } .$themeClass .OxImageViewer .OxImageOverlayArea { - background-image: -moz-linear-gradient(top, $buttonOverlayGradient); - background-image: -ms-linear-gradient(top, $buttonOverlayGradient); - background-image: -o-linear-gradient(top, $buttonOverlayGradient); - background-image: -webkit-linear-gradient(top, $buttonOverlayGradient); - background-image: linear-gradient(top, $buttonOverlayGradient); + background-color: $labelOverlayBackground; + background-image: none; } .$themeClass .OxImageViewer #OxImageOverlayCenter { border-color: $formelementOverlayBorder; diff --git a/source/Ox.UI/themes/aqua/json/theme.jsonc b/source/Ox.UI/themes/aqua/json/theme.jsonc index 951d808a..19088d56 100644 --- a/source/Ox.UI/themes/aqua/json/theme.jsonc +++ b/source/Ox.UI/themes/aqua/json/theme.jsonc @@ -36,13 +36,13 @@ "buttonDisabledGradient": [[255, 255, 255], [240, 240, 240]], "buttonSelectedColor": [224, 224, 224], "buttonSelectedGradient": [[128, 128, 128], [160, 160, 160]], - "buttonOverlayGradient": [[0, 0, 0, 0.5], [0, 0, 0, 0.5]], - "buttonOverlayActiveColor": [255, 255, 255], - "buttonOverlayActiveGradient": [[0, 0, 0, 0.5], [0, 0, 0, 0.5]], - "buttonOverlayDisabledColor": [160, 160, 160], - "buttonOverlayDisabledGradient": [[0, 0, 0, 0.5], [0, 0, 0, 0.5]], - "buttonOverlaySelectedColor": [255, 255, 255], - "buttonOverlaySelectedGradient": [[80, 80, 80, 0.5], [80, 80, 80, 0.5]], + "buttonOverlayGradient": [[224, 224, 224, 0.75], [192, 192, 192, 0.75]], + "buttonOverlayActiveColor": [48, 48, 48], + "buttonOverlayActiveGradient": [[192, 192, 192, 0.75], [192, 192, 192, 0.75]], + "buttonOverlayDisabledColor": [128, 128, 128], + "buttonOverlayDisabledGradient": [[192, 192, 192, 0.75], [192, 192, 192, 0.75]], + "buttonOverlaySelectedColor": [32, 32, 32], + "buttonOverlaySelectedGradient": [[160, 160, 160, 0.75], [192, 192, 192, 0.75]], "calendarBackground": [232, 232, 232], "calendarControlBorder": [64, 64, 64], @@ -84,9 +84,9 @@ "formelementBorder": [176, 176, 176], "formelementColor": [64, 64, 64], "formelementFocusShadow": [64, 128, 192], - "formelementOverlayBorder": [255, 255, 255, 0.75], - "formelementOverlayColor": [255, 255, 255], - "formelementOverlayShadow": [0, 0, 0], + "formelementOverlayBorder": [32, 32, 32, 0.75], + "formelementOverlayColor": [32, 32, 32], + "formelementOverlayShadow": [208, 208, 208], "gridGradient": [[248, 248, 248], [232, 232, 232]], @@ -102,8 +102,8 @@ "labelBackground": [240, 240, 240], "labelDisabledColor": [128, 128, 128], - "labelOverlayBackground": [0, 0, 0, 0.5], - "labelOverlayDisabledColor": [160, 160, 160], + "labelOverlayBackground": [208, 208, 208, 0.75], + "labelOverlayDisabledColor": [128, 128, 128], "listHeadBorder": [192, 192, 192], // wrong? "listHeadSelectedColor": [255, 255, 255], @@ -223,9 +223,9 @@ "symbolDefaultColor": [32, 32, 32], "symbolDisabledColor": [128, 128, 128], "symbolFailedColor": [160, 0, 0], - "symbolOverlayColor": [255, 255, 255], - "symbolOverlayDisabledColor": [160, 160, 160], - "symbolOverlaySelectedColor": [255, 255, 255], + "symbolOverlayColor": [32, 32, 32], + "symbolOverlayDisabledColor": [128, 128, 128], + "symbolOverlaySelectedColor": [32, 32, 32], "symbolPassedColor": [0, 160, 0], "symbolSelectedColor": [255, 255, 255], "symbolVideoColor": [255, 255, 255], diff --git a/source/Ox.UI/themes/oxlight/json/theme.jsonc b/source/Ox.UI/themes/oxlight/json/theme.jsonc index 081140e0..db13c3c1 100644 --- a/source/Ox.UI/themes/oxlight/json/theme.jsonc +++ b/source/Ox.UI/themes/oxlight/json/theme.jsonc @@ -36,13 +36,13 @@ "buttonDisabledGradient": [[192, 192, 192], [192, 192, 192]], "buttonSelectedColor": [32, 32, 32], "buttonSelectedGradient": [[160, 160, 160], [192, 192, 192]], - "buttonOverlayGradient": [[0, 0, 0, 0.5], [0, 0, 0, 0.5]], - "buttonOverlayActiveColor": [255, 255, 255], - "buttonOverlayActiveGradient": [[0, 0, 0, 0.5], [0, 0, 0, 0.5]], - "buttonOverlayDisabledColor": [160, 160, 160], - "buttonOverlayDisabledGradient": [[0, 0, 0, 0.5], [0, 0, 0, 0.5]], - "buttonOverlaySelectedColor": [255, 255, 255], - "buttonOverlaySelectedGradient": [[80, 80, 80, 0.5], [80, 80, 80, 0.5]], + "buttonOverlayGradient": [[224, 224, 224, 0.75], [192, 192, 192, 0.75]], + "buttonOverlayActiveColor": [48, 48, 48], + "buttonOverlayActiveGradient": [[192, 192, 192, 0.75], [192, 192, 192, 0.75]], + "buttonOverlayDisabledColor": [128, 128, 128], + "buttonOverlayDisabledGradient": [[192, 192, 192, 0.75], [192, 192, 192, 0.75]], + "buttonOverlaySelectedColor": [32, 32, 32], + "buttonOverlaySelectedGradient": [[160, 160, 160, 0.75], [192, 192, 192, 0.75]], "calendarBackground": [232, 232, 232], "calendarControlBorder": [64, 64, 64], @@ -84,9 +84,9 @@ "formelementBorder": [176, 176, 176], "formelementColor": [64, 64, 64], "formelementFocusShadow": [128, 128, 128], - "formelementOverlayBorder": [255, 255, 255, 0.75], - "formelementOverlayColor": [255, 255, 255], - "formelementOverlayShadow": [0, 0, 0], + "formelementOverlayBorder": [32, 32, 32, 0.75], + "formelementOverlayColor": [32, 32, 32], + "formelementOverlayShadow": [208, 208, 208], "gridGradient": [[248, 248, 248], [232, 232, 232]], @@ -102,8 +102,8 @@ "labelBackground": [208, 208, 208], "labelDisabledColor": [128, 128, 128], - "labelOverlayBackground": [0, 0, 0, 0.5], - "labelOverlayDisabledColor": [160, 160, 160], + "labelOverlayBackground": [208, 208, 208, 0.75], + "labelOverlayDisabledColor": [128, 128, 128], "listHeadBorder": [192, 192, 192], // wrong? "listHeadSelectedColor": [0, 0, 0], @@ -223,9 +223,9 @@ "symbolDefaultColor": [64, 64, 64], "symbolDisabledColor": [128, 128, 128], "symbolFailedColor": [160, 0, 0], - "symbolOverlayColor": [255, 255, 255], - "symbolOverlayDisabledColor": [160, 160, 160], - "symbolOverlaySelectedColor": [255, 255, 255], + "symbolOverlayColor": [32, 32, 32], + "symbolOverlayDisabledColor": [128, 128, 128], + "symbolOverlaySelectedColor": [32, 32, 32], "symbolPassedColor": [0, 160, 0], "symbolSelectedColor": [0, 0, 0], "symbolVideoColor": [64, 64, 64], diff --git a/source/Ox.UI/themes/oxmedium/json/theme.jsonc b/source/Ox.UI/themes/oxmedium/json/theme.jsonc index c561878f..939d95f1 100644 --- a/source/Ox.UI/themes/oxmedium/json/theme.jsonc +++ b/source/Ox.UI/themes/oxmedium/json/theme.jsonc @@ -36,11 +36,11 @@ "buttonDisabledGradient": [[176, 176, 176], [144, 144, 144]], "buttonSelectedColor": [255, 255, 255], "buttonSelectedGradient": [[96, 96, 96], [128, 128, 128]], - "buttonOverlayGradient": [[0, 0, 0, 0.5], [0, 0, 0, 0.5]], + "buttonOverlayGradient": [[176, 176, 176, 0.75], [144, 144, 144, 0.75]], "buttonOverlayActiveColor": [255, 255, 255], "buttonOverlayActiveGradient": [[0, 0, 0, 0.5], [0, 0, 0, 0.5]], - "buttonOverlayDisabledColor": [160, 160, 160], - "buttonOverlayDisabledGradient": [[0, 0, 0, 0.5], [0, 0, 0, 0.5]], + "buttonOverlayDisabledColor": [96, 96, 96], + "buttonOverlayDisabledGradient": [[160, 160, 160, 0.75], [160, 160, 160, 0.75]], "buttonOverlaySelectedColor": [255, 255, 255], "buttonOverlaySelectedGradient": [[80, 80, 80, 0.5], [80, 80, 80, 0.5]], @@ -84,9 +84,9 @@ "formelementBorder": [128, 128, 128], "formelementColor": [0, 0, 0], "formelementFocusShadow": [192, 192, 192], - "formelementOverlayBorder": [255, 255, 255, 0.75], - "formelementOverlayColor": [255, 255, 255], - "formelementOverlayShadow": [0, 0, 0], + "formelementOverlayBorder": [0, 0, 0, 0.75], + "formelementOverlayColor": [0, 0, 0], + "formelementOverlayShadow": [160, 160, 160], "gridGradient": [[152, 152, 152], [136, 136, 136]], @@ -102,8 +102,8 @@ "labelBackground": [160, 160, 160], "labelDisabledColor": [128, 128, 128], - "labelOverlayBackground": [0, 0, 0, 0.5], - "labelOverlayDisabledColor": [160, 160, 160], + "labelOverlayBackground": [160, 160, 160, 0.75], + "labelOverlayDisabledColor": [128, 128, 128], "listHeadBorder": [128, 128, 128], "listHeadSelectedColor": [255, 255, 255], @@ -223,8 +223,8 @@ "symbolDefaultColor": [0, 0, 0], "symbolDisabledColor": [64, 64, 64], "symbolFailedColor": [192, 64, 64], - "symbolOverlayColor": [255, 255, 255], - "symbolOverlayDisabledColor": [160, 160, 160], + "symbolOverlayColor": [0, 0, 0], + "symbolOverlayDisabledColor": [80, 80, 80], "symbolOverlaySelectedColor": [255, 255, 255], "symbolPassedColor": [64, 192, 64], "symbolSelectedColor": [255, 255, 255],