diff --git a/apps/common/mobile/resources/less/common-ios.less b/apps/common/mobile/resources/less/common-ios.less index a6c00d4b4..3921ef9bb 100644 --- a/apps/common/mobile/resources/less/common-ios.less +++ b/apps/common/mobile/resources/less/common-ios.less @@ -118,13 +118,13 @@ } } - .list:first-child { - li:first-child { - a { - border-radius: 0; - } - } - } + // .list:first-child { + // li:first-child { + // a { + // border-radius: 0; + // } + // } + // } .list:last-child { li:last-child { diff --git a/apps/common/mobile/resources/less/common-rtl.less b/apps/common/mobile/resources/less/common-rtl.less index fcf2f1505..e22d0cf58 100644 --- a/apps/common/mobile/resources/less/common-rtl.less +++ b/apps/common/mobile/resources/less/common-rtl.less @@ -7,18 +7,6 @@ } } - .comment-list .item-inner{ - .comment-header { - .right { - justify-content: space-between; - .comment-resolve { - margin-right: 0px; - margin-left: 10px; - } - } - } - } - .actions-modal { .actions-button-text { text-align: right; @@ -37,15 +25,25 @@ } .tab-buttons { - .tab-link.tab-link:first-child { + .tab-link:first-child { border-radius: 0px 5px 5px 0px; } - .tab-link.tab-link:last-child { + .tab-link:last-child { border-radius: 5px 0px 0px 5px; } } + .popover li:first-child .segmented a:first-child + .popover li:last-child .segmented a:first-child { + border-radius: 0 var(--f7-button-border-radius) var(--f7-button-border-radius) 0; + } + + .popover li:first-child .segmented a:last-child, + .popover li:last-child .segmented a:last-child { + border-radius: var(--f7-button-border-radius) 0 0 var(--f7-button-border-radius); + } + .list { .item-inner { .item-after .segmented { @@ -54,6 +52,27 @@ } } } + + .searchbar-inner__right .buttons-row a.next { + margin-left: 0; + margin-right: 15px; + } + + .searchbar-inner__left { + margin-right: 0; + margin-left: 10px; + } + + .navbar .searchbar-input-wrap { + margin-right: 0; + } +} + +@media (max-width: 550px) { + .device-ios[dir=rtl] .app-layout .searchbar-expandable.searchbar-enabled .searchbar-inner__right { + margin-right: 10px; + margin-left: 0; + } } [dir="rtl"] { @@ -66,6 +85,18 @@ } } + .comment-list .item-content .item-inner{ + .comment-header { + .right { + justify-content: space-between; + .comment-resolve { + margin-right: 0px; + margin-left: 10px; + } + } + } + } + .shapes { .thumb { transform: scaleX(-1); @@ -100,4 +131,13 @@ padding-right: 0; } } + + .dataview .active::after { + left: -5px; + right: unset; + } + + .popup .list .range-number, .popover .list .range-number, .sheet-modal .list .range-number { + text-align: left; + } } diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index 975b48c32..55bcd0094 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -72,8 +72,10 @@ padding: 15px 0 0 15px; } - [slot="inner-end"] { + .range-number { color: @text-normal; + min-width: 60px; + text-align: right; } } .page-content { diff --git a/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx b/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx index 1857e4292..83d1bb389 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx @@ -285,7 +285,7 @@ const PageChartBorder = props => { onRangeChanged={(value) => {props.onBorderSize(borderSizeTransform.sizeByIndex(value))}} > -
+
{stateTextBorderSize + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)}
diff --git a/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx b/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx index bd41e6a97..9190e8ce1 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx @@ -162,7 +162,7 @@ const PageStyle = props => { onRangeChanged={(value) => {props.onBorderSize(borderSizeTransform.sizeByIndex(value))}} >
-
+
{stateTextBorderSize + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)}
@@ -186,7 +186,7 @@ const PageStyle = props => { onRangeChanged={(value) => {props.onOpacity(value)}} >
-
+
{stateOpacity + ' %'}
@@ -281,7 +281,7 @@ const PageStyleNoFill = props => { onRangeChanged={(value) => {props.onBorderSize(borderSizeTransform.sizeByIndex(value))}} >
-
+
{stateTextBorderSize + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)}
diff --git a/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx b/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx index 6a0b6ca39..3f4c7b2cd 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx @@ -297,7 +297,7 @@ const PageTransition = props => { onRangeChanged={(value) => {props.onDelay(value)}} >
-
+
{stateRange + ' ' + _t.textSec}
diff --git a/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx b/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx index 95dd24122..cb73c5d26 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx @@ -280,7 +280,7 @@ const TabBorder = inject("storeFocusObjects", "storeTableSettings")(observer(pro onRangeChanged={(value) => {storeTableSettings.updateCellBorderWidth(borderSizeTransform.sizeByIndex(value));}} >
-
+
{stateTextBorderSize + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)}
@@ -539,7 +539,7 @@ const EditTable = props => { onRangeChanged={(value) => {props.onOptionMargin(value)}} >
-
+
{stateDistance + ' ' + metricText}