From 6f610eb614f5d80c3a8dc1f69832dc9032876f6f Mon Sep 17 00:00:00 2001 From: Devlon Duthie Date: Fri, 30 Sep 2011 01:01:15 -0500 Subject: 1. added button class to tpl files 2. messages - moved delete X into message div and new message form div 3. began work on creating thumbnail versions of albums - needs aspect ratio correction (javascript) 4. changed font-size and font-variation on vcard for better readability. 5. streamlining continued with the CSS file --- view/theme/testbubble/mail_head.tpl | 6 +-- view/theme/testbubble/style.css | 98 +++++++++++++------------------------ 2 files changed, 38 insertions(+), 66 deletions(-) (limited to 'view/theme') diff --git a/view/theme/testbubble/mail_head.tpl b/view/theme/testbubble/mail_head.tpl index 89615cbd0..2a4fc42ea 100644 --- a/view/theme/testbubble/mail_head.tpl +++ b/view/theme/testbubble/mail_head.tpl @@ -1,7 +1,7 @@

$messages

diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css index 9727de6d1..deae9ae58 100644 --- a/view/theme/testbubble/style.css +++ b/view/theme/testbubble/style.css @@ -7,14 +7,11 @@ */ /* ========== */ /* = Colors - Red links - #b20202 Red link hover - #db0503 Red Gradients (buttons and other gradients) - #b20202 and #d60808 - Grey/body text - #626262 Grey Gradients (buttons and other gradients) - #bdbdbd and #a2a2a2 - Dark Grey Gradients - #7c7d7b and #555753 You can switch out the colors of the header, buttons and links by using a find and replace in your text editor. @@ -134,7 +131,7 @@ section { .mframe { padding: 5px; background-color: #efefef; - border: 2px dotted #eeeeee; + border: 2px solid #dddddd; -moz-box-shadow: 3px 3px 4px #959494; -webkit-box-shadow: 3px 3px 4px #959494; box-shadow: 3px 3px 4px #959494; @@ -452,14 +449,10 @@ aside a{ font-variant:small-caps; } -.marital { - font-size: 1em; - font-variant:small-caps; -} - -.homepage-label { - font-size: 1em; - font-variant:small-caps; +.vcard dd { + font-size: 12px; + font-variant: normal; + -webkit-margin-start: 10px; } .vcard .fn { @@ -1304,7 +1297,11 @@ div[id$="wrapper"] br { clear: left; } } .photo-top-photo, -.photo-album-photo {} +.photo-album-photo { + width: 180px; + height: 180px; + overflow: hidden; +} .photo-top-album-name { position: absolute; @@ -1587,16 +1584,15 @@ input#photo_edit_form { font-size: 1em; } - #prvmail-submit-wrapper { margin-top: 10px; } #prvmail-submit { float: right; margin-top: 0px; - margin-right: 90px; + margin-right: 0px; } #prvmail-upload { -margin-left: 90px; +margin-left: 0px; } #prvmail-submit-wrapper > div { @@ -1637,7 +1633,7 @@ margin-left: 90px; float: right; clear: block; display: inline; - font-size: 0.8em; + font-size: 0.9em; padding-left: 10px; font-stretch:ultra-condensed; font-variant:small-caps; @@ -1654,11 +1650,15 @@ margin-left: 90px; color: #626262; } -.mail-list-delete-wrapper { float: left; margin-right:550px; } +.mail-list-delete-wrapper { float: right;} .mail-list-outside-wrapper-end { clear: both; } +.mail-conv-outside-wrapper { + margin-bottom: 10px; +} + .mail-conv-sender {float: left; margin: 0px 5px 5px 0px; } .mail-conv-sender-photo { width: 64px; @@ -1675,13 +1675,20 @@ margin-left: 90px; .mail-conv-detail { width: 500px; padding: 30px; + padding-bottom: 10px; margin-left: 20px; + margin-bottom: 0px; vertical-align: middle; margin: auto; border: 1px solid #dddddd; } .mail-conv-break { display: none; border: none;} -.mail-conv-delete-wrapper { margin-top: 5px; width: 650px; text-align: right; } +.mail-conv-delete-wrapper { padding-top: 10px; width: 510px; text-align: right; } + +#prvmail-subject { + font-weight: bold; + border: none; +} /* ================= */ /* = Notifications = */ @@ -2061,56 +2068,19 @@ margin-left: 90px; padding-top: 10px; } -#profile-tab-status-link:hover { +#profile-tab-status-link { border: 0px; padding: 5px 10px 5px 10px; font-style: bold; - color: #efefef; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) ); - background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808'); - background-color:#b20202; -} - -#profile-tab-status-link:active { - border: 0px; - padding: 5px 10px 5px 10px; - font-style: bold; - background-color: #b20202; - position:relative; - top:1px; -} - -#profile-tab-status-link a { - color: #efefef; } #uexport-link a { color: #efefef; } -#profile-tab-profile-link:hover { +#profile-tab-profile-link { border: 0px; padding: 5px 10px 5px 10px; - font-style: bold; - color: #efefef; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) ); - background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808'); - background-color:#b20202; -} - -#profile-tab-profile-link:active { - border: 0px; - padding: 5px 10px 5px 10px; - font-style: bold; - background-color: #b20202; - position:relative; - top:1px; -} - -#profile-tab-profile-link a { - color: #efefef; } #uexport-link { @@ -2246,7 +2216,7 @@ margin-left: 90px; display: inline; padding: 5px; margin-bottom: 10px; - -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; +/* -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf; box-shadow:inset 0px 1px 0px 0px #cfcfcf; background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); @@ -2255,10 +2225,10 @@ margin-left: 90px; background-color:#bdbdbd; -moz-border-radius:5px; -webkit-border-radius:5px; - border-radius:5px; + border-radius:5px;*/ } -.group-delete-wrapper:hover { +/*.group-delete-wrapper:hover { background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) ); background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% ); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808'); @@ -2275,7 +2245,7 @@ margin-left: 90px; .group-delete-wrapper a { color: #efefef; font-size: 0.9em; -} +}*/ #group-edit-desc { margin: 10px 0xp; } #group-new-text {font-size: 1.1em;} @@ -2602,7 +2572,9 @@ tr { .admin.link { list-style-position: inside; font-size: 1em; - padding: 3px; + padding: 5px; + width: 100px; + margin: 5px; } #adminpage dl { -- cgit v1.2.3 From c15690563d9be00e8f7ae29ecdd6bbdb7f64603f Mon Sep 17 00:00:00 2001 From: Devlon Duthie Date: Sat, 1 Oct 2011 01:52:06 -0500 Subject: class and wrapper div added to photo for aspect ratio display testbubble theme styling for aspect ratio on photos --- view/theme/testbubble/style.css | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) (limited to 'view/theme') diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css index deae9ae58..85a01d0d2 100644 --- a/view/theme/testbubble/style.css +++ b/view/theme/testbubble/style.css @@ -1250,7 +1250,7 @@ div[id$="wrapper"] br { clear: left; } /* ========== */ #side-bar-photos-albums li { - font-size: 1.2em; + font-size: 14px; font-variant: none; } @@ -1279,14 +1279,30 @@ div[id$="wrapper"] br { clear: left; } background-color: #b20202; } -.photo-album-image-wrapper, -.photo-top-image-wrapper { - float: left; +.photo-album-image-wrapper { + float: left; margin: 0px 10px 10px 0px; padding-bottom: 30px; position:relative; } +.photo-top-image-wrapper { + float: left; + width: 180px; + height: 180px; + margin: 0px 10px 10px 0px; + padding-bottom: 30px; + position:relative; +} + +#photo-album-wrapper-inner { + position: relative; + float: left; + width: 180px; + height: 180px; + overflow: hidden; +} + #photo-photo { max-width: 100% } #photo-photo img { max-width: 100% } @@ -1296,12 +1312,8 @@ div[id$="wrapper"] br { clear: left; } border-bottom: 0px; } -.photo-top-photo, -.photo-album-photo { - width: 180px; - height: 180px; - overflow: hidden; -} +.photo-top-photo {} +.photo-album-photo {} .photo-top-album-name { position: absolute; @@ -2216,7 +2228,7 @@ margin-left: 0px; display: inline; padding: 5px; margin-bottom: 10px; -/* -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; + -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf; box-shadow:inset 0px 1px 0px 0px #cfcfcf; background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); @@ -2228,7 +2240,7 @@ margin-left: 0px; border-radius:5px;*/ } -/*.group-delete-wrapper:hover { +.group-delete-wrapper:hover { background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) ); background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% ); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808'); @@ -2245,7 +2257,7 @@ margin-left: 0px; .group-delete-wrapper a { color: #efefef; font-size: 0.9em; -}*/ +} #group-edit-desc { margin: 10px 0xp; } #group-new-text {font-size: 1.1em;} -- cgit v1.2.3 From 78c00c287d5c14d2a93b461b8522bd8a1e95c44c Mon Sep 17 00:00:00 2001 From: Friendika Date: Sat, 1 Oct 2011 04:25:40 -0700 Subject: legibility improvements to darkbubble, mark as a derived theme --- view/theme/darkbubble/calendar.png | Bin 3779 -> 0 bytes view/theme/darkbubble/connect.png | Bin 443 -> 0 bytes view/theme/darkbubble/contact_edit.tpl | 67 -- view/theme/darkbubble/dbicons.png | Bin 0 -> 19694 bytes view/theme/darkbubble/group_drop.tpl | 8 - view/theme/darkbubble/group_edit.tpl | 16 - view/theme/darkbubble/groups.png | Bin 911 -> 0 bytes view/theme/darkbubble/icons.png | Bin 22600 -> 0 bytes view/theme/darkbubble/icons.svg | 1442 ------------------------------- view/theme/darkbubble/jot-header.tpl | 251 ------ view/theme/darkbubble/jot.tpl | 75 -- view/theme/darkbubble/login-bg.gif | Bin 237 -> 0 bytes view/theme/darkbubble/login.tpl | 25 - view/theme/darkbubble/lrarrow.gif | Bin 236 -> 0 bytes view/theme/darkbubble/mail_head.tpl | 7 - view/theme/darkbubble/menu-user-pin.png | Bin 276 -> 0 bytes view/theme/darkbubble/nav.tpl | 55 -- view/theme/darkbubble/next.png | Bin 891 -> 0 bytes view/theme/darkbubble/notifications.png | Bin 6225 -> 0 bytes view/theme/darkbubble/photo_view.tpl | 40 - view/theme/darkbubble/photography.png | Bin 766 -> 0 bytes view/theme/darkbubble/premium.png | Bin 2317 -> 0 bytes view/theme/darkbubble/prev.png | Bin 853 -> 0 bytes view/theme/darkbubble/profile_entry.tpl | 11 - view/theme/darkbubble/profile_tabs.tpl | 9 - view/theme/darkbubble/profile_vcard.tpl | 45 - view/theme/darkbubble/search.png | Bin 808 -> 0 bytes view/theme/darkbubble/search_item.tpl | 48 - view/theme/darkbubble/star.png | Bin 2129 -> 0 bytes view/theme/darkbubble/style.css | 22 + view/theme/darkbubble/theme.php | 4 + view/theme/darkbubble/user.png | Bin 664 -> 0 bytes view/theme/darkbubble/wall_item.tpl | 75 -- view/theme/darkbubble/wallwall_item.tpl | 74 -- 34 files changed, 26 insertions(+), 2248 deletions(-) delete mode 100644 view/theme/darkbubble/calendar.png delete mode 100644 view/theme/darkbubble/connect.png delete mode 100644 view/theme/darkbubble/contact_edit.tpl create mode 100644 view/theme/darkbubble/dbicons.png delete mode 100644 view/theme/darkbubble/group_drop.tpl delete mode 100644 view/theme/darkbubble/group_edit.tpl delete mode 100644 view/theme/darkbubble/groups.png delete mode 100644 view/theme/darkbubble/icons.png delete mode 100644 view/theme/darkbubble/icons.svg delete mode 100644 view/theme/darkbubble/jot-header.tpl delete mode 100644 view/theme/darkbubble/jot.tpl delete mode 100644 view/theme/darkbubble/login-bg.gif delete mode 100644 view/theme/darkbubble/login.tpl delete mode 100644 view/theme/darkbubble/lrarrow.gif delete mode 100644 view/theme/darkbubble/mail_head.tpl delete mode 100644 view/theme/darkbubble/menu-user-pin.png delete mode 100644 view/theme/darkbubble/nav.tpl delete mode 100644 view/theme/darkbubble/next.png delete mode 100644 view/theme/darkbubble/notifications.png delete mode 100644 view/theme/darkbubble/photo_view.tpl delete mode 100644 view/theme/darkbubble/photography.png delete mode 100644 view/theme/darkbubble/premium.png delete mode 100644 view/theme/darkbubble/prev.png delete mode 100644 view/theme/darkbubble/profile_entry.tpl delete mode 100644 view/theme/darkbubble/profile_tabs.tpl delete mode 100644 view/theme/darkbubble/profile_vcard.tpl delete mode 100644 view/theme/darkbubble/search.png delete mode 100644 view/theme/darkbubble/search_item.tpl delete mode 100644 view/theme/darkbubble/star.png create mode 100644 view/theme/darkbubble/theme.php delete mode 100644 view/theme/darkbubble/user.png delete mode 100644 view/theme/darkbubble/wall_item.tpl delete mode 100644 view/theme/darkbubble/wallwall_item.tpl (limited to 'view/theme') diff --git a/view/theme/darkbubble/calendar.png b/view/theme/darkbubble/calendar.png deleted file mode 100644 index 705a75b8a..000000000 Binary files a/view/theme/darkbubble/calendar.png and /dev/null differ diff --git a/view/theme/darkbubble/connect.png b/view/theme/darkbubble/connect.png deleted file mode 100644 index b76fc13dc..000000000 Binary files a/view/theme/darkbubble/connect.png and /dev/null differ diff --git a/view/theme/darkbubble/contact_edit.tpl b/view/theme/darkbubble/contact_edit.tpl deleted file mode 100644 index 59747c62d..000000000 --- a/view/theme/darkbubble/contact_edit.tpl +++ /dev/null @@ -1,67 +0,0 @@ - -

