Merge.

diff --git a/bin/pagegen.py b/bin/pagegen.py
index 2d1cea4c2603777629bf48ca4a3d56a6f91801c8..7da601ea0da26ce2cfb2ba68f128d0396015c5be 100755 (executable)
--- a/bin/pagegen.py
+++ b/bin/pagegen.py
@@ -68,6 +68,7 @@ def producehtml(name, debug):
   <base />
   <title>%s (qwebirc)</title>
   <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+  <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;" />
   <link rel="shortcut icon" type="image/png" href="%simages/favicon.png"/>
 %s<script type="text/javascript">QWEBIRC_DEBUG=%s;</script>%s
 %s

diff --git a/css/qui.mcss b/css/qui.mcss
index f82c89577875e77a4066e55129bbbbf058aa215b..ebbd2abb7a9db74947f0849eba7e9c3ef1e90a2c 100644 (file)
--- a/css/qui.mcss
+++ b/css/qui.mcss
@@ -151,19 +151,18 @@ html {
 .qwebirc-qui .outertabbar_left {
   border-right: 1px solid $(tabbar_border);
   overflow: auto;
-
 }
 
 .qwebirc-qui .outertabbar_left .tab {
   display: block;
   margin-right: 3px;
-  margin-top: 2px;
+  margin-top: 3px;
   line-height: normal;
   overflow: hidden;
   text-overflow: ellipsis;
+  min-height: 15px;
 }
 
-
 .qwebirc-qui .outertabbar_left .tabclose {
   float: right;
   padding-left: 0;
@@ -171,7 +170,7 @@ html {
 }
 
 .qwebirc-qui .outertabbar_left .tabbar {
-  margin-left: 5px;
+  margin-left: 2px;
 }
 
 .qwebirc-qui .outertabbar_top {
@@ -302,7 +301,7 @@ div#noscript {
   cursor: pointer;
   cursor: hand;
   float: left;
-  padding: 4px;
+  padding: 3px;
   width: 17px;
 }
 

diff --git a/js/ui/panes/options.js b/js/ui/panes/options.js
index 7ee9310e4059825926d0c0f1069128fd203d8b98..56bb10edf9240817e1f8584384ea7869957a5e7f 100644 (file)
--- a/js/ui/panes/options.js
+++ b/js/ui/panes/options.js
@@ -56,7 +56,7 @@ qwebirc.config.DEFAULT_OPTIONS = [
     }
   }],
   [12, "QUERY_ON_NICK_CLICK", "Query on nickname click in channel", false],
-  [13, "SHOW_NICKLIST", "Show nickname list in channels", true],
+  [13, "SHOW_NICKLIST", "Show nickname list in channels", qwebirc.util.deviceHasKeyboard()],
   [14, "SHOW_TIMESTAMPS", "Show timestamps", true], /* we rely on the hue update */
   [15, "SIDE_TABS", "Show tabs on the side", false, {
     enabled: function() {