Use css variables instead of magic numbers

src/components/AccountForm.vue

@@ -682,11 +682,11 @@ export default {
 	flex-grow: 1;
 	text-align: center;
 	color: var(--color-text-lighter);
-	margin-bottom: 10px;
+	margin-bottom: calc(var(--default-grid-baseline) * 2);
 }
 
 :deep(.tabs-component-tab.is-active) {
-	border-bottom: 1px solid black;
+	border-bottom: var(--border-width-input) solid black;
 	font-weight: bold;
 }
 
@@ -695,7 +695,7 @@ export default {
 }
 
 .tabs-component-panels {
-	padding-top: 20px;
+	padding-top: calc(var(--default-grid-baseline) * 5);
 }
 
 .tabs-component-panels label {
@@ -706,7 +706,7 @@ export default {
 
 .tabs-component-panels input,
 .tabs-component-panels select {
-	margin-bottom: 10px;
+	margin-bottom: calc(var(--default-grid-baseline) * 2);
 }
 </style>
 
@@ -740,15 +740,15 @@ input[type='radio'][disabled] + label {
 .account-form__submit-buttons {
 	display: flex;
 	justify-content: center;
-	margin-top: 5px;
+	margin-top: var(--default-grid-baseline);
 }
 .account-form__submit-button {
 	display: flex;
 	align-items: center;
 }
 .account-form--feedback {
 	color: var(--color-text-maxcontrast);
-	margin-top: 5px;
+	margin-top: var(--default-grid-baseline);
 	text-align: center;
 }
 .account-form--error {
@@ -759,9 +759,9 @@ input[type='radio'][disabled] + label {
 	z-index: 1001;
 	width: 300px;
 	top: 15%;
-	padding-bottom: 50px;
+	padding-bottom: calc(var(--default-grid-baseline) * 12);
 	margin: 0 auto;
-	padding-top: 30px;
+	padding-top: calc(var(--default-grid-baseline) * 7);
 }
 #account-form input {
 	width: 100%;

src/components/AccountSettings.vue

@@ -206,19 +206,19 @@ export default {
 	}
 }
 .settings-hint {
-	margin-top: -12px;
-	margin-bottom: 6px;
+	margin-top: calc(var(--default-grid-baseline) * -3);
+	margin-bottom: calc(var(--default-grid-baseline) * 2);
 	color: var(--color-text-maxcontrast);
 }
 h2 {
 	font-weight: bold;
 	font-size: 20px;
-	margin-bottom: 12px;
-	margin-left: -30px;
-	line-height: 30px;
+	margin-bottom: calc(var(--default-grid-baseline) * 3);
+	margin-left: calc(var(--default-grid-baseline) * -7);
+	line-height: calc(var(--default-grid-baseline) * 7);
 	color: var(--color-text-light);
 }
 .app-settings-section {
-margin-bottom: 45px;
+	margin-bottom: calc(var(--default-grid-baseline) * 12);
 }
 </style>

src/components/AppSettingsMenu.vue

@@ -569,22 +569,22 @@ export default {
 p.app-settings span.loading-icon {
 	display: inline-block;
 	vertical-align: middle;
-	padding: 5px 0;
+	padding: var(--default-grid-baseline) 0;
 }
 p.app-settings {
-	padding: 10px 0;
+	padding: calc(var(--default-grid-baseline) * 2) 0;
 }
 .app-settings-button {
 	display: inline-flex;
 	background-position: 10px center;
 	text-align: left;
-	margin-top: 6px;
+	margin-top: calc(var(--default-grid-baseline) * 2);
 }
 .app-settings-button.button.primary.new-button {
 	color: var(--color-primary-element-text);
 	//this style will be removed after we migrate also the  'add mail account' to material design
 	padding-left: 34px;
-	gap: 4px;
+	gap: var(--default-grid-baseline);
 	width: fit-content;
 }
 .app-settings-link {
@@ -598,13 +598,13 @@ p.app-settings {
 	justify-content: flex-start;
 }
 .mailvelope-section {
-	padding-top: 15px;
+	padding-top: calc(var(--default-grid-baseline) * 4);
 
 	a.button {
 		display: flex;
 		align-items: center;
 		line-height: normal;
-		min-height: 44px;
+		min-height: calc(var(--default-grid-baseline) * 11);
 		font-size: unset;
 
 		&:focus-visible,
@@ -615,13 +615,13 @@ p.app-settings {
 }
 .material-design-icon {
 	&.lock-icon {
-		margin-right: 10px;
+		margin-right: calc(var(--default-grid-baseline) * 2);
 	}
 
 }
 .section-title {
-	margin-top: 20px;
-	margin-bottom: 10px;
+	margin-top: calc(var(--default-grid-baseline) * 5);
+	margin-bottom: calc(var(--default-grid-baseline) * 2);
 }
 .sorting {
 	display: flex;
@@ -634,8 +634,8 @@ p.app-settings {
 	width: 100%;
 }
 .settings-hint {
-	margin-top: -12px;
-	margin-bottom: 6px;
+	margin-top: calc(var(--default-grid-baseline) * -3);
+	margin-bottom: calc(var(--default-grid-baseline) * 2);
 	color: var(--color-text-maxcontrast);
 }
 .app-settings-section {

src/components/CalendarPickerOption.vue

@@ -45,8 +45,8 @@ export default {
 		height: 12px;
 		border-radius: 50%;
 		border: none;
-		margin-right: 8px;
-		flex-basis: 12px;
+		margin-right: calc(var(--default-grid-baseline) * 2);
+		flex-basis: calc(var(--default-grid-baseline) * 3);
 		flex-shrink: 0;
 	}
 

src/components/Composer.vue

@@ -1427,8 +1427,8 @@
 		 * Empty if label and email are the same or
 		 * if the suggestion is a group.
 		 *
 		 * @param {{email: string, label: string}} option
 		 * @return string
 		 */
 		getSubnameForRecipient(option) {
 			if (option.source && option.source === 'groups') {
@@ -1475,7 +1475,7 @@
 
 	&.mail-account {
 		border-top: none;
-		padding-top: 10px;
+		padding-top: calc(var(--default-grid-baseline) * 2);
 	}
 
 	input,
@@ -1490,15 +1490,15 @@
 		display: flex;
 		align-items: flex-start;
 		justify-content: space-between;
-		padding-top: 2px;
+		padding-top: calc(var(--default-grid-baseline) * 0.5);
 
 		button {
 			margin-top: 0;
 			margin-bottom: 0;
 			background-color: transparent;
 			border: none;
 			opacity: 0.5;
-			padding: 10px 16px;
+			padding: calc(var(--default-grid-baseline) * 2) calc(var(--default-grid-baseline) * 4);
 		}
 
 		.select {
@@ -1515,7 +1515,7 @@
 	.subject {
 		font-size: 15px;
 		font-weight: bold;
-		margin: 3px 0 !important;
+		margin: var(--default-grid-baseline) 0 !important;
 		padding: 0 !important;
 		width: 100%;
 
@@ -1547,7 +1547,7 @@
 }
 
 .draft-status {
-	padding: 2px;
+	padding: calc(var(--default-grid-baseline) * 0.5);
 	opacity: 0.5;
 	font-size: small;
 	display: block;
@@ -1618,11 +1618,11 @@
 .send-button {
 	display: flex;
 	align-items: center;
-	padding: 10px 15px;
-	margin-left: 5px;
+	padding: calc(var(--default-grid-baseline) * 2) calc(var(--default-grid-baseline) * 4);
+	margin-left: var(--default-grid-baseline);
 }
 .send-button .send-icon {
-	padding-right: 5px;
+	padding-right: var(--default-grid-baseline);
 }
 .centered-content {
 	margin-top: 0 !important;
@@ -1632,12 +1632,12 @@
 	align-items: center;
 	flex-direction: row;
 	justify-content: space-between;
-	bottom: 5px;
+	bottom: var(--default-grid-baseline);
 }
 .composer-actions--primary-actions {
 	display: flex;
 	flex-direction: row;
-	padding-left: 10px;
+	padding-left: calc(var(--default-grid-baseline) * 2);
 	align-items: center;
 }
 .composer-actions--secondary-actions {

src/components/ComposerSessionIndicator.vue

@@ -97,10 +97,10 @@ export default {
 
 	display: flex;
 	align-items: center;
-	gap: 5px;
+	gap: var(--default-grid-baseline);
 
 	width: 360px;
-	padding: 0 8px;
+	padding: 0 calc(var(--default-grid-baseline) * 2);
 
 	// Retain border radius from outer body container for visual consistency
 	border-radius: var(--body-container-radius);

src/components/MailboxPicker.vue

@@ -191,12 +191,12 @@ export default {
 	width: 100%;
 	height: 100%;
 	flex-direction: column;
-	padding: 15px;
+	padding: calc(var(--default-grid-baseline) * 4);
 }
 
 .crumbs {
 	display: inline-flex;
-	padding-right: 0px;
+	padding-right: 0;
 	flex-wrap: wrap;
 
 	.level {
@@ -205,15 +205,15 @@ export default {
 		min-width: 0px;
 		flex: 0 0 auto;
 		order: 1;
-		padding-right: 7px;
+		padding-right: calc(var(--default-grid-baseline) * 2);
 		background-position: right center;
 		background-size: auto 24px;
-		margin-top: -10px;
+		margin-top: calc(var(--default-grid-baseline) * -2.5);
 	}
 
 	a {
 		position: relative;
-		padding: 12px;
+		padding: calc(var(--default-grid-baseline) * 3);
 		opacity: 0.5;
 		text-overflow: ellipsis;
 		white-space: nowrap;
@@ -249,7 +249,7 @@ export default {
 		}
 
 		&:not(:last-child) {
-			border-bottom: 1px solid var(--color-border);
+			border-bottom: var(--border-width-input) solid var(--color-border);
 		}
 	}
 
@@ -266,13 +266,13 @@ export default {
 	.mailbox-icon {
 		width: 24px;
 		height: 24px;
-		padding: 14px;
+		padding: calc(var(--default-grid-baseline) * 3);
 		opacity: 0.9;
 		background-size: 24px;
 	}
 
 	.mailbox-title {
-		padding: 14px 14px 14px 0;
+		padding: calc(var(--default-grid-baseline) * 3) calc(var(--default-grid-baseline) * 3) calc(var(--default-grid-baseline) * 3) 0;
 		flex: 1;
 		overflow: hidden;
 		white-space: nowrap;
@@ -283,14 +283,14 @@ export default {
 .buttons {
 	display: flex;
 	justify-content: flex-end;
-	padding-top: 10px;
+	padding-top: calc(var(--default-grid-baseline) * 2);
 
 	.spinner {
-		margin-right: 5px;
+		margin-right: var(--default-grid-baseline);
 	}
 }
 .material-design-icon {
 	opacity: .7;
-	margin-right: 6px;
+	margin-right: calc(var(--default-grid-baseline) * 1.5);
 }
 </style>

src/components/NewMessageButtonHeader.vue

@@ -93,7 +93,7 @@ export default {
 	align-items: center;
 	justify-content: space-between;
 	padding: calc(var(--default-grid-baseline, 4px) * 2);
-	gap: 4px;
+	gap: var(--default-grid-baseline);
 }
 .refresh__button {
 	background-color: transparent;