From 2c15bdd99eea9fa234d0d0adb3219af171de8f60 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Mon, 15 Oct 2012 22:48:25 -0400 Subject: [PATCH 01/15] merge HEAD Signed-off-by: Simon L'nu --- view/theme/dispy/dark/style.css | 1 + view/theme/dispy/dark/style.less | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css index 5cb9ee205..efb00776a 100644 --- a/view/theme/dispy/dark/style.css +++ b/view/theme/dispy/dark/style.css @@ -549,4 +549,5 @@ footer{display:block;clear:both;text-align:center;} #sidebar-page-list ul{padding:0;margin:5px 0;} #sidebar-page-list li{list-style:none;} #jappix_mini{margin-left:130px;position:fixed;bottom:0;right:175px !important;z-index:999;} +#fancybox-content{color:#111;} @media handheld and screen{body{font-size:15pt;}}@media only screen and (min-device-width:320px) and (max-device-width:480px){body{font-size:12pt;}}@media only screen and (min-width:321px){body{font-size:12pt;}}@media only screen and (max-width:320px){body{font-size:12pt;}}@media only screen and (min-device-width:768px) and (max-device-width:1024px){body{font-size:14pt;}}@media only screen and (min-device-width:768px) and (max-device-width:1024px) and (orientation:landscape){body{font-size:14pt;}}@media only screen and (min-device-width:768px) and (max-device-width:1024px) and (orientation:portrait){body{font-size:14pt;}}@media only screen and (min-width:1024px){body{font-size:14pt;}}@media only screen and (min-width:1520px){body{font-size:16pt;}}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min-device-pixel-ratio:1.5){body{font-size:14pt;}} diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less index d7becbedb..9d17abdd1 100644 --- a/view/theme/dispy/dark/style.less +++ b/view/theme/dispy/dark/style.less @@ -3230,4 +3230,8 @@ footer { z-index: 999; } +#fancybox-content { + color: #111; +} + @import "../css/media"; From 136175047d1282fb9bdc8683b913dc697c0700c4 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Tue, 23 Oct 2012 14:23:28 +0200 Subject: [PATCH 02/15] modified: view/theme/smoothly/profile_vcard.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php new file: view/theme/smoothly/vcard-widget.tpl --- view/theme/smoothly/profile_vcard.tpl | 2 +- view/theme/smoothly/style.css | 19 +++++++++++++++++++ view/theme/smoothly/theme.php | 2 +- view/theme/smoothly/vcard-widget.tpl | 5 +++++ 4 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 view/theme/smoothly/vcard-widget.tpl diff --git a/view/theme/smoothly/profile_vcard.tpl b/view/theme/smoothly/profile_vcard.tpl index 6d5fb10b7..2f9d6f233 100644 --- a/view/theme/smoothly/profile_vcard.tpl +++ b/view/theme/smoothly/profile_vcard.tpl @@ -3,7 +3,7 @@ {{ if $pdesc }}
$profile.pdesc
{{ endif }} -
$profile.name
+
$profile.name
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 8bc50a0fe..5ae866004 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -1954,6 +1954,11 @@ div[id$="wrapper"] br { overflow: auto; } +.photo { + height: 191px; + width: 191px; +} + #side-bar-photos-albums h3:before { content: url("photography.png"); padding-right: 10px; @@ -2642,6 +2647,20 @@ margin-left: 0px; margin: auto; } +#contact-edit-info-wrapper, +#contact-edit-info-end, +#contact-edit-profile-select-text, +#contact-edit-profile-select-end, +#contact-edit-poll-wrapper, +#contact-edit-end { +} + +.contact-edit-submit { +} + +#contact-profile-selector { +} + .contact-photo-menu-button { position: absolute; background-image: url("photo-menu.jpg"); diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php index ee91aed17..8e108f71b 100644 --- a/view/theme/smoothly/theme.php +++ b/view/theme/smoothly/theme.php @@ -3,7 +3,7 @@ /* * Name: Smoothly * Description: Like coffee with milk. Theme works fine with iPad[2]. - * Version: Version 0.10.23 + * Version: Version 0.10.23-2 * Author: Alex * Maintainer: Alex * Screenshot: Screenshot diff --git a/view/theme/smoothly/vcard-widget.tpl b/view/theme/smoothly/vcard-widget.tpl new file mode 100644 index 000000000..897b53c20 --- /dev/null +++ b/view/theme/smoothly/vcard-widget.tpl @@ -0,0 +1,5 @@ +
+
$name
+
$name
+
+ From e43097dbc15fcf029a2a603bdc390c6a20faf8b4 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Tue, 23 Oct 2012 15:47:48 +0200 Subject: [PATCH 03/15] modified: view/theme/smoothly/css/typography.css modified: view/theme/smoothly/style.css --- view/theme/smoothly/css/typography.css | 4 +- view/theme/smoothly/style.css | 62 ++++++++++++++++++++++---- 2 files changed, 55 insertions(+), 11 deletions(-) diff --git a/view/theme/smoothly/css/typography.css b/view/theme/smoothly/css/typography.css index ffcb90003..b0f73fcfb 100644 --- a/view/theme/smoothly/css/typography.css +++ b/view/theme/smoothly/css/typography.css @@ -135,8 +135,8 @@ dd { margin:0 0 1.5em 0.8em; } p { max-width: 600px; font-size:1em; - line-height:1.5em; - margin: 1.5em 0 0 0; + /*line-height:1.5em;*/ + /*margin: 1.5em 0 0 0;*/ } blockquote, cite, q { diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 5ae866004..56a22d710 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -50,7 +50,7 @@ input[type=text-sidebar] { } input[type=submit] { - margin: 10px; + margin:10px 10px 0 0; font-size: 0.9em; padding: 5px; background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); @@ -1055,7 +1055,7 @@ ul .sidebar-group-li .icon { } #theme-preview { - margin: 15px 0 15px 150px; + margin: 15px 0 15px 0; } #profile-jot-perms, #profile-jot-submit { @@ -1836,19 +1836,19 @@ div[id$="wrapper"] br { margin-left: 20px; } -#profile-listing-desc { +#profile-listing-desc, +#profile-listing-new-link-wrapper { float: left; display: inline; padding: 5px 10px 5px 10px; width: 150px; - margin-bottom: 20px; - margin-top: 20px; + margin:20px 10px 0 0; display: inline-block; font-style: bold; text-align: center; } -#profile-listing-new-link-wrapper { +/*#profile-listing-new-link-wrapper { float: left; display: inline; width: auto; @@ -1857,7 +1857,7 @@ div[id$="wrapper"] br { padding: 5px 10px 5px 10px; font-style: bold; text-align: center; -} +}*/ .profile-listing-name { font-size: 1em; @@ -3094,12 +3094,14 @@ margin-left: 0px; margin-bottom: 20px; } +.settings-submit, .settings-submit-wrapper, .profile-edit-submit-wrapper { margin: 30px 0px; } -.profile-listing { +.profile-listing, +.profile-listing-end { float: left; clear: both; margin: 20px 20px 0px 0px; @@ -3628,7 +3630,8 @@ tr { .field label { float: left; - width: 480px; + width: auto; + margin: 5px 10px 0 0; } .field checkbox { @@ -4215,6 +4218,7 @@ div.wall-item-content-wrapper.shiny { #profile-upload-wrapper, #wall-image-upload-div, #wall-file-upload-div, + .hover, .focus { cursor: pointer; } @@ -4320,3 +4324,43 @@ div#datebrowse-sidebar.widget { .fakelink:hover { color: #6da6c4; } + +#id_theme { + margin:10px 10px 0 0; +} + +#id_post_newfriend, +#id_post_joingroup, +#id_post_profilechange, +#id_notify1, +#id_notify2, +#id_notify3, +#id_notify4, +#id_notify5, +#id_notify6, +#id_notify7, +#id_notify8, +#id_allow_location { + margin: 6px 0 0 0; +} + +#settings-form {} +.select {} +.field_help { + margin: 5px 0 10px; +} + +#settings-activity-desc, +#settings-notify-desc { + margin:10px 10px 10px 0; + font-weight: bold; +} + +#settings-notifications { + border: 1px solid #7C7D7B; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + padding:10px; +} + From 35a44d8d27f8866b90d47940d0ea3572ac663af1 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Tue, 23 Oct 2012 19:20:49 +0100 Subject: [PATCH 04/15] Diabook - first part of clean-up to make the theme maintainable. --- view/theme/diabook/admin_users.tpl | 88 ------------------------------ view/theme/diabook/theme.php | 44 --------------- 2 files changed, 132 deletions(-) delete mode 100644 view/theme/diabook/admin_users.tpl diff --git a/view/theme/diabook/admin_users.tpl b/view/theme/diabook/admin_users.tpl deleted file mode 100644 index 8aabb51ec..000000000 --- a/view/theme/diabook/admin_users.tpl +++ /dev/null @@ -1,88 +0,0 @@ - -
-

$title - $page

- -
- -

$h_pending

- {{ if $pending }} - - - - {{ for $th_pending as $th }}{{ endfor }} - - - - - - {{ for $pending as $u }} - - - - - - - - {{ endfor }} - -
$th
$u.created$u.name - - -
-
$select_all
-
- {{ else }} -

$no_pending

- {{ endif }} - - - - -

$h_users

- {{ if $users }} - - - - - {{ for $th_users as $th }}{{ endfor }} - - - - - - {{ for $users as $u }} - - - - - - - - - - - - {{ endfor }} - -
$th
$u.nickname$u.name$u.register_date$u.lastitem_date - - -
-
$select_all
-
- {{ else }} - NO USERS?!? - {{ endif }} -
-
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index cf4544175..c0ca82b41 100644 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -37,7 +37,6 @@ load_config("diabook"); load_pconfig(local_user(), "diabook"); //get statuses of boxes at right-hand-column -$close_pages = get_diabook_config( "close_pages", 1 ); $close_profiles = get_diabook_config( "close_profiles", 0 ); $close_helpers = get_diabook_config( "close_helpers", 0 ); $close_services = get_diabook_config( "close_services", 0 ); @@ -297,11 +296,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";