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

Merge branch 'master' into develop

Browse source
This commit is contained in:
Devin Howard 2016-02-06 10:11:55 +08:00
parent 3fe93be987 246c344959
commit 798035107f
11 changed files with 158 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/javascripts/src/Metamaps.GlobalUI.js.erb
View file

@ -655,14 +655,11 @@ Metamaps.GlobalUI.Search = {
self.limitMapsToMe = !self.limitMapsToMe;
}
// set the value of the search equal to itself to retrigger the autocomplete event
self.isOpen = false;
// set the value of the search equal to itself to retrigger the
// autocomplete event
var searchQuery = $('.sidebarSearchField.tt-input').val();
$(".sidebarSearchField").typeahead('val', '')
$(".sidebarSearchField").focus().typeahead('val', searchQuery).focus();
setTimeout(function () {
self.isOpen = true;
}, 2000);
.typeahead('val', searchQuery);
});
// when the user clicks minimize section, hide the results for that section

1
app/assets/stylesheets/search.scss.erb
View file

@ -136,6 +136,7 @@
top: 40px !important;
background: #F5F5F5;
width: 472px;
max-height: 25em;
overflow-y: auto;
overflow-x: visible;
box-shadow: 0 10px 10px rgba(0,0,0,0.19), 0 6px 3px rgba(0,0,0,0.23);

16
lib/tasks/perms.rake Normal file
View file

@ -0,0 +1,16 @@
require 'dotenv/tasks'
namespace :perms do
desc "Update the Unix permissions on the public directory"
task :fix => :environment do
# e.g. rake perms:fix user=mmstaging group=mmstaging
# e.g. rake perms:fix group=www-data #probably don't need this one
# e.g. rake perms:fix
user = ENV['user'] || 'metamaps'
group = ENV['group'] || 'metamaps'
public_dir = Rails.root.join('public').to_s
system "chown -R #{user}:#{group} #{public_dir}"
system "find #{public_dir} -type d -exec chmod 755 '{}' \\;"
system "find #{public_dir} -type f -exec chmod 644 '{}' \\;"
end
end

20
public/404.html Normal file → Executable file
View file

@ -26,16 +26,16 @@
}
body {
background: #d8d9da url(https://s3.amazonaws.com/metamaps-assets/site/shattered_%402X.png);
font-family: 'din-regular', helvetica, sans-serif;
color: #424242;
text-align: justify;
font-size: 18px;
line-height: 18px;
}
.dialog a {
color:#c04f4f;
}
background: #d8d9da url(https://s3.amazonaws.com/metamaps-assets/site/shattered_%402X.png);
font-family: 'din-regular', helvetica, sans-serif;
color: #424242;
text-align: justify;
font-size: 18px;
line-height: 18px;
}
.dialog a {
color:#c04f4f;
}
.title{
font-size:50px;
line-height: 50px;

0
public/422.html Normal file → Executable file
View file

0
public/500.html Normal file → Executable file
View file

128
public/503.html Executable file
View file

@ -0,0 +1,128 @@
<!DOCTYPE html>
<html>
<head>
<title>Down for maintenance (503)</title>
<style type="text/css">
@font-face {
font-family: 'din-medium';
src: url('/assets/Fonts/din.eot');
src: url('/assets/Fonts/din.eot?#iefix') format('embedded-opentype'),
url('/assets/Fonts/din.woff') format('woff'),
url('/assets/Fonts/din.ttf') format('truetype'),
url('/assets/Fonts/din.svg#din-medium') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'din-regular';
src: url('/assets/Fonts/din-reg.eot');
src: url('/assets/Fonts/din-reg.eot?#iefix') format('embedded-opentype'),
url('/assets/Fonts/din-reg.woff') format('woff'),
url('/assets/Fonts/din-reg.ttf') format('truetype'),
url('/assets/Fonts/din-reg.svg#din-reg') format('svg');
font-weight: normal;
font-style: normal;
}
body {
background: #d8d9da url(https://s3.amazonaws.com/metamaps-assets/site/shattered_%402X.png);
font-family: 'din-regular', helvetica, sans-serif;
color: #424242;
text-align: justify;
font-size: 18px;
line-height: 18px;
}
.dialog a {
color:#c04f4f;
}
.title{
font-size:50px;
line-height: 50px;
text-align: left;
font-family: 'din-medium', helvetica, sans-serif;
text-transform: uppercase;
margin-bottom: 24px;
}
div.dialog {
width: 380px;
border: 0px;
border-right-color: #999;
border-bottom-color: #999;
float: left;
margin-right: 50px;
padding-top: 70px;
padding-bottom: 70px;
}
.picture {
width: 450px;
height: 450px;
border: 10px solid #424242;
border-radius: 225px;
-webkit-border-radius: 225px;
-moz-border-radius: 225px;
background: url(https://s3.amazonaws.com/metamaps-assets/site/monkeyselfie.jpg) no-repeat;
float: left;
background-position:50% 20%;
background-size: 100%;
margin-top: 110px;
}
.wrapper {
margin: 0 auto;
width: 900px;
}
.button {
display: block;
width: 220px;
height: 14px;
padding: 16px 0;
margin-bottom: 16px;
text-align: center;
border-radius: 2px;
font-size: 14px;
box-shadow: 0px 1px 1.5px rgba(0,0,0,0.12), 0 1px 1px rgba(0,0,0,0.24);
margin: 0 auto;
text-decoration: none;
color: #FFFFFF !important;
cursor: pointer;
}
.blogCTA {
background-color: #4fc059;
}
.blogCTA:hover {
background-color: #49ad4e;
}
.exploreFeaturedCTA {
background-color: #a354cd;
margin-bottom: 16px;
}
.exploreFeaturedCTA:hover {
background-color: #9150bc;
}
</style>
</head>
<body>
<!-- This file lives in public/503.html -->
<div class="wrapper">
<div class="dialog">
<h1 class="title">503 - Down for Maintenance</h1>
<p>Metamaps is offline!</p>
<p>Don't worry, this is intentional. We're probably just turning on some great new features.</p>
<p>In the meantime, you can visit our blog, or aimlessly search YouTube until we're back online.</p>
<a href="https://twitter.com/metamapps" class="button blogCTA">GO TO OUR TWITTER FEED</a>
<a href="http://blog.metamaps.cc" class="button blogCTA">GO TO OUR BLOG</a>
</div>
<div class="picture">
</div>
</div>
</body>
</html>

0
public/famous/main.js Normal file → Executable file
View file

0
public/famous/templates.js Normal file → Executable file
View file

0
public/favicon.ico Normal file → Executable file
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 894 B

After

Width:  |  Height:  |  Size: 894 B

0
public/robots.txt Normal file → Executable file
View file