Merge branch 'master' of https://github.com/camsqu/cweb

2026-05-20 02:47:38 +00:00 · 2018-01-21 18:20:14 -08:00
parent 3177386e14 690f741f0a
commit 282930ab29
1 changed files with 5 additions and 2 deletions
@@ -1693,11 +1693,10 @@
 	h1 {
 		font-size: 2.75em;
 		font-weight: 700;
-		color: #F2839D;
 		line-height: 1.3;
 		margin: 0 0 1em 0;
 		letter-spacing: -0.035em;
-		color: white;
+		color: #F2839D;
 	}

 		h1 a {
@@ -2734,7 +2733,11 @@
 					}

 			.tiles article.style1 > .image:before {
+<<<<<<< HEAD
 				/*background-color: #f2849e;*/
+=======
+				background-color: #ffffff;
+>>>>>>> 690f741f0a1ba216d59a056141f1992f27bf5b4f
 			}

 			.tiles article.style2 > .image:before {