$header

- -
$name
- -$nettype - -
- - -
- -
- $alt_text -
- $name -
-
-
-
- - -
- - {{ if $poll_enabled }} -
-
$lastupdtext$last_update
-
$updpub
- $poll_interval - -
- {{ endif }} -
-
- -$insecure -$blocked -$ignored - - -$lblsuggest - -
-

$lbl_info1

- -
-
- - - -
-

$lbl_vis1

-

$lbl_vis2 -

-
-$profile_select -
- - - - -
diff --git a/view/theme/darkbubble/dbicons.png b/view/theme/darkbubble/dbicons.png new file mode 100644 index 000000000..696ef779c Binary files /dev/null and b/view/theme/darkbubble/dbicons.png differ diff --git a/view/theme/darkbubble/group_drop.tpl b/view/theme/darkbubble/group_drop.tpl deleted file mode 100644 index f088fc06f..000000000 --- a/view/theme/darkbubble/group_drop.tpl +++ /dev/null @@ -1,8 +0,0 @@ - -
diff --git a/view/theme/darkbubble/group_edit.tpl b/view/theme/darkbubble/group_edit.tpl deleted file mode 100644 index a8b3f92a0..000000000 --- a/view/theme/darkbubble/group_edit.tpl +++ /dev/null @@ -1,16 +0,0 @@ -

