From c5cb208cb8ac0968bebb416bad5b37b029ccd239 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Fri, 30 Mar 2012 08:17:40 -0400 Subject: [PATCH 1/2] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: quattro-green: adopted quattro option for centered display string update add themes diabook-red & diabook-aerith rename "file as" to "save to folder" bug #352 - qcomment plugin disabled, qcomments still allowed quattro-greey: apply theming to private mail zrl into people searches another silly mistake silly mistake zrl on mentions use zrl to get home again provide a way to specify an admin account for siteinfo if more than one have admin email address * master: From b88a452c6b90b8ee1aafe4f2a4f1bd905f767893 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sat, 31 Mar 2012 03:56:06 -0400 Subject: [PATCH 2/2] theme fixes; fix qcomment (finally) Signed-off-by: Simon L'nu --- view/theme/dispy-dark/comment_item.tpl | 13 ++++--- view/theme/dispy-dark/style.css | 52 ++++++++++++++++++-------- view/theme/dispy/comment_item.tpl | 13 ++++--- view/theme/dispy/style.css | 52 ++++++++++++++++++-------- 4 files changed, 86 insertions(+), 44 deletions(-) diff --git a/view/theme/dispy-dark/comment_item.tpl b/view/theme/dispy-dark/comment_item.tpl index 85176732b..adf2772af 100644 --- a/view/theme/dispy-dark/comment_item.tpl +++ b/view/theme/dispy-dark/comment_item.tpl @@ -12,14 +12,15 @@
- {{ if $qcomment }} -
    - {{ for $qcomment as $qc }} -
  • $qc
    • +
    + +
    {{ endif }}
    diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index 5dc0776e0..f5788ef82 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -54,10 +54,14 @@ select { border: 1px #555 dotted; padding: 3px; margin: 2px; + color: #eec; + background: #2e2f2e; } option { padding: 3px; vertical-align: middle; + color: #eec; + background: #2e2f2e; } li { padding: 0 0 0 2px; @@ -211,39 +215,51 @@ input[type=submit] { /** * login */ +aside .field { + overflow: hidden; + width: 200px; +} #login-extra-links { - overflow: auto; - padding-top: 140px !important; - width: 100%; + overflow: auto !important; + padding-top: 60px !important; + width: 100% !important; } #login-extra-links a { margin-right: 20px; } #login_standard { - display: block; - float: none; - height: 100px; - position: absolute; - width: 100%; + display: block !important; + float: none !important; + height: 100% !important; + position: relative !important; + width: 100% !important; } #login_standard .field label { - width: 200px; + width: 200px !important; } #login_standard input, #login_standard input[type="text"] { - margin: 0 0 8px; - width: 210px; + margin: 0 0 8px !important; + width: 210px !important; } #login-submit-wrapper { - margin: 0; + margin: 0 !important; } #login-submit-button { margin-left: 0px !important; } +aside #login_openid { + position: relative !important; + float: none !important; + margin-left: 0px !important; + height: auto !important; + width: 200px !important; +} #login_openid #id_openid_url { - width: 200px; + width: 180px !important; + overflow: hidden !important; } #login_openid label { - width: 208px; + width: 180px !important; } @@ -525,7 +541,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link width: 10em; color: #eec; } -nav #user-menu { +#user-menu { display: block; width: 75%; margin: 3px 0 0 0; @@ -538,8 +554,12 @@ nav #user-menu { clear: both; top: 4px; left: 10px; + padding: 2px; } -nav #user-menu-label { +#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/comment_item.tpl b/view/theme/dispy/comment_item.tpl index 85176732b..adf2772af 100644 --- a/view/theme/dispy/comment_item.tpl +++ b/view/theme/dispy/comment_item.tpl @@ -12,14 +12,15 @@
    - {{ if $qcomment }} -
      - {{ for $qcomment as $qc }} -
    • $qc
      • +
      + +
      {{ endif }}
      diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 1d6bba738..fdcceab0c 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -54,10 +54,14 @@ select { border: 1px #555 dotted; padding: 3px; margin: 2px; + color: #222; + background: #efefef; } option { padding: 3px; vertical-align: middle; + color: #222; + background: #efefef; } li { padding: 0 0 0 2px; @@ -211,39 +215,51 @@ input[type=submit] { /** * login */ +aside .field { + overflow: hidden; + width: 200px; +} #login-extra-links { - overflow: auto; - padding-top: 140px !important; - width: 100%; + overflow: auto !important; + padding-top: 60px !important; + width: 100% !important; } #login-extra-links a { margin-right: 20px; } #login_standard { - display: block; - float: none; - height: 100px; - position: absolute; - width: 100%; + display: block !important; + float: none !important; + height: 100% !important; + position: relative !important; + width: 100% !important; } #login_standard .field label { - width: 200px; + width: 200px !important; } #login_standard input, #login_standard input[type="text"] { - margin: 0 0 8px; - width: 210px; + margin: 0 0 8px !important; + width: 210px !important; } #login-submit-wrapper { - margin: 0; + margin: 0 !important; } #login-submit-button { margin-left: 0px !important; } +aside #login_openid { + position: relative !important; + float: none !important; + margin-left: 0px !important; + height: auto !important; + width: 200px !important; +} #login_openid #id_openid_url { - width: 200px; + width: 180px !important; + overflow: hidden !important; } #login_openid label { - width: 208px; + width: 180px !important; } @@ -525,7 +541,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link width: 10em; color: #eec; } -nav #user-menu { +#user-menu { display: block; width: 75%; margin: 3px 0 0 0; @@ -538,8 +554,12 @@ nav #user-menu { clear: both; top: 4px; left: 10px; + padding: 2px; } -nav #user-menu-label { +#user-menu > a { + vertical-align: top; +} +#user-menu-label { font-size: 12px; padding: 3px 20px 9px 5px; height: 10px;