Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  break up poller into separate processes
  add tooltip title to common_tabs
  PRIVACY: if wall is blocked, don't provide public keywords in HTML meta
  Diabook-dark update, it's almost useable now (if you're lenient).
  Added "important changes" to admin menu for admins who don't follow the github properly.

* master:

diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
index 26a21bcf1abcb0a5d512446e223e41749d9262dc..de4f3a6dc62a20ddbdc0129ab303f25eee454fff 100644 (file)
--- a/view/theme/dispy/dark/style.css
+++ b/view/theme/dispy/dark/style.css
@@ -73,8 +73,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
 .floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(dark/icons.png) -190px -60px no-repeat;}
 .search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;border-radius:5px;}
-#search-text{border:1px #eec solid;background:#2e2f2e;color:#eec;}
-.search-box #search-text{margin:8px;width:10em;height:14px;color:#eec;}
+#search-text{border:1px #eec solid;background:#2e2f2e;color:#eec;font-size:8pt;margin:8px;width:10em;height:14px;}
 #scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;}
 #user-menu{box-shadow:5px 0 10px 0 #111;display:block;width:75%;margin:3px 0 0 0;position:relative;background-color:#555753;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;background:#555753 url("dark/menu-user-pin.jpg") 98% center no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;}
 #user-menu-label{font-size:12px;padding:3px 20px 9px 5px;height:10px;}

diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
index c56adf5a18aa63ebfb2b740f7f5cee9b5a6dc42d..41fd2c8aa298665ed0c44e1133af38511be0edbf 100644 (file)
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -477,13 +477,11 @@ nav #nav-notifications-linkmenu {
 #search-text {
   border: 1px #eec solid;
   background: #2e2f2e;
-  color: #eec; }
-
-.search-box #search-text {
+  color: #eec;
+  font-size: 8pt;
   margin: 8px;
   width: 10em;
-  height: 14px;
-  color: #eec; }
+  height: 14px; }
 
 #scrollup {
   position: fixed;

diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css
index 2c95d70da97cf193c2edd8b1d6b9dd8c2b35478d..8fc48a80fd050e62a860a9aa432de97d33d34cfc 100644 (file)
--- a/view/theme/dispy/light/style.css
+++ b/view/theme/dispy/light/style.css
@@ -73,8 +73,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
 .floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(light/icons.png) -190px -60px no-repeat;}
 .search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;border-radius:5px;}
-#search-text{border:1px #eec solid;background:#2e3436;color:#eec;}
-.search-box #search-text{margin:8px;width:10em;height:14px;color:#eec;}
+#search-text{border:1px #eec solid;background:#2e3436;color:#eec;font-size:8pt;margin:8px;width:10em;height:14px;}
 #scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;}
 #user-menu{box-shadow:5px 0 10px 0 #111;display:block;width:75%;margin:3px 0 0 0;position:relative;background-color:#555753;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;background:#555753 url("light/menu-user-pin.jpg") 98% center no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;}
 #user-menu-label{font-size:12px;padding:3px 20px 9px 5px;height:10px;}

diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
index 18151bc270870d33323ebc4e948f18539958a7bb..57b40351be8cfce192303f7faf42988afdb01fb5 100644 (file)
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@@ -478,13 +478,11 @@ nav #nav-notifications-linkmenu {
 #search-text {
   border: 1px #eec solid;
   background: #2e3436;
-  color: #eec; }
-
-.search-box #search-text {
+  color: #eec;
+  font-size: 8pt;
   margin: 8px;
   width: 10em;
-  height: 14px;
-  color: #eec; }
+  height: 14px; }
 
 #scrollup {
   position: fixed;