diff --git a/build/css/ox.ui.classic.css b/build/css/ox.ui.classic.css index 2ae64cb5..8fb6be2c 100644 --- a/build/css/ox.ui.classic.css +++ b/build/css/ox.ui.classic.css @@ -16,16 +16,18 @@ Bars */ .OxThemeClassic .OxBar.OxHorizontal { - background: -moz-linear-gradient(top, rgb(192, 192, 192), rgb(160, 160, 160)); - background: -webkit-gradient(linear, left top, left bottom, from(rgb(192, 192, 192)), to(rgb(160, 160, 160))); - //background: -moz-linear-gradient(left top, left bottom, from(rgb(224, 224, 224)), to(rgb(192, 192, 192))); - //background: -webkit-gradient(linear, left top, left bottom, from(rgb(224, 224, 224)), to(rgb(192, 192, 192))); + //background: -moz-linear-gradient(top, rgb(192, 192, 192), rgb(160, 160, 160)); + //background: -webkit-gradient(linear, left top, left bottom, from(rgb(192, 192, 192)), to(rgb(160, 160, 160))); + background: -moz-linear-gradient(top, rgb(224, 224, 224), rgb(192, 192, 192)); + background: -webkit-gradient(linear, left top, left bottom, from(rgb(224, 224, 224)), to(rgb(192, 192, 192))); } .OxThemeClassic .OxBar.OxMainMenu { background: -moz-linear-gradient(top, rgb(224, 224, 224), rgb(192, 192, 192)); background: -webkit-gradient(linear, left top, left bottom, from(rgb(224, 224, 224)), to(rgb(192, 192, 192))); } - +.OxThemeClassic .OxResizebar > .OxLine { + background: rgb(208, 208, 208); +} /* ================================================================================ @@ -98,7 +100,7 @@ Forms } .OxThemeClassic .OxButton.OxSelected, .OxThemeClassic .OxSelect.OxSelected { - background: -moz-linear-gradient(top, rgb(128, 128, 128), rgb(160, 160, 160)); + background: -moz-linear-gradient(top, rgb(160, 160, 160), rgb(192, 192, 192)); background: -webkit-gradient(linear, left top, left bottom, from(rgb(160, 160, 160)), to(rgb(192, 192, 192))); //background: -moz-linear-gradient(top, rgb(128, 128, 128), rgb(160, 160, 160) 10%, rgb(192, 192, 192)); //background: -webkit-gradient(linear, left top, left bottom, from(rgb(128, 128, 128)), color-stop(0.1, rgb(160, 160, 160)), to(rgb(192, 192, 192))); @@ -181,15 +183,15 @@ Lists background: -webkit-gradient(linear, left top, left bottom, from(rgb(224, 224, 224)), to(rgb(192, 192, 192))); } .OxThemeClassic .OxTextList .OxBar .OxSelected { - background: -moz-linear-gradient(top, rgb(192, 192, 192), rgb(160, 160, 160)); - background: -webkit-gradient(linear, left top, left bottom, from(rgb(192, 192, 192)), to(rgb(160, 160, 160))); - color: rgb(0, 0, 0); + background: -moz-linear-gradient(top, rgb(240, 240, 240), rgb(208, 208, 208)); + background: -webkit-gradient(linear, left top, left bottom, from(rgb(240, 240, 240)), to(rgb(208, 208, 208))); + //color: rgb(0, 0, 0); } .OxThemeClassic .OxTextList .OxBar .OxOrder { color: rgb(0, 0, 0); } .OxThemeClassic .OxTextList .OxBar .OxResize .OxCenter { - background: rgb(232, 232, 232); + background: rgb(176, 176, 176); } .OxThemeClassic .OxTextList .OxBody .OxItem .OxCell { border-right: 1px solid rgb(232, 232, 232); diff --git a/build/css/ox.ui.css b/build/css/ox.ui.css index 02a1ff15..5f77550d 100644 --- a/build/css/ox.ui.css +++ b/build/css/ox.ui.css @@ -802,8 +802,8 @@ Menus .OxMainMenu { z-index: 9; - -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.75); - -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.75); + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); } .OxMainMenu.OxLarge { height: 24px; @@ -847,10 +847,6 @@ Menus .OxMainMenu > .OxTitle:first-child { font-weight: bold; } -.OxMainMenu > .OxTitle.OxSelected { - background: rgb(48, 48, 48); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0, rgb(80, 80, 80)), color-stop(1, rgb(48, 48, 48))); -} .OxMainMenu.OxLarge > .OxExtras { float: right; padding: 4px 12px 0 0; diff --git a/build/css/ox.ui.modern.css b/build/css/ox.ui.modern.css index 5ddb99e6..7b24091d 100644 --- a/build/css/ox.ui.modern.css +++ b/build/css/ox.ui.modern.css @@ -194,6 +194,11 @@ Menus ================================================================================ */ +.OxThemeModern .OxMainMenu > .OxTitle.OxSelected { + background: -moz-linear-gradient(top, rgb(80, 80, 80), rgb(48, 48, 48)); + background: -webkit-gradient(linear, left top, left bottom, from(rgb(80, 80, 80)), to(rgb(48, 48, 48))); +} + .OxThemeModern .OxMenu { -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.75); -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.75); diff --git a/build/js/ox.ui.js b/build/js/ox.ui.js index f646e89a..8028fb76 100644 --- a/build/js/ox.ui.js +++ b/build/js/ox.ui.js @@ -1255,6 +1255,7 @@ requires ---------------------------------------------------------------------------- */ + // fixme: this should be Ox.Theme, and provide Ox.Theme.set(), Ox.Theme.load, etc. Ox.theme = function() { var length = arguments.length, classes = $body.attr('class').split(' '),