Moved all meta-viewport declarations to a single location and removed…

… unneeded maximum-scale parameter. (#5046) Fixes: #5018
mozilla-services · Oct 19, 2018 · e509af5 · e509af5
1 parent ec53a52
commit e509af5
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/server/src/pages/homepage/view.js b/server/src/pages/homepage/view.js
@@ -24,10 +24,6 @@ class Head extends React.Component {
           src={this.props.staticLink("/static/js/homepage-bundle.js")}
           async
         />
-        <meta
-          name="viewport"
-          content="width=320, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
-        />
         <Localized id="homePageDescription" attrs={{ content: true }}>
           <meta
             name="description"

diff --git a/server/src/pages/shot/view.js b/server/src/pages/shot/view.js
@@ -111,7 +111,6 @@ class Head extends React.Component {
           <meta name="robots" content="noindex, nofollow, noimageindex" />
           <script src={ this.props.staticLink("/static/js/shot-bundle.js") } async />
           <link rel="stylesheet" href={ this.props.staticLink("/static/css/frame.css") } />
-          <meta name="viewport" content="width=device-width, initial-scale=1" />
         </reactruntime.HeadTemplate>
       );
     }
@@ -122,7 +121,6 @@ class Head extends React.Component {
         <script src={ this.props.staticLink("/static/js/shot-bundle.js") } async />
         <link rel="stylesheet" href={ this.props.staticLink("/static/css/inline-selection.css") } />
         <link rel="stylesheet" href={ this.props.staticLink("/static/css/frame.css") } />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="alternate" type="application/json+oembed" href={this.props.shot.oembedUrl} title={`${this.props.shot.title} oEmbed`} />
         {this.socialMetadata()}
       </reactruntime.HeadTemplate>

diff --git a/server/src/reactruntime.js b/server/src/reactruntime.js
@@ -45,6 +45,7 @@ exports.HeadTemplate = class HeadTemplate extends React.Component {
       <head>
         <meta charSet="UTF-8" />
         <title>{this.props.title}</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="shortcut icon" href={this.props.staticLink("/static/img/favicon-32.png")} />
         <link rel="icon" type="image/png" href={this.props.staticLink("/static/img/favicon-16.png")} sizes="16x16"/>
         <link rel="icon" type="image/png" href={this.props.staticLink("/static/img/favicon-32.png")} sizes="32x32"/>