Просмотр исходного кода

Mapco text display improvements (#4711)

* Main font color from blue to regular dark

* newline added at the end of rtl css file

* Text display improvements (code, quotes) + minor UI fixes

* replaced 2 spaces with 1 tab bcz phpcs is whining about that

* make fix-all

* Mapco/base-theme - CSS cleaning

* make fix-all

* PR #4711 cleaning

* Exclude generated CSS from lint check

* Revert exclusion of generated CSS files

Co-authored-by: patjennings <patjennings@MacBook-Pro-de-patjennings.local>
Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
Co-authored-by: patjennings <patjennings@macbook-pro-de-patjennings.home>
Co-authored-by: maTh <math-home@web.de>
Thomas Guesnon 3 лет назад
Родитель
Сommit
fc93776071

+ 8 - 8
p/themes/Mapco/_fonts.scss

@@ -3,7 +3,7 @@
 	font-style: normal;
 	font-stretch: normal;
 	font-weight: 400;
-	src: local("Lato"), url("../fonts/LatoLatin-Regular.woff") format("woff");
+	src: url("../fonts/LatoLatin-Regular.woff") format("woff");
 }
 
 @font-face {
@@ -11,7 +11,7 @@
 	font-style: italic;
 	font-stretch: normal;
 	font-weight: 400;
-	src: local("Lato"), url("../fonts/LatoLatin-Italic.woff") format("woff");
+	src: url("../fonts/LatoLatin-Italic.woff") format("woff");
 }
 
 @font-face {
@@ -19,7 +19,7 @@
 	font-style: normal;
 	font-stretch: normal;
 	font-weight: 700;
-	src: local("Lato"), url("../fonts/LatoLatin-Bold.woff") format("woff");
+	src: url("../fonts/LatoLatin-Regular.woff") format("woff");
 }
 
 @font-face {
@@ -27,7 +27,7 @@
 	font-style: italic;
 	font-stretch: normal;
 	font-weight: 700;
-	src: local("Lato"), url("../fonts/LatoLatin-BoldItalic.woff") format("woff");
+	src: url("../fonts/LatoLatin-BoldItalic.woff") format("woff");
 }
 
 @font-face {
@@ -35,7 +35,7 @@
 	font-style: normal;
 	font-stretch: normal;
 	font-weight: 400;
-	src: local("Spectral"), url("../fonts/Spectral-Regular.woff") format("woff");
+	src: url("../fonts/Spectral-Regular.woff") format("woff");
 }
 
 @font-face {
@@ -43,7 +43,7 @@
 	font-style: italic;
 	font-stretch: normal;
 	font-weight: 400;
-	src: local("Spectral"), url("../fonts/Spectral-Italic.woff") format("woff");
+	src: url("../fonts/Spectral-Italic.woff") format("woff");
 }
 
 @font-face {
@@ -51,7 +51,7 @@
 	font-style: normal;
 	font-stretch: normal;
 	font-weight: 700;
-	src: local("Spectral"), url("../fonts/Spectral-Bold.woff") format("woff");
+	src: url("../fonts/Spectral-Bold.woff") format("woff");
 }
 
 @font-face {
@@ -59,5 +59,5 @@
 	font-style: italic;
 	font-stretch: normal;
 	font-weight: 700;
-	src: local("Spectral"), url("../fonts/Spectral-BoldItalic.woff") format("woff");
+	src: url("../fonts/Spectral-BoldItalic.woff") format("woff");
 }

+ 7 - 6
p/themes/Mapco/_layout.scss