$title

- - -
-
-
- - - - $drop -
-
-
$desc
-
-
-
diff --git a/view/theme/darkbubble/groups.png b/view/theme/darkbubble/groups.png deleted file mode 100644 index a65a7218c..000000000 Binary files a/view/theme/darkbubble/groups.png and /dev/null differ diff --git a/view/theme/darkbubble/icons.png b/view/theme/darkbubble/icons.png deleted file mode 100644 index 57c4bfb05..000000000 Binary files a/view/theme/darkbubble/icons.png and /dev/null differ diff --git a/view/theme/darkbubble/icons.svg b/view/theme/darkbubble/icons.svg deleted file mode 100644 index b435ba665..000000000 --- a/view/theme/darkbubble/icons.svg +++ /dev/null @@ -1,1442 +0,0 @@ - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - YouTube - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Lorem Ip - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ? - ? - - diff --git a/view/theme/darkbubble/jot-header.tpl b/view/theme/darkbubble/jot-header.tpl deleted file mode 100644 index 0093bf82a..000000000 --- a/view/theme/darkbubble/jot-header.tpl +++ /dev/null @@ -1,251 +0,0 @@ - - - - - - diff --git a/view/theme/darkbubble/jot.tpl b/view/theme/darkbubble/jot.tpl deleted file mode 100644 index d60e8adc2..000000000 --- a/view/theme/darkbubble/jot.tpl +++ /dev/null @@ -1,75 +0,0 @@ - -
-
-
 
- -
- -
-
- -
- - - - - - - - - - - {{ if $content }}{{ endif }} - - - - - - - - - - - - - - -
- -
-
- $acl -
-
$emailcc
-
- $jotnets -
-
- -
-
-
diff --git a/view/theme/darkbubble/login-bg.gif b/view/theme/darkbubble/login-bg.gif deleted file mode 100644 index cde836c89..000000000 Binary files a/view/theme/darkbubble/login-bg.gif and /dev/null differ diff --git a/view/theme/darkbubble/login.tpl b/view/theme/darkbubble/login.tpl deleted file mode 100644 index 2c879d69a..000000000 --- a/view/theme/darkbubble/login.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -
- -
- - -
-
-
- - -
-
-
- - $lostlink -
-
- -
-
- diff --git a/view/theme/darkbubble/lrarrow.gif b/view/theme/darkbubble/lrarrow.gif deleted file mode 100644 index fa2676944..000000000 Binary files a/view/theme/darkbubble/lrarrow.gif and /dev/null differ diff --git a/view/theme/darkbubble/mail_head.tpl b/view/theme/darkbubble/mail_head.tpl deleted file mode 100644 index 89615cbd0..000000000 --- a/view/theme/darkbubble/mail_head.tpl +++ /dev/null @@ -1,7 +0,0 @@ -

$messages

- - diff --git a/view/theme/darkbubble/menu-user-pin.png b/view/theme/darkbubble/menu-user-pin.png deleted file mode 100644 index 6becfbb66..000000000 Binary files a/view/theme/darkbubble/menu-user-pin.png and /dev/null differ diff --git a/view/theme/darkbubble/nav.tpl b/view/theme/darkbubble/nav.tpl deleted file mode 100644 index a2171d431..000000000 --- a/view/theme/darkbubble/nav.tpl +++ /dev/null @@ -1,55 +0,0 @@ - - diff --git a/view/theme/darkbubble/next.png b/view/theme/darkbubble/next.png deleted file mode 100644 index 353e2e72a..000000000 Binary files a/view/theme/darkbubble/next.png and /dev/null differ diff --git a/view/theme/darkbubble/notifications.png b/view/theme/darkbubble/notifications.png deleted file mode 100644 index 803257fec..000000000 Binary files a/view/theme/darkbubble/notifications.png and /dev/null differ diff --git a/view/theme/darkbubble/photo_view.tpl b/view/theme/darkbubble/photo_view.tpl deleted file mode 100644 index 4582751c6..000000000 --- a/view/theme/darkbubble/photo_view.tpl +++ /dev/null @@ -1,40 +0,0 @@ -
-

$album.1

