diff --git a/source/Ox.UI/Ox.UI.js b/source/Ox.UI/Ox.UI.js index 347b6ec2..e374ec43 100644 --- a/source/Ox.UI/Ox.UI.js +++ b/source/Ox.UI/Ox.UI.js @@ -9,6 +9,10 @@ Ox.load.UI = function(options, callback) { }, options); var browsers = [ + { + name: 'Chrome Frame', + url: 'http://www.google.com/chromeframe/', + }, { name: 'Chrome', regexp: /Chrome\/(\d+)\./, @@ -26,15 +30,21 @@ Ox.load.UI = function(options, callback) { regexp: /Version\/(\d+).*? Safari/, url: 'http://www.apple.com/safari/', version: 5 + }, + { + name: 'Internet Explorer', + url: 'http://windows.microsoft.com/en-US/internet-explorer/products/ie/home', + version: 9 } ], browserSupported = false, imageNames = {}, imageURLs = {}, + isInternetExplorer = /MSIE/.test(navigator.userAgent), loadingInterval; browsers.forEach(function(browser) { - var match = browser.regexp.exec(navigator.userAgent); + var match = browser.regexp && browser.regexp.exec(navigator.userAgent); if (match && match[1] >= browser.version) { browserSupported = true; } @@ -126,16 +136,19 @@ Ox.load.UI = function(options, callback) { } function showWarning() { - var counter = 0, + var counter = 0; + /* message = 'Browser not supported, use ' + browsers.map(function(browser, i) { return browser.name + ( i == browsers.length - 1 ? '.' : i == browsers.length - 2 ? ' or' : ',' ); }).join(' '); + */ div.addClass('OxError'); + isInternetExplorer ? browsers.pop() : browsers.shift(); browsers.forEach(function(browser) { - browser.src = Ox.PATH + 'Ox.UI/png/browser' + browser.name + '128.png'; + browser.src = Ox.PATH + 'Ox.UI/png/browser' + browser.name.replace(' ', '') + '128.png'; Ox.loadFile(browser.src, function() { ++counter == browsers.length && showIcons(); }); @@ -151,7 +164,9 @@ Ox.load.UI = function(options, callback) { var link = Ox.element('') .attr({ href: browser.url, - title: browser.name + ' ' + browser.version + title: isInternetExplorer + ? (browser.name == 'Chrome Frame' ? 'Install' : 'Download') + ' ' + browser.name + : browser.name + ' ' + browser.version }) .css({ position: 'absolute', diff --git a/source/Ox.UI/js/List/Ox.List.js b/source/Ox.UI/js/List/Ox.List.js index f975e0c5..7c29df90 100644 --- a/source/Ox.UI/js/List/Ox.List.js +++ b/source/Ox.UI/js/List/Ox.List.js @@ -65,7 +65,12 @@ Ox.List = function(options, self) { .options(options || {}) .scroll(scroll); - that.mousedown(_mousedown); + // fixme: in short icon lists, we would want to use that.$element (i.e. that), + // to deselect by clicking below the items + // but clicking on the scrollbar then causes weird selections + // ... we need something analogous to fillFirstPage for icon lists + that.$content.mousedown(_mousedown); + //that.bindEvent('doubleclick', function() {alert('d')}) /* that.$content.bindEvent({ // fixme: port to new Ox mouse events @@ -498,9 +503,9 @@ Ox.List = function(options, self) { } function getListSize() { - return Math.ceil(self.listLength * - (self.options[self.options.orientation == 'horizontal' ? - 'itemWidth' : 'itemHeight'] + self.itemMargin) / self.rowLength); + return Math.ceil(self.listLength * (self.options[ + self.options.orientation == 'horizontal' ? 'itemWidth' : 'itemHeight' + ] + self.itemMargin) / self.rowLength); } function getNext() { diff --git a/source/Ox.UI/png/pluginChromeFrame128.png b/source/Ox.UI/png/browserChromeFrame128.png similarity index 100% rename from source/Ox.UI/png/pluginChromeFrame128.png rename to source/Ox.UI/png/browserChromeFrame128.png diff --git a/source/Ox.UI/themes/classic/css/classic.css b/source/Ox.UI/themes/classic/css/classic.css index 9eca68ab..5b6fa08b 100644 --- a/source/Ox.UI/themes/classic/css/classic.css +++ b/source/Ox.UI/themes/classic/css/classic.css @@ -565,17 +565,17 @@ Video */ .OxThemeClassic .OxSmallVideoTimeline .OxMarkerPlay { - border-color: rgba(255, 255, 255, 0.5); -} -.OxThemeClassic .OxSmallVideoTimeline .OxMarkerPlay > div { - border-color: rgba(0, 0, 0, 1); -} -.OxThemeClassic .OxSmallVideoTimeline .OxMarkerPlay.OxPaused > div { border-color: rgba(0, 0, 0, 0.5); } -.OxThemeClassic .OxSmallVideoTimeline .OxMarkerPlay > div > div { +.OxThemeClassic .OxSmallVideoTimeline .OxMarkerPlay > div { + border-color: rgba(255, 255, 255, 1); +} +.OxThemeClassic .OxSmallVideoTimeline .OxMarkerPlay.OxPaused > div { border-color: rgba(255, 255, 255, 0.5); } +.OxThemeClassic .OxSmallVideoTimeline .OxMarkerPlay > div > div { + border-color: rgba(0, 0, 0, 0.5); +} .OxThemeClassic .OxVideoPlayer .OxControls.OxOnScreen { background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0.5), rgba(192, 192, 192, 0.5)); diff --git a/source/Ox.UI/themes/modern/svg/__check.svg b/source/Ox.UI/themes/modern/svg/__check.svg index 20b60c26..93f6a2e9 100644 --- a/source/Ox.UI/themes/modern/svg/__check.svg +++ b/source/Ox.UI/themes/modern/svg/__check.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/_check.svg b/source/Ox.UI/themes/modern/svg/_check.svg index cbfad21a..9e22b971 100644 --- a/source/Ox.UI/themes/modern/svg/_check.svg +++ b/source/Ox.UI/themes/modern/svg/_check.svg @@ -1,5 +1,5 @@ - - - + + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/_mute.svg b/source/Ox.UI/themes/modern/svg/_mute.svg index d56bda90..415dccec 100644 --- a/source/Ox.UI/themes/modern/svg/_mute.svg +++ b/source/Ox.UI/themes/modern/svg/_mute.svg @@ -1,6 +1,6 @@ - - - - + + + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/_viewColumns.svg b/source/Ox.UI/themes/modern/svg/_viewColumns.svg index 227aa294..95c7e3d3 100644 --- a/source/Ox.UI/themes/modern/svg/_viewColumns.svg +++ b/source/Ox.UI/themes/modern/svg/_viewColumns.svg @@ -1,5 +1,5 @@ - - - + + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/_viewIconList.svg b/source/Ox.UI/themes/modern/svg/_viewIconList.svg index e5f366fd..11e8e2ae 100644 --- a/source/Ox.UI/themes/modern/svg/_viewIconList.svg +++ b/source/Ox.UI/themes/modern/svg/_viewIconList.svg @@ -1,10 +1,10 @@ - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/_viewIcons.svg b/source/Ox.UI/themes/modern/svg/_viewIcons.svg index 7806d42a..a3e15849 100644 --- a/source/Ox.UI/themes/modern/svg/_viewIcons.svg +++ b/source/Ox.UI/themes/modern/svg/_viewIcons.svg @@ -1,6 +1,6 @@ - - - - + + + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/_viewList.svg b/source/Ox.UI/themes/modern/svg/_viewList.svg index 4346d05e..ef8b8903 100644 --- a/source/Ox.UI/themes/modern/svg/_viewList.svg +++ b/source/Ox.UI/themes/modern/svg/_viewList.svg @@ -1,8 +1,8 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolAdd.svg b/source/Ox.UI/themes/modern/svg/symbolAdd.svg index 20432bcb..c3ed5ec5 100644 --- a/source/Ox.UI/themes/modern/svg/symbolAdd.svg +++ b/source/Ox.UI/themes/modern/svg/symbolAdd.svg @@ -1,5 +1,5 @@ - + diff --git a/source/Ox.UI/themes/modern/svg/symbolArrowDown.svg b/source/Ox.UI/themes/modern/svg/symbolArrowDown.svg index a5e028a9..5c0987cf 100644 --- a/source/Ox.UI/themes/modern/svg/symbolArrowDown.svg +++ b/source/Ox.UI/themes/modern/svg/symbolArrowDown.svg @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolArrowLeft.svg b/source/Ox.UI/themes/modern/svg/symbolArrowLeft.svg index d9781ecd..770a6116 100644 --- a/source/Ox.UI/themes/modern/svg/symbolArrowLeft.svg +++ b/source/Ox.UI/themes/modern/svg/symbolArrowLeft.svg @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolArrowRight.svg b/source/Ox.UI/themes/modern/svg/symbolArrowRight.svg index 0b754777..a744fd85 100644 --- a/source/Ox.UI/themes/modern/svg/symbolArrowRight.svg +++ b/source/Ox.UI/themes/modern/svg/symbolArrowRight.svg @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolArrowUp.svg b/source/Ox.UI/themes/modern/svg/symbolArrowUp.svg index cfde4c13..7f7c1c2d 100644 --- a/source/Ox.UI/themes/modern/svg/symbolArrowUp.svg +++ b/source/Ox.UI/themes/modern/svg/symbolArrowUp.svg @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolBracket.svg b/source/Ox.UI/themes/modern/svg/symbolBracket.svg index dae97089..5d94e9ab 100644 --- a/source/Ox.UI/themes/modern/svg/symbolBracket.svg +++ b/source/Ox.UI/themes/modern/svg/symbolBracket.svg @@ -1,8 +1,8 @@ - - + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolCenter.svg b/source/Ox.UI/themes/modern/svg/symbolCenter.svg index d9a069ab..6b4b4948 100644 --- a/source/Ox.UI/themes/modern/svg/symbolCenter.svg +++ b/source/Ox.UI/themes/modern/svg/symbolCenter.svg @@ -1,10 +1,10 @@ - - - - - - + + + + + + diff --git a/source/Ox.UI/themes/modern/svg/symbolCheck.svg b/source/Ox.UI/themes/modern/svg/symbolCheck.svg index 9a33e8da..4c3e7404 100644 --- a/source/Ox.UI/themes/modern/svg/symbolCheck.svg +++ b/source/Ox.UI/themes/modern/svg/symbolCheck.svg @@ -1,8 +1,8 @@ - + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolClose.svg b/source/Ox.UI/themes/modern/svg/symbolClose.svg index e67755ba..fd3d6b76 100644 --- a/source/Ox.UI/themes/modern/svg/symbolClose.svg +++ b/source/Ox.UI/themes/modern/svg/symbolClose.svg @@ -1,5 +1,5 @@ - + diff --git a/source/Ox.UI/themes/modern/svg/symbolDelete.svg b/source/Ox.UI/themes/modern/svg/symbolDelete.svg index 86c6929f..0a49cebd 100644 --- a/source/Ox.UI/themes/modern/svg/symbolDelete.svg +++ b/source/Ox.UI/themes/modern/svg/symbolDelete.svg @@ -1,5 +1,5 @@ - + diff --git a/source/Ox.UI/themes/modern/svg/symbolDown.svg b/source/Ox.UI/themes/modern/svg/symbolDown.svg index 49a98902..6e4af663 100644 --- a/source/Ox.UI/themes/modern/svg/symbolDown.svg +++ b/source/Ox.UI/themes/modern/svg/symbolDown.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolDownload.svg b/source/Ox.UI/themes/modern/svg/symbolDownload.svg index fa7bced8..00383d95 100644 --- a/source/Ox.UI/themes/modern/svg/symbolDownload.svg +++ b/source/Ox.UI/themes/modern/svg/symbolDownload.svg @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolEdit.svg b/source/Ox.UI/themes/modern/svg/symbolEdit.svg index 604c6487..d2feecb9 100644 --- a/source/Ox.UI/themes/modern/svg/symbolEdit.svg +++ b/source/Ox.UI/themes/modern/svg/symbolEdit.svg @@ -1,8 +1,8 @@ - - - - - - + + + + + + diff --git a/source/Ox.UI/themes/modern/svg/symbolEmbed.svg b/source/Ox.UI/themes/modern/svg/symbolEmbed.svg index 30f0121c..4f98207d 100644 --- a/source/Ox.UI/themes/modern/svg/symbolEmbed.svg +++ b/source/Ox.UI/themes/modern/svg/symbolEmbed.svg @@ -1,6 +1,6 @@ - - - - + + + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolFill.svg b/source/Ox.UI/themes/modern/svg/symbolFill.svg index 66f75353..64b57085 100644 --- a/source/Ox.UI/themes/modern/svg/symbolFill.svg +++ b/source/Ox.UI/themes/modern/svg/symbolFill.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/source/Ox.UI/themes/modern/svg/symbolFind.svg b/source/Ox.UI/themes/modern/svg/symbolFind.svg index ccf5676e..9a7ba14c 100644 --- a/source/Ox.UI/themes/modern/svg/symbolFind.svg +++ b/source/Ox.UI/themes/modern/svg/symbolFind.svg @@ -1,5 +1,5 @@ - + diff --git a/source/Ox.UI/themes/modern/svg/symbolFit.svg b/source/Ox.UI/themes/modern/svg/symbolFit.svg index a99bb57a..61876c8f 100644 --- a/source/Ox.UI/themes/modern/svg/symbolFit.svg +++ b/source/Ox.UI/themes/modern/svg/symbolFit.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/source/Ox.UI/themes/modern/svg/symbolFlag.svg b/source/Ox.UI/themes/modern/svg/symbolFlag.svg index 2b672d76..abbf26fb 100644 --- a/source/Ox.UI/themes/modern/svg/symbolFlag.svg +++ b/source/Ox.UI/themes/modern/svg/symbolFlag.svg @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolGoToIn.svg b/source/Ox.UI/themes/modern/svg/symbolGoToIn.svg index a6c98ca4..d405092a 100644 --- a/source/Ox.UI/themes/modern/svg/symbolGoToIn.svg +++ b/source/Ox.UI/themes/modern/svg/symbolGoToIn.svg @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolGoToOut.svg b/source/Ox.UI/themes/modern/svg/symbolGoToOut.svg index 0d2311f6..a2761b7c 100644 --- a/source/Ox.UI/themes/modern/svg/symbolGoToOut.svg +++ b/source/Ox.UI/themes/modern/svg/symbolGoToOut.svg @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolGoToPoster.svg b/source/Ox.UI/themes/modern/svg/symbolGoToPoster.svg index e198b056..c404fd46 100644 --- a/source/Ox.UI/themes/modern/svg/symbolGoToPoster.svg +++ b/source/Ox.UI/themes/modern/svg/symbolGoToPoster.svg @@ -1,6 +1,6 @@ - - - - + + + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolGrow.svg b/source/Ox.UI/themes/modern/svg/symbolGrow.svg index f156820c..ad95644d 100644 --- a/source/Ox.UI/themes/modern/svg/symbolGrow.svg +++ b/source/Ox.UI/themes/modern/svg/symbolGrow.svg @@ -1,6 +1,6 @@ - - - - + + + + diff --git a/source/Ox.UI/themes/modern/svg/symbolHelp.svg b/source/Ox.UI/themes/modern/svg/symbolHelp.svg index e586433d..b93f335b 100644 --- a/source/Ox.UI/themes/modern/svg/symbolHelp.svg +++ b/source/Ox.UI/themes/modern/svg/symbolHelp.svg @@ -1,10 +1,10 @@ - + - + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolInfo.svg b/source/Ox.UI/themes/modern/svg/symbolInfo.svg index 7cd2e173..a79271dd 100644 --- a/source/Ox.UI/themes/modern/svg/symbolInfo.svg +++ b/source/Ox.UI/themes/modern/svg/symbolInfo.svg @@ -1,6 +1,6 @@ - - - - + + + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolLeft.svg b/source/Ox.UI/themes/modern/svg/symbolLeft.svg index 7f91e8aa..38ff2397 100644 --- a/source/Ox.UI/themes/modern/svg/symbolLeft.svg +++ b/source/Ox.UI/themes/modern/svg/symbolLeft.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolLike.svg b/source/Ox.UI/themes/modern/svg/symbolLike.svg index 9a7a445b..d44188ea 100644 --- a/source/Ox.UI/themes/modern/svg/symbolLike.svg +++ b/source/Ox.UI/themes/modern/svg/symbolLike.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolLock.svg b/source/Ox.UI/themes/modern/svg/symbolLock.svg index 6f977e55..479dd81a 100644 --- a/source/Ox.UI/themes/modern/svg/symbolLock.svg +++ b/source/Ox.UI/themes/modern/svg/symbolLock.svg @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolMount.svg b/source/Ox.UI/themes/modern/svg/symbolMount.svg index 8dd00041..e051df10 100644 --- a/source/Ox.UI/themes/modern/svg/symbolMount.svg +++ b/source/Ox.UI/themes/modern/svg/symbolMount.svg @@ -1,5 +1,5 @@ - - - + + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolMute.svg b/source/Ox.UI/themes/modern/svg/symbolMute.svg index 5ed13097..cdf7b723 100644 --- a/source/Ox.UI/themes/modern/svg/symbolMute.svg +++ b/source/Ox.UI/themes/modern/svg/symbolMute.svg @@ -1,7 +1,7 @@ - - - - - + + + + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolPause.svg b/source/Ox.UI/themes/modern/svg/symbolPause.svg index e63dd751..3c99adf1 100644 --- a/source/Ox.UI/themes/modern/svg/symbolPause.svg +++ b/source/Ox.UI/themes/modern/svg/symbolPause.svg @@ -1,5 +1,5 @@ - + diff --git a/source/Ox.UI/themes/modern/svg/symbolPlayInToOut.svg b/source/Ox.UI/themes/modern/svg/symbolPlayInToOut.svg index f7034b31..f4f1f903 100644 --- a/source/Ox.UI/themes/modern/svg/symbolPlayInToOut.svg +++ b/source/Ox.UI/themes/modern/svg/symbolPlayInToOut.svg @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolPublish.svg b/source/Ox.UI/themes/modern/svg/symbolPublish.svg index fd3ef265..579cd5e8 100644 --- a/source/Ox.UI/themes/modern/svg/symbolPublish.svg +++ b/source/Ox.UI/themes/modern/svg/symbolPublish.svg @@ -1,5 +1,5 @@ - - - + + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolRedo.svg b/source/Ox.UI/themes/modern/svg/symbolRedo.svg index 3ddfa702..397fcf79 100644 --- a/source/Ox.UI/themes/modern/svg/symbolRedo.svg +++ b/source/Ox.UI/themes/modern/svg/symbolRedo.svg @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolRemove.svg b/source/Ox.UI/themes/modern/svg/symbolRemove.svg index f6aeaba0..06e9a807 100644 --- a/source/Ox.UI/themes/modern/svg/symbolRemove.svg +++ b/source/Ox.UI/themes/modern/svg/symbolRemove.svg @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolRight.svg b/source/Ox.UI/themes/modern/svg/symbolRight.svg index a2556c4f..c438513e 100644 --- a/source/Ox.UI/themes/modern/svg/symbolRight.svg +++ b/source/Ox.UI/themes/modern/svg/symbolRight.svg @@ -1,3 +1,3 @@ - + diff --git a/source/Ox.UI/themes/modern/svg/symbolSelect.svg b/source/Ox.UI/themes/modern/svg/symbolSelect.svg index 3161447f..88700584 100644 --- a/source/Ox.UI/themes/modern/svg/symbolSelect.svg +++ b/source/Ox.UI/themes/modern/svg/symbolSelect.svg @@ -1,4 +1,4 @@ - - + + diff --git a/source/Ox.UI/themes/modern/svg/symbolSet.svg b/source/Ox.UI/themes/modern/svg/symbolSet.svg index a2bbe2e5..96febf1c 100644 --- a/source/Ox.UI/themes/modern/svg/symbolSet.svg +++ b/source/Ox.UI/themes/modern/svg/symbolSet.svg @@ -1,13 +1,13 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolSetIn.svg b/source/Ox.UI/themes/modern/svg/symbolSetIn.svg index 018ec7e7..2de77eb3 100644 --- a/source/Ox.UI/themes/modern/svg/symbolSetIn.svg +++ b/source/Ox.UI/themes/modern/svg/symbolSetIn.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolSetOut.svg b/source/Ox.UI/themes/modern/svg/symbolSetOut.svg index 96a00b63..f1f318c6 100644 --- a/source/Ox.UI/themes/modern/svg/symbolSetOut.svg +++ b/source/Ox.UI/themes/modern/svg/symbolSetOut.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolSetPoster.svg b/source/Ox.UI/themes/modern/svg/symbolSetPoster.svg index 32e4e1d8..16a764a3 100644 --- a/source/Ox.UI/themes/modern/svg/symbolSetPoster.svg +++ b/source/Ox.UI/themes/modern/svg/symbolSetPoster.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolShrink.svg b/source/Ox.UI/themes/modern/svg/symbolShrink.svg index 9448d5e5..15a74d47 100644 --- a/source/Ox.UI/themes/modern/svg/symbolShrink.svg +++ b/source/Ox.UI/themes/modern/svg/symbolShrink.svg @@ -1,6 +1,6 @@ - - - - + + + + diff --git a/source/Ox.UI/themes/modern/svg/symbolStar.svg b/source/Ox.UI/themes/modern/svg/symbolStar.svg index 089b0202..20ae792a 100644 --- a/source/Ox.UI/themes/modern/svg/symbolStar.svg +++ b/source/Ox.UI/themes/modern/svg/symbolStar.svg @@ -1,3 +1,3 @@ - + diff --git a/source/Ox.UI/themes/modern/svg/symbolSync.svg b/source/Ox.UI/themes/modern/svg/symbolSync.svg index 001b1df7..79d3d007 100644 --- a/source/Ox.UI/themes/modern/svg/symbolSync.svg +++ b/source/Ox.UI/themes/modern/svg/symbolSync.svg @@ -1,6 +1,6 @@ - - - - + + + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolUndo.svg b/source/Ox.UI/themes/modern/svg/symbolUndo.svg index 8152905e..c54aa9af 100644 --- a/source/Ox.UI/themes/modern/svg/symbolUndo.svg +++ b/source/Ox.UI/themes/modern/svg/symbolUndo.svg @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolUnlock.svg b/source/Ox.UI/themes/modern/svg/symbolUnlock.svg index 978338cd..a2a4709b 100644 --- a/source/Ox.UI/themes/modern/svg/symbolUnlock.svg +++ b/source/Ox.UI/themes/modern/svg/symbolUnlock.svg @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolUnmount.svg b/source/Ox.UI/themes/modern/svg/symbolUnmount.svg index ac0a0cc9..303fb55e 100644 --- a/source/Ox.UI/themes/modern/svg/symbolUnmount.svg +++ b/source/Ox.UI/themes/modern/svg/symbolUnmount.svg @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolUnmute.svg b/source/Ox.UI/themes/modern/svg/symbolUnmute.svg index 34b4ec63..3726cbd5 100644 --- a/source/Ox.UI/themes/modern/svg/symbolUnmute.svg +++ b/source/Ox.UI/themes/modern/svg/symbolUnmute.svg @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolUp.svg b/source/Ox.UI/themes/modern/svg/symbolUp.svg index c8e6603b..a860276b 100644 --- a/source/Ox.UI/themes/modern/svg/symbolUp.svg +++ b/source/Ox.UI/themes/modern/svg/symbolUp.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolUser.svg b/source/Ox.UI/themes/modern/svg/symbolUser.svg index 1289aeb1..04a44024 100644 --- a/source/Ox.UI/themes/modern/svg/symbolUser.svg +++ b/source/Ox.UI/themes/modern/svg/symbolUser.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/source/Ox.UI/themes/modern/svg/symbolView.svg b/source/Ox.UI/themes/modern/svg/symbolView.svg index f6ec0af7..c4f941c0 100644 --- a/source/Ox.UI/themes/modern/svg/symbolView.svg +++ b/source/Ox.UI/themes/modern/svg/symbolView.svg @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolVolumeDown.svg b/source/Ox.UI/themes/modern/svg/symbolVolumeDown.svg index f1bc3f33..dbd39cf3 100644 --- a/source/Ox.UI/themes/modern/svg/symbolVolumeDown.svg +++ b/source/Ox.UI/themes/modern/svg/symbolVolumeDown.svg @@ -1,6 +1,6 @@ - - - - + + + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolVolumeUp.svg b/source/Ox.UI/themes/modern/svg/symbolVolumeUp.svg index 4e685a52..93921fe0 100644 --- a/source/Ox.UI/themes/modern/svg/symbolVolumeUp.svg +++ b/source/Ox.UI/themes/modern/svg/symbolVolumeUp.svg @@ -1,5 +1,5 @@ - - - + + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolWarning.svg b/source/Ox.UI/themes/modern/svg/symbolWarning.svg index 085285dd..10e797c8 100644 --- a/source/Ox.UI/themes/modern/svg/symbolWarning.svg +++ b/source/Ox.UI/themes/modern/svg/symbolWarning.svg @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/source/Ox.UI/themes/modern/svg/symbolZoom.svg b/source/Ox.UI/themes/modern/svg/symbolZoom.svg index 60314085..d7efaa01 100644 --- a/source/Ox.UI/themes/modern/svg/symbolZoom.svg +++ b/source/Ox.UI/themes/modern/svg/symbolZoom.svg @@ -1,10 +1,10 @@ - - - - - - + + + + + + diff --git a/tools/build/build.py b/tools/build/build.py index 6b1170b0..4d4968d5 100755 --- a/tools/build/build.py +++ b/tools/build/build.py @@ -49,7 +49,7 @@ files = ['Ox.UI/css/Ox.UI.css'] path = source_path + 'Ox.UI/themes/classic/svg/' for filename in os.listdir(path): svg = read_file(path + filename) - svg = svg.replace('#000000', '#XXXXXX').replace('#404040', '#XXXXXX').replace('#FFFFFF', '#000000').replace('#XXXXXX', '#FFFFFF') + svg = svg.replace('#000000', '#XXXXXX').replace('#404040', '#C0C0C0').replace('#FFFFFF', '#000000').replace('#XXXXXX', '#FFFFFF') write_file(path.replace('/classic/', '/modern/') + filename, svg) imageURLs = {}