diff --git a/source/Ox.UI/css/theme.css b/source/Ox.UI/css/theme.css index 5ea25e56..0590ed74 100644 --- a/source/Ox.UI/css/theme.css +++ b/source/Ox.UI/css/theme.css @@ -1160,6 +1160,11 @@ Miscellaneous background-image: -o-linear-gradient(top, $imageLoadingGradient); background-image: -webkit-linear-gradient(top, $imageLoadingGradient); } +.$themeClass .OxDialog .OxImageElement > .OxLoadingScreen { + background-image: -moz-linear-gradient(top, $dialogImageLoadingGradient); + background-image: -o-linear-gradient(top, $dialogImageLoadingGradient); + background-image: -webkit-linear-gradient(top, $dialogImageLoadingGradient); +} .$themeClass .OxSelectableElement { background-image: -moz-linear-gradient(top, $listItemGradient); diff --git a/source/Ox.UI/js/Core/ImageElement.js b/source/Ox.UI/js/Core/ImageElement.js index 541cf8c1..9cc5f532 100644 --- a/source/Ox.UI/js/Core/ImageElement.js +++ b/source/Ox.UI/js/Core/ImageElement.js @@ -49,6 +49,13 @@ Ox.ImageElement = function(options, self) { self.$image.appendTo(that); } + that.css = function(css) { + that.$element.css(css); + self.$screen && self.$screen.css(css); + self.$image.css(css); + return that; + }; + return that; }; \ No newline at end of file diff --git a/source/Ox.UI/themes/aqua/json/theme.jsonc b/source/Ox.UI/themes/aqua/json/theme.jsonc index f34675b6..42b2d85a 100644 --- a/source/Ox.UI/themes/aqua/json/theme.jsonc +++ b/source/Ox.UI/themes/aqua/json/theme.jsonc @@ -63,6 +63,7 @@ "dialogBackground": [255, 255, 255, 0.95], "dialogShadow": [0, 0, 0, 0.75], "dialogBarGradient": [[224, 224, 224, 0.95], [192, 192, 192, 0.95]], + "dialogImageLoadingGradient": [[240, 240, 240], [208, 208, 208]], "dialogLayerBackground": [255, 255, 255], "dialogReflectionGradient": [[255, 255, 255, 0.75], [255, 255, 255, 1]], @@ -77,7 +78,7 @@ "gridGradient": [[248, 248, 248], [232, 232, 232]], - "imageLoadingGradient": [[255, 255, 255], [224, 224, 224]], + "imageLoadingGradient": [[240, 240, 240], [208, 208, 208]], "inputGradient": [[224, 224, 224], [255, 255, 255]], "inputActiveGradient": [[208, 208, 208], [240, 240, 240]], diff --git a/source/Ox.UI/themes/oxdark/json/theme.jsonc b/source/Ox.UI/themes/oxdark/json/theme.jsonc index b522c459..81a9f629 100644 --- a/source/Ox.UI/themes/oxdark/json/theme.jsonc +++ b/source/Ox.UI/themes/oxdark/json/theme.jsonc @@ -63,6 +63,7 @@ "dialogBackground": [48, 48, 48, 0.95], "dialogShadow": [0, 0, 0], "dialogBarGradient": [[64, 64, 64, 0.95], [32, 32, 32, 0.95]], + "dialogImageLoadingGradient": [[64, 64, 64], [32, 32, 32]], "dialogLayerBackground": [0, 0, 0], "dialogReflectionGradient": [[48, 48, 48, 0.75], [48, 48, 48, 1]], diff --git a/source/Ox.UI/themes/oxlight/json/theme.jsonc b/source/Ox.UI/themes/oxlight/json/theme.jsonc index 2c45bbf2..7e448194 100644 --- a/source/Ox.UI/themes/oxlight/json/theme.jsonc +++ b/source/Ox.UI/themes/oxlight/json/theme.jsonc @@ -63,6 +63,7 @@ "dialogBackground": [208, 208, 208, 0.95], "dialogShadow": [0, 0, 0, 0.75], "dialogBarGradient": [[224, 224, 224, 0.95], [192, 192, 192, 0.95]], + "dialogImageLoadingGradient": [[224, 224, 224], [192, 192, 192]], "dialogLayerBackground": [255, 255, 255], "dialogReflectionGradient": [[208, 208, 208, 0.75], [208, 208, 208, 1]], diff --git a/source/Ox.UI/themes/oxmedium/json/theme.jsonc b/source/Ox.UI/themes/oxmedium/json/theme.jsonc index cef03fe4..fca7d7ab 100644 --- a/source/Ox.UI/themes/oxmedium/json/theme.jsonc +++ b/source/Ox.UI/themes/oxmedium/json/theme.jsonc @@ -63,6 +63,7 @@ "dialogBackground": [160, 160, 160, 0.95], "dialogShadow": [0, 0, 0, 0.75], "dialogBarGradient": [[176, 176, 176, 0.95], [144, 144, 144, 0.95]], + "dialogImageLoadingGradient": [[176, 176, 176], [144, 144, 144]], "dialogLayerBackground": [0, 0, 0], "dialogReflectionGradient": [[160, 160, 160, 0.75], [160, 160, 160, 1]],