From 21973b9985f6325315721cba1c4e046fbbe3a1f0 Mon Sep 17 00:00:00 2001
From: Arun Persaud <arun@nubati.net>
Date: Mon, 14 Nov 2011 19:31:56 -0800
Subject: CLEANUP: merged normal css file and the one for mobile phones into
 one file

---
 css/narrow.css     | 73 --------------------------------------------------
 css/standard.css   | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 include/output.php |  3 +--
 3 files changed, 79 insertions(+), 75 deletions(-)
 delete mode 100644 css/narrow.css

diff --git a/css/narrow.css b/css/narrow.css
deleted file mode 100644
index dc69296..0000000
--- a/css/narrow.css
+++ /dev/null
@@ -1,73 +0,0 @@
-.main {
-  background-color: #fff;
-  margin-left: 0em;
-  margin-right: 0em;
-  min-height: 0em;
-}
-
-header, footer {
-  margin-left: 0em;
-  margin-right: 0em;
-}
-
-
-.lastlogin {
-  position: relative;
-  left: 0em;
-  top: 0em;
-  width: 100%;
-  text-align: center;
-  border-top: 1px solid gray;
-}
-
-.session div.sessionscore div, .status {
-  right:0em;
-}
-
-.usermenu {
-  left: 0em;
-}
-
-.notes {
-  position:relative;
-  top:0em;
-  left:0;
-  margin:0.1em;
-  margin-top:0em;
-  margin-left:0em;
-
-  width: 100%;
-
-  border:    2px solid gray;
-
-  padding:0.3em;
-
-  background-color: #efefef;
-
-  height:100%;
-  overflow: auto;
-  z-index:0;
-}
-
-.user { margin-left:5%;margin-right:5%; }
-
-div.table img.table {
-  width:50%;
-}
-
-.message {
- position: relative;
- background-color: #fff;
- width: 100%;
- top:0em;
- left:0%;
- right:0%;
- text-align: center;
- z-index:1;
-}
-.message >div { border: 2px solid black; }
-.message div div {
-    width: 100%;
-    text-align: right;
-    font-size: smaller;
-}
diff --git a/css/standard.css b/css/standard.css
index b23516d..626c218 100644
--- a/css/standard.css
+++ b/css/standard.css
@@ -770,3 +770,81 @@ div span.numberoftricks {
 .about .translation {
     background-color: #fce94f;
 }
+
+
+/* special layout for mobile devices */
+@media only screen and (max-width: 900px) {
+.main {
+  background-color: #fff;
+  margin-left: 0em;
+  margin-right: 0em;
+  min-height: 0em;
+}
+
+header, footer {
+  margin-left: 0em;
+  margin-right: 0em;
+}
+
+
+.lastlogin {
+  position: relative;
+  left: 0em;
+  top: 0em;
+  width: 100%;
+  text-align: center;
+  border-top: 1px solid gray;
+}
+
+.session div.sessionscore div, .status {
+  right:0em;
+}
+
+.usermenu {
+  left: 0em;
+}
+
+.notes {
+  position:relative;
+  top:0em;
+  left:0;
+  margin:0.1em;
+  margin-top:0em;
+  margin-left:0em;
+
+  width: 100%;
+
+  border:    2px solid gray;
+
+  padding:0.3em;
+
+  background-color: #efefef;
+
+  height:100%;
+  overflow: auto;
+  z-index:0;
+}
+
+.user { margin-left:5%;margin-right:5%; }
+
+div.table img.table {
+  width:50%;
+}
+
+.message {
+ position: relative;
+ background-color: #fff;
+ width: 100%;
+ top:0em;
+ left:0%;
+ right:0%;
+ text-align: center;
+ z-index:1;
+}
+.message >div { border: 2px solid black; }
+.message div div {
+    width: 100%;
+    text-align: right;
+    font-size: smaller;
+}
+}
\ No newline at end of file
diff --git a/include/output.php b/include/output.php
index c6d78e3..42f4085 100644
--- a/include/output.php
+++ b/include/output.php
@@ -378,8 +378,7 @@ function output_header()
      <meta charset="utf-8" />
      <link rel="shortcut icon" href="pics/edoko-favicon.png" />
      <link rel="stylesheet" href="css/normalize.css?v=1" />
-     <link rel="stylesheet" href="css/standard.css?v=35" />
-     <link rel="stylesheet" media="screen and (max-width: 600px)" href="css/narrow.css?v=2" />
+     <link rel="stylesheet" href="css/standard.css?v=36" />
      <link rel="stylesheet" href="css/dateinput.css?v=1"/>
      <script type="text/javascript" src="include/jquery.js"> </script>
      <script type="text/javascript" src="include/jquery.tablesorter.js"></script>
-- 
cgit v1.2.3-18-g5258