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] 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>