From 7614d35cadb274a48434a61cdab205ca120462a3 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 23 Jun 2012 04:44:48 -0700 Subject: liking comments backend --- view/theme/duepuntozero/style.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'view/theme') diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index be755d411..de366210b 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -935,6 +935,10 @@ input#dfrn-url { background: #EEEEEE; } +.wall-item-like.comment, .wall-item-dislike.comment { + margin-left: 50px; +} + .wall-item-info { display: block; float: left; -- cgit v1.2.3 From 3b1d9d969547e08c3a421c7a3b870cfcb45f3bc5 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sat, 23 Jun 2012 13:33:58 -0400 Subject: update jquery to 1.7.2; fix some dispy templates to be more in sync with view/ Signed-off-by: Simon L'nu --- view/theme/dispy/conversation.tpl | 5 ++-- view/theme/dispy/dark/style.css | 3 ++- view/theme/dispy/dark/style.less | 5 +++- view/theme/dispy/jot.tpl | 55 +++++++++++++++++++------------------- view/theme/dispy/light/style.css | 3 ++- view/theme/dispy/light/style.less | 5 +++- view/theme/dispy/wall_item.tpl | 6 ++--- view/theme/dispy/wallwall_item.tpl | 6 ++--- 8 files changed, 49 insertions(+), 39 deletions(-) (limited to 'view/theme') diff --git a/view/theme/dispy/conversation.tpl b/view/theme/dispy/conversation.tpl index ca1b560a6..4a93dacf3 100644 --- a/view/theme/dispy/conversation.tpl +++ b/view/theme/dispy/conversation.tpl @@ -19,8 +19,9 @@
{{ if $dropping }} -
-$dropping +
{{ endif }} diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css index 327b053ab..bf23cf625 100644 --- a/view/theme/dispy/dark/style.css +++ b/view/theme/dispy/dark/style.css @@ -391,8 +391,9 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;} .item-select{opacity:0.1;margin:5px 0 0 6px !important;}.item-select:hover{opacity:1;} .checkeditem{opacity:1;} #item-delete-selected{margin-top:30px;} -.delete-checked{position:absolute;left:35px;margin-top:20px;} +#item-delete-selected{position:absolute;left:35px;margin-top:20px;} #item-delete-selected-icon{float:left;margin-right:5px;} +#item-delete-selected-desc{font-size:smaller;} .fc-state-highlight{background:#eeeecc;color:#2e2f2e;} .directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;} #group-sidebar{margin-bottom:10px;} diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less index e3966683b..1c2dc0665 100644 --- a/view/theme/dispy/dark/style.less +++ b/view/theme/dispy/dark/style.less @@ -2373,7 +2373,7 @@ div { } /* was tired of having no way of moving it around, so * here's a little 'hook' to do so */ -.delete-checked { +#item-delete-selected { position: absolute; left: 35px; margin-top: 20px; @@ -2382,6 +2382,9 @@ div { float: left; margin-right: 5px; } +#item-delete-selected-desc { + font-size: smaller; +} .fc-state-highlight { background: @main_colour; color: @bg_colour; diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl index c6b339457..563d58ce4 100644 --- a/view/theme/dispy/jot.tpl +++ b/view/theme/dispy/jot.tpl @@ -19,31 +19,32 @@
- -
$item.dislike
-
+ +
$item.dislike
+
$item.comment
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl index da5fa13b3..84da598cd 100644 --- a/view/theme/dispy/wallwall_item.tpl +++ b/view/theme/dispy/wallwall_item.tpl @@ -64,7 +64,7 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick {{ if $item.edpost }}
    • {{ endif }} - +
  • {{ if $item.drop.dropping }}{{ endif }} {{ if $item.drop.dropping }}{{ endif }} @@ -86,8 +86,8 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick
    • - -
    $item.dislike
    + +
    $item.dislike
    $item.comment -- cgit v1.2.3 From 35a098e0dc7940974132d8d65bbc4418d92fb204 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 25 Jun 2012 01:37:44 -0700 Subject: service limits for photo uploads --- view/theme/duepuntozero/style.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'view/theme') diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index de366210b..ea3a2da9c 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -1644,6 +1644,9 @@ input#dfrn-url { display:block!important; } +#photos-usage-message { + margin-bottom: 15px; +} #acl-wrapper { -- cgit v1.2.3 From 51ef8fb7ff77323382fa750827aa25f4652a1891 Mon Sep 17 00:00:00 2001 From: "Zvi ben Yaakov (a.k.a rdc)" Date: Mon, 25 Jun 2012 14:01:16 +0300 Subject: Added App::get_cached_avatar_image usage for displaying "Last users" avatar thumbs in right sidebar --- view/theme/diabook/theme.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 83079782e..53048df6c 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -528,7 +528,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $entry = replace_macros($tpl,array( '$id' => $rr['id'], '$profile-link' => $profile_link, - '$photo' => $rr[$photo], + '$photo' => $a->get_cached_avatar_image($rr[$photo]), '$alt-text' => $rr['name'], )); $aside['$lastusers_items'][] = $entry; -- cgit v1.2.3 From 2ed3af55a821f99732950e3ba2c43f7ba816d5bc Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Mon, 25 Jun 2012 17:17:06 -0400 Subject: fix delete thingy, and minor clean up Signed-off-by: Simon L'nu --- view/theme/dispy/dark/style.css | 9 +++------ view/theme/dispy/dark/style.less | 17 ++++------------- view/theme/dispy/light/style.css | 9 +++------ view/theme/dispy/light/style.less | 17 ++++------------- 4 files changed, 14 insertions(+), 38 deletions(-) (limited to 'view/theme') diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css index bf23cf625..6551d9a93 100644 --- a/view/theme/dispy/dark/style.css +++ b/view/theme/dispy/dark/style.css @@ -59,7 +59,7 @@ h6{font-size:xx-small;} .button{color:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#eeeecc;font-weight:bold;} #profile-listing-desc a{color:#eeeecc;font-weight:bold;} [class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:2px outset #d4d580;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;} -#item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;} +#item-delete-selected-desc{float:left;font-size:smaller;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;} .intro-approve-as-friend-desc{margin-top:10px;} .intro-desc{margin-bottom:20px;font-weight:bold;} #group-edit-desc{margin:10px 0px;} @@ -226,7 +226,6 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .wallwall .wall-item-photo-end{clear:both;} .wall-item-arrowphoto-wrapper{position:absolute;left:35px;top:80px;z-index:10002;} .wall-item-photo-menu{min-width:92px;font-size:0.75em;border:2px solid #555753;border-top:0px;background:#555753;position:absolute;left:-2px;top:101px;display:none;z-index:10003;-o-border-radius:0 5px 5px 5px;-webkit-border-radius:0 5px 5px 5px;-moz-border-radius:0 5px 5px 5px;-ms-border-radius:0 5px 5px 5px;border-radius:0 5px 5px 5px;}.wall-item-photo-menu li a{white-space:nowrap;display:block;padding:5px 6px;color:#eeeeee;}.wall-item-photo-menu li a:hover{color:#555753;background:#eeeeee;} -#item-delete-selected{overflow:auto;width:100%;} #connect-services-header,#extra-help-header{margin:1.5em 0 0 0;} #connect-services,#extra-help{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:1em 0 0 0;}#connect-services li,#extra-help li{display:inline;} .ccollapse-wrapper{font-size:0.9em;margin-left:5em;} @@ -390,10 +389,8 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;} .filesavetags:hover,.categorytags:hover{margin:20px 0;opacity:1.0 !important;} .item-select{opacity:0.1;margin:5px 0 0 6px !important;}.item-select:hover{opacity:1;} .checkeditem{opacity:1;} -#item-delete-selected{margin-top:30px;} -#item-delete-selected{position:absolute;left:35px;margin-top:20px;} -#item-delete-selected-icon{float:left;margin-right:5px;} -#item-delete-selected-desc{font-size:smaller;} +#item-delete-selected{margin-top:30px;position:absolute;left:35px;width:15em;overflow:auto;} +#item-delete-selected-icon{float:left;margin:11px 5px;} .fc-state-highlight{background:#eeeecc;color:#2e2f2e;} .directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;} #group-sidebar{margin-bottom:10px;} diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less index 1c2dc0665..5e6883964 100644 --- a/view/theme/dispy/dark/style.less +++ b/view/theme/dispy/dark/style.less @@ -325,6 +325,7 @@ h6 { } #item-delete-selected-desc { float: left; + font-size: smaller; margin-right: 5px; &:hover { text-decoration: underline; @@ -1533,10 +1534,6 @@ nav #nav-notifications-linkmenu { } } } -#item-delete-selected { - overflow: auto; - width: 100%; -} #connect-services-header, #extra-help-header { margin: 1.5em 0 0 0; @@ -2370,20 +2367,14 @@ div { } #item-delete-selected { margin-top: 30px; -} -/* was tired of having no way of moving it around, so -* here's a little 'hook' to do so */ -#item-delete-selected { position: absolute; left: 35px; - margin-top: 20px; + width: 15em; + overflow: auto; } #item-delete-selected-icon { float: left; - margin-right: 5px; -} -#item-delete-selected-desc { - font-size: smaller; + margin: 11px 5px; } .fc-state-highlight { background: @main_colour; diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css index cbf0168f1..793feb6fc 100644 --- a/view/theme/dispy/light/style.css +++ b/view/theme/dispy/light/style.css @@ -59,7 +59,7 @@ h6{font-size:xx-small;} .button{color:#111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#111111;font-weight:bold;} #profile-listing-desc a{color:#eeeeec;font-weight:bold;} [class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#2e3436;border:2px outset #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;} -#item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;} +#item-delete-selected-desc{float:left;font-size:smaller;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;} .intro-approve-as-friend-desc{margin-top:10px;} .intro-desc{margin-bottom:20px;font-weight:bold;} #group-edit-desc{margin:10px 0px;} @@ -226,7 +226,6 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .wallwall .wall-item-photo-end{clear:both;} .wall-item-arrowphoto-wrapper{position:absolute;left:35px;top:80px;z-index:10002;} .wall-item-photo-menu{min-width:92px;font-size:0.75em;border:2px solid #555753;border-top:0px;background:#555753;position:absolute;left:-2px;top:101px;display:none;z-index:10003;-o-border-radius:0 5px 5px 5px;-webkit-border-radius:0 5px 5px 5px;-moz-border-radius:0 5px 5px 5px;-ms-border-radius:0 5px 5px 5px;border-radius:0 5px 5px 5px;}.wall-item-photo-menu li a{white-space:nowrap;display:block;padding:5px 6px;color:#eeeeec;}.wall-item-photo-menu li a:hover{color:#555753;background:#eeeeec;} -#item-delete-selected{overflow:auto;width:100%;} #connect-services-header,#extra-help-header{margin:1.5em 0 0 0;} #connect-services,#extra-help{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:1em 0 0 0;}#connect-services li,#extra-help li{display:inline;} .ccollapse-wrapper{font-size:0.9em;margin-left:5em;} @@ -390,10 +389,8 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;} .filesavetags:hover,.categorytags:hover{margin:20px 0;opacity:1.0 !important;} .item-select{opacity:0.1;margin:5px 0 0 6px !important;}.item-select:hover{opacity:1;} .checkeditem{opacity:1;} -#item-delete-selected{margin-top:30px;} -#item-delete-selected{position:absolute;left:35px;margin-top:20px;} -#item-delete-selected-icon{float:left;margin-right:5px;} -#item-delete-selected-desc{font-size:smaller;} +#item-delete-selected{margin-top:30px;position:absolute;left:35px;width:15em;overflow:auto;} +#item-delete-selected-icon{float:left;margin:11px 5px;} .fc-state-highlight{background:#eeeeec;color:#111111;} .directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;} #group-sidebar{margin-bottom:10px;} diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less index c5624841e..13f296d22 100644 --- a/view/theme/dispy/light/style.less +++ b/view/theme/dispy/light/style.less @@ -326,6 +326,7 @@ h6 { } #item-delete-selected-desc { float: left; + font-size: smaller; margin-right: 5px; &:hover { text-decoration: underline; @@ -1534,10 +1535,6 @@ nav #nav-notifications-linkmenu { } } } -#item-delete-selected { - overflow: auto; - width: 100%; -} #connect-services-header, #extra-help-header { margin: 1.5em 0 0 0; @@ -2371,20 +2368,14 @@ div { } #item-delete-selected { margin-top: 30px; -} -/* was tired of having no way of moving it around, so -* here's a little 'hook' to do so */ -#item-delete-selected { position: absolute; left: 35px; - margin-top: 20px; + width: 15em; + overflow: auto; } #item-delete-selected-icon { float: left; - margin-right: 5px; -} -#item-delete-selected-desc { - font-size: smaller; + margin: 11px 5px; } .fc-state-highlight { background: @bg_colour; -- cgit v1.2.3 From eb6bf7e7fad9877e25eda1cbf4f6d0044b984341 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Mon, 25 Jun 2012 18:42:18 -0400 Subject: fix margin of wall-item-body Signed-off-by: Simon L'nu --- view/theme/dispy/dark/style.css | 2 +- view/theme/dispy/dark/style.less | 2 +- view/theme/dispy/light/style.css | 2 +- view/theme/dispy/light/style.less | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'view/theme') diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css index 6551d9a93..a7763ecfb 100644 --- a/view/theme/dispy/dark/style.css +++ b/view/theme/dispy/dark/style.css @@ -214,7 +214,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .wall-item-subtools1{width:30px;height:30px;list-style:none outside none;margin:18px 0 30px -20px;padding:0;} .wall-item-subtools2{width:25px;height:25px;list-style:none outside none;margin:-78px 0 0 5px;padding:0;} .wall-item-title{font-size:1.2em;font-weight:bold;margin-bottom:1.4em;} -.wall-item-body{margin:15px 10px 10px 0px;text-align:left;overflow-x:auto;} +.wall-item-body{margin:1em;text-align:left;overflow-x:auto;} .wall-item-lock-wrapper{float:right;width:22px;height:22px;margin:0 -5px 0 0;opacity:1;} .wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#888b85;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;} .wall-item-author,.wall-item-actions-author,.wall-item-ago{color:#eeeecc;line-height:1;display:inline-block;font-size:x-small;margin:0.5em auto;font-weight:bold;} diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less index 5e6883964..32b9aa4b3 100644 --- a/view/theme/dispy/dark/style.less +++ b/view/theme/dispy/dark/style.less @@ -1429,7 +1429,7 @@ nav #nav-notifications-linkmenu { margin-bottom: 1.4em; } .wall-item-body { - margin: 15px 10px 10px 0px; + margin: 1em; text-align: left; overflow-x: auto; } diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css index 793feb6fc..3d44cc8c4 100644 --- a/view/theme/dispy/light/style.css +++ b/view/theme/dispy/light/style.css @@ -214,7 +214,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .wall-item-subtools1{width:30px;height:30px;list-style:none outside none;margin:18px 0 30px -20px;padding:0;} .wall-item-subtools2{width:25px;height:25px;list-style:none outside none;margin:-78px 0 0 5px;padding:0;} .wall-item-title{font-size:1.2em;font-weight:bold;margin-bottom:1.4em;} -.wall-item-body{margin:15px 10px 10px 0px;text-align:left;overflow-x:auto;} +.wall-item-body{margin:1em;text-align:left;overflow-x:auto;} .wall-item-lock-wrapper{float:right;width:22px;height:22px;margin:0 -5px 0 0;opacity:1;} .wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#111111;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;} .wall-item-author,.wall-item-actions-author,.wall-item-ago{color:#111111;line-height:1;display:inline-block;font-size:x-small;margin:0.5em auto;font-weight:bold;} diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less index 13f296d22..c5641605e 100644 --- a/view/theme/dispy/light/style.less +++ b/view/theme/dispy/light/style.less @@ -1430,7 +1430,7 @@ nav #nav-notifications-linkmenu { margin-bottom: 1.4em; } .wall-item-body { - margin: 15px 10px 10px 0px; + margin: 1em; text-align: left; overflow-x: auto; } -- cgit v1.2.3 From fbaca4b74237c80c380d6ccf2bdddeec5ad4f013 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 25 Jun 2012 20:55:27 -0700 Subject: event summary/title --- view/theme/diabook/jot.tpl | 2 +- view/theme/duepuntozero/style.css | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl index 79151aeed..1d94cb6d3 100755 --- a/view/theme/diabook/jot.tpl +++ b/view/theme/diabook/jot.tpl @@ -70,7 +70,7 @@
    $acl -
    +
    $emailcc
    $jotnets diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index ea3a2da9c..41c747045 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2424,6 +2424,13 @@ aside input[type='text'] { .vevent { border: 1px solid #CCCCCC; } + +.vevent .event-summary { + margin-left: 10px; + margin-right: 10px; + font-weight: bold; +} + .vevent .event-description, .vevent .event-location { margin-left: 10px; margin-right: 10px; -- cgit v1.2.3 From 359a98cd22318badd9c5bb1115678181b75c9edc Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 25 Jun 2012 21:20:08 -0700 Subject: change event behaviour so that title is required but description is not --- view/theme/duepuntozero/style.css | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'view/theme') diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 41c747045..997c6d315 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2421,6 +2421,30 @@ aside input[type='text'] { font-size: 20px; } +#event-summary-text { + margin-top: 15px; +} + +#event-share-checkbox { + float: left; + margin-top: 10px; +} + +#event-share-text { + float: left; + margin-top: 10px; + margin-left: 5px; +} + +#event-share-break { + clear: both; + margin-bottom: 10px; +} + +#event-summary { + width: 400px; +} + .vevent { border: 1px solid #CCCCCC; } -- cgit v1.2.3 From fa2a8fa9bd9ffbf8b7615f79e39c87b449c9c27d Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 27 Jun 2012 13:49:35 +1000 Subject: highlight js events-reminder on birthday events --- view/theme/slackr/birthdays_reminder.tpl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/slackr/birthdays_reminder.tpl b/view/theme/slackr/birthdays_reminder.tpl index 8b1378917..3f07b262d 100644 --- a/view/theme/slackr/birthdays_reminder.tpl +++ b/view/theme/slackr/birthdays_reminder.tpl @@ -1 +1,7 @@ - +{{ if $classtoday }} + +{{ endif }} -- cgit v1.2.3 From f995a11641a47f1351eca1fc5447ec64a9f0a2c8 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 26 Jun 2012 21:35:03 -0700 Subject: have no idea why the if/endif macro block was getting printed and not processed. --- view/theme/slackr/birthdays_reminder.tpl | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'view/theme') diff --git a/view/theme/slackr/birthdays_reminder.tpl b/view/theme/slackr/birthdays_reminder.tpl index 3f07b262d..4a691dea3 100644 --- a/view/theme/slackr/birthdays_reminder.tpl +++ b/view/theme/slackr/birthdays_reminder.tpl @@ -1,7 +1,5 @@ -{{ if $classtoday }} -{{ endif }} + $(document).ready(function() { + $('#events-reminder').addClass($.trim('$classtoday')); + }); + -- cgit v1.2.3 From eb3bbd9081b384d1e1e503d8019eadc9f151edeb Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 26 Jun 2012 22:32:07 -0700 Subject: insidious little parsing bug --- view/theme/slackr/birthdays_reminder.tpl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'view/theme') diff --git a/view/theme/slackr/birthdays_reminder.tpl b/view/theme/slackr/birthdays_reminder.tpl index 4a691dea3..1dc65295a 100644 --- a/view/theme/slackr/birthdays_reminder.tpl +++ b/view/theme/slackr/birthdays_reminder.tpl @@ -1,5 +1,8 @@ +{{ if $classtoday }} +{{ endif }} + -- cgit v1.2.3 From ecf9ad9a082e12e3f77469ef2c16b1898a39c47c Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Thu, 28 Jun 2012 12:15:32 -0400 Subject: fix item-delete-selected* css Signed-off-by: Simon L'nu --- view/theme/dispy/dark/style.css | 4 ++-- view/theme/dispy/dark/style.less | 8 ++++---- view/theme/dispy/light/style.css | 4 ++-- view/theme/dispy/light/style.less | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'view/theme') diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css index a7763ecfb..8ab192368 100644 --- a/view/theme/dispy/dark/style.css +++ b/view/theme/dispy/dark/style.css @@ -59,7 +59,7 @@ h6{font-size:xx-small;} .button{color:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#eeeecc;font-weight:bold;} #profile-listing-desc a{color:#eeeecc;font-weight:bold;} [class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:2px outset #d4d580;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;} -#item-delete-selected-desc{float:left;font-size:smaller;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;} +#item-delete-selected-desc{float:left;font-size:x-small;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;} .intro-approve-as-friend-desc{margin-top:10px;} .intro-desc{margin-bottom:20px;font-weight:bold;} #group-edit-desc{margin:10px 0px;} @@ -389,7 +389,7 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;} .filesavetags:hover,.categorytags:hover{margin:20px 0;opacity:1.0 !important;} .item-select{opacity:0.1;margin:5px 0 0 6px !important;}.item-select:hover{opacity:1;} .checkeditem{opacity:1;} -#item-delete-selected{margin-top:30px;position:absolute;left:35px;width:15em;overflow:auto;} +#item-delete-selected{margin:3em 5px;position:relative;left:4em;width:15em;overflow:auto;} #item-delete-selected-icon{float:left;margin:11px 5px;} .fc-state-highlight{background:#eeeecc;color:#2e2f2e;} .directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;} diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less index 32b9aa4b3..60b49865e 100644 --- a/view/theme/dispy/dark/style.less +++ b/view/theme/dispy/dark/style.less @@ -325,7 +325,7 @@ h6 { } #item-delete-selected-desc { float: left; - font-size: smaller; + font-size: x-small; margin-right: 5px; &:hover { text-decoration: underline; @@ -2366,9 +2366,9 @@ div { opacity: 1; } #item-delete-selected { - margin-top: 30px; - position: absolute; - left: 35px; + margin: 3em 5px; + position: relative; + left: 4em; width: 15em; overflow: auto; } diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css index 3d44cc8c4..de2717f0c 100644 --- a/view/theme/dispy/light/style.css +++ b/view/theme/dispy/light/style.css @@ -59,7 +59,7 @@ h6{font-size:xx-small;} .button{color:#111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#111111;font-weight:bold;} #profile-listing-desc a{color:#eeeeec;font-weight:bold;} [class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#2e3436;border:2px outset #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;} -#item-delete-selected-desc{float:left;font-size:smaller;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;} +#item-delete-selected-desc{float:left;font-size:x-small;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;} .intro-approve-as-friend-desc{margin-top:10px;} .intro-desc{margin-bottom:20px;font-weight:bold;} #group-edit-desc{margin:10px 0px;} @@ -389,7 +389,7 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;} .filesavetags:hover,.categorytags:hover{margin:20px 0;opacity:1.0 !important;} .item-select{opacity:0.1;margin:5px 0 0 6px !important;}.item-select:hover{opacity:1;} .checkeditem{opacity:1;} -#item-delete-selected{margin-top:30px;position:absolute;left:35px;width:15em;overflow:auto;} +#item-delete-selected{margin:3em 5px;position:relative;left:4em;width:15em;overflow:auto;} #item-delete-selected-icon{float:left;margin:11px 5px;} .fc-state-highlight{background:#eeeeec;color:#111111;} .directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;} diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less index c5641605e..e18f9a01b 100644 --- a/view/theme/dispy/light/style.less +++ b/view/theme/dispy/light/style.less @@ -326,7 +326,7 @@ h6 { } #item-delete-selected-desc { float: left; - font-size: smaller; + font-size: x-small; margin-right: 5px; &:hover { text-decoration: underline; @@ -2367,9 +2367,9 @@ div { opacity: 1; } #item-delete-selected { - margin-top: 30px; - position: absolute; - left: 35px; + margin: 3em 5px; + position: relative; + left: 4em; width: 15em; overflow: auto; } -- cgit v1.2.3 From be658788de3632599d00483511439a3df537b854 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 28 Jun 2012 22:19:12 -0700 Subject: maintain page position when hovering on pop-outs --- view/theme/slackr/style.css | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'view/theme') diff --git a/view/theme/slackr/style.css b/view/theme/slackr/style.css index ea10cc377..4c0fdc22d 100644 --- a/view/theme/slackr/style.css +++ b/view/theme/slackr/style.css @@ -67,6 +67,8 @@ nav #site-location { opacity: 1.0; filter:alpha(opacity=100); box-shadow: 4px 4px 3px 0 #444444; + margin-left: 0px; + margin-top: 0px; } #events-reminder:hover { @@ -108,6 +110,8 @@ nav #site-location { #posted-date-selector { margin-left: 30px !important; margin-top: 5px !important; + margin-right: 0px !important; + margin-bottom: 0px !important; } @@ -115,6 +119,9 @@ nav #site-location { box-shadow: 4px 4px 3px 0 #444444; margin-left: 25px !important; margin-top: 0px !important; + margin-right: 5px !important; + margin-bottom: 5px !important; + } .contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo, .profile-jot-text, .group-selected, .nets-selected, .fileas-selected, #profile-jot-submit, .categories-selected { -- cgit v1.2.3 From 8b18ee49ffbc51e4d377a99fd391ee44d876734f Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Fri, 29 Jun 2012 05:29:58 -0400 Subject: quattro: some updates - add makefile to rebuild both css with single command - fix icons in Forums widget - style photos pages --- view/theme/quattro/Makefile | 5 + view/theme/quattro/dark/style.css | 258 ++++++++++++++++++++++++++++++--- view/theme/quattro/green/style.css | 258 ++++++++++++++++++++++++++++++--- view/theme/quattro/icons.less | 7 + view/theme/quattro/icons/addon_off.png | Bin 438 -> 834 bytes view/theme/quattro/icons/addon_on.png | Bin 428 -> 715 bytes view/theme/quattro/icons/dislike.png | Bin 0 -> 386 bytes view/theme/quattro/icons/like.png | Bin 0 -> 388 bytes view/theme/quattro/icons/next.png | Bin 0 -> 300 bytes view/theme/quattro/icons/prev.png | Bin 0 -> 336 bytes view/theme/quattro/photo_view.tpl | 37 +++++ view/theme/quattro/quattro.less | 109 +++++++++++++- 12 files changed, 629 insertions(+), 45 deletions(-) create mode 100644 view/theme/quattro/Makefile create mode 100644 view/theme/quattro/icons/dislike.png create mode 100644 view/theme/quattro/icons/like.png create mode 100644 view/theme/quattro/icons/next.png create mode 100644 view/theme/quattro/icons/prev.png create mode 100644 view/theme/quattro/photo_view.tpl (limited to 'view/theme') diff --git a/view/theme/quattro/Makefile b/view/theme/quattro/Makefile new file mode 100644 index 000000000..5df58c821 --- /dev/null +++ b/view/theme/quattro/Makefile @@ -0,0 +1,5 @@ +all: + cd dark; make; cd .. + cd green; make; cd .. + + diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 803a2c2f7..d115453bc 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -10,10 +10,72 @@ overflow: hidden; text-indent: -9999px; padding: 1px; + min-width: 22px; + height: 22px; } .icon.text { text-indent: 0px; } +.icon.notify { + background-image: url("../../../images/icons/22/notify_off.png"); +} +.icon.gear { + background-image: url("../../../images/icons/22/gear.png"); +} +.icon.like { + background-image: url("icons/like.png"); +} +.icon.dislike { + background-image: url("icons/dislike.png"); +} +.icon.add { + background-image: url("../../../images/icons/22/add.png"); +} +.icon.delete { + background-image: url("../../../images/icons/22/delete.png"); +} +.icon.edit { + background-image: url("../../../images/icons/22/edit.png"); +} +.icon.star { + background-image: url("../../../images/icons/22/star.png"); +} +.icon.menu { + background-image: url("../../../images/icons/22/menu.png"); +} +.icon.link { + background-image: url("../../../images/icons/22/link.png"); +} +.icon.lock { + background-image: url("../../../images/icons/22/lock.png"); +} +.icon.unlock { + background-image: url("../../../images/icons/22/unlock.png"); +} +.icon.plugin { + background-image: url("../../../images/icons/22/plugin.png"); +} +.icon.type-unkn { + background-image: url("../../../images/icons/22/zip.png"); +} +.icon.type-audio { + background-image: url("../../../images/icons/22/audio.png"); +} +.icon.type-video { + background-image: url("../../../images/icons/22/video.png"); +} +.icon.type-image { + background-image: url("../../../images/icons/22/image.png"); +} +.icon.type-text { + background-image: url("../../../images/icons/22/text.png"); +} +.icon.language { + background-image: url("icons/language.png"); +} +.icon.text { + padding: 10px 0px 0px 25px; +} .icon.s10 { min-width: 10px; height: 10px; @@ -24,6 +86,12 @@ .icon.s10.gear { background-image: url("../../../images/icons/10/gear.png"); } +.icon.s10.like { + background-image: url("icons/like.png"); +} +.icon.s10.dislike { + background-image: url("icons/dislike.png"); +} .icon.s10.add { background-image: url("../../../images/icons/10/add.png"); } @@ -82,6 +150,12 @@ .icon.s16.gear { background-image: url("../../../images/icons/16/gear.png"); } +.icon.s16.like { + background-image: url("icons/like.png"); +} +.icon.s16.dislike { + background-image: url("icons/dislike.png"); +} .icon.s16.add { background-image: url("../../../images/icons/16/add.png"); } @@ -140,6 +214,12 @@ .icon.s22.gear { background-image: url("../../../images/icons/22/gear.png"); } +.icon.s22.like { + background-image: url("icons/like.png"); +} +.icon.s22.dislike { + background-image: url("icons/dislike.png"); +} .icon.s22.add { background-image: url("../../../images/icons/22/add.png"); } @@ -198,6 +278,12 @@ .icon.s48.gear { background-image: url("../../../images/icons/48/gear.png"); } +.icon.s48.like { + background-image: url("icons/like.png"); +} +.icon.s48.dislike { + background-image: url("icons/dislike.png"); +} .icon.s48.add { background-image: url("../../../images/icons/48/add.png"); } @@ -267,7 +353,8 @@ body { h4 { font-size: 1.1em; } -a, a:link { +a, +a:link { color: #005c94; text-decoration: none; } @@ -336,6 +423,9 @@ code { .tool .action { float: right; } +.tool li > img { + float: left; +} /* popup notifications */ #jGrowl.top-right { top: 30px; @@ -489,7 +579,8 @@ nav #nav-site-linkmenu .menu-popup { right: 0px; left: auto; } -nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify { +nav #nav-notifications-linkmenu.on .icon.s22.notify, +nav #nav-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/22/notify_on.png"); } nav #nav-apps-link.selected { @@ -678,11 +769,15 @@ aside #profiles-menu { height: 48px; } /* group member */ -#contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper { +#contact-edit-drop-link, +.mail-list-delete-wrapper, +.group-delete-wrapper { float: right; margin-right: 50px; } -#contact-edit-drop-link .drophide, .mail-list-delete-wrapper .drophide, .group-delete-wrapper .drophide { +#contact-edit-drop-link .drophide, +.mail-list-delete-wrapper .drophide, +.group-delete-wrapper .drophide { background-image: url('../../../images/icons/22/delete.png'); display: block; width: 22px; @@ -691,7 +786,9 @@ aside #profiles-menu { position: relative; top: -50px; } -#contact-edit-drop-link .drop, .mail-list-delete-wrapper .drop, .group-delete-wrapper .drop { +#contact-edit-drop-link .drop, +.mail-list-delete-wrapper .drop, +.group-delete-wrapper .drop { background-image: url('../../../images/icons/22/delete.png'); display: block; width: 22px; @@ -821,7 +918,8 @@ section { display: table; width: 750px; } -.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { +.wall-item-container .wall-item-item, +.wall-item-container .wall-item-bottom { display: table-row; } .wall-item-container .wall-item-bottom { @@ -859,11 +957,13 @@ section { .wall-item-container .wall-item-content img { max-width: 710px; } -.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { +.wall-item-container .wall-item-links, +.wall-item-container .wall-item-actions { display: table-cell; vertical-align: middle; } -.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon { +.wall-item-container .wall-item-links .icon, +.wall-item-container .wall-item-actions .icon { opacity: 0.5; -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; @@ -871,7 +971,8 @@ section { -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } -.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover { +.wall-item-container .wall-item-links .icon:hover, +.wall-item-container .wall-item-actions .icon:hover { opacity: 1; -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; @@ -1015,9 +1116,6 @@ section { opacity: 0.5; } .wwto { - position: absolute !important; - width: 25px; - height: 25px; background: #FFFFFF; border: 2px solid #364e59; height: 25px; @@ -1248,7 +1346,9 @@ section { height: 18px; }*/ /** acl **/ -#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { +#photo-edit-perms-select, +#photos-upload-permissions-wrapper, +#profile-jot-acl-wrapper { display: block!important; } #acl-wrapper { @@ -1407,10 +1507,12 @@ ul.tabs li .active { float: left; width: 200px; } -.field input, .field textarea { +.field input, +.field textarea { width: 400px; } -.field input[type="checkbox"], .field input[type="radio"] { +.field input[type="checkbox"], +.field input[type="radio"] { width: auto; } .field textarea { @@ -1537,10 +1639,126 @@ ul.tabs li .active { width: 50px; float: left; } -/* photo */ -.lframe { +/* photo albums */ +#photo-edit-link-wrap { + margin-bottom: 10px; +} +#album-edit-link { + border-right: 1px solid #364e59; + float: left; + padding-right: 5px; + margin-right: 5px; +} +#photo-edit-link, +#album-edit-link a { + background: url("../../../images/icons/16/edit.png") no-repeat left center; + padding-left: 18px; +} +#photo-toprofile-link { + background: url("../../../images/icons/16/user.png") no-repeat left center; + padding-left: 18px; +} +.photos-upload-link a, +#photo-top-upload-link { + background: url("../../../images/icons/16/add.png") no-repeat left center; + padding-left: 18px; +} +.photo-top-image-wrapper, +.photo-album-image-wrapper { float: left; margin: 0px 10px 10px 0px; + width: 150px; + height: 150px; + position: relative; + overflow: hidden; +} +.photo-top-image-wrapper img, +.photo-album-image-wrapper img { + width: 150px; +} +.photo-top-image-wrapper .photo-top-album-name, +.photo-album-image-wrapper .photo-top-album-name, +.photo-top-image-wrapper .caption, +.photo-album-image-wrapper .caption { + position: absolute; + color: #2d2d2d; + background-color: #ffffff; + width: 100%; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -webkit-transition: all 0.5s ease-in-out; + -moz-transition: all 0.5s ease-in-out; + -o-transition: all 0.5s ease-in-out; + -ms-transition: all 0.5s ease-in-out; + transition: all 0.5s ease-in-out; + bottom: -150px; +} +.photo-top-image-wrapper:hover .photo-top-album-name, +.photo-album-image-wrapper:hover .photo-top-album-name, +.photo-top-image-wrapper:hover .caption, +.photo-album-image-wrapper:hover .caption { + bottom: 0px; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -webkit-transition: all 0.5s ease-in-out; + -moz-transition: all 0.5s ease-in-out; + -o-transition: all 0.5s ease-in-out; + -ms-transition: all 0.5s ease-in-out; + transition: all 0.5s ease-in-out; +} +#photo-photo { + display: block; + width: 660px; + padding: 50px; + margin-bottom: 0px; + text-align: center; + background-color: #999999; +} +#photo-photo img { + max-width: 560px; +} +#photo-album-title { + background: url("../../../images/icons/22/image.png") no-repeat top left; + padding-left: 23px; + min-height: 22px; +} +#photo-album-title a { + display: block; + padding-top: 5px; +} +#photo-caption { + display: block; + width: 660px; + min-height: 55px; + background-color: #cccccc; + padding: 0 50px 0 50px; +} +#photo-next-link > a > div { + background: url("icons/next.png") no-repeat center center; + float: right; + width: 50px; + height: 50px; +} +#photo-prev-link > a > div { + background: url("icons/prev.png") no-repeat center center; + float: left; + width: 50px; + height: 50px; +} +#photo-like-div { + display: block; + width: 660px; + height: 30px; + background-color: #cccccc; + padding: 0 50px 0 50px; +} +#photo-like-div .icon { + float: left; +} +#photo-like-div .like-rotator { + float: right; } /* profile match wrapper */ .profile-match-wrapper { @@ -1641,13 +1859,15 @@ ul.tabs li .active { transition: all 0.2s ease-in-out; } /* theme screenshot */ -.screenshot, #theme-preview { +.screenshot, +#theme-preview { position: absolute; width: 202px; left: 70%; top: 50px; } -.screenshot img, #theme-preview img { +.screenshot img, +#theme-preview img { width: 200px; height: 150px; } diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index ecf4ff986..23fd4cb41 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -10,10 +10,72 @@ overflow: hidden; text-indent: -9999px; padding: 1px; + min-width: 22px; + height: 22px; } .icon.text { text-indent: 0px; } +.icon.notify { + background-image: url("../../../images/icons/22/notify_off.png"); +} +.icon.gear { + background-image: url("../../../images/icons/22/gear.png"); +} +.icon.like { + background-image: url("icons/like.png"); +} +.icon.dislike { + background-image: url("icons/dislike.png"); +} +.icon.add { + background-image: url("../../../images/icons/22/add.png"); +} +.icon.delete { + background-image: url("../../../images/icons/22/delete.png"); +} +.icon.edit { + background-image: url("../../../images/icons/22/edit.png"); +} +.icon.star { + background-image: url("../../../images/icons/22/star.png"); +} +.icon.menu { + background-image: url("../../../images/icons/22/menu.png"); +} +.icon.link { + background-image: url("../../../images/icons/22/link.png"); +} +.icon.lock { + background-image: url("../../../images/icons/22/lock.png"); +} +.icon.unlock { + background-image: url("../../../images/icons/22/unlock.png"); +} +.icon.plugin { + background-image: url("../../../images/icons/22/plugin.png"); +} +.icon.type-unkn { + background-image: url("../../../images/icons/22/zip.png"); +} +.icon.type-audio { + background-image: url("../../../images/icons/22/audio.png"); +} +.icon.type-video { + background-image: url("../../../images/icons/22/video.png"); +} +.icon.type-image { + background-image: url("../../../images/icons/22/image.png"); +} +.icon.type-text { + background-image: url("../../../images/icons/22/text.png"); +} +.icon.language { + background-image: url("icons/language.png"); +} +.icon.text { + padding: 10px 0px 0px 25px; +} .icon.s10 { min-width: 10px; height: 10px; @@ -24,6 +86,12 @@ .icon.s10.gear { background-image: url("../../../images/icons/10/gear.png"); } +.icon.s10.like { + background-image: url("icons/like.png"); +} +.icon.s10.dislike { + background-image: url("icons/dislike.png"); +} .icon.s10.add { background-image: url("../../../images/icons/10/add.png"); } @@ -82,6 +150,12 @@ .icon.s16.gear { background-image: url("../../../images/icons/16/gear.png"); } +.icon.s16.like { + background-image: url("icons/like.png"); +} +.icon.s16.dislike { + background-image: url("icons/dislike.png"); +} .icon.s16.add { background-image: url("../../../images/icons/16/add.png"); } @@ -140,6 +214,12 @@ .icon.s22.gear { background-image: url("../../../images/icons/22/gear.png"); } +.icon.s22.like { + background-image: url("icons/like.png"); +} +.icon.s22.dislike { + background-image: url("icons/dislike.png"); +} .icon.s22.add { background-image: url("../../../images/icons/22/add.png"); } @@ -198,6 +278,12 @@ .icon.s48.gear { background-image: url("../../../images/icons/48/gear.png"); } +.icon.s48.like { + background-image: url("icons/like.png"); +} +.icon.s48.dislike { + background-image: url("icons/dislike.png"); +} .icon.s48.add { background-image: url("../../../images/icons/48/add.png"); } @@ -267,7 +353,8 @@ body { h4 { font-size: 1.1em; } -a, a:link { +a, +a:link { color: #009100; text-decoration: none; } @@ -336,6 +423,9 @@ code { .tool .action { float: right; } +.tool li > img { + float: left; +} /* popup notifications */ #jGrowl.top-right { top: 30px; @@ -489,7 +579,8 @@ nav #nav-site-linkmenu .menu-popup { right: 0px; left: auto; } -nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify { +nav #nav-notifications-linkmenu.on .icon.s22.notify, +nav #nav-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/22/notify_on.png"); } nav #nav-apps-link.selected { @@ -678,11 +769,15 @@ aside #profiles-menu { height: 48px; } /* group member */ -#contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper { +#contact-edit-drop-link, +.mail-list-delete-wrapper, +.group-delete-wrapper { float: right; margin-right: 50px; } -#contact-edit-drop-link .drophide, .mail-list-delete-wrapper .drophide, .group-delete-wrapper .drophide { +#contact-edit-drop-link .drophide, +.mail-list-delete-wrapper .drophide, +.group-delete-wrapper .drophide { background-image: url('../../../images/icons/22/delete.png'); display: block; width: 22px; @@ -691,7 +786,9 @@ aside #profiles-menu { position: relative; top: -50px; } -#contact-edit-drop-link .drop, .mail-list-delete-wrapper .drop, .group-delete-wrapper .drop { +#contact-edit-drop-link .drop, +.mail-list-delete-wrapper .drop, +.group-delete-wrapper .drop { background-image: url('../../../images/icons/22/delete.png'); display: block; width: 22px; @@ -821,7 +918,8 @@ section { display: table; width: 750px; } -.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { +.wall-item-container .wall-item-item, +.wall-item-container .wall-item-bottom { display: table-row; } .wall-item-container .wall-item-bottom { @@ -859,11 +957,13 @@ section { .wall-item-container .wall-item-content img { max-width: 710px; } -.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { +.wall-item-container .wall-item-links, +.wall-item-container .wall-item-actions { display: table-cell; vertical-align: middle; } -.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon { +.wall-item-container .wall-item-links .icon, +.wall-item-container .wall-item-actions .icon { opacity: 0.5; -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; @@ -871,7 +971,8 @@ section { -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } -.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover { +.wall-item-container .wall-item-links .icon:hover, +.wall-item-container .wall-item-actions .icon:hover { opacity: 1; -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; @@ -1015,9 +1116,6 @@ section { opacity: 0.5; } .wwto { - position: absolute !important; - width: 25px; - height: 25px; background: #FFFFFF; border: 2px solid #364e59; height: 25px; @@ -1248,7 +1346,9 @@ section { height: 18px; }*/ /** acl **/ -#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { +#photo-edit-perms-select, +#photos-upload-permissions-wrapper, +#profile-jot-acl-wrapper { display: block!important; } #acl-wrapper { @@ -1407,10 +1507,12 @@ ul.tabs li .active { float: left; width: 200px; } -.field input, .field textarea { +.field input, +.field textarea { width: 400px; } -.field input[type="checkbox"], .field input[type="radio"] { +.field input[type="checkbox"], +.field input[type="radio"] { width: auto; } .field textarea { @@ -1537,10 +1639,126 @@ ul.tabs li .active { width: 50px; float: left; } -/* photo */ -.lframe { +/* photo albums */ +#photo-edit-link-wrap { + margin-bottom: 10px; +} +#album-edit-link { + border-right: 1px solid #364e59; + float: left; + padding-right: 5px; + margin-right: 5px; +} +#photo-edit-link, +#album-edit-link a { + background: url("../../../images/icons/16/edit.png") no-repeat left center; + padding-left: 18px; +} +#photo-toprofile-link { + background: url("../../../images/icons/16/user.png") no-repeat left center; + padding-left: 18px; +} +.photos-upload-link a, +#photo-top-upload-link { + background: url("../../../images/icons/16/add.png") no-repeat left center; + padding-left: 18px; +} +.photo-top-image-wrapper, +.photo-album-image-wrapper { float: left; margin: 0px 10px 10px 0px; + width: 150px; + height: 150px; + position: relative; + overflow: hidden; +} +.photo-top-image-wrapper img, +.photo-album-image-wrapper img { + width: 150px; +} +.photo-top-image-wrapper .photo-top-album-name, +.photo-album-image-wrapper .photo-top-album-name, +.photo-top-image-wrapper .caption, +.photo-album-image-wrapper .caption { + position: absolute; + color: #2d2d2d; + background-color: #ffffff; + width: 100%; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -webkit-transition: all 0.5s ease-in-out; + -moz-transition: all 0.5s ease-in-out; + -o-transition: all 0.5s ease-in-out; + -ms-transition: all 0.5s ease-in-out; + transition: all 0.5s ease-in-out; + bottom: -150px; +} +.photo-top-image-wrapper:hover .photo-top-album-name, +.photo-album-image-wrapper:hover .photo-top-album-name, +.photo-top-image-wrapper:hover .caption, +.photo-album-image-wrapper:hover .caption { + bottom: 0px; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -webkit-transition: all 0.5s ease-in-out; + -moz-transition: all 0.5s ease-in-out; + -o-transition: all 0.5s ease-in-out; + -ms-transition: all 0.5s ease-in-out; + transition: all 0.5s ease-in-out; +} +#photo-photo { + display: block; + width: 660px; + padding: 50px; + margin-bottom: 0px; + text-align: center; + background-color: #999999; +} +#photo-photo img { + max-width: 560px; +} +#photo-album-title { + background: url("../../../images/icons/22/image.png") no-repeat top left; + padding-left: 23px; + min-height: 22px; +} +#photo-album-title a { + display: block; + padding-top: 5px; +} +#photo-caption { + display: block; + width: 660px; + min-height: 55px; + background-color: #cccccc; + padding: 0 50px 0 50px; +} +#photo-next-link > a > div { + background: url("icons/next.png") no-repeat center center; + float: right; + width: 50px; + height: 50px; +} +#photo-prev-link > a > div { + background: url("icons/prev.png") no-repeat center center; + float: left; + width: 50px; + height: 50px; +} +#photo-like-div { + display: block; + width: 660px; + height: 30px; + background-color: #cccccc; + padding: 0 50px 0 50px; +} +#photo-like-div .icon { + float: left; +} +#photo-like-div .like-rotator { + float: right; } /* profile match wrapper */ .profile-match-wrapper { @@ -1641,13 +1859,15 @@ ul.tabs li .active { transition: all 0.2s ease-in-out; } /* theme screenshot */ -.screenshot, #theme-preview { +.screenshot, +#theme-preview { position: absolute; width: 202px; left: 70%; top: 50px; } -.screenshot img, #theme-preview img { +.screenshot img, +#theme-preview img { width: 200px; height: 150px; } diff --git a/view/theme/quattro/icons.less b/view/theme/quattro/icons.less index ae7459dfc..f9be4cc72 100644 --- a/view/theme/quattro/icons.less +++ b/view/theme/quattro/icons.less @@ -5,6 +5,9 @@ &.notify { background-image: url("../../../images/icons/@{size}/notify_off.png"); } &.gear { background-image: url("../../../images/icons/@{size}/gear.png"); } + &.like { background-image: url("icons/like.png"); } + &.dislike { background-image: url("icons/dislike.png"); } + &.add { background-image: url("../../../images/icons/@{size}/add.png"); } &.delete { background-image: url("../../../images/icons/@{size}/delete.png"); } &.edit { background-image: url("../../../images/icons/@{size}/edit.png"); } @@ -40,6 +43,10 @@ text-indent: 0px; } + min-width:22px; height: 22px; + .icons(22); + &.text { padding: 10px 0px 0px 25px; } + &.s10 { min-width:10px; height: 10px; .icons(10); diff --git a/view/theme/quattro/icons/addon_off.png b/view/theme/quattro/icons/addon_off.png index 40b53259a..0fcce4d5a 100644 Binary files a/view/theme/quattro/icons/addon_off.png and b/view/theme/quattro/icons/addon_off.png differ diff --git a/view/theme/quattro/icons/addon_on.png b/view/theme/quattro/icons/addon_on.png index 3d9490f15..79ce07f0e 100644 Binary files a/view/theme/quattro/icons/addon_on.png and b/view/theme/quattro/icons/addon_on.png differ diff --git a/view/theme/quattro/icons/dislike.png b/view/theme/quattro/icons/dislike.png new file mode 100644 index 000000000..23de426c5 Binary files /dev/null and b/view/theme/quattro/icons/dislike.png differ diff --git a/view/theme/quattro/icons/like.png b/view/theme/quattro/icons/like.png new file mode 100644 index 000000000..b65edccc0 Binary files /dev/null and b/view/theme/quattro/icons/like.png differ diff --git a/view/theme/quattro/icons/next.png b/view/theme/quattro/icons/next.png new file mode 100644 index 000000000..7b5e25b90 Binary files /dev/null and b/view/theme/quattro/icons/next.png differ diff --git a/view/theme/quattro/icons/prev.png b/view/theme/quattro/icons/prev.png new file mode 100644 index 000000000..55c1464ba Binary files /dev/null and b/view/theme/quattro/icons/prev.png differ diff --git a/view/theme/quattro/photo_view.tpl b/view/theme/quattro/photo_view.tpl new file mode 100644 index 000000000..3b7a66271 --- /dev/null +++ b/view/theme/quattro/photo_view.tpl @@ -0,0 +1,37 @@ +
    +

    $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/quattro/quattro.less b/view/theme/quattro/quattro.less index 9099f0be1..2e4c0da38 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -27,13 +27,17 @@ h4 { font-size: 1.1em } .opaque(@v: 0.5){ opacity: @v; - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - -ms-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; + .transition(); } +.transition(@d: 0.2s){ + -webkit-transition: all @d ease-in-out; + -moz-transition: all @d ease-in-out; + -o-transition: all @d ease-in-out; + -ms-transition: all @d ease-in-out; + transition: all @d ease-in-out; +} + a, a:link { color: @Link; text-decoration: none; } a:visited { color: @LinkVisited; text-decoration: none; } @@ -81,6 +85,7 @@ code { height: auto; overflow: auto; .label { float: left;} .action { float: right; } + li > img { float: left; } } @@ -1068,12 +1073,102 @@ ul.tabs { width: 50px; float: left; } -/* photo */ -.lframe { +/* photo albums */ +@photosize: 150px; + +#photo-edit-link-wrap { margin-bottom: 10px; } + +#album-edit-link { + border-right: 1px solid @MenuBorder; + float: left; + padding-right: 5px; + margin-right: 5px; +} +#photo-edit-link, +#album-edit-link a { + background: url("../../../images/icons/16/edit.png") no-repeat left center; + padding-left: 18px; +} +#photo-toprofile-link { + background: url("../../../images/icons/16/user.png") no-repeat left center; + padding-left: 18px; +} + +.photos-upload-link a, +#photo-top-upload-link { + background: url("../../../images/icons/16/add.png") no-repeat left center; + padding-left: 18px; +} + + +.photo-top-image-wrapper, +.photo-album-image-wrapper { float: left; margin: 0px 10px 10px 0px; + width:@photosize; height: @photosize; + position: relative; + overflow: hidden; + + img { width: @photosize; } + + .photo-top-album-name, + .caption{ + position: absolute; + color: @Menu; + background-color: @MenuBg; + + width: 100%; + .shadow(0px, 5px); + .transition(0.5s); + bottom: -@photosize; + } + + &:hover .photo-top-album-name, + &:hover .caption { + bottom: 0px; + .shadow(0px, 0px); + .transition(0.5s); + } +} + +#photo-photo { + display: block; width: 660px; + padding: 50px; margin-bottom: 0px; + text-align: center; + background-color: @Grey3; + img { max-width: 560px; } +} +#photo-album-title { + background: url("../../../images/icons/22/image.png") no-repeat top left; + padding-left: 23px; + min-height: 22px; + a { display: block; padding-top: 5px; } } +#photo-caption { + display: block; width: 660px; + min-height: 55px; + background-color: @Grey2; + padding:0 50px 0 50px; +} +#photo-next-link > a > div { + background: url("icons/next.png") no-repeat center center; + float: right; + width: 50px; height: 50px; +} +#photo-prev-link > a > div { + background: url("icons/prev.png") no-repeat center center; + float: left; + width: 50px; height: 50px; +} +#photo-like-div { + display: block; width: 660px; + height: 30px; + background-color: @Grey2; + padding:0 50px 0 50px; + .icon {float: left;} + .like-rotator {float: right;} +} /* profile match wrapper */ .profile-match-wrapper { float: left; -- cgit v1.2.3 From a03e6b96ea96c81d4cb1a1e8c4e86a8a3a82863e Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Fri, 29 Jun 2012 05:47:53 -0400 Subject: quattro: fix Forum widget, hide edit profile link --- view/theme/quattro/dark/style.css | 5 ++++- view/theme/quattro/green/style.css | 5 ++++- view/theme/quattro/quattro.less | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'view/theme') diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index d115453bc..35595c8bc 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -423,7 +423,7 @@ code { .tool .action { float: right; } -.tool li > img { +.tool > img { float: left; } /* popup notifications */ @@ -690,6 +690,9 @@ aside { padding: 0px 10px 0px 20px; border-right: 1px solid #bdcdd4; } +aside .profile-edit-side-div { + display: none; +} aside .vcard .fn { font-size: 16px; font-weight: bold; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index 23fd4cb41..57fa38aa1 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -423,7 +423,7 @@ code { .tool .action { float: right; } -.tool li > img { +.tool > img { float: left; } /* popup notifications */ @@ -690,6 +690,9 @@ aside { padding: 0px 10px 0px 20px; border-right: 1px solid #bdcdd4; } +aside .profile-edit-side-div { + display: none; +} aside .vcard .fn { font-size: 16px; font-weight: bold; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 2e4c0da38..0dac79bf9 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -85,7 +85,7 @@ code { height: auto; overflow: auto; .label { float: left;} .action { float: right; } - li > img { float: left; } + > img { float: left; } } @@ -287,6 +287,8 @@ aside { padding:0px 10px 0px 20px; border-right: 1px solid @AsideBorder; + .profile-edit-side-div { display: none; } + .vcard { .fn { font-size: 16px; font-weight: bold; margin-bottom: 5px; } .title { margin-bottom: 5px; } -- cgit v1.2.3 From 31718968c66b77354ed52b06a2f8f8456dd94ee4 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 30 Jun 2012 01:29:29 -0700 Subject: advanced profile theming --- view/theme/duepuntozero/style.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 997c6d315..1be81d738 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -560,7 +560,12 @@ input#dfrn-url { clear: both; margin-bottom: 30px; } - +.aprofile dt { + font-weight: bold; +} +#page-profile .title { + font-weight: bold; +} #profile-vcard-break { clear: both; } -- cgit v1.2.3 From 2214cd74e55648367cd40baba88d1e2518215945 Mon Sep 17 00:00:00 2001 From: "Zvi ben Yaakov (a.k.a rdc)" Date: Sun, 1 Jul 2012 14:46:03 +0300 Subject: Added more profile data and CSS styling to the /directory page --- view/theme/diabook/directory_item.tpl | 35 +++++++++++++++++++++-- view/theme/diabook/style.css | 54 +++++++++++++++++++++++++++++++++-- 2 files changed, 84 insertions(+), 5 deletions(-) (limited to 'view/theme') diff --git a/view/theme/diabook/directory_item.tpl b/view/theme/diabook/directory_item.tpl index bc2af16c2..70d197955 100755 --- a/view/theme/diabook/directory_item.tpl +++ b/view/theme/diabook/directory_item.tpl @@ -3,9 +3,40 @@ -
    $name
    +
    +
    $name
    +
    $page-type
    + {{ if $pdesc }}
    $profile.pdesc
    {{ endif }} +
    +
    + {{ 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 $marital }}
    ♥$marital
    $profile.marital
    {{ endif }} + + {{ if $homepage }}
    $homepage
    $profile.homepage
    {{ endif }} +
    +
    +
    + {{ if $about }}
    $about
    $profile.about
    {{ endif }} +
    +
    diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 736817c7b..049fb7ba4 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -2732,6 +2732,30 @@ float: left; /* ============= */ /* = Directory = */ /* ============= */ +section .directory-item dl { + height: auto; + overflow: auto; +} +section .directory-item dt { + float: left; + margin-left: 0px; + text-align: right; + color: #999; +} +section .directory-item dd { + float: left; + margin-left: 5px; +} +.directory-profile-wrapper { + float: left; + max-height: 178px; + overflow: hidden; + width: 635px; +} +.directory-copy-wrapper { + float: left; + overflow: hidden; +} /* contacts menu */ .contact-photo-wrapper { position: relative; @@ -2773,7 +2797,7 @@ float: left; } .directory-item { float: left; - width: 200px; + width: 800px; height: 200px; } .directory-item .contact-photo { @@ -2784,14 +2808,38 @@ float: left; width: 175px; height: 175px; } +.directory-photo-wrapper { + float: left; + height: 200px; + width: 165px; +} .contact-name { - text-align: left; + font-size: 18px; font-weight: bold; - font-size: 12px; + margin-bottom: -3px; + text-align: left; } .contact-details { color: #999999; } +.page-type { + font-size: 10px; + font-style: italic; +} +.directory-detailscolumn-wrapper { + float: left; + width: 305px; + margin-right: 10px; +} +.directory-profile-wrapper dl { + margin-top: 3px; + margin-bottom: 3px; +} +.directory-profile-title { + font-weight: bold; + margin-bottom: 3px; + font-size: 14px; +} #side-bar-photos-albums li{ list-style-type: disc; } -- cgit v1.2.3 From 74a819980fad6d79998a70b0f6be44803db7e0c7 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 2 Jul 2012 03:40:12 +0100 Subject: Various theme stuff. Profile group list for testbubble Screenshot for facepark Various niggles in darkzero/NS --- view/theme/darkzero-NS/style.css | 27 +++++++++++++++++++++++++-- view/theme/darkzero/style.css | 31 ++++++++++++++++++++++++++----- view/theme/facepark/screenshot.jpg | Bin 0 -> 76017 bytes view/theme/testbubble/style.css | 6 ++++++ 4 files changed, 57 insertions(+), 7 deletions(-) create mode 100644 view/theme/facepark/screenshot.jpg (limited to 'view/theme') diff --git a/view/theme/darkzero-NS/style.css b/view/theme/darkzero-NS/style.css index 9c15329da..5d1bb6310 100644 --- a/view/theme/darkzero-NS/style.css +++ b/view/theme/darkzero-NS/style.css @@ -113,7 +113,7 @@ input#acl-search { .notify-seen { - background:#666; + background:#111; } #nav-notifications-menu { @@ -157,4 +157,27 @@ blockquote { #datebrowse-sidebar select { color:#99CCFF !important; -} \ No newline at end of file +} + +.settings-widget .selected { +background: #666; +} + +#adminpage table tr:hover { + color: #eec; + background-color: #666; +} + +input#prvmail-subject { +background: #222 !important; +} + +/* Events */ + +.fc-state-highlight { +background: #666 !important; +} + +.fc-state-disabled, .fc-state-disabled .fc-button-inner { +color: #000 !important; +} diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css index 8a6099ee8..55644e462 100644 --- a/view/theme/darkzero/style.css +++ b/view/theme/darkzero/style.css @@ -111,9 +111,8 @@ input#acl-search { } - .notify-seen { - background:#666; + background:#111; } #nav-notifications-menu { @@ -138,7 +137,7 @@ blockquote { color:#eec !important; } -.group-selected, .nets-selected, .fileas-selected, .categories-selected { +.group-selected, .nets-selected, .fileas-selected, .categories-selected{ background:#2e2f2e; } @@ -146,11 +145,33 @@ blockquote { background:#444; } -/* This seems okay to me...we might not need a new iconset, lets see how people react */ .editicon { background-color: #333; } #datebrowse-sidebar select { color:#99CCFF !important; -} \ No newline at end of file +} + +.settings-widget .selected { +background: #666; +} + +#adminpage table tr:hover { + color: #eec; + background-color: #666; +} + +input#prvmail-subject { +background: #222 !important; +} + +/* Events */ + +.fc-state-highlight { +background: #666 !important; +} + +.fc-state-disabled, .fc-state-disabled .fc-button-inner { +color: #000 !important; +} diff --git a/view/theme/facepark/screenshot.jpg b/view/theme/facepark/screenshot.jpg new file mode 100644 index 000000000..37adcc54f Binary files /dev/null and b/view/theme/facepark/screenshot.jpg differ diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css index 1e63c7ef6..58f31971b 100644 --- a/view/theme/testbubble/style.css +++ b/view/theme/testbubble/style.css @@ -3280,3 +3280,9 @@ ul.menu-popup { .notify-seen { background: #000; } + + +/* Pages profile widget */ +#page-profile div#profile-page-list{ +margin-left: 45px; +} \ No newline at end of file -- cgit v1.2.3 From f7144e671c79302f33ef2928955d8100a4ab4cc6 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 2 Jul 2012 16:56:37 -0700 Subject: fix diabook directory pages (only the normal style - any volunteers for the wide?) --- view/theme/diabook/diabook-aerith/style.css | 57 +++++++++++++++++++++++++++-- view/theme/diabook/diabook-blue/style.css | 57 +++++++++++++++++++++++++++-- view/theme/diabook/diabook-dark/style.css | 57 +++++++++++++++++++++++++++-- view/theme/diabook/diabook-green/style.css | 57 +++++++++++++++++++++++++++-- view/theme/diabook/diabook-pink/style.css | 57 +++++++++++++++++++++++++++-- view/theme/diabook/diabook-red/style.css | 57 +++++++++++++++++++++++++++-- 6 files changed, 318 insertions(+), 24 deletions(-) (limited to 'view/theme') diff --git a/view/theme/diabook/diabook-aerith/style.css b/view/theme/diabook/diabook-aerith/style.css index b512c8bfe..6b772edf2 100644 --- a/view/theme/diabook/diabook-aerith/style.css +++ b/view/theme/diabook/diabook-aerith/style.css @@ -2808,6 +2808,30 @@ float: left; /* ============= */ /* = Directory = */ /* ============= */ +section .directory-item dl { + height: auto; + overflow: auto; +} +section .directory-item dt { + float: left; + margin-left: 0px; + text-align: right; + color: #999; +} +section .directory-item dd { + float: left; + margin-left: 5px; +} +.directory-profile-wrapper { + float: left; + max-height: 178px; + overflow: hidden; + width: 635px; +} +.directory-copy-wrapper { + float: left; + overflow: hidden; +} /* contacts menu */ .contact-photo-wrapper { position: relative; @@ -2849,7 +2873,7 @@ float: left; } .directory-item { float: left; - width: 200px; + width: 800px; height: 200px; } .directory-item .contact-photo { @@ -2860,17 +2884,42 @@ float: left; width: 175px; height: 175px; } + +.directory-photo-wrapper { + float: left; + height: 200px; + width: 165px; +} .contact-name { - text-align: left; font-weight: bold; - font-size: 12px; + font-size: 18px; + margin-bottom: -3px; + text-align: left; } .contact-details { color: #999999; } +.page-type { + font-size: 10px; + font-style: italic; +} +.directory-detailscolumn-wrapper { + float: left; + width: 305px; + margin-right: 10px; +} +.directory-profile-wrapper dl { + margin-top: 3px; + margin-bottom: 3px; +} +.directory-profile-title { + font-weight: bold; + margin-bottom: 3px; + font-size: 14px; +} #side-bar-photos-albums{ margin-top: 15px; - } +} .photo-top-photo, .photo-album-photo { -webkit-border-radius: 5px 5px 0 0; -moz-border-radius: 5px 5px 0 0; diff --git a/view/theme/diabook/diabook-blue/style.css b/view/theme/diabook/diabook-blue/style.css index e7f3fd0bc..b1de26608 100644 --- a/view/theme/diabook/diabook-blue/style.css +++ b/view/theme/diabook/diabook-blue/style.css @@ -2766,6 +2766,30 @@ float: left; /* ============= */ /* = Directory = */ /* ============= */ +section .directory-item dl { + height: auto; + overflow: auto; +} +section .directory-item dt { + float: left; + margin-left: 0px; + text-align: right; + color: #999; +} +section .directory-item dd { + float: left; + margin-left: 5px; +} +.directory-profile-wrapper { + float: left; + max-height: 178px; + overflow: hidden; + width: 635px; +} +.directory-copy-wrapper { + float: left; + overflow: hidden; +} /* contacts menu */ .contact-photo-wrapper { position: relative; @@ -2807,7 +2831,7 @@ float: left; } .directory-item { float: left; - width: 200px; + width: 800px; height: 200px; } .directory-item .contact-photo { @@ -2818,17 +2842,42 @@ float: left; width: 175px; height: 175px; } + +.directory-photo-wrapper { + float: left; + height: 200px; + width: 165px; +} .contact-name { - text-align: left; font-weight: bold; - font-size: 12px; + font-size: 18px; + margin-bottom: -3px; + text-align: left; } .contact-details { color: #999999; } +.page-type { + font-size: 10px; + font-style: italic; +} +.directory-detailscolumn-wrapper { + float: left; + width: 305px; + margin-right: 10px; +} +.directory-profile-wrapper dl { + margin-top: 3px; + margin-bottom: 3px; +} +.directory-profile-title { + font-weight: bold; + margin-bottom: 3px; + font-size: 14px; +} #side-bar-photos-albums{ margin-top: 15px; - } +} .photo-top-photo, .photo-album-photo { -webkit-border-radius: 5px 5px 0 0; -moz-border-radius: 5px 5px 0 0; diff --git a/view/theme/diabook/diabook-dark/style.css b/view/theme/diabook/diabook-dark/style.css index 189bd30bf..844ed369e 100644 --- a/view/theme/diabook/diabook-dark/style.css +++ b/view/theme/diabook/diabook-dark/style.css @@ -2780,6 +2780,30 @@ float: left; /* ============= */ /* = Directory = */ /* ============= */ +section .directory-item dl { + height: auto; + overflow: auto; +} +section .directory-item dt { + float: left; + margin-left: 0px; + text-align: right; + color: #999; +} +section .directory-item dd { + float: left; + margin-left: 5px; +} +.directory-profile-wrapper { + float: left; + max-height: 178px; + overflow: hidden; + width: 635px; +} +.directory-copy-wrapper { + float: left; + overflow: hidden; +} /* contacts menu */ .contact-photo-wrapper { position: relative; @@ -2821,7 +2845,7 @@ float: left; } .directory-item { float: left; - width: 200px; + width: 800px; height: 200px; } .directory-item .contact-photo { @@ -2832,17 +2856,42 @@ float: left; width: 175px; height: 175px; } + +.directory-photo-wrapper { + float: left; + height: 200px; + width: 165px; +} .contact-name { - text-align: left; font-weight: bold; - font-size: 12px; + font-size: 18px; + margin-bottom: -3px; + text-align: left; } .contact-details { color: #999999; } +.page-type { + font-size: 10px; + font-style: italic; +} +.directory-detailscolumn-wrapper { + float: left; + width: 305px; + margin-right: 10px; +} +.directory-profile-wrapper dl { + margin-top: 3px; + margin-bottom: 3px; +} +.directory-profile-title { + font-weight: bold; + margin-bottom: 3px; + font-size: 14px; +} #side-bar-photos-albums{ margin-top: 15px; - } +} .photo-top-photo, .photo-album-photo { -webkit-border-radius: 5px 5px 0 0; -moz-border-radius: 5px 5px 0 0; diff --git a/view/theme/diabook/diabook-green/style.css b/view/theme/diabook/diabook-green/style.css index 762310e4d..111c31cfe 100644 --- a/view/theme/diabook/diabook-green/style.css +++ b/view/theme/diabook/diabook-green/style.css @@ -2795,6 +2795,30 @@ float: left; /* ============= */ /* = Directory = */ /* ============= */ +section .directory-item dl { + height: auto; + overflow: auto; +} +section .directory-item dt { + float: left; + margin-left: 0px; + text-align: right; + color: #999; +} +section .directory-item dd { + float: left; + margin-left: 5px; +} +.directory-profile-wrapper { + float: left; + max-height: 178px; + overflow: hidden; + width: 635px; +} +.directory-copy-wrapper { + float: left; + overflow: hidden; +} /* contacts menu */ .contact-photo-wrapper { position: relative; @@ -2836,7 +2860,7 @@ float: left; } .directory-item { float: left; - width: 200px; + width: 800px; height: 200px; } .directory-item .contact-photo { @@ -2847,17 +2871,42 @@ float: left; width: 175px; height: 175px; } + +.directory-photo-wrapper { + float: left; + height: 200px; + width: 165px; +} .contact-name { - text-align: left; font-weight: bold; - font-size: 12px; + font-size: 18px; + margin-bottom: -3px; + text-align: left; } .contact-details { color: #999999; } +.page-type { + font-size: 10px; + font-style: italic; +} +.directory-detailscolumn-wrapper { + float: left; + width: 305px; + margin-right: 10px; +} +.directory-profile-wrapper dl { + margin-top: 3px; + margin-bottom: 3px; +} +.directory-profile-title { + font-weight: bold; + margin-bottom: 3px; + font-size: 14px; +} #side-bar-photos-albums{ margin-top: 15px; - } +} .photo-top-photo, .photo-album-photo { -webkit-border-radius: 5px 5px 0 0; -moz-border-radius: 5px 5px 0 0; diff --git a/view/theme/diabook/diabook-pink/style.css b/view/theme/diabook/diabook-pink/style.css index 248e3ead0..b0b768df2 100644 --- a/view/theme/diabook/diabook-pink/style.css +++ b/view/theme/diabook/diabook-pink/style.css @@ -2795,6 +2795,30 @@ float: left; /* ============= */ /* = Directory = */ /* ============= */ +section .directory-item dl { + height: auto; + overflow: auto; +} +section .directory-item dt { + float: left; + margin-left: 0px; + text-align: right; + color: #999; +} +section .directory-item dd { + float: left; + margin-left: 5px; +} +.directory-profile-wrapper { + float: left; + max-height: 178px; + overflow: hidden; + width: 635px; +} +.directory-copy-wrapper { + float: left; + overflow: hidden; +} /* contacts menu */ .contact-photo-wrapper { position: relative; @@ -2836,7 +2860,7 @@ float: left; } .directory-item { float: left; - width: 200px; + width: 800px; height: 200px; } .directory-item .contact-photo { @@ -2847,17 +2871,42 @@ float: left; width: 175px; height: 175px; } + +.directory-photo-wrapper { + float: left; + height: 200px; + width: 165px; +} .contact-name { - text-align: left; font-weight: bold; - font-size: 12px; + font-size: 18px; + margin-bottom: -3px; + text-align: left; } .contact-details { color: #999999; } +.page-type { + font-size: 10px; + font-style: italic; +} +.directory-detailscolumn-wrapper { + float: left; + width: 305px; + margin-right: 10px; +} +.directory-profile-wrapper dl { + margin-top: 3px; + margin-bottom: 3px; +} +.directory-profile-title { + font-weight: bold; + margin-bottom: 3px; + font-size: 14px; +} #side-bar-photos-albums{ margin-top: 15px; - } +} .photo-top-photo, .photo-album-photo { -webkit-border-radius: 5px 5px 0 0; -moz-border-radius: 5px 5px 0 0; diff --git a/view/theme/diabook/diabook-red/style.css b/view/theme/diabook/diabook-red/style.css index 37e26b8b9..16b42d0e1 100644 --- a/view/theme/diabook/diabook-red/style.css +++ b/view/theme/diabook/diabook-red/style.css @@ -2793,6 +2793,30 @@ float: left; /* ============= */ /* = Directory = */ /* ============= */ +section .directory-item dl { + height: auto; + overflow: auto; +} +section .directory-item dt { + float: left; + margin-left: 0px; + text-align: right; + color: #999; +} +section .directory-item dd { + float: left; + margin-left: 5px; +} +.directory-profile-wrapper { + float: left; + max-height: 178px; + overflow: hidden; + width: 635px; +} +.directory-copy-wrapper { + float: left; + overflow: hidden; +} /* contacts menu */ .contact-photo-wrapper { position: relative; @@ -2834,7 +2858,7 @@ float: left; } .directory-item { float: left; - width: 200px; + width: 800px; height: 200px; } .directory-item .contact-photo { @@ -2845,17 +2869,42 @@ float: left; width: 175px; height: 175px; } + +.directory-photo-wrapper { + float: left; + height: 200px; + width: 165px; +} .contact-name { - text-align: left; font-weight: bold; - font-size: 12px; + font-size: 18px; + margin-bottom: -3px; + text-align: left; } .contact-details { color: #999999; } +.page-type { + font-size: 10px; + font-style: italic; +} +.directory-detailscolumn-wrapper { + float: left; + width: 305px; + margin-right: 10px; +} +.directory-profile-wrapper dl { + margin-top: 3px; + margin-bottom: 3px; +} +.directory-profile-title { + font-weight: bold; + margin-bottom: 3px; + font-size: 14px; +} #side-bar-photos-albums{ margin-top: 15px; - } +} .photo-top-photo, .photo-album-photo { -webkit-border-radius: 5px 5px 0 0; -moz-border-radius: 5px 5px 0 0; -- cgit v1.2.3 From 424797138fc9f0d8ce62960c7f99878fe620440c Mon Sep 17 00:00:00 2001 From: "Zvi ben Yaakov (a.k.a rdc)" Date: Tue, 3 Jul 2012 21:49:02 +0300 Subject: Limiting .directory-photo-wrapper styles to
    so as not to interfere with .directory-photo-wrapper in