opelly/cweb
1
0
Fork 0
mirror of https://github.com/opelly27/cweb.git synced 2026-05-20 07:27:36 +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:
opelly27
2018-01-21 18:23:11 -08:00
parent bf9ea37307 282930ab29
commit 11fc0502c7
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/css/main.css
+7 -3
View File
@@ -1696,7 +1696,7 @@
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 {
@@ -2733,7 +2733,11 @@
} }
.tiles article.style1 > .image:before { .tiles article.style1 > .image:before {
background-color: #f2849e; <<<<<<< HEAD
/*background-color: #f2849e;*/
=======
background-color: #ffffff;
>>>>>>> 690f741f0a1ba216d59a056141f1992f27bf5b4f
} }
.tiles article.style2 > .image:before { .tiles article.style2 > .image:before {
@@ -3196,7 +3200,7 @@
#footer { #footer {
padding: 5em 0 6em 0 ; padding: 5em 0 6em 0 ;
background-color: #bbc1cc; background-color: #F2839D;
} }
#footer > .inner { #footer > .inner {
images/men-s-hoddie-500x500.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

index.html
+1 -1
View File
@@ -63,7 +63,7 @@
<section class="tiles"> <section class="tiles">
<article class="style1"> <article class="style1">
<span class="image"> <span class="image">
<img src="images/pic01.jpg" alt="" /> <img src="images/men-s-hoddie-500x500.jpg" alt="" />
</span> </span>
<a href="hoodies.html"> <a href="hoodies.html">
<h2>Hoodies</h2> <h2>Hoodies</h2>