@@ -307,20 +307,21 @@ main.prompt {
 
 	code {
 		padding: 2px 5px;
-		background: variables.$grey-lighter;
-		border: 1px solid variables.$grey-light;
+		background: variables.$code-bg;
+		color: variables.$code-text;
+		font-size: 1rem;
+		// border: 1px solid variables.$alert-light;
 		border-radius: 3px;
 	}
 
 
 	blockquote {
 		margin: 0;
-		padding: 5px 20px;
+		padding: 0.5rem 1.5rem;
 		background: variables.$grey-lighter;
 		display: block;
-		color: variables.$main-font-color;
-		border-top: 1px solid variables.$grey-medium-light;
-		border-bottom: 1px solid variables.$grey-medium-light;
+		color: variables.$light-font-color;
+		border-left: 4px solid variables.$grey-medium-light;
 
 		p {
 			margin: 0;

+ 3 - 0
p/themes/Mapco/_variables.scss

@@ -30,6 +30,9 @@ $alert-bg: #f5633e; // the base
 $alert-light: #fde0d8; // +light
 $alert-text: #73341f; // +dark
 
+$code-text: #e41212;
+$code-bg: #fde3e3;
+
 $warning-bg: #f4f762;
 $warning-light: #fdfde0;
 $warning-text: #73762f;

+ 16 - 14
p/themes/Mapco/mapco.css

@@ -3,56 +3,56 @@
 	font-style: normal;
 	font-stretch: normal;
 	font-weight: 400;
-	src: local("Lato"), url("../fonts/LatoLatin-Regular.woff") format("woff");
+	src: url("../fonts/LatoLatin-Regular.woff") format("woff");
 }
 @font-face {
 	font-family: "lato";
 	font-style: italic;
 	font-stretch: normal;
 	font-weight: 400;
-	src: local("Lato"), url("../fonts/LatoLatin-Italic.woff") format("woff");
+	src: url("../fonts/LatoLatin-Italic.woff") format("woff");
 }
 @font-face {
 	font-family: "lato";
 	font-style: normal;
 	font-stretch: normal;
 	font-weight: 700;
-	src: local("Lato"), url("../fonts/LatoLatin-Bold.woff") format("woff");
+	src: url("../fonts/LatoLatin-Regular.woff") format("woff");
 }
 @font-face {
 	font-family: "lato";
 	font-style: italic;
 	font-stretch: normal;
 	font-weight: 700;
-	src: local("Lato"), url("../fonts/LatoLatin-BoldItalic.woff") format("woff");
+	src: url("../fonts/LatoLatin-BoldItalic.woff") format("woff");
 }
 @font-face {
 	font-family: "spectral";
 	font-style: normal;
 	font-stretch: normal;
 	font-weight: 400;
-	src: local("Spectral"), url("../fonts/Spectral-Regular.woff") format("woff");
+	src: url("../fonts/Spectral-Regular.woff") format("woff");
 }
 @font-face {
 	font-family: "spectral";
 	font-style: italic;
 	font-stretch: normal;
 	font-weight: 400;
-	src: local("Spectral"), url("../fonts/Spectral-Italic.woff") format("woff");
+	src: url("../fonts/Spectral-Italic.woff") format("woff");
 }
 @font-face {
 	font-family: "spectral";
 	font-style: normal;
 	font-stretch: normal;
 	font-weight: 700;
-	src: local("Spectral"), url("../fonts/Spectral-Bold.woff") format("woff");
+	src: url("../fonts/Spectral-Bold.woff") format("woff");
 }
 @font-face {
 	font-family: "spectral";
 	font-style: italic;
 	font-stretch: normal;
 	font-weight: 700;
-	src: local("Spectral"), url("../fonts/Spectral-BoldItalic.woff") format("woff");
+	src: url("../fonts/Spectral-BoldItalic.woff") format("woff");
 }
 /* stylelint-disable property-no-vendor-prefix */
 /* FUNCTIONS */
@@ -921,18 +921,18 @@ main.prompt {
 }
 .content code, .content.thin code {
 	padding: 2px 5px;
-	background: #f9fafb;
-	border: 1px solid #eff0f2;
+	background: #fde3e3;
+	color: #e41212;
+	font-size: 1rem;
 	border-radius: 3px;
 }
 .content blockquote, .content.thin blockquote {
 	margin: 0;
-	padding: 5px 20px;
+	padding: 0.5rem 1.5rem;
 	background: #f9fafb;
 	display: block;
-	color: #303136;
-	border-top: 1px solid #d5d8db;
-	border-bottom: 1px solid #d5d8db;
+	color: #5b6871;
+	border-left: 4px solid #d5d8db;
 }
 .content blockquote p, .content.thin blockquote p {
 	margin: 0;
@@ -1386,3 +1386,5 @@ a, button.as-link {
 	outline: none;
 	color: #36c;
 }
+
+/*# sourceMappingURL=mapco.css.map */

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
p/themes/Mapco/mapco.css.map


+ 14 - 14
p/themes/Mapco/mapco.rtl.css

@@ -3,56 +3,56 @@
 	font-style: normal;
 	font-stretch: normal;
 	font-weight: 400;
-	src: local("Lato"), url("../fonts/LatoLatin-Regular.woff") format("woff");
+	src: url("../fonts/LatoLatin-Regular.woff") format("woff");
 }
 @font-face {
 	font-family: "lato";
 	font-style: italic;
 	font-stretch: normal;
 	font-weight: 400;
-	src: local("Lato"), url("../fonts/LatoLatin-Italic.woff") format("woff");
+	src: url("../fonts/LatoLatin-Italic.woff") format("woff");
 }
 @font-face {
 	font-family: "lato";
 	font-style: normal;
 	font-stretch: normal;
 	font-weight: 700;
-	src: local("Lato"), url("../fonts/LatoLatin-Bold.woff") format("woff");
+	src: url("../fonts/LatoLatin-Regular.woff") format("woff");
 }
 @font-face {
 	font-family: "lato";
 	font-style: italic;
 	font-stretch: normal;
 	font-weight: 700;
-	src: local("Lato"), url("../fonts/LatoLatin-BoldItalic.woff") format("woff");
+	src: url("../fonts/LatoLatin-BoldItalic.woff") format("woff");
 }
 @font-face {
 	font-family: "spectral";
 	font-style: normal;
 	font-stretch: normal;
 	font-weight: 400;
-	src: local("Spectral"), url("../fonts/Spectral-Regular.woff") format("woff");
+	src: url("../fonts/Spectral-Regular.woff") format("woff");
 }
 @font-face {
 	font-family: "spectral";
 	font-style: italic;
 	font-stretch: normal;
 	font-weight: 400;
-	src: local("Spectral"), url("../fonts/Spectral-Italic.woff") format("woff");
+	src: url("../fonts/Spectral-Italic.woff") format("woff");
 }
 @font-face {
 	font-family: "spectral";
 	font-style: normal;
 	font-stretch: normal;
 	font-weight: 700;
-	src: local("Spectral"), url("../fonts/Spectral-Bold.woff") format("woff");
+	src: url("../fonts/Spectral-Bold.woff") format("woff");
 }
 @font-face {
 	font-family: "spectral";
 	font-style: italic;
 	font-stretch: normal;
 	font-weight: 700;
-	src: local("Spectral"), url("../fonts/Spectral-BoldItalic.woff") format("woff");
+	src: url("../fonts/Spectral-BoldItalic.woff") format("woff");
 }
 /* stylelint-disable property-no-vendor-prefix */
 /* FUNCTIONS */
@@ -921,18 +921,18 @@ main.prompt {
 }
 .content code, .content.thin code {
 	padding: 2px 5px;
-	background: #f9fafb;
-	border: 1px solid #eff0f2;
+	background: #fde3e3;
+	color: #e41212;
+	font-size: 1rem;
 	border-radius: 3px;
 }
 .content blockquote, .content.thin blockquote {
 	margin: 0;
-	padding: 5px 20px;
+	padding: 0.5rem 1.5rem;
 	background: #f9fafb;
 	display: block;
-	color: #303136;
-	border-top: 1px solid #d5d8db;
-	border-bottom: 1px solid #d5d8db;
+	color: #5b6871;
+	border-right: 4px solid #d5d8db;
 }
 .content blockquote p, .content.thin blockquote p {
 	margin: 0;

+ 1 - 0
p/themes/Mapco/mapco.scss

@@ -51,3 +51,4 @@ a, button.as-link {
 	outline: none;
 	color: variables.$main-first;
 }
+

+ 1 - 1
p/themes/base-theme/frss.css

@@ -727,7 +727,7 @@ input[type="checkbox"]:focus-visible {
 	display: inline-block;
 	max-width: none;
 	width: 1rem;
-	height: 1rem;
+	height: inherit;
 	vertical-align: middle;
 	line-height: 1;
 }

+ 1 - 1
p/themes/base-theme/frss.rtl.css

@@ -727,7 +727,7 @@ input[type="checkbox"]:focus-visible {
 	display: inline-block;
 	max-width: none;
 	width: 1rem;
-	height: 1rem;
+	height: inherit;
 	vertical-align: middle;
 	line-height: 1;
 }

Некоторые файлы не были показаны из-за большого количества измененных файлов