- - - -
- {{ if $prevlink }}{{ endif }} - - {{ if $nextlink }}{{ endif }} -
- -
-
$desc
-{{ if $tags }} -
$tags.0
-
$tags.1
-{{ endif }} -{{ if $tags.2 }}{{ endif }} - -{{ if $edit }}$edit{{ endif }} - -{{ if $likebuttons }} -
- $likebuttons - $like - $dislike -
-{{ endif }} - -$comments - -$paginate - diff --git a/view/theme/darkbubble/photography.png b/view/theme/darkbubble/photography.png deleted file mode 100644 index 7ec919f2b..000000000 Binary files a/view/theme/darkbubble/photography.png and /dev/null differ diff --git a/view/theme/darkbubble/premium.png b/view/theme/darkbubble/premium.png deleted file mode 100644 index 1ad601c0f..000000000 Binary files a/view/theme/darkbubble/premium.png and /dev/null differ diff --git a/view/theme/darkbubble/prev.png b/view/theme/darkbubble/prev.png deleted file mode 100644 index 0ae6022af..000000000 Binary files a/view/theme/darkbubble/prev.png and /dev/null differ diff --git a/view/theme/darkbubble/profile_entry.tpl b/view/theme/darkbubble/profile_entry.tpl deleted file mode 100644 index 82c04cc20..000000000 --- a/view/theme/darkbubble/profile_entry.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
-
-$alt -
-
- -
$visible
-
-
- diff --git a/view/theme/darkbubble/profile_tabs.tpl b/view/theme/darkbubble/profile_tabs.tpl deleted file mode 100644 index c236490b2..000000000 --- a/view/theme/darkbubble/profile_tabs.tpl +++ /dev/null @@ -1,9 +0,0 @@ - -
- $status - $profile - $photos - {{ if $events }}$events{{ endif }} - {{ if $notes }}$notes{{ endif }} -
-
diff --git a/view/theme/darkbubble/profile_vcard.tpl b/view/theme/darkbubble/profile_vcard.tpl deleted file mode 100644 index 0ee6919bc..000000000 --- a/view/theme/darkbubble/profile_vcard.tpl +++ /dev/null @@ -1,45 +0,0 @@ -
-
$profile.name
- - - {{ if $pdesc }}
$profile.pdesc
{{ endif }} -
$profile.name
- - - - {{ if $location }} -
$location
-
- {{ if $profile.address }}
$profile.address
{{ endif }} - - $profile.locality{{ if $profile.locality }}, {{ endif }} - $profile.region - $profile.postal-code - - {{ if $profile.country-name }}$profile.country-name{{ endif }} -
-
- {{ endif }} - - {{ if $gender }}
$gender
$profile.gender
{{ endif }} - - {{ if $profile.pubkey }}{{ endif }} - - {{ if $marital }}
♥$marital
$profile.marital
{{ endif }} - - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} - - {{ inc diaspora_vcard.tpl }}{{ endinc }} - - -
- -$contact_block - - diff --git a/view/theme/darkbubble/search.png b/view/theme/darkbubble/search.png deleted file mode 100644 index 51c428594..000000000 Binary files a/view/theme/darkbubble/search.png and /dev/null differ diff --git a/view/theme/darkbubble/search_item.tpl b/view/theme/darkbubble/search_item.tpl deleted file mode 100644 index 7e5bfbe71..000000000 --- a/view/theme/darkbubble/search_item.tpl +++ /dev/null @@ -1,48 +0,0 @@ -
-
-
-
- - $name - menu -
-
    - $item_photo_menu -
