Skip to content

modify ui, change filters to table layout and decrease header buttons size #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ScottBlew wants to merge 5 commits into
base: gh-pages
Choose a base branch
from
Open

modify ui, change filters to table layout and decrease header buttons size #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c82907f
modify ui, change filters to table layout and decrease header button …
Feb 10, 2013
b76e889
change default map center to show USA
Feb 10, 2013
4249ab0
remove mapcluster test function
Feb 10, 2013
463a4e4
modify filters, elevate any filter
Feb 11, 2013
3ccb255
add 3d effect to header
Feb 12, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions css/phone.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
.menu,.footerWrap,.tooltip{display:none !important;}
.filterWrap{display:none;}
a.action-large.addResource{display:none;}
.searchWrap{-webkit-box-shadow:0 3px 0 0 #ccc;box-shadow:0 3px 0 0 #ccc;}
.filterWrap{position:relative;z-index:2;background:#112F49;}
.filterWrap table{-webkit-box-shadow:0 3px 0 0 #ccc;box-shadow:0 3px 0 0 #ccc;}
.searchWrap .searchIcon{display:none;}
.aboutWrap .searchAction{display:none;}
.about h1,.about h2{display:none;}
Expand All @@ -10,7 +13,8 @@ a.action-large.addResource{display:none;}
.about p,.mapActions a.action{font-size:.8em;}
.menuToggle,.filterHeader .icon-caret-up{display:block;}
.searchWrap .searchIcon{left:0;}
.header{padding:15px 0 10px;}
.brand{font-size:1.5em;}
.header{padding:15px 0 10px;padding:4px 0 6px;}
.brand{font-size:2em;text-shadow:none;}
.searchWrap{height:50px;}
#search input[type="text"]{font-size:1.2em;padding:15px 4% 10px;}
.filters td label{padding:10px 8px 8px;}
36 changes: 21 additions & 15 deletions css/screen.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,48 +315,54 @@ body{margin:0;padding:0;font-family:'PT Sans',sans-serif;}
#map-wrapper{width:100%;height:100%;position:fixed;z-index:1;top:0;left:0;}
#map-canvas{height:100%;width:100%;overflow:hidden;}
#map-canvas img{max-width:none;}
#controlWrap{background-color:#162640;color:#ffffff;width:95%;position:relative;margin:10px 0 0 10px;max-width:320px;z-index:3;-webkit-box-shadow:0px 0px 3px 1px rgba(0, 0, 0, 0.4);box-shadow:0px 0px 3px 1px rgba(0, 0, 0, 0.4);}
.header{text-align:center;padding:20px 0 15px;border-bottom:1px solid #1E3F60;font-family:'PT Sans Narrow',sans-serif;position:relative;}
.brand{font-size:2.5em;line-height:1em;text-transform:uppercase;}
.menuToggle{display:none;border:1px solid #1E3F60;position:absolute;-webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;-o-border-radius:3px;border-radius:3px;text-align:center;margin:0;right:9px;top:9px;padding:4px 9px 2px;}
#controlWrap{background-color:#112f49;color:#ffffff;width:95%;position:relative;margin:10px 0 0 10px;max-width:320px;z-index:3;}
.header{text-align:center;padding:15px 0 13px;border-bottom:1px solid #1E3F60;font-family:'PT Sans Narrow',sans-serif;position:relative;}
.brand{font-size:3em;line-height:1em;text-transform:uppercase;text-shadow:0 -1px 0 #858585,0 1px 10px rgba(0, 0, 0, 0.6),0 6px 1px rgba(0, 0, 0, 0.1),0 0 5px rgba(0, 0, 0, 0.2),0 1px 3px rgba(0, 0, 0, 0.3),0 3px 5px rgba(0, 0, 0, 0.2),0 7px 10px rgba(0, 0, 0, 0.25),0 15px 10px rgba(0, 0, 0, 0.2);color:#ffffff;text-shadow:0 0.015em 0 #ffffff,0 0.03em 0.015em #e6e6e6,0 0.045em 0.03em #e3e3e3,0 0.06em 0.03em #dedede;}
.brand span{font-size:.4em;vertical-align:super;margin-right:-4px;margin-left:-16px;text-shadow:none;}
.menuToggle{display:none;border:1px solid #1E3F60;position:absolute;-webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;-o-border-radius:3px;border-radius:3px;text-align:center;margin:0;right:9px;top:6px;padding:4px 9px 2px;}
.menuToggle [class^="icon-"],.menuToggle [class*=" icon-"]{font-size:1.5em;}
.menu{text-align:center;padding:10px 0 14px;}
.aboutWrap{display:none;}
.about{text-align:center;padding:20px 0;width:90%;margin:0 auto;}
.about h1{font-size:2em;margin:0 0 5px;line-height:1em;text-transform:uppercase;}
.about h2{line-height:1em;margin:0;font-size:1.8em;font-weight:300;}
.about p{font-size:1.1em;line-height:1.3em;margin:1em 0;}
.footerWrap{padding:10px 0 0;text-align:center;}
.footerWrap{padding:10px 0 0;text-align:center;background:#112f49;-webkit-box-shadow:0 3px 0 0 #0c1d2d;box-shadow:0 3px 0 0 #0c1d2d;-webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;-o-border-radius:3px;border-radius:3px;}
.socialite{display:inline-block;margin:0 0 5px;color:#ffffff;}.socialite.facebook-like{min-width:105px;position:relative;top:-3px;}
.filterHeader{margin:0 auto;padding:8px 10px;font-size:0.9em;position:relative;}
.filterHeader .icon-caret-up{display:none;color:#162640;font-size:27px;position:absolute;right:21px;top:-17px;z-index:10;}
.filterWrap{position:relative;z-index:4;}
.filterHeader{margin:0 auto;padding:8px 10px;font-size:0.9em;}
.filterHeader .icon-caret-up{display:none;color:#112f49;font-size:27px;position:absolute;right:21px;top:-17px;z-index:10;}
#filter{margin-bottom:0;}
ul.filters{list-style-type:none;margin:0;padding:0;}
ul.filters li{background-color:#F6F6F6;color:#162640;font-weight:600;border-bottom:1px solid #DEDEDE;cursor:pointer;-webkit-transition:all 0.2s ease;-moz-transition:all 0.2s ease;-o-transition:all 0.2s ease;transition:all 0.2s ease;}
ul.filters li:hover{background-color:#ffffff;}
ul.filters li label{cursor:pointer;padding:10px 10px 8px;display:block;font-weight:600;margin:0;}
ul.filters li label input[type="checkbox"]{float:right;margin:4px 0;padding:0;}
.filters td{background-color:#ffffff;border:1px solid #dedede;}
.filters td:last-child{border-right:none;}
.filters td:first-child{border-left:none;}
.filters label{color:#0c1d2d;cursor:pointer;display:block;font-weight:600;font-size:.85em;margin:0;-webkit-transition:all 0.2s ease;-moz-transition:all 0.2s ease;-o-transition:all 0.2s ease;transition:all 0.2s ease;padding:6px 8px 4px;}
.filters td:hover label{background-color:#F6F6F6;}
.filters label input[type="checkbox"]{margin:4px 6px 4px 0;padding:0;}
#search{width:100%;margin:0;}
.searchWrap{background:#ffffff;height:60px;position:relative;}
#search input[type="text"]{font-family:'PT Sans',sans-serif;margin:0 auto;border:none;font-size:1.5em;padding:16px 4% 12px;width:92%;display:block;font-weight:300;outline:none;line-height:1.5em;height:100%;}
.filterIcon{display:none;background:#ffffff;height:100%;width:53px;position:absolute;top:0;right:0;text-align:center;border-left:1px solid #DEDEDE;}
.filterIcon{display:none;background:#ffffff;height:100%;width:53px;position:absolute;top:0;right:0;text-align:center;border-left:1px solid #DEDEDE;-webkit-border-bottom-right-radius:3px;-moz-border-radius-bottomright:3px;border-bottom-right-radius:3px;}
.searchIcon{height:100%;width:40px;display:table;position:absolute;top:0;right:0;text-align:center;background:#ffffff;-webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;-o-border-radius:3px;border-radius:3px;}
.searchIcon .icon-search,.filterIcon .icon-tags{color:#0082c8;font-size:1.5em;vertical-align:middle;display:table-cell;}
a.action{background-color:#0082C8;color:#ffffff;text-decoration:none;font-size:0.9em;padding:12px 10px 8px;display:inline-block;border-color:#0082C8;border-style:solid;border-width:1px;width:38%;text-align:center;position:relative;text-shadow:0 1px 0 rgba(0, 0, 0, 0.3);-webkit-transition:all 0.2s ease;-moz-transition:all 0.2s ease;-o-transition:all 0.2s ease;transition:all 0.2s ease;-webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;-o-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 3px 0 0 #0b62a8;box-shadow:0 3px 0 0 #0b62a8;}
a.action{background-color:#0082C8;color:#ffffff;text-decoration:none;font-size:0.9em;padding:7px 10px 8px;display:inline-block;border-color:#0082C8;border-style:solid;border-width:1px;width:38%;text-align:center;position:relative;text-shadow:0 1px 0 rgba(0, 0, 0, 0.3);-webkit-transition:all 0.2s ease;-moz-transition:all 0.2s ease;-o-transition:all 0.2s ease;transition:all 0.2s ease;-webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;-o-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 3px 0 0 #0b62a8;box-shadow:0 3px 0 0 #0b62a8;}
a.action-large.addResource{position:absolute;z-index:2;bottom:30px;left:40%;width:240px;padding:24px 20px 18px;font-size:1.8em;line-height:1em;text-align:left;-webkit-box-shadow:0 3px 0 0 #0b62a8;box-shadow:0 3px 0 0 #0b62a8;}
a.action-large.addResource:active{bottom:29px;-webkit-box-shadow:0 2px 0 0 #0b62a8;box-shadow:0 2px 0 0 #0b62a8;}
.menu a.action{padding:7px 10px 5px;}
.menu a.action.addResource{margin:0 2% 0 0;}
a.action:hover{background-color:#0082E1;}
a.action:active{-webkit-box-shadow:0 2px 0 0 #0b62a8;box-shadow:0 2px 0 0 #0b62a8;}
.menu a.action:active,.mapActions a.action:active{top:1px;}
a.action [class^="icon-"],a.action [class*=" icon-"]{font-size:1.8em;}
a.action-large [class^="icon-"],a.action-large [class*=" icon-"]{font-size:1.2em;}
.menu a.action [class^="icon-"],.menu a.action [class*=" icon-"]{font-size:1.4em;margin:1px 0 0 ;}
.mapActions a.action{width:30%;margin:0 0.5%;padding:12px 0 8px;}
.searchAction{background:#ffffff;color:#dedede;font-size:1.5em;text-align:left;padding:0 15px 0;height:2.6em;line-height:2.7em;border-color:#0082C8;border-style:solid;border-width:1px;cursor:pointer;width:88%;margin:0 auto 2%;position:relative;-webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;-o-border-radius:3px;border-radius:3px;-webkit-transition:all 0.2s ease;-moz-transition:all 0.2s ease;-o-transition:all 0.2s ease;transition:all 0.2s ease;}
.searchAction:hover{color:#162640;}
.searchAction [class^="icon-"],.searchAction [class*="icon-"]{font-size:1.2em;}
.searchAction .searchIcon{width:50px;}
.locateMe{background:#ffffff;height:40px;width:40px;position:fixed;z-index:2;bottom:30px;right:10px;cursor:pointer;text-align:center;display:none;-webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;-o-border-radius:3px;border-radius:3px;-webkit-box-shadow:0px 0px 3px 1px rgba(0, 0, 0, 0.4);box-shadow:0px 0px 3px 1px rgba(0, 0, 0, 0.4);}
.locateMe{background:#ffffff;height:40px;width:40px;position:fixed;z-index:2;bottom:30px;right:10px;cursor:pointer;text-align:center;display:none;-webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;-o-border-radius:3px;border-radius:3px;-webkit-box-shadow:0px 0px 3px 1px rgba(0, 0, 0, 0.4);box-shadow:0px 0px 3px 1px rgba(0, 0, 0, 0.4);-webkit-box-shadow:0 3px 0 0 #ccc;box-shadow:0 3px 0 0 #ccc;}
.locateMe [class^="icon-"],.locateMe [class*="icon-"]{color:#0082c8;font-size:1.5em;vertical-align:middle;display:table-cell;}
.locateMe:active{-webkit-box-shadow:0 2px 0 0 #ccc;box-shadow:0 2px 0 0 #ccc;bottom:29px;}
.locateMe.active [class^="icon-"],.locateMe.active [class*="icon-"]{color:#0082c8;}
#aboutModal button.close{z-index:10;font-size:3em;position:absolute;right:15px;top:15px;color:#0082c8;opacity:0.7;filter:alpha(opacity=70);}
94 changes: 50 additions & 44 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
<body>
<div id="controlWrap">
<div class="header">
<span class="brand">The <b>Maker</b> Map</span>
<span class="brand"><span>The</span> <b>Maker</b>Map</span>
<div class="menuToggle"><i class="icon-reorder"></i></div>
</div><!-- .header -->
<div class="menu">
<a href="https://docs.google.com/spreadsheet/viewform?formkey=dFFZc2hBY1h3M3hPM1B2bVphZmhsY0E6MA#gid=0" class="action addResource" title="Add a Resource" target="_blank"><i class="icon-plus"></i><br/> Add a Resource</a>
<a href="#aboutModal" role="button" class="action aboutMap" title="About the Map" data-toggle="modal"><i class="icon-map-marker"></i><br/>About the Map</a>
<a href="https://docs.google.com/spreadsheet/viewform?formkey=dFFZc2hBY1h3M3hPM1B2bVphZmhsY0E6MA#gid=0" class="action addResource" title="Add a Resource" target="_blank"><i class="icon-plus"></i><br/>Add a Resource </a>
<a href="#aboutModal" role="button" class="action aboutMap" title="About the Map" data-toggle="modal"><i class="icon-map-marker"></i><br/>About the Map </a>
</div><!-- .menu -->
<div class="aboutWrap">
<div class="about">
Expand All @@ -53,54 +53,60 @@ <h2>Join the Maker Movement</h2>
<div class="filterIcon"><i class="icon-tags"></i></div>
</div><!-- .searchWrap -->
<div class="filterWrap">
<div class="filterHeader">Filter By Business Type <i class="icon-caret-up"></i></div>
<form id="filter">
<ul class="filters">
<li><label class="any-filter">Any<input type="checkbox" checked="checked" value="any"></label></li>
<li><label>Retail<input type="checkbox" checked="checked" value="retail"></label></li>
<li><label>Workspace<input type="checkbox" checked="checked" value="workspace"></label></li>
<li><label>Fabricator<input type="checkbox" checked="checked" value="fabricator"></label></li>
<li><label>Distributor<input type="checkbox" checked="checked" value="distributor"></label></li>
<li><label>Museum<input type="checkbox" checked="checked" value="museum"></label></li>
<li><label>Service<input type="checkbox" checked="checked" value="service"></label></li>
<li><label>Incubator<input type="checkbox" checked="checked" value="incubator"></label></li>
</ul>
<div class="filterHeader">Filter By Business Type <i class="icon-caret-up"></i></div>
<table border="0" bordercolor="#ffffff" style="background-color:#ffffff" width="100%" cellpadding="0" cellspacing="0" class="filters">
<tr>
<td colspan="3"><label class="any-filter"><input type="checkbox" checked="checked" value="any">Any</label></td>
</tr>
<tr>
<td><label><input type="checkbox" checked="checked" value="retail">Retail</label></td>
<td><label><input type="checkbox" checked="checked" value="workspace">Workspace</label></td>
<td><label><input type="checkbox" checked="checked" value="fabricator">Fabricator</label></td>
</tr>
<tr>
<td><label><input type="checkbox" checked="checked" value="distributor">Distributor</label></td>
<td><label><input type="checkbox" checked="checked" value="museum">Museum</label></td>
<td><label><input type="checkbox" checked="checked" value="service">Service</label></td>
</tr>
<tr>
<td><label><input type="checkbox" checked="checked" value="incubator">Incubator</label></td>
<td></td>
<td></td>
</tr>
</table>
</form>
</div><!-- .filterWrap -->
<div class="footerWrap">
<div class="footer">



<a class="socialite facebook-like" href="http://www.facebook.com/sharer.php?u=http://themakermap.com"
data-href="http://themakermap.com"
data-send="false"
data-layout="button_count"
data-width="100"
data-show-faces="false"
data-font="segoe ui"
rel="nofollow"
target="_blank">Share on Facebook</a>



data-href="http://themakermap.com"
data-send="false"
data-layout="button_count"
data-width="100"
data-show-faces="false"
data-font="segoe ui"
rel="nofollow"
target="_blank">Share on Facebook
</a>
<a class="socialite github-fork" href="https://github.com/hwstartup/TheMakerMap.com"
data-user="hwstartup"
data-repo="TheMakerMap.com"
data-type="fork"
data-count="true">Fork on GitHub</a>

<a class="socialite twitter-share" href="http://twitter.com/share"
data-url="http://themakermap.com"
data-dnt="true"
rel="nofollow"
target="_blank">Share on Twitter</a>

<!-- a class="socialite googleplus-one" href="https://plusone.google.com/_/+1/confirm?hl=en&amp;url=http://themakermap.com"
data-size="medium"
data-href="http://themakermap.com"
rel="nofollow"
target="_blank">Share on Google+</a -->
data-user="hwstartup"
data-repo="TheMakerMap.com"
data-type="fork"
data-count="true">Fork on GitHub
</a>
<a class="socialite twitter-share" href="http://twitter.com/share"
data-url="http://themakermap.com"
data-dnt="true"
rel="nofollow"
target="_blank">Share on Twitter
</a>
<!-- a class="socialite googleplus-one" href="https://plusone.google.com/_/+1/confirm?hl=en&amp;url=http://themakermap.com"
data-size="medium"
data-href="http://themakermap.com"
rel="nofollow"
target="_blank">Share on Google+
</a -->
</div>
</div>
</div><!-- #controlWrap -->
Expand Down
4 changes: 2 additions & 2 deletions js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@
*/
function initMaps () {
map = new google.maps.Map(document.getElementById('map-canvas'), {
center: new google.maps.LatLng(37.65, -122.25),
zoom: 9,
center: new google.maps.LatLng(39.50, -98.35),
zoom: 4,
disableDefaultUI: true,
zoomControl: true,
zoomControlOptions: {
Expand Down
29 changes: 24 additions & 5 deletions less/phone.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,22 @@ a.action-large.addResource {
display:none;
}

.searchWrap {
-webkit-box-shadow: 0 3px 0 0 #ccc;
box-shadow: 0 3px 0 0 #ccc;
}

.filterWrap {
position:relative;
z-index:2;
background:#112F49;
}

.filterWrap table {
-webkit-box-shadow: 0 3px 0 0 #ccc;
box-shadow: 0 3px 0 0 #ccc;
}

.searchWrap .searchIcon {
display:none;
}
Expand All @@ -47,7 +63,7 @@ a.action-large.addResource {
}

.about p,.mapActions a.action {
font-size: .8em;
font-size: .8em;
}
.menuToggle,.filterHeader .icon-caret-up {
display:block;
Expand All @@ -59,20 +75,23 @@ font-size: .8em;

.header {
padding: 15px 0 10px;
padding:4px 0 6px;
}

.brand {
font-size: 1.5em;
font-size: 2em;
text-shadow:none;
}




.searchWrap {
height:50px;
}

#search input[type="text"] {
font-size: 1.2em;
padding: 15px 4% 10px;
}

.filters td label{
padding: 10px 8px 8px;
}
Loading