glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed up search results some. colophon links open in new tab. updated homepage bg image. fixed topic carousel dimensions

Browse source
This commit is contained in:
Connor Turland 2014-11-26 16:37:13 -05:00
parent ab53e996d4
commit 377138c483
10 changed files with 34 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/homepage-bg.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 109 KiB

BIN
app/assets/images/homepage_bg.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 128 KiB

BIN
app/assets/images/mm-homepage-bg-image.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 109 KiB

BIN
app/assets/images/user.png Executable file → Normal file
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

4
app/assets/stylesheets/application.css
View file

@ -520,7 +520,7 @@ input[type="submit"]:active {
left: 41px; left: 41px;
z-index: 9999; z-index: 9999;
width: 256px; width: 256px;
height: 42px; height: 34px;
} }
.new_topic #topic_name, .new_topic #topic_name,
.new_topic .tt-hint { .new_topic .tt-hint {
@ -528,7 +528,7 @@ input[type="submit"]:active {
background: #FFFFFF; background: #FFFFFF;
height: 14px; height: 14px;
margin: 0; margin: 0;
padding: 14px 6px; padding: 10px 6px;
border: none; border: none;
border-radius: 2px; border-radius: 2px;
outline: none; outline: none;

2
app/assets/stylesheets/base.css
View file

@ -608,7 +608,7 @@ padding: 9px 7px 9px 31px;
height: 12px; height: 12px;
width: 198px; width: 198px;
margin: 0 0 0 0; margin: 0 0 0 0;
border: 1px solid #BDBDBD; border: none;
outline: none; outline: none;
font-size: 12px; font-size: 12px;
line-height: 12px; line-height: 12px;

35
app/assets/stylesheets/clean.css
View file

@ -213,14 +213,14 @@
outline: none; outline: none;
font-size: 14px; font-size: 14px;
line-height: 14px; line-height: 14px;
background: #FFFFFF; background: #F5F5F5;
font-family: 'din-medium', helvetica, sans-serif; font-family: 'din-medium', helvetica, sans-serif;
} }
.sidebarSearch .tt-dropdown-menu { .sidebarSearch .tt-dropdown-menu {
top: 40px !important; top: 40px !important;
background: #F5F5F5; background: #F5F5F5;
width: 472px; width: 472px;
overflow-y: visible; overflow-y: auto;
overflow-x: visible; overflow-x: visible;
box-shadow: 0 1px 1.5px rgba(0,0,0,0.12), 0 1px 1px rgba(0,0,0,0.24); box-shadow: 0 1px 1.5px rgba(0,0,0,0.12), 0 1px 1px rgba(0,0,0,0.24);
} }
@ -338,18 +338,16 @@
display: table-cell; display: table-cell;
vertical-align: middle; vertical-align: middle;
padding: 0 0 0 8px; padding: 0 0 0 8px;
max-width: 70px; width: 70px;
} }
.sidebarSearch .tt-dataset-topics .topicIcon { .sidebarSearch .tt-dataset-topics .topicIcon {
width: 32px; width: 32px;
height: 32px; height: 32px;
}
.sidebarSearch .tt-dataset-topics .tt-is-under-cursor .topicIcon,
.sidebarSearch .tt-dataset-topics .tt-is-under-mouse-cursor .topicIcon {
margin: 0 auto; margin: 0 auto;
} }
.sidebarSearch .tt-dataset-topics .metacodeTip { .sidebarSearch .tt-dataset-topics .metacodeTip {
display: none; display: none;
margin: 0 auto;
} }
.sidebarSearch .tt-dataset-topics .tt-is-under-cursor .metacodeTip, .sidebarSearch .tt-dataset-topics .tt-is-under-cursor .metacodeTip,
.sidebarSearch .tt-dataset-topics .tt-is-under-mouse-cursor .metacodeTip { .sidebarSearch .tt-dataset-topics .tt-is-under-mouse-cursor .metacodeTip {
@ -488,8 +486,7 @@
} }
.sidebarSearch .topicOriginatorIcon .tip { .sidebarSearch .topicOriginatorIcon .tip {
left: 30px; right: 30px;
right: auto;
top: 1px; top: 1px;
} }
.sidebarSearch .tip { .sidebarSearch .tip {
@ -512,8 +509,7 @@
} }
.sidebarSearch .mapContributorsIcon .tip { .sidebarSearch .mapContributorsIcon .tip {
left: 40px; right: 40px;
right: auto;
top: -5px; top: -5px;
padding-top: 5px; padding-top: 5px;
padding-bottom: 5px; padding-bottom: 5px;
@ -536,7 +532,7 @@
position: absolute; position: absolute;
width: 0; width: 0;
height: 0; height: 0;
border-right: 4px solid #424242; border-left: 4px solid #424242;
border-top: 5px solid transparent; border-top: 5px solid transparent;
border-bottom: 5px solid transparent; border-bottom: 5px solid transparent;
} }
@ -546,20 +542,16 @@
} }
.sidebarSearch .hoverForTip.addToMap .tip:before { .sidebarSearch .hoverForTip.addToMap .tip:before {
right: -4px; right: -4px;
border-left: 4px solid #424242;
border-right: none;
} }
.sidebarSearch .mapContributorsIcon .tip:before { .sidebarSearch .mapContributorsIcon .tip:before {
top: 65px; top: 12px;
left: -4px; right: -4px;
margin-top: -53px;
} }
.sidebarSearch .topicOriginatorIcon .tip:before { .sidebarSearch .topicOriginatorIcon .tip:before {
top: 58px; top: 5px;
left: -4px; right: -4px;
margin-top: -53px;
} }
.sidebarSearch .mapContributorsIcon .mapContributors { .sidebarSearch .mapContributorsIcon .mapContributors {
@ -806,12 +798,11 @@
background-color: #4fb5c0; background-color: #4fb5c0;
} }
.callToAction .learnMoreCTA:hover { .callToAction .learnMoreCTA:hover {
background-color: #9150bc; background-color: #3d8e8e;
} }
.fullWidthWrapper.withPartners { .fullWidthWrapper.withPartners {
background: url(homepage-bg.png) no-repeat center -332px; background: url(homepage_bg.png) no-repeat center -300px;
background-size: 1430px 1072px;
} }
.homeWrapper.homePartners { .homeWrapper.homePartners {
padding: 64px 0 100px; padding: 64px 0 100px;

30
app/views/layouts/_lightboxes.html.erb
View file

@ -81,15 +81,15 @@
<p>Iconography within Metamaps is a distinctive and subtle art. We thank the following creators of icons used throughout Metamaps for the courtesy of sharing their work under Creative Commons licenses:<p> <p>Iconography within Metamaps is a distinctive and subtle art. We thank the following creators of icons used throughout Metamaps for the courtesy of sharing their work under Creative Commons licenses:<p>
<h4 id="colophonSectionIndented">System Icons</h4> <h4 id="colophonSectionIndented">System Icons</h4>
<p id="colophonLinks"><a href="http://thenounproject.com/r0">Ryan Oksenhorn</a>, <a href="http://thenounproject.com/leonides.dm">Leonides Delgado</a>, <a href="http://thenounproject.com/matheusanturio">Matheus Antúrio</a>, <a href="http://thenounproject.com/nl_menghini">Nicholas Menghini</a>, <a href="http://thenounproject.com/useiconic.com">useiconic.com</a>, <a href="http://thenounproject.com/Icomatic">Icomatic</a>, <a href="http://thenounproject.com/ansteydesign">AnsteyDesign</a>, <a href="http://thenounproject.com/somerandomdude">P.J. Onori</a>, <a href="http://thenounproject.com/Michzen">Michael Zenaty</a>, <a href="http://thenounproject.com/edward">Edward Boatman</a>, <a href="http://thenounproject.com/garrett.knoll">Garrett Knoll</a>, <a href="http://thenounproject.com/misirlou">misirlou</a>, <a href="http://thenounproject.com/DmitryBaranovskiy">Dmitry Baranovskiy</a>, <a href="http://thenounproject.com/waymanate">Nathan Thomson</a>, <a href="http://thenounproject.com/razerk">Alex Auda Samora</a>, <a href="http://thenounproject.com/bernar.novalyi">Bernar Novalyi</a>, <a href="http://thenounproject.com/jeremy.j.bristol">Jeremy J Bristol</a>, <a href="http://thenounproject.com/FivebyFive/">FivebyFive</a>, <a href="http://thenounproject.com/thibault.geffroy">Thibault Geffroy</a>, <a href="http://cargocollective.com/gavinkeech">Gavin Keech</a></p> <p id="colophonLinks"><a href="http://thenounproject.com/r0" target="_blank">Ryan Oksenhorn</a>, <a href="http://thenounproject.com/leonides.dm" target="_blank">Leonides Delgado</a>, <a href="http://thenounproject.com/matheusanturio" target="_blank">Matheus Antúrio</a>, <a href="http://thenounproject.com/nl_menghini" target="_blank">Nicholas Menghini</a>, <a href="http://thenounproject.com/useiconic.com" target="_blank">useiconic.com</a>, <a href="http://thenounproject.com/Icomatic" target="_blank">Icomatic</a>, <a href="http://thenounproject.com/ansteydesign" target="_blank">AnsteyDesign</a>, <a href="http://thenounproject.com/somerandomdude" target="_blank">P.J. Onori</a>, <a href="http://thenounproject.com/Michzen" target="_blank">Michael Zenaty</a>, <a href="http://thenounproject.com/edward" target="_blank">Edward Boatman</a>, <a href="http://thenounproject.com/garrett.knoll" target="_blank">Garrett Knoll</a>, <a href="http://thenounproject.com/misirlou" target="_blank">misirlou</a>, <a href="http://thenounproject.com/DmitryBaranovskiy" target="_blank">Dmitry Baranovskiy</a>, <a href="http://thenounproject.com/waymanate" target="_blank">Nathan Thomson</a>, <a href="http://thenounproject.com/razerk" target="_blank">Alex Auda Samora</a>, <a href="http://thenounproject.com/bernar.novalyi" target="_blank">Bernar Novalyi</a>, <a href="http://thenounproject.com/jeremy.j.bristol" target="_blank">Jeremy J Bristol</a>, <a href="http://thenounproject.com/FivebyFive/" target="_blank">FivebyFive</a>, <a href="http://thenounproject.com/thibault.geffroy" target="_blank">Thibault Geffroy</a>, <a href="http://cargocollective.com/gavinkeech" target="_blank">Gavin Keech</a></p>
<p>We are also indebted to <a href="http://thenounproject.com/">The Noun Project</a>, an invaluable resource for iconography on the web, and also where many of the above creators' icons can be found.</p> <p>We are also indebted to <a href="http://thenounproject.com/" target="_blank">The Noun Project</a>, an invaluable resource for iconography on the web, and also where many of the above creators' icons can be found.</p>
<h4 id="colophonSectionIndented">Metacodes:</h4> <h4 id="colophonSectionIndented">Metacodes:</h4>
<p id="colophonLinks">Legacy:<a href="http://cargocollective.com/gavinkeech">Gavin Keech</a>, <a href="http://notthisbody.com/">Notthisbody</a><br><a href="http://thenounproject.com/FivebyFive/">FivebyFive</a></p> <p id="colophonLinks">Legacy:<a href="http://cargocollective.com/gavinkeech" target="_blank">Gavin Keech</a>, <a href="http://notthisbody.com/" target="_blank">Notthisbody</a><br><a href="http://thenounproject.com/FivebyFive/" target="_blank">FivebyFive</a></p>
<h4 id="colophonSection">MEDIA</h4> <h4 id="colophonSection">MEDIA</h4>
<p>Intro video: <a href="http://notthisbody.com/">Notthisbody</a>, <a href="https://uwaterloo.ca/arts/people-profiles/glenn-stillar">Glenn Stillar</a> <br>Tutorial videos: <a href="http://notthisbody.com/">Notthisbody</a></p> <p>Intro video: <a href="http://notthisbody.com/" target="_blank">Notthisbody</a>, <a href="https://uwaterloo.ca/arts/people-profiles/glenn-stillar" target="_blank">Glenn Stillar</a> <br>Tutorial videos: <a href="http://notthisbody.com/" target="_blank">Notthisbody</a></p>
<h4 id="colophonSection">OPEN SOURCE CREDITS</h4> <h4 id="colophonSection">OPEN SOURCE CREDITS</h4>
@ -110,12 +110,12 @@
<h4 id="colophonSection">Communication</h4> <h4 id="colophonSection">Communication</h4>
<ul> <ul>
<li>Asana</li> <li>Asana</li>
<li>Invision App <a href="http://invis.io/541GCFJRM">*</a></li> <li>Invision App <a href="http://invis.io/541GCFJRM" target="_blank">*</a></li>
<li>Docracy <a href="https://www.docracy.com/userprofile/show?userId=7366">*</a></li> <li>Docracy <a href="https://www.docracy.com/userprofile/show?userId=7366" target="_blank">*</a></li>
<li>Google Plus <a href="https://plus.google.com/communities/115060009262157699234">*</a></li> <li>Google Plus <a href="https://plus.google.com/communities/115060009262157699234" target="_blank">*</a></li>
<li>Hackpad <a href="http://metamaps.hackpad.com/">*</a></li> <li>Hackpad <a href="http://metamaps.hackpad.com/" target="_blank">*</a></li>
<li>Loomio <a href="https://www.loomio.org/g/bu3L1tIW/topos-ffo">*</a></li> <li>Loomio <a href="https://www.loomio.org/g/bu3L1tIW/topos-ffo" target="_blank">*</a></li>
<li>Twitter <a href="http://twitter.com/metamapps">*</a></li> <li>Twitter <a href="http://twitter.com/metamapps" target="_blank">*</a></li>
<li>Hipchat</li> <li>Hipchat</li>
<li>Google Hangouts</li> <li>Google Hangouts</li>
<li>Vimeo </li> <li>Vimeo </li>
@ -123,12 +123,12 @@
<br> <br>
<h4 id="colophonSection">Design & Development</h4> <h4 id="colophonSection">Design & Development</h4>
<ul> <ul>
<li>Github<a href="https://github.com/metamaps">*</a></li> <li>Github<a href="https://github.com/metamaps" target="_blank">*</a></li>
<li>Pixelapse<a href="https://www.pixelapse.com/poietic/projects/Metamaps.cc/overview">*</a></li> <li>Pixelapse<a href="https://www.pixelapse.com/poietic/projects/Metamaps.cc/overview" target="_blank">*</a></li>
</ul> </ul>
<h4 id="colophonSection">Documentation</h4> <h4 id="colophonSection">Documentation</h4>
<ul><li>Dropbox <a href="https://www.dropbox.com/sh/qqkesm0pmzaihfa/AAAv9aCVZeawUzDXrdM9y3T5a?dl=0">*</a></li> <ul><li>Dropbox <a href="https://www.dropbox.com/sh/qqkesm0pmzaihfa/AAAv9aCVZeawUzDXrdM9y3T5a?dl=0" target="_blank">*</a></li>
<li>Google Drive <a href="https://drive.google.com/folderview?id=0B_RQI2WcwEHLckplOHhhdnZkSUE&usp=sharing">*</a></li> <li>Google Drive <a href="https://drive.google.com/folderview?id=0B_RQI2WcwEHLckplOHhhdnZkSUE&usp=sharing" target="_blank">*</a></li>
<li>Toggl</li></ul> <li>Toggl</li></ul>
<br> <br>
<h4 id="colophonSection">Hosting</h4> <h4 id="colophonSection">Hosting</h4>
@ -140,7 +140,7 @@
<ul><li>Google Analytics</li></ul> <ul><li>Google Analytics</li></ul>
<br> <br>
<h4 id="colophonSection">Support</h4> <h4 id="colophonSection">Support</h4>
<ul><li>Uservoice <a href="http://support.metamaps.cc/">*</a></li></ul> <ul><li>Uservoice <a href="http://support.metamaps.cc/" target="_blank">*</a></li></ul>
</div> </div>
<div class="clearfloat"></div> <div class="clearfloat"></div>

4
app/views/layouts/_templates.html.erb
View file

@ -99,7 +99,7 @@
<div class="result{{rtype}}"> <div class="result{{rtype}}">
<div class="topicMetacode"> <div class="topicMetacode">
<img src="{{typeImageURL}}" class="topicIcon" /> <img src="{{typeImageURL}}" class="topicIcon" />
<span class="metacodeTip">{{type}}</span> <div class="metacodeTip">{{type}}</div>
</div> </div>
<div class="resultText"> <div class="resultText">
<p class="resultTitle">{{label}}</p> <p class="resultTitle">{{label}}</p>
@ -117,7 +117,7 @@
</div> </div>
<div class="topicOriginatorIcon hoverForTip"> <div class="topicOriginatorIcon hoverForTip">
<img width="18" height="18" src="{{originatorImage}}"> <img width="18" height="18" src="{{originatorImage}}">
<span class="tip topicOriginator">created by {{originator}}</span> <span class="tip topicOriginator">{{originator}}</span>
</div> </div>
<div class="topicPermission {{permission}}"> <div class="topicPermission {{permission}}">
</div> </div>

2
app/views/main/home.html.erb
View file

@ -21,7 +21,7 @@
<p>Designers, inventors, artists, educators, strategists, consultants, facilitators, organizers, systems thinkers, changemakers, analysts, students, researchers... maybe you!</p> <p>Designers, inventors, artists, educators, strategists, consultants, facilitators, organizers, systems thinkers, changemakers, analysts, students, researchers... maybe you!</p>
<a href="/request" class="requestInviteCTA" data-bypass="true">REQUEST INVITE</a> <a href="/request" class="requestInviteCTA" data-bypass="true">REQUEST INVITE</a>
<a href="/explore/featured" class="exploreFeaturedCTA">EXPLORE FEATURED MAPS</a> <a href="/explore/featured" class="exploreFeaturedCTA">EXPLORE FEATURED MAPS</a>
<button type="button" class="button learnMoreCTA">LEARN MORE</button> <button type="button" class="button learnMoreCTA" onclick="Metamaps.GlobalUI.openLightbox('about');">LEARN MORE</button>
</div> </div>
<div class="clearfloat"></div> <div class="clearfloat"></div>
</div> </div>