From 549c086af4a56fc1b55fe4f099948fd283f62cb4 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Wed, 31 Aug 2016 18:57:19 -0400 Subject: [PATCH] styleee (#620) --- app/assets/images/.DS_Store | Bin 8196 -> 18436 bytes app/assets/images/exploremaps_sprite.png | Bin 2264 -> 3162 bytes app/assets/images/map_control_sprite.png | Bin 0 -> 5441 bytes app/assets/images/missing-map.png | Bin 4242 -> 5046 bytes app/assets/images/newmap_sprite.png | Bin 0 -> 667 bytes app/assets/images/star.png | Bin 514 -> 0 bytes app/assets/images/starmap_sprite.png | Bin 0 -> 739 bytes app/assets/javascripts/src/Metamaps.Map.js | 1 + app/assets/javascripts/src/Metamaps.Router.js | 2 + app/assets/stylesheets/base.css.erb | 42 ++++++++++++++++-- app/assets/stylesheets/clean.css.erb | 38 +++++++++------- .../{mobile.css.erb => mobile.scss.erb} | 29 +++++++++++- app/models/map.rb | 2 +- app/views/layouts/_mobilemenu.html.erb | 7 ++- frontend/src/components/Header.js | 2 +- frontend/src/components/Maps.js | 1 + 16 files changed, 100 insertions(+), 24 deletions(-) create mode 100644 app/assets/images/map_control_sprite.png create mode 100644 app/assets/images/newmap_sprite.png delete mode 100644 app/assets/images/star.png create mode 100644 app/assets/images/starmap_sprite.png rename app/assets/stylesheets/{mobile.css.erb => mobile.scss.erb} (85%) diff --git a/app/assets/images/.DS_Store b/app/assets/images/.DS_Store index 5dbe43d02555e42ebdfb413463dfc67feb75069f..faa17423b952a6839ab40a32e5b658b6d996199e 100644 GIT binary patch literal 18436 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 b`hp>kIPw2O|L-L6|8>0MYEj}hwg3Nbhb7hW delta 151 zcmZpfz}Vs-!N9=4=v10w$iM(%asV-i7T}&(C^k_~as$2DwrMt diff --git a/app/assets/images/exploremaps_sprite.png b/app/assets/images/exploremaps_sprite.png index 492daaa8954731023e5685f1de787a9a567c7f74..624d67e61e9f4fe4ae76853a2da2c8ac552e160d 100644 GIT binary patch delta 3135 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 literal 0 HcmV?d00001 diff --git a/app/assets/images/missing-map.png b/app/assets/images/missing-map.png index 54cbd84315c5600bd8ca07fb685c0f39c1a9de03..1230ae2b397dabf035c874ab41898c885d26b47a 100644 GIT binary patch literal 5046 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 DlaL`l delta 4200 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 rJUu-nn5n22{7NRSQ diff --git a/app/assets/images/newmap_sprite.png b/app/assets/images/newmap_sprite.png new file mode 100644 index 0000000000000000000000000000000000000000..812fc7a5de4ed02f01de98fa4d58b6a435395c1e GIT binary patch literal 667 zcmeAS@N?(olHy`uVBq!ia0vp^9zZ;SgAGWoZqQ`~Qk(@Ik;M!Q+`=Ht$S`Y;1W-`2 z#5JNMI6tkVJh3R1!7(L2DOJHUH!(dmC^a#qvhZZ84Fdy{hNp{TNX4x;cP{2$c91#n zklBzyxrKKZW1w0Cr-rbC+$W#PZ$j_b<{tROR>FLV*N7?osg`Sp)bE_5XMg_o43l5w zz1DxN_I$tp0xFq1@9BJW{{H)~@1IY~aqr!AtdG4;4-M^iWp8RoZ=vc7u=b@THI{Fx9F zJbC@EFs|%NaxrrM*m@>V=EAa) z1*^HBzGdN<0Q57&^Ce;Lm(|`%*w3pyWAP0W-`UJtR#|olX8w>l+Oe7UnMM^`r3W)q zDGSF19{r1p8~C)Dv)mbvn&0L-A#+r5_2t=rWA^T{?5b^dy3hNwWxCnqqFIc;Gtd40 zIDrisz??9PJsRRHCs=m4%!}=JJIy zkq@u_TsG-IkK;M^S#|fN+Cx@+nCZ(9k-O9SW%)I~b=!UIC3s6t2T$B^;fGy~n^D4a zH|K(b6;FP?kv`xSbIxR@p|$$`P=%G+)|bOmPtE2Dst=AbjQFKoZ~6SxRPF2k*KN|d zy=$HQqgl`XH%RQ0VYu{1e#NR+ybOo*^&%1uUVd*7rS0#^bm0B}MrGEk z4|khLHE|zPW=OmLCI86Np0u`Cg0G(#b1b<(b?(d6Mo)d&R_@naE1~mu;{G|sPj{`7 ZHxvw6IC*W}YGB+lc)I$ztaD0e0su6T^Q-^> diff --git a/app/assets/images/starmap_sprite.png b/app/assets/images/starmap_sprite.png new file mode 100644 index 0000000000000000000000000000000000000000..f882edd8298d4219450664883622a614613212a2 GIT binary patch literal 739 zcmeAS@N?(olHy`uVBq!ia0vp^3P7B|!3HF2lnQ15Db50q$YKTtZeb8+WSBKa0w^e1 z;u=vBoS#-wo>-L1;Fyx1l&avFo0y&&l$w}QS$HzlhJk^pz|+Msq~g|_8K->@I|#JB z?O+OGlG#zfB|2eA)fX z{;<)Kw;aDOUy$38^>*_Gwk@LPnk5;^`!{Tf&68~lS^VT5|Mzm$d0Izi{iH7g#00_XZ{OEDUfH2man0=V#LMgb?il{F1{LjC*)E**Zr{GmnMu7P{!M@EUHv+N7*@XIea zWB!Qw&d&o{&Q?8V*?rnB7k*;&N~mYc*cD%6*AQ|1F>~mmz{j`bD*`HVW`R%)N;A%brqOE O89ZJ6T-G@yGywo~U_}K0 literal 0 HcmV?d00001 diff --git a/app/assets/javascripts/src/Metamaps.Map.js b/app/assets/javascripts/src/Metamaps.Map.js index c5a5adf2..0964ef51 100644 --- a/app/assets/javascripts/src/Metamaps.Map.js +++ b/app/assets/javascripts/src/Metamaps.Map.js @@ -161,6 +161,7 @@ Metamaps.Map = { $.post('/maps/' + Metamaps.Active.Map.id + '/star') Metamaps.Stars.push({ user_id: Metamaps.Active.Mapper.id, map_id: Metamaps.Active.Map.id }) Metamaps.Maps.Starred.add(Metamaps.Active.Map) + Metamaps.GlobalUI.notifyUser('Map is now starred') self.updateStar() }, unstar: function () { diff --git a/app/assets/javascripts/src/Metamaps.Router.js b/app/assets/javascripts/src/Metamaps.Router.js index 511577ba..f76bdcc7 100644 --- a/app/assets/javascripts/src/Metamaps.Router.js +++ b/app/assets/javascripts/src/Metamaps.Router.js @@ -44,6 +44,7 @@ // all this only for the logged in home page if (Metamaps.Active.Mapper) { + $('.homeButton a').attr('href', '/') Metamaps.GlobalUI.hideDiv('#yield') Metamaps.GlobalUI.showDiv('#explore') @@ -89,6 +90,7 @@ document.title = 'Explore My Maps | Metamaps' } + if (Metamaps.Active.Mapper) $('.homeButton a').attr('href', '/explore/' + section + (id ? '/' + id : '')) $('.wrapper').removeClass('homePage mapPage topicPage') $('.wrapper').addClass('explorePage') diff --git a/app/assets/stylesheets/base.css.erb b/app/assets/stylesheets/base.css.erb index 6be8579a..5b0fcf84 100644 --- a/app/assets/stylesheets/base.css.erb +++ b/app/assets/stylesheets/base.css.erb @@ -947,15 +947,51 @@ font-family: 'din-regular', helvetica, sans-serif; .map { display:inline-block; width:220px; - height:340px; + height:340px; font-size: 12px; text-align: left; overflow: visible; - background: #424242; + background: #e8e8e8; border-radius:2px; margin:16px 16px 16px 19px; box-shadow: 0px 3px 3px rgba(0,0,0,0.23), 0 3px 3px rgba(0,0,0,0.16); } +.map:hover { + background: #dcdcdc; +} +.map.newMap { + float: left; + position: relative; +} +.map.newMap a { + height: 340px; + display: block; + position: relative; +} +.newMap .newMapImage { + display: block; + width: 72px; + height: 72px; + background-image: url("<%= asset_data_uri('newmap_sprite.png') %>"); + background-repeat: no-repeat; + background-position: 0 0; + position: absolute; + left: 50%; + margin-left: -36px; + top: 50%; + margin-top: -36px; +} +.map:hover .newMapImage { + background-position: 0 -72px; +} +.newMap span { + font-family: 'din-regular', sans-serif; + font-size: 18px; + line-height: 22px; + text-align: center; + display: block; + padding-top: 220px; +} .mapCard { display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */ @@ -974,7 +1010,7 @@ font-family: 'din-regular', helvetica, sans-serif; width:100%; height:308px; padding: 16px 0; - color:#F5F5F5; + color: #424242; } .mapCard .title { diff --git a/app/assets/stylesheets/clean.css.erb b/app/assets/stylesheets/clean.css.erb index 140ee8db..4ff31f7e 100644 --- a/app/assets/stylesheets/clean.css.erb +++ b/app/assets/stylesheets/clean.css.erb @@ -127,7 +127,7 @@ } .homeButton a { display:block; - color: #9E9E9E; + color: #747474; font-family: "vinyl", sans-serif; font-style: italic; text-transform: uppercase; @@ -135,6 +135,9 @@ font-size: 30px; line-height: 38px; } +.homeButton a:hover { + color: #616161; +} /* end upperLeftUI */ @@ -377,13 +380,16 @@ top: 0; } .starMap { - background-image: url(<%= asset_data_uri('star.png') %>); + background-image: url(<%= asset_data_uri('starmap_sprite.png') %>); background-position: 0 0; background-repeat: no-repeat; width: 32px; } -.starMap:hover, .starMap.starred { - background-position: 0 -32px; +.starMap:hover { + background-position: 0 -32px !important; +} + .starMap.starred { + background-position: 0 -64px; } .starMap.starred:hover { background-position: 0 0; @@ -670,7 +676,7 @@ font-family: 'din-medium'; font-size: 14px; height: 14px; - padding: 14px 16px 12px 40px; + padding: 14px 8px 12px 40px; border-bottom: 2px solid rgba(0,0,0,0); display: inline-block; cursor: pointer; @@ -709,38 +715,38 @@ } .exploreMapsCenter .myMaps .exploreMapsIcon { background-image: url(<%= asset_data_uri 'exploremaps_sprite.png' %>); - background-position: 0 0; + background-position: -32px 0; } .exploreMapsCenter .sharedMaps .exploreMapsIcon { background-image: url(<%= asset_data_uri 'exploremaps_sprite.png' %>); - background-position: -96px 0; + background-position: -128px 0; } .exploreMapsCenter .activeMaps .exploreMapsIcon { background-image: url(<%= asset_data_uri 'exploremaps_sprite.png' %>); - background-position: -32px 0; + background-position: 0 0; } .exploreMapsCenter .featuredMaps .exploreMapsIcon { background-image: url(<%= asset_data_uri 'exploremaps_sprite.png' %>); - background-position: -64px 0; + background-position: -96px 0; } .exploreMapsCenter .starredMaps .exploreMapsIcon { background-image: url(<%= asset_data_uri 'exploremaps_sprite.png' %>); - background-position: -64px 0; + background-position: -96px 0; } .myMaps:hover .exploreMapsIcon, .myMaps.active .exploreMapsIcon { - background-position: 0 -32px; -} -.activeMaps:hover .exploreMapsIcon, .activeMaps.active .exploreMapsIcon { background-position: -32px -32px; } +.activeMaps:hover .exploreMapsIcon, .activeMaps.active .exploreMapsIcon { + background-position: 0 -32px; +} .featuredMaps:hover .exploreMapsIcon, .featuredMaps.active .exploreMapsIcon { - background-position: -64px -32px; + background-position: -96px -32px; } .starredMaps:hover .exploreMapsIcon, .starredMaps.active .exploreMapsIcon { - background-position: -64px -32px; + background-position: -96px -32px; } .sharedMaps:hover .exploreMapsIcon, .sharedMaps.active .exploreMapsIcon { - background-position: -96px -32px; + background-position: -128px -32px; } .mapsWrapper { diff --git a/app/assets/stylesheets/mobile.css.erb b/app/assets/stylesheets/mobile.scss.erb similarity index 85% rename from app/assets/stylesheets/mobile.css.erb rename to app/assets/stylesheets/mobile.scss.erb index c46ef3ff..cf416e37 100644 --- a/app/assets/stylesheets/mobile.css.erb +++ b/app/assets/stylesheets/mobile.scss.erb @@ -73,6 +73,33 @@ #exploreMaps > div { margin-top: 70px; } + + .map.newMap { + a { + height: auto; + } + + .newMapImage { + position: relative; + display: inline-block; + height: 40px; + width: 40px; + left: auto; + top: auto; + margin: 0 0 0 8px; + background-size: 40px 80px; + vertical-align: middle; + } + + span { + vertical-align: middle; + padding: 16px; + display: inline-block; + } + } + .map.newMap:hover .newMapImage { + background-position: 0 -40px; + } } /* Smartphones (portrait) ----------- */ @@ -151,4 +178,4 @@ li.mobileMenuUser { vertical-align: middle; margin-right: 10px; border-radius: 16px; -} \ No newline at end of file +} diff --git a/app/models/map.rb b/app/models/map.rb index cb5c286e..bf5757d3 100644 --- a/app/models/map.rb +++ b/app/models/map.rb @@ -19,7 +19,7 @@ class Map < ActiveRecord::Base thumb: ['188x126#', :png] #:full => ['940x630#', :png] }, - default_url: 'https://s3.amazonaws.com/metamaps-assets/site/missing-map.png' + default_url: 'https://s3.amazonaws.com/metamaps-assets/site/missing-map-white.png' validates :name, presence: true validates :arranged, inclusion: { in: [true, false] } diff --git a/app/views/layouts/_mobilemenu.html.erb b/app/views/layouts/_mobilemenu.html.erb index f3313d01..e2b14253 100644 --- a/app/views/layouts/_mobilemenu.html.erb +++ b/app/views/layouts/_mobilemenu.html.erb @@ -25,9 +25,12 @@
  • <%= link_to "Shared With Me", explore_shared_path, :data => { :router => 'true'} %>
  • +
  • + <%= link_to "Starred By Me", explore_starred_path, :data => { :router => 'true'} %> +
  • <% end %>
  • - <%= link_to "Recently Active", explore_active_path, :data => { :router => 'true'} %> + <%= link_to "Global Maps", explore_active_path, :data => { :router => 'true'} %>
  • <% if not current_user %>
  • @@ -51,4 +54,4 @@
  • <% end %> - \ No newline at end of file + diff --git a/frontend/src/components/Header.js b/frontend/src/components/Header.js index f42a137f..c8c67619 100644 --- a/frontend/src/components/Header.js +++ b/frontend/src/components/Header.js @@ -58,7 +58,7 @@ class Header extends Component { href={signedIn ? "/" : "/explore/active"} linkClass={activeClass("active")} data-router="true" - text="Recently Active" + text="Global" />
    { user ? : null } + { currentUser && !user ? : null } { mapElements }
    { moreToLoad ?