From 3b4016168ddb9927f710775008d3a80ee582e34f Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Thu, 29 Mar 2012 20:19:43 -0400 Subject: tweaking stuff in dispys. i thought i fixed the login screens, but they're b0rked right now. Signed-off-by: Simon L'nu --- view/theme/dispy-dark/style.css | 22 +++++++++++++++++----- view/theme/dispy-dark/theme.php | 23 ++--------------------- view/theme/dispy-dark/wall_item.tpl | 8 ++++---- view/theme/dispy/style.css | 20 ++++++++++++++++---- view/theme/dispy/theme.php | 21 +-------------------- view/theme/dispy/wall_item.tpl | 8 ++++---- 6 files changed, 44 insertions(+), 58 deletions(-) (limited to 'view') diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index 361648999..5dc0776e0 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -1031,6 +1031,7 @@ section { font-size: 0.8em; padding-right: 230px; min-width: 475px; + width: 65%; } /** tabs **/ @@ -1161,10 +1162,18 @@ section { transition: all 1s ease-in-out; } .wall-item-subtools1 { - list-style: none; + height: 30px; + list-style: none outside none; + margin: 20px 0 30px -20px; + padding: 0; + width: 30px; } .wall-item-subtools2 { - list-style: none; + height: 25px; + list-style: none outside none; + margin: -75px 0 0 5px; + padding: 0; + width: 25px; } .wall-item-title { font-size: 1.2em; @@ -1172,11 +1181,15 @@ section { margin-bottom: 1em; } .wall-item-body { - margin: 10px 10px 10px 0px; + margin: 20px 20px 10px 0px; text-align: left; } .wall-item-lock-wrapper { float: right; + height: 22px; + margin: 0 -5px 0 0; + width: 22px; + opacity: 1; } .wall-item-dislike, .wall-item-like { @@ -2141,8 +2154,7 @@ div[id$="wrapper"] br { opacity: 0.1; filter:alpha(opacity=10); float: right; - margin-right: 10px; - + margin-right: 5px; } .item-select:hover, .checkeditem { opacity: 1; diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php index cebe9eb4f..7115faca1 100644 --- a/view/theme/dispy-dark/theme.php +++ b/view/theme/dispy-dark/theme.php @@ -6,14 +6,9 @@ * Version: 1.0 * Author: Simon * Maintainer: Simon - * Screenshot: screenshot + * Screenshot: Screenshot */ - -$a->theme_info = array( - 'extends' => 'dispy-dark' -); - $a->page['htmlhead'] .= <<< EOT EOT; @@ -157,6 +138,6 @@ function dispydark_community_info() { } // aside on profile page -if ($a->argv[0] === "profile") { +if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) { dispydark_community_info(); } diff --git a/view/theme/dispy-dark/wall_item.tpl b/view/theme/dispy-dark/wall_item.tpl index 4b973bf93..b54f753d3 100644 --- a/view/theme/dispy-dark/wall_item.tpl +++ b/view/theme/dispy-dark/wall_item.tpl @@ -16,11 +16,11 @@
{{ if $item.location }}$item.location {{ endif }}
-
    -
  • +
    {{ if $item.lock }}
    $item.lock
    {{ else }}
    {{ endif }} -
  • +
+
    {{ if $item.star }}
  • @@ -37,7 +37,7 @@
  • {{ endif }} -
+
    {{ if $item.filer }}
  • diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index c2c746767..1d6bba738 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -1031,6 +1031,7 @@ section { font-size: 0.8em; padding-right: 230px; min-width: 475px; + width: 65%; } /** tabs **/ @@ -1161,10 +1162,18 @@ section { transition: all 1s ease-in-out; } .wall-item-subtools1 { - list-style: none; + height: 30px; + list-style: none outside none; + margin: 20px 0 30px -20px; + padding: 0; + width: 30px; } .wall-item-subtools2 { - list-style: none; + height: 25px; + list-style: none outside none; + margin: -75px 0 0 5px; + padding: 0; + width: 25px; } .wall-item-title { font-size: 1.2em; @@ -1172,11 +1181,15 @@ section { margin-bottom: 1em; } .wall-item-body { - margin: 10px 10px 10px 0px; + margin: 20px 20px 10px 0px; text-align: left; } .wall-item-lock-wrapper { float: right; + height: 22px; + margin: 0 -5px 0 0; + width: 22px; + opacity: 1; } .wall-item-dislike, .wall-item-like { @@ -2142,7 +2155,6 @@ div[id$="wrapper"] br { filter:alpha(opacity=10); float: right; margin-right: 10px; - } .item-select:hover, .checkeditem { opacity: 1; diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index 9789fd0fa..f3c54caf9 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -9,11 +9,6 @@ * Screenshot: Screenshot */ - -$a->theme_info = array( - 'extends' => 'dispy' -); - $a->page['htmlhead'] .= <<< EOT EOT; @@ -157,6 +138,6 @@ function dispy_community_info() { } // aside on profile page -if ($a->argv[0] === "profile") { +if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) { dispy_community_info(); } diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl index 4b973bf93..b54f753d3 100644 --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -16,11 +16,11 @@
    {{ if $item.location }}$item.location {{ endif }}
    -
      -
    • +
      {{ if $item.lock }}
      $item.lock
      {{ else }}
      {{ endif }} -
    • +
    +
      {{ if $item.star }}
    • @@ -37,7 +37,7 @@
    • {{ endif }} -
    +

    {{ if $item.filer }}
  • -- cgit v1.2.3