Merge branch '1.0.x' into schema-x

Conflicts:
	plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po

1 files changed, 23 insertions, 0 deletions

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index a278126dc..7ac66095a 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -975,6 +975,29 @@ max-height:96px;
 margin-right:18px;
 float:left;
 }
+
+.oauth-desktop-mode #wrap {
+    min-width: 500px;
+}
+
+.oauth-desktop-mode #content {
+    width: 480px;
+    padding: 6px;
+    margin: 4px 0px 0px 4px;
+    border-top-left-radius: 7px;
+    -moz-border-radius-topleft: 7px;
+    -webkit-border-top-left-radius: 7px;
+}
+
+.oauth-desktop-mode fieldset {
+    margin-bottom: 10px !important;
+}
+
+#oauth_pin {
+    text-align: center;
+    font-size: 3em;
+}
+
 #showapplication .entity_profile {
 width:68%;
 }