diff --git a/app/assets/images/MM Social-51.png b/app/assets/images/MM Social-51.png new file mode 100644 index 00000000..d31ecc9f Binary files /dev/null and b/app/assets/images/MM Social-51.png differ diff --git a/app/assets/images/MM Social-52.png b/app/assets/images/MM Social-52.png new file mode 100644 index 00000000..2396356a Binary files /dev/null and b/app/assets/images/MM Social-52.png differ diff --git a/app/assets/images/MM Social-53.png b/app/assets/images/MM Social-53.png new file mode 100644 index 00000000..e78ab067 Binary files /dev/null and b/app/assets/images/MM Social-53.png differ diff --git a/app/assets/stylesheets/Fonts/Lato-Bol-webfont.eot b/app/assets/stylesheets/Fonts/Lato-Bol-webfont.eot new file mode 100644 index 00000000..32b80380 Binary files /dev/null and b/app/assets/stylesheets/Fonts/Lato-Bol-webfont.eot differ diff --git a/app/assets/stylesheets/Fonts/Lato-Bol-webfont.svg b/app/assets/stylesheets/Fonts/Lato-Bol-webfont.svg new file mode 100644 index 00000000..f5401579 --- /dev/null +++ b/app/assets/stylesheets/Fonts/Lato-Bol-webfont.svg @@ -0,0 +1,147 @@ + + + + +This is a custom SVG webfont generated by Font Squirrel. +Copyright : Copyright c 20102011 by tyPoland Lukasz Dziedzic with Reserved Font Name Lato Licensed under the SIL Open Font License Version 11 +Designer : Lukasz Dziedzic +Foundry : tyPoland Lukasz Dziedzic +Foundry URL : httpwwwtypolandcom + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/stylesheets/Fonts/Lato-Bol-webfont.ttf b/app/assets/stylesheets/Fonts/Lato-Bol-webfont.ttf new file mode 100644 index 00000000..a62d61ae Binary files /dev/null and b/app/assets/stylesheets/Fonts/Lato-Bol-webfont.ttf differ diff --git a/app/assets/stylesheets/Fonts/Lato-Bol-webfont.woff b/app/assets/stylesheets/Fonts/Lato-Bol-webfont.woff new file mode 100644 index 00000000..866d7867 Binary files /dev/null and b/app/assets/stylesheets/Fonts/Lato-Bol-webfont.woff differ diff --git a/app/assets/stylesheets/Fonts/Lato-Reg-webfont.eot b/app/assets/stylesheets/Fonts/Lato-Reg-webfont.eot new file mode 100644 index 00000000..e648b1ad Binary files /dev/null and b/app/assets/stylesheets/Fonts/Lato-Reg-webfont.eot differ diff --git a/app/assets/stylesheets/Fonts/Lato-Reg-webfont.svg b/app/assets/stylesheets/Fonts/Lato-Reg-webfont.svg new file mode 100644 index 00000000..d300fe48 --- /dev/null +++ b/app/assets/stylesheets/Fonts/Lato-Reg-webfont.svg @@ -0,0 +1,147 @@ + + + + +This is a custom SVG webfont generated by Font Squirrel. +Copyright : Copyright c 20102011 by tyPoland Lukasz Dziedzic with Reserved Font Name Lato Licensed under the SIL Open Font License Version 11 +Designer : Lukasz Dziedzic +Foundry : tyPoland Lukasz Dziedzic +Foundry URL : httpwwwtypolandcom + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/stylesheets/Fonts/Lato-Reg-webfont.ttf b/app/assets/stylesheets/Fonts/Lato-Reg-webfont.ttf new file mode 100644 index 00000000..1d1e0865 Binary files /dev/null and b/app/assets/stylesheets/Fonts/Lato-Reg-webfont.ttf differ diff --git a/app/assets/stylesheets/Fonts/Lato-Reg-webfont.woff b/app/assets/stylesheets/Fonts/Lato-Reg-webfont.woff new file mode 100644 index 00000000..95bba717 Binary files /dev/null and b/app/assets/stylesheets/Fonts/Lato-Reg-webfont.woff differ diff --git a/app/assets/stylesheets/Fonts/Lato-RegIta-webfont.eot b/app/assets/stylesheets/Fonts/Lato-RegIta-webfont.eot new file mode 100644 index 00000000..6f7fd309 Binary files /dev/null and b/app/assets/stylesheets/Fonts/Lato-RegIta-webfont.eot differ diff --git a/app/assets/stylesheets/Fonts/Lato-RegIta-webfont.svg b/app/assets/stylesheets/Fonts/Lato-RegIta-webfont.svg new file mode 100644 index 00000000..28bd02ab --- /dev/null +++ b/app/assets/stylesheets/Fonts/Lato-RegIta-webfont.svg @@ -0,0 +1,147 @@ + + + + +This is a custom SVG webfont generated by Font Squirrel. +Copyright : Copyright c 20102011 by tyPoland Lukasz Dziedzic with Reserved Font Name Lato Licensed under the SIL Open Font License Version 11 +Designer : Lukasz Dziedzic +Foundry : tyPoland Lukasz Dziedzic +Foundry URL : httpwwwtypolandcom + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/stylesheets/Fonts/Lato-RegIta-webfont.ttf b/app/assets/stylesheets/Fonts/Lato-RegIta-webfont.ttf new file mode 100644 index 00000000..60197266 Binary files /dev/null and b/app/assets/stylesheets/Fonts/Lato-RegIta-webfont.ttf differ diff --git a/app/assets/stylesheets/Fonts/Lato-RegIta-webfont.woff b/app/assets/stylesheets/Fonts/Lato-RegIta-webfont.woff new file mode 100644 index 00000000..4adbc518 Binary files /dev/null and b/app/assets/stylesheets/Fonts/Lato-RegIta-webfont.woff differ diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 26cdd05f..07452ea4 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -30,6 +30,42 @@ } +@font-face { + font-family: 'LatoRegular'; + src: url('/assets/Fonts/Lato-Reg-webfont.eot'); + src: url('/assets/Fonts/Lato-Reg-webfont.eot?#iefix') format('embedded-opentype'), + url('/assets/Fonts/Lato-Reg-webfont.woff') format('woff'), + url('/assets/Fonts/Lato-Reg-webfont.ttf') format('truetype'), + url('/assets/Fonts/Lato-Reg-webfont.svg#LatoRegular') format('svg'); + font-weight: normal; + font-style: normal; + +} + +@font-face { + font-family: 'LatoItalic'; + src: url('/assets/Fonts/Lato-RegIta-webfont.eot'); + src: url('/assets/Fonts/Lato-RegIta-webfont.eot?#iefix') format('embedded-opentype'), + url('/assets/Fonts/Lato-RegIta-webfont.woff') format('woff'), + url('/assets/Fonts/Lato-RegIta-webfont.ttf') format('truetype'), + url('/assets/Fonts/Lato-RegIta-webfont.svg#LatoItalic') format('svg'); + font-weight: normal; + font-style: normal; + +} + +@font-face { + font-family: 'LatoBold'; + src: url('/assets/Fonts/Lato-Bol-webfont.eot'); + src: url('/assets/Fonts/Lato-Bol-webfont.eot?#iefix') format('embedded-opentype'), + url('/assets/Fonts/Lato-Bol-webfont.woff') format('woff'), + url('/assets/Fonts/Lato-Bol-webfont.ttf') format('truetype'), + url('/assets/Fonts/Lato-Bol-webfont.svg#LatoBold') format('svg'); + font-weight: normal; + font-style: normal; + +} + /* clear styles */ html, body, div, h1, h2, h3, h4, h5, h6, ul, ol, dl, li, dt, dd, p, blockquote, @@ -689,19 +725,16 @@ cursor:pointer; .sidebarFork .tip { display: none; position: absolute; -background: white; -min-width: 180px; -max-width: 250px; +background: black; text-align: center; top: 36px; right: 0; -color: black; +color: white; border-radius: 4px; font-size: 15px !important; -font-family: 'LatoLight'; +font-family: 'LatoRegular'; line-height: 17px; padding: 3px 5px 2px; -border: 1px solid black; z-index: 100; } @@ -750,19 +783,16 @@ cursor:pointer; .sidebarSave .tip { display: none; position: absolute; -background: white; -min-width: 180px; -max-width: 250px; +background: black; text-align: center; top: 36px; right: 0; -color: black; +color: white; border-radius: 4px; font-size: 15px !important; -font-family: 'LatoLight'; +font-family: 'LatoRegular'; line-height: 17px; padding: 3px 5px 2px; -border: 1px solid black; z-index: 100; } @@ -910,19 +940,16 @@ background-size: 26px 25px; .sidebarCollaborate .tip { display: none; position: absolute; -background: white; -min-width: 180px; -max-width: 250px; +background: black; text-align: center; top: 36px; right: 0; -color: black; +color: white; border-radius: 4px; font-size: 15px !important; -font-family: 'LatoLight'; +font-family: 'LatoRegular'; line-height: 17px; padding: 3px 5px 2px; -border: 1px solid black; z-index: 100; } @@ -2082,7 +2109,7 @@ background-size: 22px 20px; cursor:pointer; } .footer ul li:hover { - background:black; + } li.meta a, li.tutorial a, li.exploreMaps a { @@ -2105,6 +2132,13 @@ li.meta, li.tutorial, li.exploreMaps { /* home page */ +div#preloaded-images { + position: absolute; + overflow: hidden; + left: -9999px; + top: -9999px; +} + .home_content { width: 830px; margin:0 auto; @@ -2162,6 +2196,13 @@ box-shadow: none; margin:5px auto; } +.featuredMaps { + margin: 15px 0; + font-size:20px; + line-height:20px; + text-align:center; +} + #homeMap { width:738px; margin: 0 auto; @@ -2241,9 +2282,9 @@ border-radius:5px; } #homeFigure figure:hover .littleOverlay { - top: 0; + /*top: 0; background: rgba(255,255,255, 0.9); - bottom: 0; + bottom: 0; */ } @@ -2251,6 +2292,31 @@ border-radius:5px; height:226px; } +.socialIcons { + position:fixed; + bottom: 9px; + height: 35px; + right:11px; +} +.socialIcons a { + float:left; + height:35px; + width:35px; + margin-right:5px; + background-repeat:no-repeat; + background-size:30px 30px; +} +.socialIcons .twitter { + background-image: url('MM Social-51.png'); +} +.socialIcons .google { + background-image: url('MM Social-52.png'); +} +.socialIcons .wordpress { + background-image: url('MM Social-53.png'); +} + + .contact { text-align: center; margin: 1em 0 1em 0; diff --git a/app/views/main/home.html.erb b/app/views/main/home.html.erb index a4fb7e26..ef664bb9 100644 --- a/app/views/main/home.html.erb +++ b/app/views/main/home.html.erb @@ -6,6 +6,11 @@ <% content_for :title, "Home | Metamaps" %> + +
+ Image 01 +
+
@@ -34,9 +39,7 @@

Request Invite Learn More -
-
- explore what experienced metamappers are creating +

explore featured maps from our community

@@ -52,6 +55,13 @@
+ +
@@ -66,11 +76,12 @@ $(document).ready(function() { minDisplayTime: 2000 }); - - /*$("#homeMap").mCustomScrollbar({ - horizontalScroll:true, - scrollButtons: { enable: true } - }).mCustomScrollbar('scrollTo',300);*/ + $('#homeMapImage').hover(function() { + $(this).attr('src','/assets/metacodes75ms300x300.gif'); + }, function() { + $(this).attr('src','/assets/metamap128x128.png'); + }); + });