From 09f320283b70cab70bf4e64141c374b735c9cb45 Mon Sep 17 00:00:00 2001 From: Jon Szeto Date: Thu, 7 Dec 2017 16:44:05 -0500 Subject: [PATCH 1/6] Add name to README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a38d4d6..23ac55e 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,5 @@ assignment_bootstrap_sprint Pick yourself up! [A Bootstrap, HTM5 and SASS project from the Viking Code School](http://www.vikingcodeschool.com) + +Jon Szeto From 2e29cbf78e2913b7ffe5c613930b7ac8428b4978 Mon Sep 17 00:00:00 2001 From: Jon Szeto Date: Thu, 7 Dec 2017 17:01:32 -0500 Subject: [PATCH 2/6] Create index.html and SASS files --- index.html | 0 .../style.scssc | Bin 0 -> 555 bytes sass/css/style.css | 3 +++ sass/css/style.css.map | 7 +++++++ sass/scss/style.scss | 0 5 files changed, 10 insertions(+) create mode 100644 index.html create mode 100644 sass/.sass-cache/4c1cc4a47e4df651100feddbf56bc70e7e777848/style.scssc create mode 100644 sass/css/style.css create mode 100644 sass/css/style.css.map create mode 100644 sass/scss/style.scss diff --git a/index.html b/index.html new file mode 100644 index 0000000..e69de29 diff --git a/sass/.sass-cache/4c1cc4a47e4df651100feddbf56bc70e7e777848/style.scssc b/sass/.sass-cache/4c1cc4a47e4df651100feddbf56bc70e7e777848/style.scssc new file mode 100644 index 0000000000000000000000000000000000000000..131a6b62212ed8cb998d7d34392db8d6c4dcce81 GIT binary patch literal 555 zcmcIhJ5R$f5bl6V36CPgP{dMof~5(B0Cg7&C{mXS(K0baZgWWtsW0*wP(l26E-4E? zfbIO9@4m-{{iq*yPi_i;M4PNTN-{Y05)}?q2oS;L{9+y?;dvCzQ%DEVWpH*q2vnL} z2Uo$s+i0OUnkph8W)?t*M?^Ql1h&PVT;#e)ESTp8KT=(QQA-HKuEf%5H1t*B4whx1 z9E^L7rf804!jpwIpqt`A62935#8#OMP;}Nj(;8%^3f&TINlsZ8mq;j%|9*Ku(iPL@ zaGUq-NK8`#$K|dBlhh-_cHJEAGwRhM$Gt;Z5c%X*1@x=3IrL_%R4+@k4lIi9nr8e9 zu=#s-M=N48EnZ_egmG`;KM`2+U)bs=IP~v;ULBVHyME=UZ#kvuB1bHI&QE7%3C6{9 x9wld08B=MsaXxXg7SNU!R1yEn?v5lrO Date: Thu, 7 Dec 2017 17:12:08 -0500 Subject: [PATCH 3/6] Import bootstrap and jQuery files to index.html --- index.html | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/index.html b/index.html index e69de29..cc36d6f 100644 --- a/index.html +++ b/index.html @@ -0,0 +1,25 @@ + + + + Bootstrap 101 Template + + + + + + + + + +

Hello, world!

+ + + + + + + + From 9e1c2854b53a4c3cfc80d041a9628461b964448c Mon Sep 17 00:00:00 2001 From: Jon Szeto Date: Thu, 7 Dec 2017 20:29:54 -0500 Subject: [PATCH 4/6] Lay out elements for banner and main section --- index.html | 69 +++++++++++++++++- .../style.scssc | Bin 555 -> 1471 bytes sass/css/style.css | 3 +- sass/css/style.css.map | 4 +- sass/scss/style.scss | 3 + 5 files changed, 75 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index cc36d6f..da3ddca 100644 --- a/index.html +++ b/index.html @@ -14,7 +14,74 @@ -

Hello, world!

+ + + +
+ +
+

Hello, world!

+
+ +
+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

+
+ +
+ +
+
+ +
+
+ +
+
+

Heading

+
+ +
+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

+
+ +
+ +
+
+ +
+
+

Heading

+
+ +
+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

+
+ +
+ +
+
+ +
+
+

Heading

+
+ +
+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

+
+ +
+ +
+
+
+
+ + + + diff --git a/sass/.sass-cache/4c1cc4a47e4df651100feddbf56bc70e7e777848/style.scssc b/sass/.sass-cache/4c1cc4a47e4df651100feddbf56bc70e7e777848/style.scssc index 131a6b62212ed8cb998d7d34392db8d6c4dcce81..2cd039c78617b10978013841dc5c51677646ee64 100644 GIT binary patch literal 1471 zcmcIkTTdE66y~8>5W!p8ic;-{Hb#>MM5Nl8mr1QAB#kkJ_Qi+I?Ct?Zm!0j*pi<+1 z?-_0i+Q+`Y?3~+ozVn@_mFwl2yZbc)2u0j+Ps0xEW$On)yIzAs{HeBU{uh4q+4qBb z^{9Fr`Ug;}^20+o;>X!n8A&#pTx&vF3V@IwQkruaLXIr4pev$KL44`VJM|;5PRk_A z6rL}gMk!bJr3yhg#5rw|HI{ItA@rK!)U54|+Z* zZEJ1KJ5T)5G-vG}p4mk&iD2TjIP%(@_d1EN&kRD2c@G+;#W7yG(89Y_4Ox-BBG z4*Q5n_x&rxJ3Pw13T!8tCKv|;x?Fc3QfJty9-2JG;|@qt7?&MhBA@nlfh;p^xH4WM zF-39KtqJ+()R`wNwVwz73>nqrcIS z6qz1#?akn$g$24HAM-i%-IK2+y45JX)`8X)Z3YpP?a@Jo=(Z&82zFy!6(w_qK=eQx z=vi77N~cjeul&?F$I6wA^&c>@@(uL0kxAu7T%$lwP&Un=D`ix{X^2kTgV=aJhH9gD z;^{<**i07XhHghWBW4Q?M&2`ce$%>=?iAFGixU6)T~ zkVaXpOl4rd-qS6%Nw-;%eiSLP$`b6?(}URXJCcdv7AZ+tz3s8xf8@)&oR6#zm+u8h zvhqv>3UP#h6h?%;5Hi;77(S~^LLQMhlTKM-n%%+v9<#66J@zIKU27bQyM>xgBIK}9 m`ZRvn-21HSj@}I7&JBiUAF{(WvD-JxuB|t_WX=?5we=U~LA`ze delta 214 zcmdnby_#i$m_|yXv1OuhYN~0fS&~VTL5i`FscBMLYMP~~nSr5&r9om^iiLr>f#pOy zDJO0#K8NIt%$$^>)Vyd0ASW#|Cp9lIH`Tz3*CD^4Br`v+xEds0lA2qPlUS1Ksl>o$ z#pW7f#pRHbnU|W$Ho1Y(myvt&IYvoAes*i_Og3wQOg5k_$e_uAOd`BoAwcb!xdr(} zC8 Date: Thu, 7 Dec 2017 20:42:31 -0500 Subject: [PATCH 5/6] Add background color to banner section --- index.html | 31 ++++++++++-------- .../style.scssc | Bin 1471 -> 1515 bytes sass/css/style.css | 4 +-- sass/css/style.css.map | 2 +- sass/scss/style.scss | 4 +-- 5 files changed, 22 insertions(+), 19 deletions(-) diff --git a/index.html b/index.html index da3ddca..d721f37 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,7 @@ + -
- -
-

Hello, world!

-
- -
-

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

-
- -
- -
-
+
diff --git a/sass/.sass-cache/4c1cc4a47e4df651100feddbf56bc70e7e777848/style.scssc b/sass/.sass-cache/4c1cc4a47e4df651100feddbf56bc70e7e777848/style.scssc index 2cd039c78617b10978013841dc5c51677646ee64..516fa4c05150d1e13abd75c02974d6f3c972fbf4 100644 GIT binary patch delta 424 zcmZ8dy-vbV6t>s`1r<;rrd8x85gou%`DyQs<{BsB-~e&cw=vg_I&_)Cbhi)fD1et697&_4Gnn(tRmN&o$)72Ac=4gP=6wV zI3?20dORd&ypgm}nB*)v~B9n9%B*#}?Gh8altcPelnRhcBn qT%NUs!ci5hp@7_aBOH)!xxG+dagrz&7uunqDE__59)xzJ+5Z8UB7Kek delta 394 zcmaFOy`Ou6n1-oQa+;}estJ%VOfychOf)x3N=i00G&i(JNis?`HcT`zNi|Qjm}uwC z!K0UyUzCzsG;!uic5VoBav73STo=PHy1r-X#`8k;>3Q0MM$=PhyoFP`c4*3No znfZCe)eKf#4keWZsaE`%DXDoSnQ57+MOI1xSOmodtYz}8rP#qD(wXwsvJO(#at_jy8(0(>H75J9i1Txxs+fF& zMVVg@MT~FqFBUx!ph*t;F#Xm-2G*Jm8k22Ur5X7qN3hBnYgq9)l%(bs8U5CB>XaZ>;Q diff --git a/sass/css/style.css b/sass/css/style.css index a856565..435f508 100644 --- a/sass/css/style.css +++ b/sass/css/style.css @@ -1,4 +1,4 @@ -.border { - border: 1px solid black; } +.banner-section { + background-color: #eaeaea; } /*# sourceMappingURL=style.css.map */ diff --git a/sass/css/style.css.map b/sass/css/style.css.map index caf71ea..52e3a91 100644 --- a/sass/css/style.css.map +++ b/sass/css/style.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "AAAA,OAAQ;EACN,MAAM,EAAE,eAAe", +"mappings": "AAAA,eAAgB;EACd,gBAAgB,EAAG,OAAO", "sources": ["../scss/style.scss"], "names": [], "file": "style.css" diff --git a/sass/scss/style.scss b/sass/scss/style.scss index 08c2a44..4a87963 100644 --- a/sass/scss/style.scss +++ b/sass/scss/style.scss @@ -1,3 +1,3 @@ -.border { - border: 1px solid black; +.banner-section { + background-color: #eaeaea } From 5bfe402c2e50cdfdd4fc15032f9a98b8778d36b9 Mon Sep 17 00:00:00 2001 From: Jon Szeto Date: Fri, 8 Dec 2017 13:33:18 -0500 Subject: [PATCH 6/6] Finalize design on all sections --- index.html | 46 +++++++++++++++--- .../style.scssc | Bin 1515 -> 4116 bytes sass/css/style.css | 18 ++++++- sass/css/style.css.map | 2 +- sass/scss/style.scss | 22 ++++++++- 5 files changed, 76 insertions(+), 12 deletions(-) diff --git a/index.html b/index.html index d721f37..63c1e46 100644 --- a/index.html +++ b/index.html @@ -17,8 +17,33 @@ - -