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 ++++---- 3 files changed, 23 insertions(+), 30 deletions(-) (limited to 'view/theme/dispy-dark') 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 }}
    • -- cgit v1.2.3 From b88a452c6b90b8ee1aafe4f2a4f1bd905f767893 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sat, 31 Mar 2012 03:56:06 -0400 Subject: 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 +++++++++++++++++++++++----------- 2 files changed, 43 insertions(+), 22 deletions(-) (limited to 'view/theme/dispy-dark') 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; +} +#user-menu > a { + vertical-align: top; } -nav #user-menu-label { +#user-menu-label { font-size: 12px; padding: 3px 20px 9px 5px; height: 10px; -- cgit v1.2.3 From f5e3ec9a56f4f9aabe6c1d52831bf62a5bb61eb5 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sat, 31 Mar 2012 04:02:51 -0400 Subject: forgot the css changes for last push Signed-off-by: Simon L'nu --- view/theme/dispy-dark/style.css | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'view/theme/dispy-dark') diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index f5788ef82..6f5544a1c 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -2894,13 +2894,7 @@ footer { } .qcomment-wrapper { padding: 0px; - margin: 2px; - list-style-type: none; -} -.qcomment, .qcomment:hover { - display: inline; - padding: 5px; - margin: 5px; + margin: 5px 5px 5px 81%; } .qcomment { opacity: 0.5; -- cgit v1.2.3 From db7f7e42370bc787be8bc8f71845d98a95bb705f Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 1 Apr 2012 03:57:05 -0400 Subject: latest fixes for dispys. tweaking/repairing Signed-off-by: Simon L'nu --- view/theme/dispy-dark/communityhome.tpl | 2 ++ view/theme/dispy-dark/profile_vcard.tpl | 4 +--- view/theme/dispy-dark/style.css | 21 ++++++++++++++++----- view/theme/dispy-dark/theme.php | 9 +++++++-- 4 files changed, 26 insertions(+), 10 deletions(-) (limited to 'view/theme/dispy-dark') diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl index 2876f936e..340b7216c 100644 --- a/view/theme/dispy-dark/communityhome.tpl +++ b/view/theme/dispy-dark/communityhome.tpl @@ -37,8 +37,10 @@ {{ endif }} +{{ if $lastusers_title }}

      PostIt to Friendica

      Post to Friendica from anywhere by bookmarking this link.
      +{{ endif }} diff --git a/view/theme/dispy-dark/profile_vcard.tpl b/view/theme/dispy-dark/profile_vcard.tpl index 350a6ce4a..f14ea7915 100644 --- a/view/theme/dispy-dark/profile_vcard.tpl +++ b/view/theme/dispy-dark/profile_vcard.tpl @@ -10,9 +10,8 @@ $e.profile_name {{ endfor }} -
    • $profile.menu.chg_photo
      • +
    • $profile.menu.chg_photo
    • $profile.menu.cr_new
      • -
    {{ endif }} @@ -81,4 +80,3 @@ $contact_block - diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index 6f5544a1c..5f9b38f8c 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -1062,6 +1062,8 @@ section { } .tabs li { display: inline; + font-size: smaller; + font-weight: bold; } .tab { border: 1px solid #729fcf; @@ -1120,6 +1122,7 @@ section { } .wall-item-content { overflow-x: auto; + margin: 0px 15px 0px 5px; } /* removing it from here, vs. putting it in .wall-item-content * might break things for people. we shall see ;) */ @@ -1203,6 +1206,7 @@ section { .wall-item-body { margin: 20px 20px 10px 0px; text-align: left; + overflow-x: auto; } .wall-item-lock-wrapper { float: right; @@ -2072,6 +2076,9 @@ div[id$="wrapper"] br { float:left; font-size:20px; } +.event { + background: #2e2f2e; +} .vevent { border:1px solid #ccc; } @@ -2083,15 +2090,14 @@ div[id$="wrapper"] br { margin-left: 10px; margin-right: 10px; } - #new-event-link { margin-bottom: 10px; } .edit-event-link, .plink-event-link { - float: left; - margin-top: 4px; - margin-right: 4px; - margin-bottom: 15px; + /*float: left; */ + /*margin-top: 4px; */ + /*margin-right: 4px;*/ + /*margin-bottom: 15px;*/ } .event-description:before { content: url('../../../images/calendar.png'); @@ -2100,6 +2106,7 @@ div[id$="wrapper"] br { .event-start, .event-end { margin-left: 10px; width: 330px; + font-size: smaller; } .event-start .dtstart, .event-end .dtend { float: right; @@ -2200,6 +2207,10 @@ div[id$="wrapper"] br { #item-delete-selected-desc:hover { text-decoration: underline; } +.fc-state-highlight { + background: #eec; + color: #2e2f2e; +} /** diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php index 7115faca1..17d31feda 100644 --- a/view/theme/dispy-dark/theme.php +++ b/view/theme/dispy-dark/theme.php @@ -113,6 +113,10 @@ EOT; function dispydark_community_info() { $a = get_app(); + $aside['$lastusers_title'] = t('Last users'); + $aside['$lastusers_items'] = array(); + $publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " ); + $fostitJS = "javascript: (function() { the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + @@ -138,6 +142,7 @@ function dispydark_community_info() { } // aside on profile page -if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) { +//if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) { dispydark_community_info(); -} +//} + -- cgit v1.2.3