diff --git a/apps/common/mobile/resources/less/ios/_color-schema.less b/apps/common/mobile/resources/less/ios/_color-schema.less index 0e5581f32..ce527c340 100644 --- a/apps/common/mobile/resources/less/ios/_color-schema.less +++ b/apps/common/mobile/resources/less/ios/_color-schema.less @@ -10,14 +10,12 @@ padding-left: 16px; } .color-schema-block { - min-width: 150px; display: flex; } .color { min-width: 26px; min-height: 26px; - flex-grow: 1; - margin: 0 1px 0 0; + margin: 0 2px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.15) inset; } .text { diff --git a/apps/common/mobile/resources/less/material/_color-schema.less b/apps/common/mobile/resources/less/material/_color-schema.less index 0e5581f32..ce527c340 100644 --- a/apps/common/mobile/resources/less/material/_color-schema.less +++ b/apps/common/mobile/resources/less/material/_color-schema.less @@ -10,14 +10,12 @@ padding-left: 16px; } .color-schema-block { - min-width: 150px; display: flex; } .color { min-width: 26px; min-height: 26px; - flex-grow: 1; - margin: 0 1px 0 0; + margin: 0 2px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.15) inset; } .text { diff --git a/apps/documenteditor/mobile/resources/css/app-ios.css b/apps/documenteditor/mobile/resources/css/app-ios.css index af9f6c188..635aa35b5 100644 --- a/apps/documenteditor/mobile/resources/css/app-ios.css +++ b/apps/documenteditor/mobile/resources/css/app-ios.css @@ -874,7 +874,7 @@ p { width: 100%; height: 100%; overflow: hidden; - background: #efeff4; + background: #000; } .page { box-sizing: border-box; @@ -6239,6 +6239,31 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after background: url('../../../../common/mobile/resources/img/about/logo.svg') no-repeat center; margin-top: 20px; } +.color-schemes-menu { + cursor: pointer; + display: block; + background-color: #fff; +} +.color-schemes-menu .item-content { + padding-left: 0; +} +.color-schemes-menu .item-inner { + justify-content: flex-start; + padding-left: 16px; +} +.color-schemes-menu .color-schema-block { + display: flex; +} +.color-schemes-menu .color { + min-width: 26px; + min-height: 26px; + margin: 0 2px 0 0; + box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.15) inset; +} +.color-schemes-menu .text { + margin-left: 20px; + color: #212121; +} .tablet .searchbar.document.replace .center .searchbar:first-child { margin-right: 10px; } @@ -6830,31 +6855,3 @@ html.pixel-ratio-3 .numbers li { max-height: 100%; overflow: auto; } - -.color-schemes-menu { - cursor: pointer; - display: block; - background-color: #fff; -} -.color-schemes-menu .item-content { - padding-left: 0; -} -.color-schemes-menu .item-inner { - justify-content: flex-start; - padding-left: 16px; -} -.color-schemes-menu .color-schema-block { - min-width: 150px; - display: flex; -} -.color-schemes-menu .color { - min-width: 26px; - min-height: 26px; - flex-grow: 1; - margin: 0 1px 0 0; - box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.15) inset; -} -.color-schemes-menu .text { - margin-left: 20px; - color: #212121; -} diff --git a/apps/documenteditor/mobile/resources/css/app-material.css b/apps/documenteditor/mobile/resources/css/app-material.css index 50fc7fe4b..6fe7b8da6 100644 --- a/apps/documenteditor/mobile/resources/css/app-material.css +++ b/apps/documenteditor/mobile/resources/css/app-material.css @@ -5836,7 +5836,7 @@ html.phone .document-menu .list-block .item-link { margin-right: 5px; } .about .logo { - background: url('../../../../common/mobile/resources/img/about/onlyoffice.svg') no-repeat center; + background: url('../../../../common/mobile/resources/img/about/logo.svg') no-repeat center; } .color-schemes-menu { cursor: pointer; @@ -5851,14 +5851,12 @@ html.phone .document-menu .list-block .item-link { padding-left: 16px; } .color-schemes-menu .color-schema-block { - min-width: 150px; display: flex; } .color-schemes-menu .color { min-width: 26px; min-height: 26px; - flex-grow: 1; - margin: 0 1px 0 0; + margin: 0 2px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.15) inset; } .color-schemes-menu .text { diff --git a/apps/documenteditor/mobile/resources/less/app-ios.less b/apps/documenteditor/mobile/resources/less/app-ios.less index 26ec02ce6..4b6a4d160 100644 --- a/apps/documenteditor/mobile/resources/less/app-ios.less +++ b/apps/documenteditor/mobile/resources/less/app-ios.less @@ -40,7 +40,6 @@ @import url('../../../../../vendor/framework7/src/less/ios/notifications.less'); //@import url('../../../../../vendor/framework7/src/less/ios/login-screen.less'); @import url('../../../../../vendor/framework7/src/less/ios/disabled.less'); -@import url('../../../../common/mobile/resources/less/material/_color-schema.less'); // Disable text select * { @@ -72,6 +71,8 @@ input, textarea { @import url('../../../../common/mobile/resources/less/ios/_contextmenu.less'); @import url('../../../../common/mobile/resources/less/ios/_color-palette.less'); @import url('../../../../common/mobile/resources/less/ios/_about.less'); +@import url('../../../../common/mobile/resources/less/ios/_color-schema.less'); + @import url('ios/_search.less'); @import url('ios/_icons.less');