From 5bfde917b074234755a46e55e534a7a70bd5e19f Mon Sep 17 00:00:00 2001
From: 0ip <me@factor.cc>
Date: Mon, 27 Feb 2012 22:04:03 +0100
Subject: [PATCH 1/4] revert viewport to fix #508

---
 static/index.html | 2 +-
 static/pad.html   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/index.html b/static/index.html
index da24a7a7c..8e0b02a97 100644
--- a/static/index.html
+++ b/static/index.html
@@ -4,7 +4,7 @@
         <title>Etherpad Lite</title>
 
         <meta charset="utf-8"> 
-        <meta name="viewport" content="width=device-width, user-scalable=0">
+        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
 
         <style>
             body {
diff --git a/static/pad.html b/static/pad.html
index 24c90970c..be92ecae8 100644
--- a/static/pad.html
+++ b/static/pad.html
@@ -5,7 +5,7 @@
 
         <meta charset="utf-8">
         <meta name="robots" content="noindex, nofollow">
-        <meta name="viewport" content="width=device-width, user-scalable=0">
+        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
 
         <link href="../static/css/pad.css" rel="stylesheet">
         <link href="../static/custom/pad.css" rel="stylesheet">

From eddbc950dddfe862838117a20fb87cd198433218 Mon Sep 17 00:00:00 2001
From: 0ip <me@factor.cc>
Date: Mon, 27 Feb 2012 22:06:46 +0100
Subject: [PATCH 2/4] combined css class

---
 static/css/pad.css | 7 +------
 static/pad.html    | 8 ++++----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/static/css/pad.css b/static/css/pad.css
index e12738b50..4fdcd0c36 100644
--- a/static/css/pad.css
+++ b/static/css/pad.css
@@ -1157,12 +1157,7 @@ label {
  margin: 5px 0;
 }
 
-.left_popup {
- float: left;
- width: 50%;
-}
-
-.right_popup {
+.column {
  float: left;
  width: 50%;
 }
diff --git a/static/pad.html b/static/pad.html
index be92ecae8..c0099d101 100644
--- a/static/pad.html
+++ b/static/pad.html
@@ -133,7 +133,7 @@
 
         <div id="settingsmenu" class="popup">
             <h1>Pad settings</h1>
-            <div class="left_popup">
+            <div class="column">
                 <h2>My view</h2>
                 <p>
                     <input type="checkbox" id="options-stickychat" onClick="chat.stickToScreen();">
@@ -155,7 +155,7 @@
                     </select>
                 </p>
             </div>
-            <div class="right_popup">
+            <div class="column">
                 <h2>Global view</h2>
                 <p>Currently nothing.</p>
                 <p class="note">These options affect everyone viewing this pad.</p>
@@ -163,7 +163,7 @@
         </div>
 
         <div id="importexport" class="popup">
-            <div class="left_popup">
+            <div class="column">
                 <h2>Import from text file, HTML, PDF, Word, ODT or RTF</h2><br>
                 <form id="importform" method="post" action="" target="importiframe" enctype="multipart/form-data">
                     <div class="importformdiv" id="importformfilediv"> 
@@ -182,7 +182,7 @@
                     </div> 
                 </form>
             </div>
-            <div class="right_popup">
+            <div class="column">
                 <h2>Export current pad as</h2>
                 <a id="exporthtmla" target="_blank" class="exportlink"><div class="exporttype" id="exporthtml">HTML</div></a>
                 <a id="exportplaina" target="_blank" class="exportlink"><div class="exporttype" id="exportplain">Plain text</div></a>

From d8a058476863077904645e534a29abd42915f8bd Mon Sep 17 00:00:00 2001
From: 0ip <me@factor.cc>
Date: Mon, 27 Feb 2012 22:29:21 +0100
Subject: [PATCH 3/4] more subtle ui feedback when pressing buttons

---
 static/css/pad.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/static/css/pad.css b/static/css/pad.css
index 4fdcd0c36..2c86908ae 100644
--- a/static/css/pad.css
+++ b/static/css/pad.css
@@ -75,11 +75,13 @@ a img
 
 #editbar ul li:hover {
   background: #fff;
+  background: linear-gradient(#f4f4f4, #e4e4e4);
 }
 
 #editbar ul li:active {
   background: #eee;
   background: linear-gradient(#ddd, #fff);
+  box-shadow: 0 0 8px rgba(0,0,0,.1) inset;
 }
 
 #editbar ul li.separator

From a17a04182a412f8539d780a2edfa2bb84c3e82f6 Mon Sep 17 00:00:00 2001
From: 0ip <me@factor.cc>
Date: Mon, 27 Feb 2012 22:40:47 +0100
Subject: [PATCH 4/4] fix weird looking input [IE7]

---
 static/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/index.html b/static/index.html
index 8e0b02a97..58f688017 100644
--- a/static/index.html
+++ b/static/index.html
@@ -84,6 +84,7 @@
               box-sizing: border-box;
               -moz-box-sizing: border-box;   
               padding: 0 45px 0 10px;
+              *padding: 0; /* IE7 hack */
               width: 100%;
               height: 100%;
               outline: none;