From 5285c99da76ede5674a80ad8682a0809af5263c5 Mon Sep 17 00:00:00 2001 From: Marissa Felitto Date: Wed, 5 Nov 2014 11:59:24 -0800 Subject: [PATCH 1/2] refactor sheyna and wendy's project --- marissa-casey/css/base.css | 48 +++++++++++++++++++++++ marissa-casey/css/style.css | 71 ++++++++++++++++++++++++++++++++++ marissa-casey/index.html | 70 +++++++++++++++++++++++++++++++++ marissa-casey/js/GoogleMaps.js | 29 ++++++++++++++ 4 files changed, 218 insertions(+) create mode 100644 marissa-casey/css/base.css create mode 100644 marissa-casey/css/style.css create mode 100644 marissa-casey/index.html create mode 100644 marissa-casey/js/GoogleMaps.js diff --git a/marissa-casey/css/base.css b/marissa-casey/css/base.css new file mode 100644 index 0000000..d9f27b5 --- /dev/null +++ b/marissa-casey/css/base.css @@ -0,0 +1,48 @@ +/* http://meyerweb.com/eric/tools/css/reset/ + v2.0 | 20110126 + License: none (public domain) +*/ + +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} +/* HTML5 display-role reset for older browsers */ +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { + display: block; +} +body { + line-height: 1; +} +ol, ul { + list-style: none; +} +blockquote, q { + quotes: none; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} +table { + border-collapse: collapse; + border-spacing: 0; +} diff --git a/marissa-casey/css/style.css b/marissa-casey/css/style.css new file mode 100644 index 0000000..fbe9507 --- /dev/null +++ b/marissa-casey/css/style.css @@ -0,0 +1,71 @@ +body { + font-family: 'Bubbler One', sans-serif; + background-color: #fff; + color: rgb(84, 89, 70); + font-size: 100%; + text-align: center; +} + +.buildingBlock { + display: block; + margin: 0; + padding: 2% 15% 2% 15%; +} + +.buildingBlock--bottom { + background-color: rgb(209, 213, 192); +} + +.indexFigureHero { + display: block; + margin: 0 auto; + max-width: 100%; +} + +h1 { + font-size: 3.8em; + margin: 3% auto 2% auto; + color: rgb(168, 172, 138); +} + +h2 { + font-size: 1.6em; + margin: 0.5em auto 0.3em auto; +} + +ul { + margin: 4% auto 1% auto; +} + +li { + list-style-type: none; + display: inline-block; + font-size: 2em; + margin: 0% 3%; +} + +a { + text-decoration: none; + color: rgb(84, 89, 70); +} + +a:hover { + color: #93315a; +} + +.preview { + display: inline-block; + position: relative; + margin: 3%; + width: 220px; + font-size: 1em; +} + +.preview__figure-image { + width: 220px; +} + +#googleMap { + width:220px; + height:179px; +} diff --git a/marissa-casey/index.html b/marissa-casey/index.html new file mode 100644 index 0000000..a317471 --- /dev/null +++ b/marissa-casey/index.html @@ -0,0 +1,70 @@ + + + + + South Lake Union Farmer's Market + + + + + + + + + + + + +
+ + + +

South Lake Union Farmer's Market

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et + dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi.

+ +
+ + + + + + + + + diff --git a/marissa-casey/js/GoogleMaps.js b/marissa-casey/js/GoogleMaps.js new file mode 100644 index 0000000..77ddba5 --- /dev/null +++ b/marissa-casey/js/GoogleMaps.js @@ -0,0 +1,29 @@ + +var myCenter=new google.maps.LatLng(47.6235481,-122.336212); +var marker; + +function initialize(){ + var mapProp = { + center:myCenter, + zoom:18, + mapTypeId:google.maps.MapTypeId.TERRAIN + }; + var map=new google.maps.Map(document.getElementById("googleMap") + ,mapProp); + var marker=new google.maps.Marker({ + position:myCenter, + animation:google.maps.Animation.BOUNCE + }); + + marker.setMap(map); + + var infowindow = new google.maps.InfoWindow({ + content:"SLU Farmer's Market" + }); + + google.maps.event.addListener(marker, 'click', function(){ + infowindow.open(map,marker); + }); +} + +google.maps.event.addDomListener(window, 'load', initialize); From 3253278b04e5d46a59035c6978839b48858bc4c5 Mon Sep 17 00:00:00 2001 From: Dexter Lesaca Date: Mon, 1 Jun 2015 11:21:51 -0700 Subject: [PATCH 2/2] README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e69de29..24e5d00 100644 --- a/README.md +++ b/README.md @@ -0,0 +1 @@ +#README