-
-
-
-
{{ if $location }}$location {{ endif }}
-
-
- {{ if $lock }}
$lock
- {{ else }}
{{ endif }} -
-
-
- {{ if $drop.dropping }}{{ endif }} -
- {{ if $drop.dropping }}{{ endif }} -
-
-
-
$title
-
-
$body
-
-
- $name -
$ago
- -
- -
-
- {{ if $conv }}$conv.title{{ endif }} -
-
-
- -
diff --git a/view/theme/darkbubble/star.png b/view/theme/darkbubble/star.png deleted file mode 100644 index a327ba14e..000000000 Binary files a/view/theme/darkbubble/star.png and /dev/null differ diff --git a/view/theme/darkbubble/style.css b/view/theme/darkbubble/style.css index 03434d7f8..2e180400b 100644 --- a/view/theme/darkbubble/style.css +++ b/view/theme/darkbubble/style.css @@ -1,7 +1,29 @@ @import url('../testbubble/style.css'); +.icon { + background-image: url('dbicons.png'); +} + body { background: #000000; color: #dddddd; } +.info-message { + color: #444444; +} + +#id_openid_url { + background: url(../testbubble/login-bg.gif) no-repeat #ffffff; + background-position: 0 50%; + padding-left: 18px; + width: 385px; + +/* background: #FFFFFF;*/ + color: #000000; + +} + +.fortunate { + color: #8888FF !important; +} \ No newline at end of file diff --git a/view/theme/darkbubble/theme.php b/view/theme/darkbubble/theme.php new file mode 100644 index 000000000..326c98bbd --- /dev/null +++ b/view/theme/darkbubble/theme.php @@ -0,0 +1,4 @@ +theme_info = array( + 'extends' => 'testbubble', +); diff --git a/view/theme/darkbubble/user.png b/view/theme/darkbubble/user.png deleted file mode 100644 index df899e7e0..000000000 Binary files a/view/theme/darkbubble/user.png and /dev/null differ diff --git a/view/theme/darkbubble/wall_item.tpl b/view/theme/darkbubble/wall_item.tpl deleted file mode 100644 index 70ec00dd9..000000000 --- a/view/theme/darkbubble/wall_item.tpl +++ /dev/null @@ -1,75 +0,0 @@ - -
-
-
-
- - $name - - menu -
-
    - $item_photo_menu -
-
-
-
-
{{ if $location }}$location {{ endif }}
-
-
- {{ if $lock }}
$lock
- {{ else }}
{{ endif }} -
-
-
$title
-
-
$body
-
- -
- {{ if $vote }} - - {{ endif }} - {{ if $plink }} -
- {{ endif }} - {{ if $edpost }} - - {{ endif }} - - {{ if $star }} - - {{ endif }} - -
- {{ if $drop.dropping }}{{ endif }} -
- {{ if $drop.dropping }}{{ endif }} -
- - -
- -
- $name -
$ago
- -
-
-
- -
$dislike
-
- $comment -
-
- -
- diff --git a/view/theme/darkbubble/wallwall_item.tpl b/view/theme/darkbubble/wallwall_item.tpl deleted file mode 100644 index 8819103a3..000000000 --- a/view/theme/darkbubble/wallwall_item.tpl +++ /dev/null @@ -1,74 +0,0 @@ -
-
-
-
- - $owner_name -
-
$wall
-
- - $name - menu -
-
    - $item_photo_menu -
-
- -
-
-
{{ if $location }}$location {{ endif }}
-
-
- {{ if $lock }}
$lock
- {{ else }}
{{ endif }} -
-
- {{ if $vote }} - - {{ endif }} - {{ if $plink }} -
- {{ endif }} - {{ if $edpost }} - - {{ endif }} - - {{ if $star }} - - {{ endif }} - -
- {{ if $drop.dropping }}{{ endif }} -
- {{ if $drop.dropping }}{{ endif }} -
-
-
-
$title
-
-
$body
-
-
- $name -
$ago
-
-
-
- -
$dislike
-
- $comment -
-
- -
- -- cgit v1.2.3 From 8f47540e9b8e5bde94cf3acd7e27d0a4060315e9 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sat, 1 Oct 2011 04:37:28 -0700 Subject: darkbubble - event legibility --- view/theme/darkbubble/style.css | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'view/theme') diff --git a/view/theme/darkbubble/style.css b/view/theme/darkbubble/style.css index 2e180400b..9336dc01b 100644 --- a/view/theme/darkbubble/style.css +++ b/view/theme/darkbubble/style.css @@ -18,10 +18,14 @@ body { background-position: 0 50%; padding-left: 18px; width: 385px; - -/* background: #FFFFFF;*/ color: #000000; - +} + +.vevent, .eventcal { + color: #000000; +} +.event-list-date { + color: #DDDDDD; } .fortunate { -- cgit v1.2.3 From 0ad9e7b5f4f72f789363ae1a1836e43d5707bf0a Mon Sep 17 00:00:00 2001 From: Friendika Date: Sat, 1 Oct 2011 06:20:41 -0700 Subject: option to not post photos to status stream --- view/theme/duepuntozero/style.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'view/theme') diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 1fe8fb2f4..4769da8af 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -1559,6 +1559,8 @@ input#dfrn-url { display:block!important; } + + #acl-wrapper { width: 690px; float:left; @@ -1917,6 +1919,10 @@ a.mail-list-link { float: left; width: 175px; } + +#photos-upload-noshare { + margin-bottom: 10px; +} #photos-upload-existing-album-text { float: left; width: 175px; -- cgit v1.2.3 From 8c9a6b0512da3bd73f28989bc179c4e417b267d8 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 2 Oct 2011 02:46:54 -0700 Subject: fix notifications duepuntozero --- view/theme/duepuntozero/nav.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/duepuntozero/nav.tpl b/view/theme/duepuntozero/nav.tpl index 82ac178e8..efc95bde1 100644 --- a/view/theme/duepuntozero/nav.tpl +++ b/view/theme/duepuntozero/nav.tpl @@ -32,7 +32,7 @@ {{ endif }} {{ if $nav.notifications }} $nav.notifications.1 - + {{ endif }} {{ if $nav.messages }} $nav.messages.1 -- cgit v1.2.3 From f6f5e5b99389019bdd6a3258de19cdda2d014b97 Mon Sep 17 00:00:00 2001 From: Devlon Duthie Date: Sun, 2 Oct 2011 18:38:08 -0500 Subject: aspect ratio fixes for photos in testbubble theme some other testbubble styling tweaks --- view/theme/testbubble/photo_album.tpl | 8 +++++ view/theme/testbubble/photo_top.tpl | 8 +++++ view/theme/testbubble/style.css | 64 +++++++++++++++++++++-------------- 3 files changed, 54 insertions(+), 26 deletions(-) create mode 100644 view/theme/testbubble/photo_album.tpl create mode 100644 view/theme/testbubble/photo_top.tpl (limited to 'view/theme') diff --git a/view/theme/testbubble/photo_album.tpl b/view/theme/testbubble/photo_album.tpl new file mode 100644 index 000000000..a0e3f46c4 --- /dev/null +++ b/view/theme/testbubble/photo_album.tpl @@ -0,0 +1,8 @@ + +

$desc

+ + +
diff --git a/view/theme/testbubble/photo_top.tpl b/view/theme/testbubble/photo_top.tpl new file mode 100644 index 000000000..d552409c4 --- /dev/null +++ b/view/theme/testbubble/photo_top.tpl @@ -0,0 +1,8 @@ + +
+
+ $imgalt +
+
$albumname
+
+
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css index 85a01d0d2..36fe1bbc1 100644 --- a/view/theme/testbubble/style.css +++ b/view/theme/testbubble/style.css @@ -840,11 +840,16 @@ profile-jot-banner-wrapper { /* = Posts = */ /* ========= */ -.wall-item-outside-wrapper { - margin-top: 50px; +.wall-item-outside-wrapper { + max-width: 85%; + border-bottom: 1px solid #dedede; + margin-top: 20px; + padding-right: 10px; + overflow: hidden; } + .wall-item-outside-wrapper-end { clear: both;} -.wall-item-content-wrapper { position: relative; max-width: 95%; } +.wall-item-content-wrapper { position: relative; max-width: 100%; } .wall-item-photo-menu { display: none;} .wall-item-photo-menu-button { display:none; @@ -890,12 +895,13 @@ profile-jot-banner-wrapper { } .wall-item-outside-wrapper.comment .wall-item-tools { - margin: 5px 5px 10px 60px; + margin: 5px 5px 10px 70px; float: left; } .wall-item-like-buttons { float: left; + padding-left: 10px; } .wall-item-like-buttons a.icon { float: left; @@ -924,9 +930,13 @@ profile-jot-banner-wrapper { float: left; } .wall-item-title { font-size: 1.2em; font-weight: bold;} -.wall-item-body { margin-left: 140px; padding-right: 20px; } +.wall-item-body { + margin-left: 140px; + padding-right: 10px; + max-width: 85%; +} + .wall-item-body p { - max-width: 600px; font-size: 0.8em; } .wall-item-lock-wrapper { float: right; } @@ -936,6 +946,7 @@ profile-jot-banner-wrapper { clear: left; font-size: 0.9em; margin: 4px 0px 0px 140px; + padding-left: 10px; font-variant:small-caps; } @@ -1042,11 +1053,7 @@ profile-jot-banner-wrapper { .icon.drop, .icon.drophide { float: left; } #item-delete-selected { overflow: auto; width: 100%;} -.wall-item-outside-wrapper { - max-width: 83%; - border-bottom: 1px solid #dedede; - margin-top: 20px; -} + /* ============ */ /* = Comments = */ @@ -1055,11 +1062,11 @@ profile-jot-banner-wrapper { .ccollapse-wrapper { font-size: 0.9em; color: #898989; - margin-left: 80px; + margin-left: 60px; font-variant:small-caps; } -.wall-item-outside-wrapper.comment { margin-left: 80px; } +.wall-item-outside-wrapper.comment { margin-left: 70px; } .wall-item-outside-wrapper.comment .wall-item-photo { width: 40px!important; height: 40px!important; @@ -1072,7 +1079,13 @@ profile-jot-banner-wrapper { background-position: 35px center; } .wall-item-outside-wrapper.comment .wall-item-info { width: 60px; } -.wall-item-outside-wrapper.comment .wall-item-body { margin-left: 60px; max-width: 85%;} +.wall-item-outside-wrapper.comment .wall-item-body { + margin-left: 70px; + max-width: 85%; + padding-right: 10px; + padding-left: 10px; +} + .wall-item-outside-wrapper.comment .wall-item-author { margin-left: 60px;} .wall-item-outside-wrapper.comment .wall-item-photo-menu { @@ -1249,9 +1262,18 @@ div[id$="wrapper"] br { clear: left; } /* = Photos = */ /* ========== */ +#side-bar-photos-albums h3:before { + content: url("photography.png"); + padding-right: 10px; + vertical-align: middle; +} + #side-bar-photos-albums li { font-size: 14px; font-variant: none; + text-align: left; + padding-left: 20px; + margin-bottom: 5px; } #photo-top-links { @@ -1303,7 +1325,7 @@ div[id$="wrapper"] br { clear: left; } overflow: hidden; } -#photo-photo { max-width: 100% } +#photo-photo { max-width: 85%; height: auto; } #photo-photo img { max-width: 100% } .photo-top-image-wrapper a:hover, @@ -1511,16 +1533,6 @@ input#photo_edit_form { margin-left: 190px; } -#side-bar-photos-albums h3:before { - content: url("photography.png"); - padding-right: 10px; - vertical-align: middle; -} - -#side-bar-photos-albums li { - margin-bottom: 5px; -} - #photo-album-edit-wrapper { margin-bottom: 10px; } @@ -1699,7 +1711,7 @@ margin-left: 0px; #prvmail-subject { font-weight: bold; - border: none; + border: 1px solid #dddddd; } /* ================= */ -- cgit v1.2.3 From da53ebf4b3431559d2383dd9e0651de44e9714e8 Mon Sep 17 00:00:00 2001 From: Devlon Duthie Date: Sun, 2 Oct 2011 20:37:47 -0500 Subject: added activetab var to message.php for templates (testbubble only) added logic to photo header to make tab 'sticky' (active class for styling) (testbubble only) css fix for avatars in wallitems --- view/theme/testbubble/mail_head.tpl | 6 +++--- view/theme/testbubble/style.css | 17 ++++++++++------- 2 files changed, 13 insertions(+), 10 deletions(-) (limited to 'view/theme') diff --git a/view/theme/testbubble/mail_head.tpl b/view/theme/testbubble/mail_head.tpl index 2a4fc42ea..2a4596cd6 100644 --- a/view/theme/testbubble/mail_head.tpl +++ b/view/theme/testbubble/mail_head.tpl @@ -1,7 +1,7 @@

$messages

diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css index 36fe1bbc1..8ef2b6619 100644 --- a/view/theme/testbubble/style.css +++ b/view/theme/testbubble/style.css @@ -361,7 +361,7 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in #notifications { height: 32px; position: absolute; - top:10px; left: 650px; + top:10px; left: 40%; } .nav-ajax-update { width: 44px; @@ -373,10 +373,10 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in padding-top: 0.5em; float: left; padding-left: 11px; - display: none; + /*display: none;*/ } #net-update { background-position: 0px 0px; } -#mail-update { background-position: 0px -42px; } +#mail-update { background-position: 0px -40px; } #notify-update { background-position: 0px -84px; } #home-update { background-position: 0px -126px; } @@ -1146,11 +1146,14 @@ profile-jot-banner-wrapper { } .wall-item-body code { - border-color: #CCCCCC; - border-style: solid; + font-family: Courier, monospace; + white-space: pre; + display: block; + overflow: auto; + border: 1px solid #cccccc; border-width: 1px 1px 1px 10px; - display: block; - padding-left: 10px; + padding-left: 10px; + margin-top: 20px; } /* =========== */ -- cgit v1.2.3 From f84c208ac577cb43d24a8a33bbcb865677e1c7ae Mon Sep 17 00:00:00 2001 From: Devlon Duthie Date: Mon, 3 Oct 2011 01:45:27 -0500 Subject: broke 'find similar' matches content into a tpl in core, added an extended tpl to testbubble that lists the profile tags --- view/theme/testbubble/match.tpl | 10 +++++++ view/theme/testbubble/style.css | 63 +++++++++++------------------------------ 2 files changed, 26 insertions(+), 47 deletions(-) create mode 100644 view/theme/testbubble/match.tpl (limited to 'view/theme') diff --git a/view/theme/testbubble/match.tpl b/view/theme/testbubble/match.tpl new file mode 100644 index 000000000..49c3c81e4 --- /dev/null +++ b/view/theme/testbubble/match.tpl @@ -0,0 +1,10 @@ +
+
+ + $name + +
+ $name is interested in:
$tags +
+
+
\ No newline at end of file diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css index 8ef2b6619..a468296fb 100644 --- a/view/theme/testbubble/style.css +++ b/view/theme/testbubble/style.css @@ -841,11 +841,10 @@ profile-jot-banner-wrapper { /* ========= */ .wall-item-outside-wrapper { - max-width: 85%; + max-width: 83%; border-bottom: 1px solid #dedede; margin-top: 20px; padding-right: 10px; - overflow: hidden; } .wall-item-outside-wrapper-end { clear: both;} @@ -1251,14 +1250,26 @@ div[id$="wrapper"] br { clear: left; } } .profile-match-wrapper { - width: 300px; - padding: 5px; + width: 80%; + padding: 15px; margin-bottom:10px; + margin-left: 20px; background-color: #f6f6f6; border: 1px solid #dddddd; -moz-box-shadow: 3px 3px 4px #959494; -webkit-box-shadow: 3px 3px 4px #959494; - box-shadow: 3px 3px 4px #959494; + box-shadow: 3px 3px 4px #959494; + clear: both; +} + +.profile-match-end { + clear: both; +} + +.profile-match-photo { + float: left; + margin-right: 10px; + margin-bottom: 5px; } /* ========== */ @@ -1717,48 +1728,6 @@ margin-left: 0px; border: 1px solid #dddddd; } -/* ================= */ -/* = Notifications = */ -/* ================= */ - -/*#notification-show-hide-wrapper { - width: 160px; - -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf; - box-shadow:inset 0px 1px 0px 0px #cfcfcf; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); - background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); - background-color:#bdbdbd; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; - padding: 5px 10px 5px 10px; - margin-right: 5px; - margin-top: 10px; - font-style: bold; - color: #efefef; - text-align: center; -} - -#notification-show-hide-wrapper:hover { - color: #efefef; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) ); - background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808'); - background-color:#b20202; -} - -#notification-show-hide-wrapper:active { - background-color: #b20202; - position:relative; - top:1px; -} - -#notification-show-hide-wrapper a { - color: #efefef; -}*/ - /* ============ */ /* = Contacts = */ /* ============ */ -- cgit v1.2.3 From b476575a982746551619dd920a934b44d013f083 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 3 Oct 2011 09:38:17 +0200 Subject: quattro: add comment box --- view/theme/quattro/colors.less | 5 +++++ view/theme/quattro/quattro.less | 40 +++++++++++++++++++++++++++++++++++----- view/theme/quattro/style.css | 39 +++++++++++++++++++++++++++++++++++---- 3 files changed, 75 insertions(+), 9 deletions(-) (limited to 'view/theme') diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less index 12b0d08a6..564cf6d24 100644 --- a/view/theme/quattro/colors.less +++ b/view/theme/quattro/colors.less @@ -67,3 +67,8 @@ @NoticeBackgroundColor: #511919; @ThreadBackgroundColor: #f6f7f8; + +@CommentBoxEmptyColor: @Grey3; +@CommentBoxEmptyBorderColor: @Grey3; +@CommentBoxFullColor: @Grey5; +@CommentBoxFullBorderColor: @Grey5; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 1be65ea91..31a25694f 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -3,7 +3,7 @@ /* global */ body { font-family: Liberation Sans,helvetica,arial,clean,sans-serif; - font-size: 10px; + font-size: 12px; background-color: @BodyBackground; color: @BodyColor; margin: 50px 0px 0px 0px; @@ -324,18 +324,17 @@ section { .wall-item-ago { padding-right: 40px; } .wall-item-name { font-weight: bold; } - .wall-item-actions-author { float: left; width: 25%; margin-top: 0.5em; } - .wall-item-actions-social { float: left; width: 50%; margin-top: 0.5em; + .wall-item-actions-author { float: left; width: 20em; margin-top: 0.5em; } + .wall-item-actions-social { float: left; margin-top: 0.5em; a { margin-right: 3em; } } - .wall-item-actions-tools { float: right; width: 25%; + .wall-item-actions-tools { float: right; width: 15%; a { float: right; } input { float: right; } } } - .wall-item-container.comment { margin-top: 50px; .wall-item-photo { width: 32px; height: 32px; margin-left: 16px;} @@ -345,3 +344,34 @@ section { } .wall-item-links { padding-left: 12px; } } + +.wall-item-comment-wrapper { + margin: 30px 2em 2em 60px; + .comment-edit-photo { display: none; } + textarea { + height: 1em; width: 100%; font-size: 10px; + color: @CommentBoxEmptyColor; + border: 1px solid @CommentBoxEmptyBorderColor; + padding:0.3em; + } + .comment-edit-text-full { + font-size: 14px; + height: 4em; + color: @CommentBoxFullColor; + border: 1px solid @CommentBoxFullBorderColor; + } +} + +#profile-jot-wrapper { + width: 100%; + margin: 0px 2em 20px 0px; + + +} +.profile-jot-text { + height: 1em; width: 100%; font-size: 10px; + color: @CommentBoxEmptyColor; + border: 1px solid @CommentBoxEmptyBorderColor; + padding:0.3em; +} + diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index 4d9e12540..f3237801d 100644 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -153,7 +153,7 @@ /* global */ body { font-family: Liberation Sans, helvetica, arial, clean, sans-serif; - font-size: 10px; + font-size: 12px; background-color: #ffffff; color: #2d2d2d; margin: 50px 0px 0px 0px; @@ -574,12 +574,11 @@ section { } .wall-item-container .wall-item-actions-author { float: left; - width: 25%; + width: 20em; margin-top: 0.5em; } .wall-item-container .wall-item-actions-social { float: left; - width: 50%; margin-top: 0.5em; } .wall-item-container .wall-item-actions-social a { @@ -587,7 +586,7 @@ section { } .wall-item-container .wall-item-actions-tools { float: right; - width: 25%; + width: 15%; } .wall-item-container .wall-item-actions-tools a { float: right; @@ -610,3 +609,35 @@ section { .wall-item-container.comment .wall-item-links { padding-left: 12px; } +.wall-item-comment-wrapper { + margin: 30px 2em 2em 60px; +} +.wall-item-comment-wrapper .comment-edit-photo { + display: none; +} +.wall-item-comment-wrapper textarea { + height: 1em; + width: 100%; + font-size: 10px; + color: #999999; + border: 1px solid #999999; + padding: 0.3em; +} +.wall-item-comment-wrapper .comment-edit-text-full { + font-size: 14px; + height: 4em; + color: #2d2d2d; + border: 1px solid #2d2d2d; +} +#profile-jot-wrapper { + width: 100%; + margin: 0px 2em 20px 0px; +} +.profile-jot-text { + height: 1em; + width: 100%; + font-size: 10px; + color: #999999; + border: 1px solid #999999; + padding: 0.3em; +} -- cgit v1.2.3 From f7d055687eb8e87368023a94a613b027458cdd83 Mon Sep 17 00:00:00 2001 From: Devlon Duthie Date: Tue, 4 Oct 2011 11:10:57 -0500 Subject: - moved the header for profile permissions out of the scrolling div - tweaks to the testbubble theme's nav --- view/theme/testbubble/nav.tpl | 2 +- view/theme/testbubble/style.css | 25 ++++++++++++++++++++----- 2 files changed, 21 insertions(+), 6 deletions(-) (limited to 'view/theme') diff --git a/view/theme/testbubble/nav.tpl b/view/theme/testbubble/nav.tpl index 38d2dfac6..80bcfbeb1 100644 --- a/view/theme/testbubble/nav.tpl +++ b/view/theme/testbubble/nav.tpl @@ -6,7 +6,7 @@
{{ if $nav.network }}{{ endif }} {{ if $nav.home }}{{ endif }} - {{ if $nav.notifications }}{{ endif }} + {{ if $nav.notifications }}{{ endif }} {{ if $nav.messages }}{{ endif }}
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css index a468296fb..03f50762b 100644 --- a/view/theme/testbubble/style.css +++ b/view/theme/testbubble/style.css @@ -377,7 +377,7 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in } #net-update { background-position: 0px 0px; } #mail-update { background-position: 0px -40px; } -#notify-update { background-position: 0px -84px; } +#intro-update { background-position: 0px -84px; } #home-update { background-position: 0px -126px; } #lang-select-icon { @@ -848,7 +848,12 @@ profile-jot-banner-wrapper { } .wall-item-outside-wrapper-end { clear: both;} -.wall-item-content-wrapper { position: relative; max-width: 100%; } +.wall-item-content-wrapper { + position: relative; + max-width: 100%; + word-wrap: break-word; +} + .wall-item-photo-menu { display: none;} .wall-item-photo-menu-button { display:none; @@ -1192,7 +1197,8 @@ div[id$="wrapper"] br { clear: left; } #profile-listing-new-link-wrapper { float: left; - display: inline; + display: inline-block; + clear: right; width: 130px; margin-left:5px; margin-top: 20px; @@ -2022,7 +2028,7 @@ margin-left: 0px; border-radius:5px; padding: 5px 10px 5px 10px; color: #efefef; - font-size: 1.2em; + font-size: 1em; text-align: center; } @@ -2181,7 +2187,12 @@ margin-left: 0px; .settings-submit-wrapper, .profile-edit-submit-wrapper { margin: 30px 0px;} -.profile-listing { float: left; clear: both; margin: 20px 20px 0px 0px} +.profile-listing { + float: left; + clear: left; + display: inline; + margin: 20px 20px 0px 0px; +} #profile-edit-links ul { margin: 20px 0px; padding: 0px; list-style: none; } @@ -2245,6 +2256,10 @@ margin-left: 0px; #group-edit-desc { margin: 10px 0xp; } #group-new-text {font-size: 1.1em;} +#prof-members-title,#prof-all-contcts-title { + margin-top: 10px; + margin-bottom: 5px; +} #group-members, #prof-members { width: 83%; -- cgit v1.2.3 From 7d5e839664edc65bbb7dde5c2533393a8ebb8433 Mon Sep 17 00:00:00 2001 From: Devlon Duthie Date: Wed, 5 Oct 2011 11:29:25 -0500 Subject: - added drop-down notification support in testbubble theme --- view/theme/testbubble/nav.tpl | 21 ++++--- view/theme/testbubble/style.css | 135 +++++++++++++++++++++++++++++++++------- 2 files changed, 123 insertions(+), 33 deletions(-) (limited to 'view/theme') diff --git a/view/theme/testbubble/nav.tpl b/view/theme/testbubble/nav.tpl index 80bcfbeb1..dc16d40eb 100644 --- a/view/theme/testbubble/nav.tpl +++ b/view/theme/testbubble/nav.tpl @@ -3,13 +3,16 @@ -
- {{ if $nav.network }}{{ endif }} - {{ if $nav.home }}{{ endif }} - {{ if $nav.notifications }}{{ endif }} - {{ if $nav.messages }}{{ endif }} +
+ {{ if $nav.network }}{{ endif }} + {{ if $nav.home }}{{ endif }} + {{ if $nav.notifications }}{{ endif }} + {{ if $nav.messages }}{{ endif }} +
- +
$sitelocation @@ -48,8 +51,8 @@ {{ if $nav.logout }}
  • $nav.logout.1
    • {{ endif }}
    - - - + diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css index 03f50762b..5e31a2c8a 100644 --- a/view/theme/testbubble/style.css +++ b/view/theme/testbubble/style.css @@ -375,10 +375,10 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in padding-left: 11px; /*display: none;*/ } -#net-update { background-position: 0px 0px; } +#net-update { background-position: 0px -126px; } #mail-update { background-position: 0px -40px; } #intro-update { background-position: 0px -84px; } -#home-update { background-position: 0px -126px; } +#home-update { background-position: 0px 0px; } #lang-select-icon { cursor: pointer; @@ -845,15 +845,12 @@ profile-jot-banner-wrapper { border-bottom: 1px solid #dedede; margin-top: 20px; padding-right: 10px; + padding-left: 12px; + overflow: hidden; } .wall-item-outside-wrapper-end { clear: both;} -.wall-item-content-wrapper { - position: relative; - max-width: 100%; - word-wrap: break-word; -} - +.wall-item-content-wrapper { position: relative; max-width: 100%; } .wall-item-photo-menu { display: none;} .wall-item-photo-menu-button { display:none; @@ -1197,8 +1194,7 @@ div[id$="wrapper"] br { clear: left; } #profile-listing-new-link-wrapper { float: left; - display: inline-block; - clear: right; + display: inline; width: 130px; margin-left:5px; margin-top: 20px; @@ -1256,8 +1252,8 @@ div[id$="wrapper"] br { clear: left; } } .profile-match-wrapper { - width: 80%; - padding: 15px; + width: 82%; + padding: 5px; margin-bottom:10px; margin-left: 20px; background-color: #f6f6f6; @@ -1734,6 +1730,48 @@ margin-left: 0px; border: 1px solid #dddddd; } +/* ================= */ +/* = Notifications = */ +/* ================= */ + +/*#notification-show-hide-wrapper { + width: 160px; + -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; + -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf; + box-shadow:inset 0px 1px 0px 0px #cfcfcf; + background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); + background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); + background-color:#bdbdbd; + -moz-border-radius:5px; + -webkit-border-radius:5px; + border-radius:5px; + padding: 5px 10px 5px 10px; + margin-right: 5px; + margin-top: 10px; + font-style: bold; + color: #efefef; + text-align: center; +} + +#notification-show-hide-wrapper:hover { + color: #efefef; + background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) ); + background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808'); + background-color:#b20202; +} + +#notification-show-hide-wrapper:active { + background-color: #b20202; + position:relative; + top:1px; +} + +#notification-show-hide-wrapper a { + color: #efefef; +}*/ + /* ============ */ /* = Contacts = */ /* ============ */ @@ -2028,7 +2066,7 @@ margin-left: 0px; border-radius:5px; padding: 5px 10px 5px 10px; color: #efefef; - font-size: 1em; + font-size: 1.2em; text-align: center; } @@ -2187,12 +2225,7 @@ margin-left: 0px; .settings-submit-wrapper, .profile-edit-submit-wrapper { margin: 30px 0px;} -.profile-listing { - float: left; - clear: left; - display: inline; - margin: 20px 20px 0px 0px; -} +.profile-listing { float: left; clear: both; margin: 20px 20px 0px 0px} #profile-edit-links ul { margin: 20px 0px; padding: 0px; list-style: none; } @@ -2256,10 +2289,6 @@ margin-left: 0px; #group-edit-desc { margin: 10px 0xp; } #group-new-text {font-size: 1.1em;} -#prof-members-title,#prof-all-contcts-title { - margin-top: 10px; - margin-bottom: 5px; -} #group-members, #prof-members { width: 83%; @@ -2972,4 +3001,62 @@ a.active { color:#efefef; padding: 5px 10px 5px 10px; margin-right: 5px; -} \ No newline at end of file +} + +/* notifications popup menu */ +.nav-notify { + display: none; + position: absolute; + font-size: 10px; + padding: 1px 3px; + top: 0px; + right: -10px; + min-width: 15px; + text-align: right; +} +.nav-notify.show { + display: block; +} +ul.menu-popup { + position: absolute; + display: none; + width: 10em; + margin: 0px; + padding: 0px; + list-style: none; + z-index: 100000; + top: 40px; +} +#nav-notifications-menu { + width: 320px; + max-height: 400px; + overflow-y: scroll; + background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #797979), color-stop(1, #898988) ); + background:-moz-linear-gradient( center top, #797979 5%, #898988 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#797979', endColorstr='#898988'); + background-color:#a2a2a2; + -moz-border-radius:0px 0px 5px 5px; + -webkit-border-radius:0px 0px 5px 5px; + border-radius:0px 0px 5px 5px; + border: 1px solid #9A9A9A; + border-top: none; + -moz-box-shadow: 5px 5px 10px #242424; + -webkit-box-shadow: 5px 5px 10px #242424; + box-shadow: 5px 5px 10px #242424; + +} +#nav-notifications-menu .contactname { font-weight: bold; font-size: 0.9em; } +#nav-notifications-menu img { float: left; margin-right: 5px; } +#nav-notifications-menu .notif-when { font-size: 0.8em; display: block; } +#nav-notifications-menu li { + padding: 7px 10px 7px 10px; + word-wrap:normal; + border-bottom: 1px solid #626262; +} + +#nav-notifications-menu li:hover { + background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) ); + background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808'); + background-color:#b20202; +} -- cgit v1.2.3 From 2d89f3b421fa23d567da87bc346875a94a0e094a Mon Sep 17 00:00:00 2001 From: Devlon Duthie Date: Wed, 5 Oct 2011 12:24:12 -0500 Subject: wrapped notification line item with the anchros tag instead of the inner, makes the whole line item a link (better) --- view/theme/testbubble/nav.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/testbubble/nav.tpl b/view/theme/testbubble/nav.tpl index dc16d40eb..baf5f7d30 100644 --- a/view/theme/testbubble/nav.tpl +++ b/view/theme/testbubble/nav.tpl @@ -54,5 +54,5 @@ -- cgit v1.2.3