opelly/cweb
1
0
Fork 0
mirror of https://github.com/opelly27/cweb.git synced 2026-05-20 03:57:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Cameron Squire
2018-01-21 18:20:14 -08:00
parent 3177386e14 690f741f0a
commit 282930ab29
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/css/main.css
+5 -2
View File
@@ -1693,11 +1693,10 @@
h1 { h1 {
font-size: 2.75em; font-size: 2.75em;
font-weight: 700; font-weight: 700;
color: #F2839D;
line-height: 1.3; line-height: 1.3;
margin: 0 0 1em 0; margin: 0 0 1em 0;
letter-spacing: -0.035em; letter-spacing: -0.035em;
color: white; color: #F2839D;
} }
h1 a { h1 a {
@@ -2734,7 +2733,11 @@
} }
.tiles article.style1 > .image:before { .tiles article.style1 > .image:before {
<<<<<<< HEAD
/*background-color: #f2849e;*/ /*background-color: #f2849e;*/
=======
background-color: #ffffff;
>>>>>>> 690f741f0a1ba216d59a056141f1992f27bf5b4f
} }
.tiles article.style2 > .image:before { .tiles article.style2 > .image:before {