diff options
| author | Brion Vibber <brion@pobox.com> | 2010-10-25 13:08:57 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-10-25 13:08:57 -0700 |
| commit | ca489631db840e33757a71a7e4cb56b187c182d3 (patch) | |
| tree | 92c71b81b6870a8fd2d9c94bed8571b653d95413 /theme | |
| parent | 90c87553ee7566593529199374215ae80bb3e209 (diff) | |
| parent | 01637bcd32921d6857fb7f5c0bbd40fba6bdb830 (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
actions/subscriptions.php
lib/router.php
lib/xmppmanager.php
lib/xmppoutqueuehandler.php
Diffstat (limited to 'theme')
| -rw-r--r-- | theme/base/css/display.css | 23 | ||||
| -rw-r--r-- | theme/rebase/css/display.css | 5 |
2 files changed, 26 insertions, 2 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%; } diff --git a/theme/rebase/css/display.css b/theme/rebase/css/display.css index 19ef2b577..ab7516567 100644 --- a/theme/rebase/css/display.css +++ b/theme/rebase/css/display.css @@ -687,6 +687,7 @@ display:none; float: left; position: relative; margin-bottom: 10px; + width: 100%; } #aside_primary .notices li { @@ -1398,7 +1399,7 @@ display:block; padding: 4px 4px 4px 26px; } -.entity_actions a, .entity_actions p, .entity_actions .entity_subscribe input, .entity_actions .entity_block input { +.entity_actions a, .entity_actions p, .entity_actions .entity_subscribe input, .entity_actions .entity_block input, .entity_actions .entity_moderation input, .entity_actions .entity_role input { background-color: #ccc !important; border: none; } @@ -1407,7 +1408,7 @@ display:block; padding: 2px 4px 4px 28px; } -.entity_actions a, .entity_actions p, .entity_actions .entity_subscribe input, .entity_actions .entity_block input { +.entity_actions a:hover, .entity_actions p:hover, .entity_actions .entity_subscribe input:hover, .entity_actions .entity_block input:hover, .entity_actions .entity_moderation input:hover, .entity_actions .entity_role input:hover { background-color: #f2f2f2 !important; } |