diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js index df5006ed3..10fb090a7 100644 --- a/apps/common/main/lib/util/utils.js +++ b/apps/common/main/lib/util/utils.js @@ -577,7 +577,7 @@ Common.Utils.String = new (function() { })(); Common.Utils.isBrowserSupported = function() { - return !((Common.Utils.ieVersion != 0 && Common.Utils.ieVersion < 9.0) || + return !((Common.Utils.ieVersion != 0 && Common.Utils.ieVersion < 10.0) || (Common.Utils.safariVersion != 0 && Common.Utils.safariVersion < 5.0) || (Common.Utils.firefoxVersion != 0 && Common.Utils.firefoxVersion < 4.0) || (Common.Utils.chromeVersion != 0 && Common.Utils.chromeVersion < 7.0) || diff --git a/apps/common/main/resources/img/controls/flags.png b/apps/common/main/resources/img/controls/flags.png index ba8404c55..21e559123 100644 Binary files a/apps/common/main/resources/img/controls/flags.png and b/apps/common/main/resources/img/controls/flags.png differ diff --git a/apps/common/main/resources/img/controls/flags@2x.png b/apps/common/main/resources/img/controls/flags@2x.png index 61a4cea97..07b0ea13a 100644 Binary files a/apps/common/main/resources/img/controls/flags@2x.png and b/apps/common/main/resources/img/controls/flags@2x.png differ diff --git a/apps/common/main/resources/img/controls/toolbarbig.png b/apps/common/main/resources/img/controls/toolbarbig.png index f589fa1c3..a12a54961 100644 Binary files a/apps/common/main/resources/img/controls/toolbarbig.png and b/apps/common/main/resources/img/controls/toolbarbig.png differ diff --git a/apps/common/main/resources/img/controls/toolbarbig@2x.png b/apps/common/main/resources/img/controls/toolbarbig@2x.png index 26977df1a..3692eeff3 100644 Binary files a/apps/common/main/resources/img/controls/toolbarbig@2x.png and b/apps/common/main/resources/img/controls/toolbarbig@2x.png differ diff --git a/apps/documenteditor/main/resources/img/controls/dimension-picker/dimension-highlighted.png b/apps/common/main/resources/img/dimension-picker/dimension-highlighted.png similarity index 100% rename from apps/documenteditor/main/resources/img/controls/dimension-picker/dimension-highlighted.png rename to apps/common/main/resources/img/dimension-picker/dimension-highlighted.png diff --git a/apps/documenteditor/main/resources/img/controls/dimension-picker/dimension-highlighted@2x.png b/apps/common/main/resources/img/dimension-picker/dimension-highlighted@2x.png similarity index 100% rename from apps/documenteditor/main/resources/img/controls/dimension-picker/dimension-highlighted@2x.png rename to apps/common/main/resources/img/dimension-picker/dimension-highlighted@2x.png diff --git a/apps/documenteditor/main/resources/img/controls/dimension-picker/dimension-unhighlighted.png b/apps/common/main/resources/img/dimension-picker/dimension-unhighlighted.png similarity index 100% rename from apps/documenteditor/main/resources/img/controls/dimension-picker/dimension-unhighlighted.png rename to apps/common/main/resources/img/dimension-picker/dimension-unhighlighted.png diff --git a/apps/documenteditor/main/resources/img/controls/dimension-picker/dimension-unhighlighted@2x.png b/apps/common/main/resources/img/dimension-picker/dimension-unhighlighted@2x.png similarity index 100% rename from apps/documenteditor/main/resources/img/controls/dimension-picker/dimension-unhighlighted@2x.png rename to apps/common/main/resources/img/dimension-picker/dimension-unhighlighted@2x.png diff --git a/apps/documenteditor/main/resources/img/right-panels/Begin-EndStyle.png b/apps/common/main/resources/img/right-panels/Begin-EndStyle.png similarity index 100% rename from apps/documenteditor/main/resources/img/right-panels/Begin-EndStyle.png rename to apps/common/main/resources/img/right-panels/Begin-EndStyle.png diff --git a/apps/documenteditor/main/resources/img/right-panels/Begin-EndStyle@2x.png b/apps/common/main/resources/img/right-panels/Begin-EndStyle@2x.png similarity index 100% rename from apps/documenteditor/main/resources/img/right-panels/Begin-EndStyle@2x.png rename to apps/common/main/resources/img/right-panels/Begin-EndStyle@2x.png diff --git a/apps/documenteditor/main/resources/img/right-panels/SmallBorders.png b/apps/common/main/resources/img/right-panels/SmallBorders.png similarity index 100% rename from apps/documenteditor/main/resources/img/right-panels/SmallBorders.png rename to apps/common/main/resources/img/right-panels/SmallBorders.png diff --git a/apps/documenteditor/main/resources/img/right-panels/SmallBorders@2x.png b/apps/common/main/resources/img/right-panels/SmallBorders@2x.png similarity index 100% rename from apps/documenteditor/main/resources/img/right-panels/SmallBorders@2x.png rename to apps/common/main/resources/img/right-panels/SmallBorders@2x.png diff --git a/apps/documenteditor/main/resources/img/right-panels/gradients.png b/apps/common/main/resources/img/right-panels/gradients.png similarity index 100% rename from apps/documenteditor/main/resources/img/right-panels/gradients.png rename to apps/common/main/resources/img/right-panels/gradients.png diff --git a/apps/documenteditor/main/resources/img/right-panels/gradients@2x.png b/apps/common/main/resources/img/right-panels/gradients@2x.png similarity index 100% rename from apps/documenteditor/main/resources/img/right-panels/gradients@2x.png rename to apps/common/main/resources/img/right-panels/gradients@2x.png diff --git a/apps/documenteditor/main/resources/img/right-panels/patterns.png b/apps/common/main/resources/img/right-panels/patterns.png similarity index 100% rename from apps/documenteditor/main/resources/img/right-panels/patterns.png rename to apps/common/main/resources/img/right-panels/patterns.png diff --git a/apps/documenteditor/main/resources/img/right-panels/patterns@2x.png b/apps/common/main/resources/img/right-panels/patterns@2x.png similarity index 100% rename from apps/documenteditor/main/resources/img/right-panels/patterns@2x.png rename to apps/common/main/resources/img/right-panels/patterns@2x.png diff --git a/apps/presentationeditor/main/resources/img/right-panels/rowscols_icon.png b/apps/common/main/resources/img/right-panels/rowscols_icon.png similarity index 100% rename from apps/presentationeditor/main/resources/img/right-panels/rowscols_icon.png rename to apps/common/main/resources/img/right-panels/rowscols_icon.png diff --git a/apps/presentationeditor/main/resources/img/right-panels/rowscols_icon@2x.png b/apps/common/main/resources/img/right-panels/rowscols_icon@2x.png similarity index 100% rename from apps/presentationeditor/main/resources/img/right-panels/rowscols_icon@2x.png rename to apps/common/main/resources/img/right-panels/rowscols_icon@2x.png diff --git a/apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering.png b/apps/common/main/resources/img/toolbar/bullets-and-numbering.png similarity index 100% rename from apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering.png rename to apps/common/main/resources/img/toolbar/bullets-and-numbering.png diff --git a/apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering@2x.png b/apps/common/main/resources/img/toolbar/bullets-and-numbering@2x.png similarity index 100% rename from apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering@2x.png rename to apps/common/main/resources/img/toolbar/bullets-and-numbering@2x.png diff --git a/apps/documenteditor/main/resources/img/toolbar/charttypes.png b/apps/common/main/resources/img/toolbar/charttypes.png similarity index 100% rename from apps/documenteditor/main/resources/img/toolbar/charttypes.png rename to apps/common/main/resources/img/toolbar/charttypes.png diff --git a/apps/documenteditor/main/resources/img/toolbar/charttypes@2x.png b/apps/common/main/resources/img/toolbar/charttypes@2x.png similarity index 100% rename from apps/documenteditor/main/resources/img/toolbar/charttypes@2x.png rename to apps/common/main/resources/img/toolbar/charttypes@2x.png diff --git a/apps/documenteditor/main/resources/img/toolbar/math.png b/apps/common/main/resources/img/toolbar/math.png similarity index 100% rename from apps/documenteditor/main/resources/img/toolbar/math.png rename to apps/common/main/resources/img/toolbar/math.png diff --git a/apps/documenteditor/main/resources/img/toolbar/math@2x.png b/apps/common/main/resources/img/toolbar/math@2x.png similarity index 100% rename from apps/documenteditor/main/resources/img/toolbar/math@2x.png rename to apps/common/main/resources/img/toolbar/math@2x.png diff --git a/apps/common/main/resources/less/dimension-picker.less b/apps/common/main/resources/less/dimension-picker.less index feb87653c..6738d6a17 100644 --- a/apps/common/main/resources/less/dimension-picker.less +++ b/apps/common/main/resources/less/dimension-picker.less @@ -21,12 +21,12 @@ .dimension-picker-unhighlighted { //background: transparent repeat scroll 0 0; - .background-ximage('@{app-image-path}/controls/dimension-picker/dimension-unhighlighted.png', '@{app-image-path}/controls/dimension-picker/dimension-unhighlighted@2x.png', 18px, auto, repeat); + .background-ximage('@{common-image-path}/dimension-picker/dimension-unhighlighted.png', '@{common-image-path}/dimension-picker/dimension-unhighlighted@2x.png', 18px, auto, repeat); } .dimension-picker div.dimension-picker-highlighted { //background: transparent repeat scroll 0 0; - .background-ximage('@{app-image-path}/controls/dimension-picker/dimension-highlighted.png', '@{app-image-path}/controls/dimension-picker/dimension-highlighted@2x.png', 18px, auto, repeat); + .background-ximage('@{common-image-path}/dimension-picker/dimension-highlighted.png', '@{common-image-path}/dimension-picker/dimension-highlighted@2x.png', 18px, auto, repeat); } .dimension-picker-status { diff --git a/apps/common/main/resources/less/language-dialog.less b/apps/common/main/resources/less/language-dialog.less index b5aacdaf5..ab82c66b0 100644 --- a/apps/common/main/resources/less/language-dialog.less +++ b/apps/common/main/resources/less/language-dialog.less @@ -30,7 +30,7 @@ &.it, &.it-IT {background-position: -32px -24px;} &.ko, &.ko-KR {background-position: 0 -36px;} &.nl, &.nl-NL {background-position: -16px -36px;} - &.nb, &.nb-NO {background-position: -32px -36px;} + &.nb, &.nb-NO, &.nn, &.nn-NO {background-position: -32px -36px;} &.pl, &.pl-PL {background-position: 0 -48px;} &.pt, &.pt-BR {background-position: -16px -48px;} &.ro, &.ro-RO {background-position: -32px -48px;} @@ -42,7 +42,6 @@ &.lt, &.lt-LT {background-position: 0 -84px;} &.vi, &.vi-VN {background-position: -16px -84px;} &.de-CH {background-position: -32px -84px;} - &.nn, &.nn-NO {background-position: 0 -96px;} &.pt-PT {background-position: -16px -96px;} &.de-AT {background-position: -32px -96px;} &.es, &.es-ES {background-position: 0 -108px;} @@ -67,4 +66,5 @@ &.fi, &.fi-FI {background-position: -16px -180px;} &.zh, &.zh-CN {background-position: -32px -180px;} &.ja, &.ja-JP {background-position: 0 -192px;} + &.es-MX {background-position: -16px -192px;} } diff --git a/apps/documenteditor/embed/index.html b/apps/documenteditor/embed/index.html index ec5a7131a..5a37da3b2 100644 --- a/apps/documenteditor/embed/index.html +++ b/apps/documenteditor/embed/index.html @@ -198,7 +198,7 @@ check = function(regex){ return regex.test(userAgent); }; if (!check(/opera/) && (check(/msie/) || check(/trident/))) { var m = /msie (\d+\.\d+)/.exec(userAgent); - if (m && parseFloat(m[1]) < 9.0) { + if (m && parseFloat(m[1]) < 10.0) { document.write( '
', '
', @@ -340,7 +340,7 @@