From fab3f9f1b493cc86e2d16023baf0e16d2a4222b3 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Fri, 20 Nov 2020 17:39:53 +0300 Subject: [PATCH] [mobile] Fix common styles --- .../mobile/resources/less/common-ios.less | 40 +++++++++++++++++++ apps/common/mobile/resources/less/common.less | 5 +++ .../mobile/src/css/app-ios.less | 7 +--- .../mobile/src/css/app-material.less | 1 - apps/documenteditor/mobile/src/css/app.less | 2 + 5 files changed, 49 insertions(+), 6 deletions(-) diff --git a/apps/common/mobile/resources/less/common-ios.less b/apps/common/mobile/resources/less/common-ios.less index 0e635722d..332d7f089 100644 --- a/apps/common/mobile/resources/less/common-ios.less +++ b/apps/common/mobile/resources/less/common-ios.less @@ -1,8 +1,48 @@ @white: #ffffff; +@black: #000000; .device-ios { + --f7-navbar-link-color: @themeColor; + --f7-navbar-text-color: @black; + --f7-navbar-title-line-height: 44px; + --f7-navbar-link-line-height: 44px; + --f7-navbar-title-font-size: 17px; + + --f7-list-bg-color: @white; + --f7-navbar-bg-color: #f7f7f8; + + // Main Toolbar + #editor-navbar.navbar .right a + a, + #editor-navbar.navbar .left a + a { + margin-left: 0; + } + + .navbar { + background-color: var(--f7-navbar-bg-color); + .title { + font-weight: 600; + } + } + .popover__titled { + .list { + ul { + background-color: var(--f7-list-bg-color); + li:first-child, li:last-child { + border-radius: 0; + a { + border-radius: 0; + } + } + } + &:first-child, &:last-child { + ul { + border-radius: 0; + } + } + } + .popover-inner { //border-radius: var(--f7-popover-border-radius); diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index 7887e8df4..12fe7b087 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -1,3 +1,8 @@ +.popup, .popover, .sheet-modal { + .list:first-child { + margin-top: 0; + } +} .row { padding: 0 10px; diff --git a/apps/documenteditor/mobile/src/css/app-ios.less b/apps/documenteditor/mobile/src/css/app-ios.less index 3b5a73f0c..a1575794a 100644 --- a/apps/documenteditor/mobile/src/css/app-ios.less +++ b/apps/documenteditor/mobile/src/css/app-ios.less @@ -1,8 +1,5 @@ .device-ios { - // Main Toolbar - #editor-navbar.navbar .right a + a, - #editor-navbar.navbar .left a + a { - margin-left: 0; - } + + } diff --git a/apps/documenteditor/mobile/src/css/app-material.less b/apps/documenteditor/mobile/src/css/app-material.less index f59ccad18..879f3a67c 100644 --- a/apps/documenteditor/mobile/src/css/app-material.less +++ b/apps/documenteditor/mobile/src/css/app-material.less @@ -1,6 +1,5 @@ // Colors -@themeColor: #446995; // (64,102,215) @themeColorLight: #a2bdde; @navBarIconColor: #fff; diff --git a/apps/documenteditor/mobile/src/css/app.less b/apps/documenteditor/mobile/src/css/app.less index bbcd5ba29..24c5dc0fb 100644 --- a/apps/documenteditor/mobile/src/css/app.less +++ b/apps/documenteditor/mobile/src/css/app.less @@ -1,3 +1,5 @@ +@themeColor: #446995; + @import '../../../../common/mobile/resources/less/_mixins.less'; @import '../../../../common/mobile/resources/less/collaboration.less'; @import '../../../../common/mobile/resources/less/common.less';