From 2fd8a72f39758e0cc753f9624f1b77072994d7f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 23 Feb 2022 15:24:04 +0100
Subject: [PATCH] MOBILE-3833 style: Use same card margin on ios and md
---
src/core/features/course/components/module/module.scss | 4 ++--
src/core/features/login/login.scss | 4 ++++
src/theme/theme.base.scss | 5 +++++
src/theme/theme.light.scss | 2 ++
4 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/core/features/course/components/module/module.scss b/src/core/features/course/components/module/module.scss
index 614464d9e..4c06e9ca0 100644
--- a/src/core/features/course/components/module/module.scss
+++ b/src/core/features/course/components/module/module.scss
@@ -2,10 +2,10 @@
:host {
--horizontal-margin: 10px;
+ --vertical-margin: 10px;
ion-card {
- margin-left: var(--horizontal-margin);
- margin-right: var(--horizontal-margin);
+ margin: var(--vertical-margin) var(--horizontal-margin);
}
ion-item {
diff --git a/src/core/features/login/login.scss b/src/core/features/login/login.scss
index 6aeb84b40..165ba96e3 100644
--- a/src/core/features/login/login.scss
+++ b/src/core/features/login/login.scss
@@ -34,6 +34,10 @@
margin-bottom: 16px;
}
+ form .core-username.ios {
+ --inner-border-width: 0 0 1px 0;
+ }
+
form .item,
form .item ion-label {
--background: var(--core-login-input-background);
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 7d39abe82..10175cb7e 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -813,6 +813,7 @@ ion-card {
border-color: var(--border-color);
box-shadow: var(--box-shadow);
border-radius: var(--border-radius);
+ margin: var(--ion-card-vertical-margin) var(--ion-card-horizontal-margin);
ion-item:only-child {
--inner-border-width: 0px;
@@ -1151,6 +1152,10 @@ ion-item.item-lines-inset {
--border-width: 0px;
}
+ion-item.item-input.ios {
+ --inner-border-width: 0 0 1px 0;
+}
+
// Fake item.
div.fake-ion-item {
position: relative;
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index edcdad2f9..448d88505 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -88,6 +88,8 @@
--subdued-text-color: var(--gray-700);
--ion-card-color: var(--text-color);
+ --ion-card-vertical-margin: 10px;
+ --ion-card-horizontal-margin: 10px;
ion-card {
--border-width: 1px;
--border-style: solid;