cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into redesign

Browse source 
Conflicts:
	app/controllers/browse_controller.rb
	app/views/layouts/_head.html.erb
	config/environments/production.rb
	config/routes.rb
This commit is contained in:
John Firebaugh 2013-11-15 16:47:49 -08:00
commit 2b4f8e92c9
111 changed files with 23614 additions and 4867 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/_head.html.erb
View file

@ -1,8 +1,8 @@
<head>
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
<meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"/>
<!--[if lt IE 9]><%= javascript_include_tag "html5shiv" %><![endif]-->
<%= javascript_include_tag "application" %>
<!--[if lt IE 7]><%= javascript_include_tag "pngfix" %><![endif]--> <!-- thanks, microsoft! -->
<%= stylesheet_link_tag "small-#{dir}", :media => "only screen and (max-width:721px)" %>
<%= stylesheet_link_tag "large-#{dir}", :media => "screen and (min-width: 722px)" %>
<%= stylesheet_link_tag "print-#{dir}", :media => "print" %>