From 705b4a00ce7d127d80da87f96aca3210476978c0 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Fri, 2 Mar 2012 19:05:41 -0500 Subject: [PATCH 1/4] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: fix @mention autocomplete in comments template proc: fix variables regexp * master: From 7ef861907e32cd3d01877c0fdf8e2544f4f659b1 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Fri, 2 Mar 2012 19:09:17 -0500 Subject: [PATCH 2/4] minor formatting issues Signed-off-by: Simon L'nu --- view/jot.tpl | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/view/jot.tpl b/view/jot.tpl index 2c1ce5ae1..2f89d4372 100755 --- a/view/jot.tpl +++ b/view/jot.tpl @@ -1,9 +1,9 @@
-
 
- +
 
+
- + @@ -11,9 +11,9 @@ - - - + + +
- + -
{{ if $content }}{{ endif }} - - - - From 64400e8d59cab64cfa57b969df88a4cafe76f168 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sat, 3 Mar 2012 19:19:35 -0500 Subject: [PATCH 3/4] first commit for dispy New Edition Signed-off-by: Simon L'nu --- view/theme/dispy/comment_item.tpl | 35 + view/theme/dispy/contact_template.tpl | 6 +- view/theme/dispy/conversation.tpl | 21 + view/theme/dispy/group_side.tpl | 12 +- view/theme/dispy/head.tpl | 99 + view/theme/dispy/icons.png | Bin 20057 -> 28076 bytes view/theme/dispy/icons.svg | 1940 +++++++++++------ view/theme/dispy/jot-header.tpl | 338 ++- view/theme/dispy/jot.tpl | 106 +- view/theme/dispy/mail_head.tpl | 8 +- view/theme/dispy/nav.tpl | 145 +- view/theme/dispy/profile_vcard.tpl | 59 +- view/theme/dispy/style.css | 2815 ++++++++++++++++++------- view/theme/dispy/theme.php | 74 + view/theme/dispy/wall_item.tpl | 6 +- view/theme/dispy/wallwall_item.tpl | 6 +- 16 files changed, 3921 insertions(+), 1749 deletions(-) create mode 100644 view/theme/dispy/comment_item.tpl mode change 100755 => 100644 view/theme/dispy/contact_template.tpl create mode 100644 view/theme/dispy/conversation.tpl mode change 100755 => 100644 view/theme/dispy/group_side.tpl create mode 100644 view/theme/dispy/head.tpl mode change 100755 => 100644 view/theme/dispy/icons.png mode change 100755 => 100644 view/theme/dispy/icons.svg mode change 100755 => 100644 view/theme/dispy/jot-header.tpl mode change 100755 => 100644 view/theme/dispy/jot.tpl mode change 100755 => 100644 view/theme/dispy/mail_head.tpl mode change 100755 => 100644 view/theme/dispy/nav.tpl mode change 100755 => 100644 view/theme/dispy/profile_vcard.tpl mode change 100755 => 100644 view/theme/dispy/style.css create mode 100644 view/theme/dispy/theme.php mode change 100755 => 100644 view/theme/dispy/wall_item.tpl mode change 100755 => 100644 view/theme/dispy/wallwall_item.tpl diff --git a/view/theme/dispy/comment_item.tpl b/view/theme/dispy/comment_item.tpl new file mode 100644 index 000000000..85176732b --- /dev/null +++ b/view/theme/dispy/comment_item.tpl @@ -0,0 +1,35 @@ +
+
+ + + + + + + +
+ $mytitle +
+
+ + + {{ if $qcomment }} +
    + {{ for $qcomment as $qc }} +
  • $qc
    • + {{ endfor }} +
+ {{ endif }} + +
+ + +
+
+ +
diff --git a/view/theme/dispy/contact_template.tpl b/view/theme/dispy/contact_template.tpl old mode 100755 new mode 100644 index 48930b48a..2aa9b88fe --- a/view/theme/dispy/contact_template.tpl +++ b/view/theme/dispy/contact_template.tpl @@ -1,9 +1,9 @@
-
+
+ onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)"> $contact.name @@ -20,6 +20,8 @@
$contact.name
+
$contact.itemurl
+
$contact.network
diff --git a/view/theme/dispy/conversation.tpl b/view/theme/dispy/conversation.tpl new file mode 100644 index 000000000..0b14f1c80 --- /dev/null +++ b/view/theme/dispy/conversation.tpl @@ -0,0 +1,21 @@ +{{ for $threads as $thread }} +
+ {{ for $thread.items as $item }} + {{if $item.comment_firstcollapsed}} +
+ $thread.num_comments $thread.hide_text +
+ {{endif}} + + {{ inc $item.template }}{{ endinc }} + + + {{ endfor }} +
+{{ endfor }} + +{{ if $dropping }} +$dropping +{{ endif }} diff --git a/view/theme/dispy/group_side.tpl b/view/theme/dispy/group_side.tpl old mode 100755 new mode 100644 index a1fc70a22..516d70d5b --- a/view/theme/dispy/group_side.tpl +++ b/view/theme/dispy/group_side.tpl @@ -5,23 +5,25 @@
diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl new file mode 100644 index 000000000..793af6fd2 --- /dev/null +++ b/view/theme/dispy/head.tpl @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/view/theme/dispy/icons.png b/view/theme/dispy/icons.png old mode 100755 new mode 100644 index bd52b62c810e6b9157c74cb35c3bfd578a99c6af..d9d58aa475ec08bfe8c44076240404a0ec5aa86f GIT binary patch literal 28076 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 diff --git a/view/theme/dispy/icons.svg b/view/theme/dispy/icons.svg old mode 100755 new mode 100644 index b435ba665..40899c0a5 --- a/view/theme/dispy/icons.svg +++ b/view/theme/dispy/icons.svg @@ -7,15 +7,16 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="250" height="200" id="svg3403" version="1.1" - inkscape:version="0.48.1 r9760" + inkscape:version="0.48+devel r" sodipodi:docname="icons.svg" - inkscape:export-filename="/home/fabio/public_html/friendika/view/theme/dispy/icons.png" + inkscape:export-filename="/var/www3/kisikew.org/portal/pub/fd/view/theme/dispy/icons.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> image/svg+xml - + @@ -118,11 +119,12 @@ y="852.36218" inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons.png" inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> + inkscape:export-ydpi="90" + transform="matrix(1,0,0,1.5151515,0,-439.09566)" /> + style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;fill-opacity:1;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> @@ -202,15 +204,15 @@ inkscape:connector-curvature="0" id="path4005" d="M 504.69787,53.131473 480.30214,28.735746" - style="fill:#555753;fill-opacity:1;stroke:#888a85;stroke-width:2.31938004" /> + style="fill:#333333;fill-opacity:1;stroke:#e6e6e6;stroke-width:2.31938004" /> + style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:#1a1a1a;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.31938004" /> + style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:#1a1a1a;fill-opacity:1;stroke:#d3d7cf;stroke-width:1.66475451;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> - - - - + + @@ -425,16 +422,16 @@ sodipodi:cy="21.754047" sodipodi:cx="559.67499" id="path4008-8" - style="fill:#555753;fill-opacity:1;stroke:none" + style="fill:#1a1a1a;fill-opacity:1;stroke:none" sodipodi:type="arc" /> - - YouTube - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + style="fill:none;stroke:#1a1a1a;stroke-width:0.35579938;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#1a1a1a;stroke-width:0.62789989;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + + + + + - - - Lorem Ip + style="font-weight:bold;fill:#1a1a1a;-inkscape-font-specification:Liberation Sans Bold">Lorem Ip + id="g4173"> + transform="matrix(0.92307692,0.3846154,-0.3846154,0.92307692,5.144234,833.96249)" /> - - + + @@ -930,12 +902,12 @@ inkscape:connector-curvature="0" d="m 132.109,867.43017 c 0.0548,-0.091 0.10266,-0.1866 0.16432,-0.2731 0.23235,-0.3261 0.52565,-0.6137 0.79275,-0.9102 0.42229,-0.4689 0.38553,-0.4337 0.82852,-0.9537 1.44214,-1.6363 3.06836,-3.0981 4.69856,-4.5425 1.63203,-1.40992 3.17698,-2.91672 4.78859,-4.34862 0.46305,-0.4369 0.97793,-0.8014 1.52221,-1.1266 0.15824,-0.2112 3.14491,2.0267 2.98666,2.2379 l 0,0 c -0.2952,0.5224 -0.62275,1.0204 -1.01852,1.4748 -0.88192,1.11922 -1.78212,2.22372 -2.79371,3.23052 -0.29346,0.2921 -0.60222,0.5684 -0.90606,0.8497 -0.31321,0.2899 -0.63003,0.5759 -0.94504,0.8639 -1.67153,1.4209 -3.37366,2.8163 -5.22715,3.9963 -0.49876,0.3405 -0.57121,0.3777 -1.0203,0.7266 -0.39341,0.3057 -0.75974,0.6889 -1.26518,0.7962 -0.14292,0.1842 -2.74857,-1.8369 -2.60565,-2.0212 z" id="path4265" - style="fill:#d3d7cf;fill-opacity:1;stroke:none;display:inline" + style="fill:#666666;fill-opacity:1;stroke:none;display:inline" inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> + style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> @@ -962,7 +934,7 @@ inkscape:connector-curvature="0" id="path4279" d="m -43.348187,1128.4959 c 1.108441,-0.8952 1.929509,-0.3581 2.381097,0.045 -0.328428,1.1191 -1.190549,3.9391 -1.190549,3.9391 z" - style="fill:#555753;stroke:#555753;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:#1a1a1a;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a" /> + + + + + + + + + + + + + - - - - - - - @@ -1104,15 +1085,15 @@ inkscape:connector-curvature="0" id="path4323" d="m -42.239747,1107.2336 0,17.6813" - style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> @@ -1133,14 +1114,14 @@ inkscape:connector-curvature="0" id="path4331" d="m -44.467884,1107.2152 0,17.7252 1.161165,3.7983 c 1.200046,4.2782 1.065706,4.1105 2.322331,0 l 1.161165,-3.7983 0,-17.7252 z" - style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> @@ -1149,7 +1130,7 @@ inkscape:connector-curvature="0" id="path4337" d="m -43.348187,1128.4959 c 1.108441,-0.8952 1.929509,-0.3581 2.381097,0.045 -0.328428,1.1191 -1.190549,3.9391 -1.190549,3.9391 z" - style="fill:#555753;stroke:#555753;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:#1a1a1a;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a" /> - - - + + + + + + + + + + + + + + + + + + - - - - - - - + id="g226"> + style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)" /> + ? + id="g204"> - - ? - ? + y="979.64215" + id="text3155" + sodipodi:linespacing="100%">? + + + + + + + + + + + + + + + + + + alternate housing ;) + wikuom/wigwam + + + + + + alternate housing ;) + wikuom/wigwam + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ! + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl old mode 100755 new mode 100644 index 8dccf71ed..0a559aae7 --- a/view/theme/dispy/jot-header.tpl +++ b/view/theme/dispy/jot-header.tpl @@ -1,157 +1,137 @@ - - - + +{{ endif }} + +{{ if $content }}{{ endif }} diff --git a/view/theme/dispy/mail_head.tpl b/view/theme/dispy/mail_head.tpl old mode 100755 new mode 100644 index 89615cbd0..d49d7c1af --- a/view/theme/dispy/mail_head.tpl +++ b/view/theme/dispy/mail_head.tpl @@ -1,7 +1,5 @@

$messages

- +
+$tab_content +
diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl old mode 100755 new mode 100644 index 79852217f..67a263519 --- a/view/theme/dispy/nav.tpl +++ b/view/theme/dispy/nav.tpl @@ -1,57 +1,116 @@ + diff --git a/view/theme/dispy/profile_vcard.tpl b/view/theme/dispy/profile_vcard.tpl old mode 100755 new mode 100644 index b3f5cc50d..0c289d982 --- a/view/theme/dispy/profile_vcard.tpl +++ b/view/theme/dispy/profile_vcard.tpl @@ -2,34 +2,53 @@
$profile.name
- - - {{ if $pdesc }}
$profile.pdesc
{{ endif }} -
$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 - +
+ $location +
+ {{ if $profile.address }} +
$profile.address
{{ endif }} + $profile.zip + $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 $gender }} +
+ $gender + $profile.gender +
+ {{ endif }} - {{ if $profile.pubkey }}{{ endif }} + {{ if $profile.pubkey }} + + {{ endif }} - {{ if $marital }}
♥$marital
$profile.marital
{{ endif }} + {{ if $marital }} +
+ + ♥$marital + $profile.marital +
+ {{ endif }} - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} + {{ if $homepage }} +
+ $homepage + $profile.homepage +
{{ endif }} {{ inc diaspora_vcard.tpl }}{{ endinc }} diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css old mode 100755 new mode 100644 index 7f563293a..f0929094c --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -1,74 +1,233 @@ +/* + * dispy + * + * modernised, sort of, by simon + * + */ + +/* from html5boilerplate */ + +/* these are to tell browsers they should be displayed a certain way */ +article, aside, details, figcaption, figure, footer, +header, hgroup, nav, section { + display: block; +} +audio, canvas, video, time { + display: inline-block; + *display: inline; + *zoom: 1; +} +audio:not([controls]) { + display: none; +} +[hidden] { + display: none; +} + +/* ============================================================================= + Base + ========================================================================== */ + +/* + * 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units + * 2. Force vertical scrollbar in non-IE + * 3. Prevent iOS text size adjust on device orientation change, without disabling user zoom: h5bp.com/g + */ + +html { + font-size: 100%; + overflow-y: scroll; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; +} body { - margin: 0px; - padding: 0px; - font-family: freesans,helvetica,arial,clean,sans-serif; - font-size: 16px; + margin: 0; + font-size: 16px; + line-height: 1.1em; } -img { border: 0 none; } -a { color: #3465a4; text-decoration: none; margin-bottom:1px;} -a:hover { color: #729fcf; padding-bottom: 0px; border-bottom: 1px dotted #729fcf;} +body, button, input, select, textarea { + font-family: sans-serif; + color: #222; + background-color: rgb(254,254,254); + background-color: rgba(254,254,254,255); +} +/* remember to define focus styles! */ +:focus { + outline: 0; +} +/* remember to highlight inserts somehow! */ +ins { + background-color: #ff9; + color: #000; + text-decoration: none; +} +mark { + background-color: #ff9; + color: #000; + font-style: italic; + font-weight: bold; +} +ins { + background: #ff9; + color: #000; + text-decoration: none; +} +mark { + background: #ff0; + color: #000; + font-style: italic; + font-weight: bold; +} +/* Redeclare monospace font family: h5bp.com/j */ +pre, code, kbd, samp { + font-family: monospace, monospace; + _font-family: 'courier new', monospace; + font-size: 1em; } -.required { display: inline; color: #ff0000;} -.fakelink { color: #3465a4; cursor: pointer; } -.fakelink :hover{ color: #729fcf; } +/* Improve readability of pre-formatted text in all browsers */ +pre { + white-space: pre; + white-space: pre-wrap; + word-wrap: break-word; +} +q { + quotes: none; +} +q:before, q:after { + content: ""; + content: none; +} +small { + font-size: 85%; +} +/* Position subscript and superscript content without affecting line-height: h5bp.com/k */ +sub, sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} +sup { + top: -0.5em; +} +sub { + bottom: -0.25em; +} +img { + border: 0 none; + /*vertical-align: middle;*/ +} +a { + color: #3465a4; + text-decoration: none; + margin-bottom: 1px; +} +a:hover img { + text-decoration: none; +} +blockquote { + background: #eee; + text-indent: 5px; + padding: 5px; + border: 1px #aaa solid; + border-radius: 5px; +} +a:hover { + color: #729fcf; + padding-bottom: 0; + border-bottom: 1px dotted #729fcf; +} +.required { + display: inline; + color: #ff0000; +} +.fakelink, .lockview { + color: #3465a4; + cursor: pointer; +} +.fakelink:hover { + color: #729fcf; +} input[type=submit] { - margin-top: 20px; - height: 22px; - background-color: #555753; - color: #eeeeec; - -webkit-border-radius: 5px ; - -moz-border-radius: 5px; - border-radius: 5px; - border: 0px; + margin-top: 20px; + height: 22px; + background-color: #555753; + color: #eeeeec; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + border: 0; +} +.smalltext { + font-size: 0.7em; } - -.smalltext { font-size: 0.7em } - #panel { position: absolute; - font-size:0.8em; - -webkit-border-radius: 5px ; + font-size: 0.8em; + -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; - border: 1px solid #ffffff; + border: 1px solid #fff; background-color: #2e3436; color: #eeeeec; - padding:1em; + padding: 1em; } - .pager { padding-top: 30px; - display:block; + display: block; clear: both; text-align: center; } +.pager span { + padding: 4px; + margin:4px; +} +.pager_current { + background-color: #729fcf; + color: #fff; +} -.pager span { padding: 4px; margin:4px; } -.pager_current { background-color: #729fcf; color: #ffffff; } +/** + * global + */ +/* .tool .action */ +.action { + float: right; +} /** * login */ -#login-extra-links a { margin-right: 20px; } +#login-extra-links a { + margin-right: 20px; +} /********* * nav *********/ - nav { - height: 50px; + height: 60px; display: block; background-color: #2e3436; color: #eeeeec; position: relative; - padding: 0px 10%; + padding: 20px 20px 10px 95px; + margin-left: auto; + margin-right: auto; +} +nav a { + text-decoration: none; + color: #eeeeec; + border: 0px; +} +nav a:hover { + text-decoration: none; + color: #eeeeec; + border: 0px; } -nav a { text-decoration: none; color: #eeeeec; border:0px;} -nav a:hover { text-decoration: none; color: #eeeeec; border:0px;} - nav #banner { display: block; position: absolute; @@ -79,23 +238,18 @@ nav #banner #logo-text a { font-weight: bold; margin-left: 3px; } - nav #user-menu { display: block; - width: auto; + width: auto; float: right; - margin-top: 22px; - margin-right: 10px; + margin: 3px 68px 0 0; position: relative; - vertical-align: middle; - background-color: #555753; - -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; - background: #555753 url("menu-user-pin.jpg") 98% center no-repeat; + clear: both; } nav #user-menu-label { float: left; @@ -103,63 +257,219 @@ nav #user-menu-label { padding: 3px 20px 9px 5px; height: 10px; } - ul#user-menu-popup { - display: none; - position: absolute; - background-color: #555753; - width: 100%; + display: none; + position: absolute; + background-color: #555753; + width: 100%; padding: 10px 0px; margin: 0px; - top: 20px; - left: 0px; - - -webkit-border-radius: 0px 0px 5px 5px; - -moz-border-radius: 0px 0px 5px 5px; - border-radius: 0px 0px 5px 5px; - - z-index: 10000; + top: 20px; + left: 0; + -webkit-border-radius: 0 0 5px 5px; + -moz-border-radius: 0 0 5px 5px; + border-radius: 0 0 5px 5px; + z-index: 10000; +} +ul#user-menu-popup li { + display: block; +} +ul#user-menu-popup li a { + display: block; + padding: 5px; +} +ul#user-menu-popup li a:hover { + color: #2e3436; + background-color: #eeeeec; +} +ul#user-menu-popup li a.nav-sep { + border-top: 1px solid #eeeeec; +} +#nav-buttons { + clear: both; } - -ul#user-menu-popup li { display: block; } -ul#user-menu-popup li a { display: block; padding: 5px; } -ul#user-menu-popup li a:hover { color: #2e3436; background-color: #eeeeec; } -ul#user-menu-popup li a.nav-sep { border-top: 1px solid #eeeeec; } nav .nav-link { - float: right; - display: block; - width: 22px; - height: 22px; - /*border: 1px solid #eeeeec;*/ - overflow: hidden; - margin-top: 22px; - margin-right: 10px; - text-indent: 50px; - background: transparent url('icons.png') 0px 0px no-repeat; + float: right; + display: block; + width: 22px; + height: 22px; + overflow: hidden; + margin: 0px 5px 5px; + text-indent: 50px; + background: transparent url(icons.png) 0 0 no-repeat; +} +#nav-apps-link { + background-position: 0 -66px; +} +#nav-apps-link:hover { + background-position: -22px -66px; +} +#nav-community-link { + background-position: 0 -22px; +} +#nav-community-link:hover { + background-position: -22px -22px; +} +#nav-contacts-link { + background-position: 0 -22px; +} +#nav-contacts-link:hover { + background-position: -22px -22px; +} +#nav-directory-link { + background-position: -44px -154px; +} +#nav-directory-link:hover { + background-position: -66px -154px; +} +#nav-help-link { + background-position: 0 -110px; +} +#nav-help-link:hover { + background-position: -22px -110px; +} +#nav-home-link { + background-position: -44px -132px; +} +#nav-home-link:hover { + background-position: -66px -132px; +} +#nav-login-link { + background-position: 0 -88px; +} +#nav-login-link:hover { + background-position: -22px -88px; +} +#nav-logout-link { + background-position: 0 -88px; +} +#nav-logout-link:hover { + background-position: -22px -88px; +} +#nav-messages-link { + background-position: -44px -88px; +} +#nav-messages-link:hover { + background-position: -66px -88px; +} +#nav-notify-link, #nav-notifications-linkmenu { + background-position: -44px -110px; +} +#nav-notify-link:hover { + background-position: -66px -110px; +} +#nav-network-link { + background-position: 0px -177px; +} +#nav-network-link:hover { + background-position: -22px -177px; +} +#nav-search-link { + background-position: 0 -44px; +} +#nav-search-link:hover { + background-position: -22px -44px; +} +#profile-link, +#profile-title, +#wall-image-upload, +#wall-file-upload, +#profile-attach-wrapper, +#profile-audio, +#profile-link, +#profile-location, +#profile-nolocation, +#profile-title, +#jot-title, +#profile-upload-wrapper, +#profile-video, +#profile-jot-submit, +#wall-image-upload-div, +#wall-file-upload-div, +.icon, .hover, .focus, .pointer { + cursor: pointer; } - -#nav-directory-link { background-position: 0px -22px } -#nav-directory-link:hover { background-position: -22px -22px;} -#nav-search-link { background-position: 0px -44px } -#nav-search-link:hover { background-position: -22px -44px;} -#nav-apps-link { background-position: 0px -66px } -#nav-apps-link:hover { background-position: -22px -66px;} -#nav-login-link { background-position: 0px -88px } -#nav-login-link:hover { background-position: -22px -88px;} -#nav-help-link { background-position: 0px -110px } -#nav-help-link:hover { background-position: -22px -110px;} - - #notifications { - height: 20px; width: 100%; + height: 20px; + width: 100%; position: absolute; - top:-19px; left: 0px; + top: -19px; + left: 0; } -.nav-ajax-update { +/* popup notifications */ +div.jGrowl div.notice { + background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +div.jGrowl div.info { + background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +#nav-notifications-menu { + margin-top: 30px; + width: 255px; + max-height: 400px; + overflow: auto; + font-size: 9pt; +} +#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 0px 7px 10px; + word-wrap: normal; + border-bottom: 1px solid #000; +} +#nav-notifications-menu li:hover { + color: black; +} +#nav-notifications-menu a:hover { + color: black; + text-decoration: underline; +} +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"); +} +.show { + display: block; +} +#nav-floater { + position: fixed; + top: 20px; + right: 1%; + padding: 5px; + background: #2e3436; + border-radius: 5px; + z-index: 100; +} +.floaterflip { + display: block; + position: fixed; + z-index: 110; + top: 53px; + right: 19px; + width: 22px; + height: 22px; + overflow: hidden; + margin: 0px; + background: transparent url(icons.png) -190px -60px no-repeat; +} +.nav-ajax-update, .nav-ajax-left { width: 30px; height: 19px; - background: transparent url('notifications.png') 0px 0px no-repeat; - color: #ffffff; + background: transparent url(notifications.png) 0 0 no-repeat; + color: #fff; font-weight: bold; font-size: 0.8em; padding-top: 0.2em; @@ -168,312 +478,666 @@ nav .nav-link { margin-right: -4px; display: none; } -#net-update { background-position: 0px 0px; } -#mail-update { background-position: -30px 0px; } -#notify-update { background-position: -60px 0px; } -#home-update { background-position: -90px 0px; } - +.nav-ajax-update.show, .nav-ajax-left.show { + display: block; +} +#net-update { + background-position: 0px 0px; +} +#mail-update { + background-position: -30px 0; +} +#notify-update { + background-position: -60px 0px; +} +#home-update { + background-position: -90px 0px; +} #lang-select-icon { cursor: pointer; position: absolute; - left: 0px; - top: 0px; -} - -#language-selector { - position: absolute; + left: 0; top: 0; - left: 16px; } - +#language-selector { + position: absolute; + top: 0; + left: 16px; + padding-right: 50px; +} +.menu-popup { + position: absolute; + display: none; + width: 11em; + background: #ffffff; + color: #2d2d2d; + margin: 0px; + padding: 0px; + list-style: none; + border: 3px solid #364e59; + z-index: 100000; + -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); +} +.menu-popup a { + display: block; + color: #2d2d2d; + padding: 5px 10px; + text-decoration: none; +} +.menu-popup a:hover { + background-color: #bdcdd4; +} +.menu-popup .menu-sep { + border-top: 1px solid #9eabb0; +} +.menu-popup li { + float: none; + overflow: auto; + height: auto; + display: block; +} +.menu-popup li img { + float: left; + width: 16px; + height: 16px; + padding-right: 5px; +} +.menu-popup .empty { + padding: 5px; + text-align: center; + color: #9eabb0; +} +.notif-item { + font-size: small; +} +.notif-item a { + vertical-align: middle; +} +.notif-image { + width: 32px; + height: 32px; + padding: 7px 7px 0px 0px; +} +.notify-seen { + background: #ddd; +} /** sysmsg **/ -#sysmsg_info{ - position:fixed; - bottom: 0px; right:20%; - -moz-box-shadow: 0px 0px 5px #888; - -webkit-box-shadow: 0px 0px 5px #888; - box-shadow: 0px 0px 5px #888; - padding: 10px; - background-color: #fcaf3e; border:2px solid #f8911b; - border-bottom:0px; - padding-bottom: 50px; - z-index: 1000; +#sysmsg_info { + position:fixed; + bottom:0; + -moz-box-shadow:0 0 5px #888; + -webkit-box-shadow:0 0 5px #888; + box-shadow:0 0 5px #888; + padding: 10px; + background-color:#fcaf3e; + border:2px solid #f8911b; + border-bottom:0; + padding-bottom: 50px; + z-index:1000; } -#sysmsg { - position:fixed; - bottom: 0px; right:10%; - -moz-box-shadow: 0px 0px 5px #888; - -webkit-box-shadow: 0px 0px 5px #888; - box-shadow: 0px 0px 5px #888; - padding: 10px; - background-color: #fcaf3e; border:2px solid #f8911b; - border-bottom:0px; - padding-bottom: 50px; - z-index: 1000; +#sysmsg { + position:fixed; + bottom:0; + -moz-box-shadow:0 0 5px #888; + -webkit-box-shadow:0 0 5px #888; + box-shadow:0 0 5px #888; + padding: 10px; + background-color:#fcaf3e; + border:2px solid #f8911b; + border-bottom:0; + padding-bottom: 50px; + z-index:1000; } #sysmsg_info br, #sysmsg br { display:block; margin:2px 0px; - border-top: 1px solid #ccccce; + border-top:1px solid #ccccce; } - /** * aside **/ - aside { position: absolute; - right: 11%; - width: 200px; - font-size: 0.7em; - + right: 8%; + width: 20.5%; + font-size: smaller; +} +.vcard .fn { + font-size: 1.7em; + font-weight: 700; + border-bottom: 1px solid #729fcf; + padding-top: 1px; +} +.vcard #profile-photo-wrapper { + margin: 10px 0px; +} +aside h4 { + font-size: 1.2em; } -.vcard .fn { font-size: 1.7em; font-weight: bold; border-bottom: 1px solid #729fcf; padding-top: 1px;} - -.vcard #profile-photo-wrapper { margin: 10px 0px } - -aside h4 { font-size: 1.2em; } - -aside #viewcontacts { text-align: right;} - -#profile-extra-links ul { margin-left: 0px; padding-left: 0px; list-style: none; } +aside #viewcontacts { + text-align: right; +} +#profile-extra-links ul { + margin-left: 0px; + padding-left: 0px; + list-style: none; +} #dfrn-request-link { - background: #3465A4 url('connect.png') no-repeat 95% center; - border-radius: 5px 5px 5px 5px; - color: #FFFFFF; - display: block; - font-size: 1.2em; - padding: 0.2em 0.5em; + background:#3465A4 url(connect.png) no-repeat 95% center; + border-radius:5px 5px 5px 5px; + color:#fff; + display:block; + font-size:1.2em; + padding:.2em .5em; } - - #netsearch-box { margin: 30px 0px; } + /** * contacts block */ -.contact-block-div { width: 50px; height: 50px; float: left; } -.contact-block-textdiv { width: 150px; height: 34px; float: left; } -#contact-block-end { clear: both; } +.contact-block-div { + width: 50px; + height: 50px; + float: left; +} +.contact-block-textdiv { + width: 150px; + height: 34px; + float: left; +} +#contact-block-end { + clear: both; +} + /** * jot - **/ -#profile-jot-text_tbl { margin-bottom: 10px; } -#profile-jot-text_ifr { width: 99.9%!important } -#profile-jot-submit-wrapper { float: right;} -#profile-jot-perms { - float: right; - background-color: #555753; - height: 22px; width: 20px; - -webkit-border-radius: 0px 5px 5px 0px; - -moz-border-radius: 0px 5px 5px 0px; - border-radius: 0px 5px 5px 0px; - overflow: hidden; - border: 0px; - margin-left:2px; + **/ +#jot { + /*width: 785px;*/ + margin: 0px 0 20px 0px; + width: 100%; } -#profile-jot-submit { +#jot #jot-tools { + margin: 0px; + padding: 0px; + height: 40px; + overflow: none; + width: 100%; + /*background-color: #0e232e;*/ + /*border-bottom: 2px solid #9eabb0;*/ +} +#jot #jot-tools span { + float: left; + margin: 10px 20px 2px 0px; +} +#jot #jot-tools span a { + display: block; + /*color: #cccccc; */ + /*width: 100%; */ + /*height: 40px; */ + /*text-align: center;*/ + /*line-height: 40px; */ + /*overflow: hidden;*/ +} +/*#jot #jot-tools li:hover {*/ + /*background-color: #364e59;*/ +/*}*/ +#jot #jot-tools .perms { + float: right; + width: 40px; +} +/*#jot #jot-tools .perms a.unlock {*/ +/* width: 30px; */ +/* border-left: 10px solid #cccccc;*/ +/* background-color: #cccccc; */ +/*}*/ +/*#jot #jot-tools .perms a.lock {*/ +/* width: 30px; */ +/* border-left: 10px solid #666666;*/ +/* background-color: #666666; */ +/*}*/ +/*#jot #jot-tools li.submit { */ +/* float: right; */ +/* background-color: #cccccc; */ +/* border-bottom: 2px solid #cccccc; */ +/* border-right: 1px solid #666666; */ +/* border-left: 1px solid #666666; */ +/*} */ +/*#jot #jot-tools li.submit input { */ +/* border: 0px; */ +/* margin: 0px; */ +/* padding: 0px; */ +/* background-color: #cccccc; */ +/* color: #666666; */ +/* width: 80px; */ +/* height: 40px; */ +/* line-height: 40px; */ +/*} */ +/*#jot #jot-tools li.submit input:hover {*/ +/* background-color: #bdcdd4; */ +/* color: #666666; */ +/*} */ +#jot #jot-tools li.loading { + float: right; + background-color: #ffffff; + width: 20px; + vertical-align: center; + text-align: center; + border-top: 2px solid #9eabb0; + height: 38px; +} +#jot #jot-tools li.loading img { + margin-top: 10px; +} +#jot #jot-title { + border: 0px; + margin: 0px; + height: 20px; + width: 100%; + font-weight: bold; + border: 1px solid #ffffff; + border-radius: 5px; +} +#jot #jot-title:-webkit-input-placeholder { + font-weight: normal; +} +#jot #jot-title:-moz-placeholder { + font-weight: normal; +} +#jot #jot-title:placeholder { + font-weight: normal; +} +#jot #jot-title:hover, +#jot #jot-title:focus { + border: 1px solid #999999; + border-radius: 5px; +} +#jot #character-counter { + width: 80px; + float: right; + text-align: right; + height: 20px; + line-height: 20px; + padding-right: 20px; +} +#profile-jot-text_tbl { + margin-bottom: 10px; +} +#profile-jot-text_ifr { + width:99.900002% !important; +} +#profile-attach-wrapper, +#profile-audio, +#profile-link-wrapper, +#profile-location, +#profile-nolocation, +#profile-title-wrapper, +#profile-upload-wrapper, +#profile-video { + float: left; + margin-left: 10px; +} +#character-counter { + float:right; + padding:8px 10px; +} +#profile-rotator-wrapper { + float: right; +} +#profile-jot-tools-end, +#profile-jot-banner-end { + clear: both; +} +#profile-jot-email-wrapper { + margin:10px 10% 0; + border:1px solid #555753; + border-bottom:0; +} +#profile-jot-email-label { + background-color:#555753; + color:#ccccce; + padding:5px; +} +#profile-jot-email { + width:90%; + margin:5px; +} +#profile-jot-networks { + margin: 0 10%; + border: 1px solid #555753; + border-top: 0; + border-bottom: 0; + padding: 5px; +} +#jot-preview-link { + margin: 0 0 0 25px; + border: 0; + text-decoration: none; +} +.icon-text-preview { + margin: 0 0 -18px 0; + display: block; + width: 20px; + height: 20px; + background: url(icons.png) no-repeat -128px -40px; + border: 0; + text-decoration: none; +} +#profile-jot-perms { + /*float: right;*/ + background-color: #555753; + height: 22px; + width: 20px; + -webkit-border-radius: 5px 0px 0px 5px; + -moz-border-radius: 5px 0px 0px 5px; + border-radius: 5px 0px 0px 5px; + overflow: hidden; + border: 0px; + margin: 0 -4px 0 10px; +} +#profile-jot-submit-wrapper { float: right; + width: 30%; + list-style: none; + margin: 10px 0 0 0; + padding: 0; +} +#profile-jot-submit-wrapper li { + display: inline-block; + vertical-align: middle; +} +#profile-jot-submit { height: 22px; background-color: #555753; color: #eeeeec; - -webkit-border-radius: 5px 0px 0px 5px; - -moz-border-radius: 5px 0px 0px 5px; - border-radius: 5px 0px 0px 5px; - border: 0px; - margin-top: 0px; + -webkit-border-radius: 0 5px 5px 0; + -moz-border-radius: 0 5px 5px 0; + border-radius: 0 5px 5px 0; + border: 0; + margin: 0; } -#character-counter { - float: right; padding: 8px 10px; -} -#profile-rotator-wrapper { - float: right; -} - -.jot-tool { - float: left; - margin-right: 5px; -} -#profile-jot-tools-end, -#profile-jot-banner-end { clear: both; } - -#profile-jot-email-wrapper { - margin: 10px 10% 0px 10%; - border: 1px solid #555753; - border-bottom: 0px; -} -#profile-jot-email-label { background-color: #555753; color: #ccccce; padding: 5px;} -#profile-jot-email { margin: 5px; width: 90%; } - -#profile-jot-networks { - margin: 0px 10%; - border: 1px solid #555753; - border-top: 0px; - border-bottom: 0px; - padding: 5px; +#jot-perms-icons { + background-color: #555753; + height: 22px; + width: 20px; + -webkit-border-radius: 0 5px 5px 0; + -moz-border-radius: 0 5px 5px 0; + border-radius: 0 5px 5px 0; + overflow: hidden; + border: 0; + margin: 0 0 0 94.4%; } #profile-jot-acl-wrapper { - margin: 0px 10px; + margin: 0 10px; border: 1px solid #555753; - border-top: 0px; - display:block!important; + border-top: 0; + display: block !important; } #group_allow_wrapper, #group_deny_wrapper, -#acl-permit-outer-wrapper { width: 47%; float: left; } - +#acl-permit-outer-wrapper { + width:47%; + float:left; +} #contact_allow_wrapper, #contact_deny_wrapper, -#acl-deny-outer-wrapper { width: 47%; float: right; } - -#acl-permit-text {background-color: #555753; color: #ccccce; padding: 5px; float: left;} -#jot-public {background-color: #555753; color: #ff0000; padding: 5px; float: left;} -#acl-deny-text {background-color: #555753; color: #ccccce; padding: 5px; float: left;} - +#acl-deny-outer-wrapper { + width:47%; + float:right; +} +#acl-permit-text { + background-color: #555753; + color: #ccccce; + padding: 5px; + float: left; +} +#jot-public { + background-color: #555753; + color: #ff0000; + padding: 5px; + float: left; +} +#acl-deny-text { + background-color: #555753; + color: #ccccce; + padding: 5px; + float: left; +} #acl-permit-text-end, -#acl-deny-text-end { clear: both; } - - -#jot-title-desc { +#acl-deny-text-end { + clear: both; +} +#jot-title-desc, #profile-jot-desc { color: #cccccc; } - #jot-title-wrapper { margin-bottom: 5px; } - #jot-title { border: 1px solid #cccccc; - width: 530px; + width: 90%; } #jot-title-display { font-weight: bold; } +.jothidden { + display: none; +} +#jot-preview-content { + background-color: #ffffe0; + border: 1px #aaaa00 solid; + border-radius: 3px; + padding: 3px 3px 6px 10px; +} /** * section */ -section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;} +section { + margin: 20px 9% 0 9%; + font-size: 0.8em; + padding-right: 250px; +} /** tabs **/ -.tabs {list-style: none; padding: 0px; margin: 0px; border-bottom: 1px solid #729fcf; } -.tabs li { display: inline;} -.tab { padding: 0px 5px; margin-right: 10px; } -.tab:hover { background-color: #729fcf; color: #eeeeec; border: 0px; } -.tab.active { background-color: #729fcf; color: #eeeeec; border: 0px; } +.tabs { + list-style: none; + margin: 0; + padding: 0; + border-bottom: 1px solid #729fcf; + font-size: 14px; +} +.tabs li { + display: inline; +} +.tab { + padding: 0 5px; +} +.tab:hover { + background-color: #729fcf; + color: #eeeeec; + border: 0px; +} +.tab:active { + background-color: #729fcf; + color: #eeeeec; + border: 0px; +} /** * items */ .wall-item-outside-wrapper { - margin-top: 50px; + margin-top: 15px; +} +.wall-item-outside-wrapper-end { + clear: both; +} +.wall-item-content-wrapper { + position: relative; + border-top: 1px #aaa solid; + padding: 10px; +} +.wall-item-outside-wrapper .wall-item-comment-wrapper { + /*margin-left: 90px;*/ +} +.wall-item-content-wrapper.shiny { + background: #efefcf; + border-right: 3px solid #ffd398; +} +.wall-item-content { + overflow-x: auto; +} +[id^="tread-wrapper"], [class^="tread-wrapper"] { + margin: 5px 0; + border: 1px #aaa solid; + border-radius: 5px; + padding: 10px; +} +.wall-item-photo-menu { + display: none; } -.wall-item-outside-wrapper-end { clear: both;} -.wall-item-content-wrapper { position: relative; } -.wall-item-photo-menu { display: none;} .wall-item-photo-menu-button { - display:none; - text-indent: -99999px; - background: #555753 url("menu-user-pin.jpg") no-repeat 75px center; - position: absolute; - overflow: hidden; - height: 20px; width: 90px; - top: 85px; left: 0px; - -webkit-border-radius: 0px 0px 5px 5px; - -moz-border-radius: 0px 0px 5px 5px; - border-radius: 0px 0px 5px 5px; - - + display:none; + text-indent:-99999px; + background:#555753 url(menu-user-pin.jpg) no-repeat 75px center; + position:absolute; + overflow:hidden; + height:20px; + width:90px; + top:85px; + left:0; + -webkit-border-radius:0 0 5px 5px; + -moz-border-radius:0 0 5px 5px; + border-radius:0 0 5px 5px; } - -.wall-item-info { float: left; width: 140px; } -.wall-item-photo-wrapper { - width: 80px; height: 80px; - position: relative; - padding: 5px; - background-color: #555753; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; +.wall-item-info { + float: left; + width: 110px; } - - -.wall-item-tools { - float: right; - /*height: 0px; - padding-top: 20px; - overflow:hidden; - background: #ffffff url("icons.png") no-repeat -50px -40px;*/ - filter: alpha(opacity=20); - opacity: 0.2; - -webkit-transition: all 1s ease-in-out; - -moz-transition: all 1s ease-in-out; - -o-transition: all 1s ease-in-out; - -ms-transition: all 1s ease-in-out; - transition: all 1s ease-in-out; +.wall-item-photo-wrapper { + width: 80px; + height: 80px; + position: relative; + padding: 5px; + background-color: #555753; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} +[class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * { + margin: 0 0 10px 0; +} +.wall-item-tools { + float: right; + filter: alpha(opacity=35); + opacity: 0.4; + -webkit-transition: all 1s ease-in-out; + -moz-transition: all 1s ease-in-out; + -o-transition: all 1s ease-in-out; + -ms-transition: all 1s ease-in-out; + transition: all 1s ease-in-out; } .wall-item-tools:hover { - /*height:auto;*/ - filter: alpha(opacity=100); - opacity: 1; - -webkit-transition: all 1s ease-in-out; - -moz-transition: all 1s ease-in-out; - -o-transition: all 1s ease-in-out; - -ms-transition: all 1s ease-in-out; - transition: all 1s ease-in-out; - + filter: alpha(opacity=100); + opacity: 1; + -webkit-transition: all 1s ease-in-out; + -moz-transition: all 1s ease-in-out; + -o-transition: all 1s ease-in-out; + -ms-transition: all 1s ease-in-out; + transition: all 1s ease-in-out; +} +.wall-item-title { + font-size: 1.2em; + font-weight: bold; + margin-bottom: 1em; +} +.wall-item-body { + margin: 10px 10px 10px 0px; + text-align: left; +} +.wall-item-lock-wrapper { + float: right; } - -.wall-item-title { font-size: 1.2em; font-weight: bold;} -.wall-item-body { margin-left: 140px;} -.wall-item-lock-wrapper { float: right; } .wall-item-dislike, -.wall-item-like, -.wall-item-author { clear: left; font-size: 0.8em; margin: 10px 0px 0px 140px; color: #babdb6;} -.wall-item-ago { display: inline; padding-left: 10px;} -.wall-item-wrapper-end { clear:both; } +.wall-item-like { + clear: left; + font-size: 0.8em; + color: #878883; + margin: 20px 0 0 140px; +} +.wall-item-author, .wall-item-actions-author { + clear: left; + font-size: 0.8em; + color: #878883; + margin: 20px 0 0 140px; +} +.wall-item-ago { + display: inline; + padding-left: 10px; +} +.wall-item-wrapper-end { + clear:both; +} .wall-item-location { - margin-top:5px; - width: 100px; - overflow: hidden; - text-overflow: ellipsis; - -o-text-overflow: ellipsis; + margin-top: 5px; + width: 100px; + overflow:hidden; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; +} +.wall-item-location .icon { + float: left; +} +.wall-item-location > a { + margin-left: 25px; + font-size: 0.7em; + display: block; +} +.wall-item-location .smalltext { + margin-left: 25px; + font-size: 0.7em; + display: block; +} +.wall-item-location > br { + display: none; } -.wall-item-location .icon { float: left; } -.wall-item-location > a { margin-left: 25px; font-size: 0.7em; display: block;} -.wall-item-location .smalltext { margin-left: 25px; font-size: 0.7em; display: block;} -.wall-item-location > br { display: none; } - .wallwall .wwto { - left: -10px; + left:-10px; margin: 0; - position: absolute; - top: 65px; + position:absolute; + top:65px; width: 30px; - z-index: 10001; - width: 30px; - height: 30px; - + z-index:10001; + width:30px; + height:30px; +} +.wallwall .wwto img { + width: 30px !important; + height: 30px !important; +} +.wallwall .wall-item-photo-end { + clear: both; } -.wallwall .wwto img { width: 30px!important; height: 30px!important;} -.wallwall .wall-item-photo-end { clear: both; } .wall-item-arrowphoto-wrapper { position: absolute; left: 20px; top: 70px; z-index: 10002; } - .wall-item-photo-menu { min-width: 92px; border: 2px solid #FFFFFF; @@ -487,85 +1151,158 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;} -moz-border-radius: 0px 5px 5px 5px; border-radius: 0px 5px 5px 5px; } -.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none } -.wall-item-photo-menu li a { white-space: nowrap; display: block; padding: 5px 2px; color: #eeeeec; } -.wall-item-photo-menu li a:hover { color: #555753; background: #eeeeec; } +.wall-item-photo-menu ul { + margin:0px; + padding: 0px; + list-style: none; +} +.wall-item-photo-menu li a { + white-space: nowrap; + display: block; + padding: 5px 2px; + color: #eeeeec; +} +.wall-item-photo-menu li a:hover { + color: #555753; + background: #eeeeec; +} +#item-delete-selected { + overflow: auto; + width: 100%; +} + -.icon.drop, -.icon.drophide { float: left; } -#item-delete-selected { overflow: auto; width: 100%} /** * comment */ - - .ccollapse-wrapper { font-size: 0.9em; margin-left: 80px; } - -.wall-item-outside-wrapper.comment { margin-left: 80px; } -.wall-item-outside-wrapper.comment .wall-item-photo { width: 40px!important; height: 40px!important;} -.wall-item-outside-wrapper.comment .wall-item-photo-wrapper {width: 40px; height: 40px; } -.wall-item-outside-wrapper.comment .wall-item-photo-menu-button { - width: 50px; top: 45px; background-position: 35px center; +.ccollapse-wrapper { + font-size: 0.9em; + margin-left: 80px; +} + +.wall-item-outside-wrapper.comment { + margin-left: 80px; +} +.wall-item-outside-wrapper.comment .wall-item-photo { + width: 40px!important; + height: 40px!important; +} +.wall-item-outside-wrapper.comment .wall-item-photo-wrapper { + width: 40px; + height: 40px; +} +.wall-item-outside-wrapper.comment .wall-item-photo-menu-button { + width: 50px; + top: 45px; + background-position: 35px center; +} +.wall-item-outside-wrapper.comment .wall-item-info { + width: 60px; +} +.wall-item-outside-wrapper.comment .wall-item-body { + margin-left: 10px; +} +.wall-item-outside-wrapper.comment .wall-item-actions-author { + margin-left: 60px; } -.wall-item-outside-wrapper.comment .wall-item-info { width: 60px; } -.wall-item-outside-wrapper.comment .wall-item-body { margin-left: 60px;} -.wall-item-outside-wrapper.comment .wall-item-author { margin-left: 60px;} .wall-item-outside-wrapper.comment .wall-item-photo-menu { - min-width: 50px; - top: 60px; + min-width: 50px; + top: 60px; +} +.comment-wwedit-wrapper { + /*margin: 30px 0px 0px 80px;*/ +} +.comment-edit-wrapper { + border-top: 1px #aaa solid; } - - -.comment-wwedit-wrapper, -.comment-edit-wrapper { margin: 30px 0px 0px 80px;} .comment-wwedit-wrapper img, -.comment-edit-wrapper img { width: 20px; height: 20px; } -.comment-edit-photo-link { float: left; width: 40px;} -.comment-edit-text-empty { width: 80%; height: 20px; border: 0px; color: #babdb6; - -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; +.comment-edit-wrapper img { + width: 20px; + height: 20px; } -.comment-edit-text-empty:hover { color: #999999;} -.comment-edit-text-full { width: 80%; height: 6em; - -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; +.comment-edit-photo-link { + float: left; + width: 40px; } -.comment-edit-submit-wrapper { width: 80%; margin-left: 40px; text-align: right; } -.comment-edit-submit { - height: 22px; - background-color: #555753; - color: #eeeeec; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; +.my-comment-photo { + width: 40px; + height: 40px; + padding: 5px; +} +[class^="comment-edit-text"] { + margin: 5px 0 10px 20px; + width: 86.5%; +} +.comment-edit-text-empty { + height: 20px; + border: 2px #babdd6 solid; border-radius: 5px; - border: 0px; + color: #babdb6; + -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; } +.comment-edit-text-empty:hover { + color: #999999; +} +.comment-edit-text-full { + height: 10em; + border-radius: 5px; + -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; +} +.comment-edit-submit-wrapper { + width: 90%; + margin-left: 0px; + text-align: right; +} +.comment-edit-submit { + height: 22px; + background-color: #555753; + color: #eeeeec; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + border: 0; +} + /** * item text style **/ .wall-item-body code { - border-color: #CCCCCC; - border-style: solid; - border-width: 1px 1px 1px 10px; - display: block; - padding-left: 10px; + display:block; + padding-left:10px; + border-color:#ccc; + border-style:solid; + border-width:1px 1px 1px 10px; } + /** * profile **/ - -div[id$="text"] { font-weight: bold; border-bottom: 1px solid #cccccc; } -div[id$="wrapper"] { height: 100%; margin-bottom: 1em; } -div[id$="wrapper"] br { clear: left; } -#advanced-profile-with { margin-left: 200px; } +div[id$="text"] { + font-weight: bold; + border-bottom: 1px solid #ccc; +} +div[id$="wrapper"] { + height: 100%; + margin-bottom: 1em; +} +div[id$="wrapper"] br { + clear: left; +} +#advanced-profile-with { + margin-left: 200px; +} + /** * photos @@ -575,202 +1312,333 @@ div[id$="wrapper"] br { clear: left; } overflow: auto; } #photo-top-links { - margin-bottom:30px; + margin-bottom: 30px; } .photo-album-image-wrapper, -.photo-top-image-wrapper { - float: left; - margin: 0px 10px 10px 0px; - -moz-box-shadow: 0px 0px 5px #888; - -webkit-box-shadow: 0px 0px 5px #888; - box-shadow: 0px 0px 5px #888; - background-color: #eeeeee; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - - padding-bottom: 30px; - position:relative; - +.photo-top-image-wrapper { + float: left; + -moz-box-shadow: 0 0 5px #888; + -webkit-box-shadow: 0 0 5px #888; + box-shadow: 0 0 5px #888; + background-color: #eee; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + padding-bottom: 30px; + position: relative; + margin: 0 10px 10px 0; } -#photo-photo { max-width: 100% } -#photo-photo img { max-width: 100% } - +#photo-photo { + max-width: 100%; +} +#photo-photo img { + max-width: 100%; +} .photo-top-image-wrapper a:hover, #photo-photo a:hover, -.photo-album-image-wrapper a:hover { - border-bottom: 0px; +.photo-album-image-wrapper a:hover { + border-bottom: 0; } - -.photo-top-photo, -.photo-album-photo { - -webkit-border-radius: 5px 5px 0px 0px; - -moz-border-radius: 5px 5px 0px 0px; - border-radius: 5px 5px 0px 0px; - } - -.photo-top-album-name { position: absolute; bottom: 0px; padding: 0px 5px;} -.caption { position: absolute; bottom: 0px; margin: 0px 5px} - - -#photo-photo{ +.photo-top-photo,.photo-album-photo { + -webkit-border-radius:5px 5px 0 0; + -moz-border-radius:5px 5px 0 0; + border-radius:5px 5px 0 0; +} +.photo-top-album-name { + position: absolute; + bottom: 0; + padding: 0 5px; +} +.caption { + position: absolute; + bottom: 0; + margin: 0 5px; +} +#photo-photo { position: relative; float:left; } -#photo-photo-end { clear: both; } +#photo-photo-end { + clear: both; +} #photo-prev-link, -#photo-next-link{ - position: absolute; - width:30%; - height: 100%; - background-color: rgba(255,255,255,0.5); - opacity: 0; - -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; - background-position: center center; - background-repeat: no-repeat; - +#photo-next-link { + position:absolute; + width:30%; + height:100%; + background-color:rgba(255,255,255,0.5); + opacity:0; + -webkit-transition:all .2s ease-in-out; + -moz-transition:all .2s ease-in-out; + -o-transition:all .2s ease-in-out; + -ms-transition:all .2s ease-in-out; + transition:all .2s ease-in-out; + background-position:center center; + background-repeat:no-repeat; } -#photo-prev-link { left:0px; top:0px; background-image: url('prev.png'); } -#photo-next-link { right:0px; top:0px; background-image: url('next.png');} - -#photo-prev-link a, -#photo-next-link a{ - display: block; width: 100%; height: 100%; - overflow: hidden; - text-indent: -900000px; +#photo-prev-link { + left:0; + top:0; + background-image:url(prev.png); +} +#photo-next-link { + right:0; + top:0; + background-image:url(next.png); } +#photo-prev-link a,#photo-next-link a { + display:block; + width:100%; + height:100%; + overflow:hidden; + text-indent:-900000px; +} #photo-prev-link:hover, -#photo-next-link:hover{ - opacity: 1; - -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; +#photo-next-link:hover { + opacity:1; + -webkit-transition:all .2s ease-in-out; + -moz-transition:all .2s ease-in-out; + -o-transition:all .2s ease-in-out; + -ms-transition:all .2s ease-in-out; + transition:all .2s ease-in-out; } - #photo-next-link .icon, -#photo-prev-link .icon { display: none } - +#photo-prev-link .icon { + display: none; +} #photos-upload-spacer, #photos-upload-new-wrapper, -#photos-upload-exist-wrapper { margin-bottom: 1em; } +#photos-upload-exist-wrapper { + margin-bottom: 1em; +} #photos-upload-existing-album-text, -#photos-upload-newalbum-div { - background-color: #555753; - color: #eeeeec; - padding: 1px; +#photos-upload-newalbum-div { + background-color:#555753; + color:#eeeeec; + padding:1px; } #photos-upload-album-select, -#photos-upload-newalbum { width: 99% } -#photos-upload-perms-menu { text-align: right; } +#photos-upload-newalbum { + width: 99%; +} +#photos-upload-perms-menu { + text-align: right; +} /** * message */ -.prvmail-text { width: 100%;} -#prvmail-subject { width: 100%;} -#prvmail-submit-wrapper { margin-top: 10px; } +.prvmail-text { + width: 100%; +} +#prvmail-subject { + width: 100%; +} +#prvmail-submit-wrapper { + margin-top: 10px; +} #prvmail-submit { - float: right; - margin-top: 0px; + float:right; + margin-top: 0; } #prvmail-submit-wrapper > div { - margin-right: 5px; - float: left; + margin-right:5px; + float:left; +} +.mail-list-outside-wrapper { + margin-top: 20px; +} +.mail-list-sender { + float: left; +} +.mail-list-detail { + margin-left: 90px; +} +.mail-list-sender-name { + display: inline; +} +.mail-list-date { + display: inline; + font-size: 0.8em; + padding-left: 10px; +} +.mail-list-subject { + font-size: 1.5em; +} +.mail-list-delete-wrapper { + float: right; +} +.mail-list-outside-wrapper-end { + clear: both; +} +.mail-conv-sender { + float: left; + margin: 0px 5px 5px 0px; +} +.mail-conv-sender-photo { + width: 32px; + height: 32px; +} +.mail-conv-sender-name { + float: left; +} +.mail-conv-date { + float: right; +} +.mail-conv-subject { + clear: right; + font-weight: bold; + font-size: 1.2em; +} +.mail-conv-body { + clear: both; +} +.mail-conv-delete-wrapper { + margin-top: 5px; } -.mail-list-outside-wrapper { margin-top: 20px;} -.mail-list-sender { float: left; } -.mail-list-detail { margin-left: 90px; } -.mail-list-sender-name { display: inline; } -.mail-list-date { display: inline; font-size: 0.8em; padding-left: 10px;} -.mail-list-subject { font-size: 1.5em;} -.mail-list-delete-wrapper { float: right; } -.mail-list-outside-wrapper-end { clear: both;} - -.mail-conv-sender {float: left; margin: 0px 5px 5px 0px } -.mail-conv-sender-photo { width: 32px; height: 32px } -.mail-conv-sender-name { float: left } -.mail-conv-date { float: right } -.mail-conv-subject { clear: right; font-weight: bold; font-size: 1.2em } -.mail-conv-body { clear: both; } -.mail-conv-delete-wrapper { margin-top: 5px; } /** * contacts */ - .view-contact-wrapper, -.contact-entry-wrapper { float: left; margin-right: 20px; margin-bottom: 20px; width: 120px; height: 120px; position: relative;} -.contact-entry-direction-wrapper {position: absolute; top: 20px;} -.contact-entry-edit-links { position: absolute; top: 60px; } -.contact-entry-photo { - margin-left:20px; +.contact-entry-wrapper { + float: left; + margin-right: 20px; + margin-bottom: 20px; + width: 120px; + /*height: 120px;*/ + position: relative; +} +.contact-direction-wrapper { + position: absolute; + top: 20px; +} +.contact-edit-links { + position: absolute; + top: 60px; +} +.contact-entry-photo-wrapper { + +} +.contact-entry-photo { + margin-left: 20px; +} +.contact-entry-name { + width: 120px; + font-weight: bold; + /*overflow: hidden;*/ } -.contact-entry-name { width: 120px; overflow: hidden; } .contact-entry-photo { position: relative; } - -.contact-entry-edit-links .icon { - border: 1px solid #babdb6; +.contact-entry-edit-links .icon { + border: 1px solid #babdb6; -webkit-border-radius: 3px; -moz-border-radius: 3px; - border-radius: 3px; - background-color: #ffffff; + border-radius: 3px; + background-color: #fff; +} +#contact-entry-url, [id^="contact-entry-url"] { + font-size: smaller; + /*overflow: scroll;*/ +} +#contact-entry-network, [id^="contact-entry-network"] { + font-size: smaller; + font-style: italic; +} +#contact-edit-banner-name { + font-size: 1.5em; +} +#contact-edit-photo-wrapper { + position: relative; + float: left; + padding: 20px; +} +#contact-edit-direction-icon { + position:absolute; + top:60px; + left:0; +} +#contact-edit-nav-wrapper { + margin-left: 0px; +} +#contact-edit-links { + margin-top: 23px; +} +#contact-edit-links ul { + list-style-type: none; +} +#contact-drop-links { + margin-left:5px; } - -#contact-edit-banner-name { font-size: 1.5em; } -#contact-edit-photo-wrapper {position: relative; float: left; padding: 20px;} -#contact-edit-direction-icon { position: absolute; top: 60px; left:0px;} -#contact-edit-nav-wrapper { margin-left: 210px; } -#contact-edit-links { float: left; margin-top: 23px; } -#contact-drop-links { margin-left: 5px; } #contact-edit-nav-wrapper .icon { border: 1px solid #babdb6; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } -#contact-edit-poll-wrapper { margin-left: 50px; } -#contact-edit-last-update-text { margin-bottom: 15px; } -#contact-edit-last-updated { font-weight: bold; } -#contact-edit-poll-text { display: inline; } -#contact-edit-end { clear: both; margin-bottom: 65px;} +#contact-edit-poll-wrapper { + margin-left: 0px; +} +#contact-edit-last-update-text { + margin-bottom: 15px; +} +#contact-edit-last-updated { + font-weight: bold; +} +#contact-edit-poll-text { + display: inline; +} +#contact-edit-info_tbl, #contact-edit-info_parent { + width: 100%; +} +.mceLayout { + width: 100%; +} +#contact-edit-end { + clear: both; + margin-bottom: 65px; +} .contact-photo-menu-button { - position: absolute; - background-image: url("photo-menu.jpg"); - background-position: top left; - background-repeat: no-repeat; - margin: 0px; padding: 0px; - width: 16px; - height: 16px; - top: 64px; left:0px; - overflow: hidden; - text-indent: 40px; - display: none; - + position: absolute; + background-image: url("photo-menu.jpg"); + background-position: top left; + background-repeat: no-repeat; + margin: 0px; padding: 0px; + width: 16px; + height: 16px; + top: 64px; left:0px; + overflow: hidden; + text-indent: 40px; + display: none; } .contact-photo-menu { - width: auto; - border: 2px solid #444444; - background: #FFFFFF; - position: absolute; - left: 0px; top: 90px; - display: none; - z-index: 10000; + width: auto; + border: 2px solid #444444; + background: #FFFFFF; + position: absolute; + left: 0px; top: 90px; + display: none; + z-index: 10000; +} +.contact-photo-menu ul { + margin:0px; + padding: 0px; + list-style: none; +} +.contact-photo-menu li a { + display: block; + padding: 2px; +} +.contact-photo-menu li a:hover { + color: #fff; + background: #3465A4; + text-decoration: none; } -.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none } -.contact-photo-menu li a { display: block; padding: 2px; } -.contact-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; } @@ -779,96 +1647,121 @@ div[id$="wrapper"] br { clear: left; } */ #id_openid_url, .openid { - background: url(login-bg.gif) no-repeat; - background-position: 0 50%; - padding-left: 18px; + background:url(login-bg.gif) no-repeat; + background-position:0 50%; + padding-left:18px; } - + #settings-nickname-desc { - background-color: #DDEFFF; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - padding: 5px; + background-color:#DDEFFF; + -webkit-border-radius:5px; + -moz-border-radius:5px; + border-radius:5px; + padding:5px; } #register-form div, -#profile-edit-form div { - clear: both; +#profile-edit-form div { + clear: both; } #register-form label, #profile-edit-form label { - width: 300px; float: left; + width: 300px; + float: left; } #register-form span, -#profile-edit-form span { - color: #555753; - display:block; - margin-bottom: 20px; +#profile-edit-form span { + color:#555753; + display:block; + margin-bottom:20px; } .settings-submit-wrapper, -.profile-edit-submit-wrapper { margin: 30px 0px;} -.profile-listing { float: left; margin: 20px 20px 0px 0px} +.profile-edit-submit-wrapper { + margin: 30px 0px; +} +.profile-edit-side-div { + margin-top: 10px; +} +.profile-edit-side-link { + float: right; + margin: 10px 20px -16px 0; +} +.profile-listing { + float: left; + margin: 20px 20px 0px 0px; +} -#profile-edit-links ul { margin: 20px 0px; padding: 0px; list-style: none; } +#profile-edit-links ul { + margin: 20px 0; + padding: 0; + list-style: none; +} - -#register-sitename { display: inline; font-weight: bold;} +#register-sitename { + display: inline; + font-weight: bold; +} /** * contacts selector */ -#group-edit-desc { margin: 10px 0xp; } +#group-edit-desc { + margin: 10px 0px; +} #group-members, #prof-members { - height: 200px; - overflow: auto; - border: 1px solid #555753; - -webkit-border-radius: 5px 5px 0px 0px; - -moz-border-radius: 5px 5px 0px 0px; - border-radius: 5px 5px 0px 0px; + height:200px; + overflow:auto; + border:1px solid #555753; + -webkit-border-radius:5px 5px 0 0; + -moz-border-radius:5px 5px 0 0; + border-radius:5px 5px 0 0; } #group-all-contacts, -#prof-all-contacts { - height: 200px; - overflow: auto; - border: 1px solid #555753; - -webkit-border-radius: 0px 0px 5px 5px; - -moz-border-radius: 0px 0px 5px 5px; - border-radius: 0px 0px 5px 5px; +#prof-all-contacts { + height:200px; + overflow:auto; + border:1px solid #555753; + -webkit-border-radius:0 0 5px 5px; + -moz-border-radius:0 0 5px 5px; + border-radius:0 0 5px 5px; } #group-members h3, #group-all-contacts h3, #prof-members h3, -#prof-all-contacts h3{ - color: #eeeeec; - background-color: #555753; - margin: 0px; - padding: 5px; +#prof-all-contacts h3 { + color:#eeeeec; + background-color:#555753; + margin:0; + padding:5px; } #group-separator, -#prof-separator { display: none;} +#prof-separator { + display: none; +} /** * profile */ -#cropimage-wrapper { float:left; } -#crop-image-form { clear:both; } +#cropimage-wrapper { + float:left; +} +#crop-image-form { + clear:both; +} /** * events **/ - .clear { clear: both; } .eventcal { - float: left; - font-size: 20px; + float:left; + font-size:20px; } - .vevent { - border: 1px solid #CCCCCC; + border:1px solid #ccc; } .vevent .event-description, .vevent .event-location { margin-left: 10px; @@ -882,32 +1775,26 @@ div[id$="wrapper"] br { clear: left; } #new-event-link { margin-bottom: 10px; } - .edit-event-link, .plink-event-link { float: left; margin-top: 4px; margin-right: 4px; margin-bottom: 15px; } - .event-description:before { content: url('../../../images/calendar.png'); margin-right: 15px; } - .event-start, .event-end { margin-left: 10px; width: 330px; } - .event-start .dtstart, .event-end .dtend { float: right; } - .event-list-date { margin-bottom: 10px; } - .prevcal, .nextcal { float: left; margin-left: 32px; @@ -917,40 +1804,33 @@ div[id$="wrapper"] br { clear: left; } .event-calendar-end { clear: both; } - - .calendar { - font-family: Courier, monospace; + font-family: monospace; } .today { font-weight: bold; color: #FF0000; } - #event-start-text, #event-finish-text { margin-top: 10px; margin-bottom: 5px; } - -#event-nofinish-checkbox, -#event-nofinish-text, -#event-adjust-checkbox, +#event-nofinish-checkbox, +#event-nofinish-text, +#event-adjust-checkbox, #event-adjust-text, -#event-share-checkbox -{ - float: left; +#event-share-checkbox { + float:left; } #event-datetime-break { margin-bottom: 10px; } - -#event-nofinish-break, +#event-nofinish-break, #event-adjust-break, #event-share-break { clear: both; } - #event-desc-text, #event-location-text { margin-top: 10px; @@ -959,45 +1839,156 @@ div[id$="wrapper"] br { clear: left; } #event-submit { margin-top: 10px; } +.body-tag { + margin: 10px 0; + opacity: 0.5; + filter:alpha(opacity=50); +} +.body-tag:hover { + opacity: 1.0 !important; + filter:alpha(opacity=100) !important; +} +.item-select { + opacity: 0.1; + filter:alpha(opacity=10); + float: right; + margin-right: 10px; + +} +.item-select:hover, .checkeditem { + opacity: 1; + filter:alpha(opacity=100); +} +#item-delete-selected { + margin-top: 30px; +} + +#item-delete-selected-end { + clear: both; +} +#item-delete-selected-icon, #item-delete-selected-desc { + float: left; + margin-right: 5px; +} +#item-delete-selected-desc:hover { + text-decoration: underline; +} + /** * directory */ -.directory-item {float: left; margin: 50px 50px 0px 0px;} +.directory-item { + float: left; + margin: 50px 50px 0px 0px; +} + + +/** + * sidebar + */ +#group-sidebar { + margin-bottom: 10px; +} +.group-selected, .nets-selected { + padding: 3px; + border: 1px solid #CCCCCC; + background: #F8F8F8; + font-weight: bold; +} +.groupsideedit { + margin-right: 10px; +} +#sidebar-group-ul { + padding-left: 0; +} +#sidebar-group-list { + margin: 0 0 5px 0; +} +#sidebar-group-list ul { + list-style-type: none; + list-style-position: inside; +} +#sidebar-group-list li { + margin-top: 10px; +} +#sidebar-group-list .icon { + display: inline-block; + height: 12px; + width: 12px; +} +#sidebar-new-group { + margin: auto; + display: inline-block; + color: #efefef; + text-decoration: none; + text-align: center; +} + +#sidebar-new-group: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% );*/ + /*background-color: #b20202;*/ +} + +#sidebar-new-group:active { + position: relative; + top: 1px; +} +.nets-ul { + list-style-type: none; + padding-left: 0px; +} +.nets-ul li { + margin: 10px 0 0; +} + +.nets-link { + margin-left: 0px; +} +.nets-all { + margin-left: 0px; +} +#netsearch-box { + margin-top: 20px; + width: 150px; +} +#netsearch-box #search-submit { + margin: 5px 0px 0px 0px; +} /** * ADMIN */ #pending-update { - float:right; - color: #ffffff; - font-weight: bold; - background-color: #FF0000; - padding: 0em 0.3em; + float:right; + color: #fff; + font-weight: bold; + background-color: #ff0000; + padding: 0 .3em; } .admin.linklist { - border: 0px; padding: 0px; + border: 0; padding: 0; } .admin.link { - list-style-position: inside; + list-style-position: inside; } - #adminpage dl { - clear: left; - margin-bottom: 2px; - padding-bottom: 2px; - border-bottom: 1px solid black; + clear:left; + margin-bottom: 2px; + padding-bottom: 2px; + border-bottom: 1px solid #000; } #adminpage dt { - width: 200px; - float: left; - font-weight: bold; + width: 200px; + float: left; + font-weight: bold; } #adminpage dd { margin-left: 200px; } #adminpage h3 { - border-bottom: 1px solid #cccccc; + border-bottom:1px solid #ccc; } #adminpage .submit { @@ -1005,283 +1996,513 @@ div[id$="wrapper"] br { clear: left; } } #adminpage #pluginslist { - margin: 0px; padding: 0px; + margin: 0; + padding: 0; } #adminpage .plugin { - list-style: none; - display: block; - border: 1px solid #888888; - padding: 1em; - margin-bottom: 5px; - clear: left; + list-style: none; + display: block; + border: 1px solid #888; + padding: 1em; + margin-bottom: 5px; + clear: left; } #adminpage .toggleplugin { float:left; margin-right: 1em; } -#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;} -#adminpage table th { text-align: left;} -#adminpage td .icon { float: left;} -#adminpage table#users img { width: 16px; height: 16px; } -#adminpage table tr:hover { background-color: #bbc7d7; } -#adminpage .selectall { text-align: right; } +#adminpage table { + width: 100%; + border-bottom: 1px solid #000; + margin: 5px 0; +} +#adminpage table th { + text-align: left; +} +#adminpage td .icon { + float: left; +} +#adminpage table#users img { + width: 16px; height: 16px; +} +#adminpage table tr:hover { + background-color:#bbc7d7; +} +#adminpage .selectall { + text-align: right; +} /** * Form fields */ .field { - margin-bottom: 10px; - padding-bottom: 10px; - overflow: auto; - width: 100% + margin-bottom: 10px; + padding-bottom: 10px; + overflow: auto; + width: 100%; } - .field label { - float: left; - width: 200px; + float: left; + width: 200px; } .field input, .field textarea { - width: 400px; + width: 400px; +} +.field textarea { + height: 100px; } -.field textarea { height: 100px; } .field_help { - display: block; - margin-left: 200px; - color: #666666; - + display: block; + margin-left: 0px; + color: #666; } - - .field .onoff { - float: left; - width: 80px; + float: left; + width: 80px; } .field .onoff a { - display: block; - border:1px solid #666666; - background-image:url("../../../images/onoff.jpg"); - background-repeat: no-repeat; - padding: 4px 2px 2px 2px; - height: 16px; - text-decoration: none; + display: block; + border: 1px solid #666; + background: url("../../../images/onoff.jpg") no-repeat; + padding: 4px 2px 2px; + height: 16px; + text-decoration: none; } .field .onoff .off { - border-color:#666666; - padding-left: 40px; - background-position: left center; - background-color: #cccccc; - color: #666666; - text-align: right; + border-color: #666; + padding-left: 40px; + background: #ccc left center; + color: #666; + text-align:right; } .field .onoff .on { - border-color:#204A87; - padding-right: 40px; - background-position: right center; - background-color: #3465A4; - color: #FFFFFF; - text-align: left; + border-color:#204a87; + padding-right:40px; + background-position:right center; + background-color:#3465A4; + color:#fff; + text-align:left; +} +.hidden { + display:none !important; +} + +.field.radio .field_help { + margin-left:0; +} + + +/* + * UPDATE + */ +.popup { + width: 100%; + height: 100%; + top:0px; + left:0px; + position: absolute; + display: none; +} +.popup .background { + background-color: rgba(0,0,0,128); + opacity: 0.5; + width: 100%; + height: 100%; + position: absolute; + top:0px; + left:0px; +} +.popup .panel { + top: 25%; + left: 25%; + width: 50%; + height: 50%; + padding: 1em; + position: absolute; + border: 4px solid #000000; + background-color: #FFFFFF; +} +#panel { + z-index: 100; +} +.grey { + color: grey; +} +.orange { + color: orange; +} +.red { + color: red; +} +.popup .panel .panel_text { + display: block; + overflow: auto; + height: 80%; +} +.popup .panel .panel_in { + width: 100%; + height: 100%; + position: relative; +} +.popup .panel .panel_actions { + width: 100%; + bottom: 4px; + left: 0px; + position: absolute; +} +.panel_text .progress { + width: 50%; + overflow: hidden; + height: auto; + border: 1px solid #cccccc; + margin-bottom: 5px; +} +.panel_text .progress span { + float: right; + display: block; + width: 25%; + background-color: #eeeeee; + text-align: right; +} + +/** + * OAuth + */ +.oauthapp { + height: auto; + overflow: auto; + border-bottom: 2px solid #cccccc; + padding-bottom: 1em; + margin-bottom: 1em; +} +.oauthapp img { + float: left; + width: 48px; height: 48px; + margin: 10px; +} +.oauthapp img.noicon { + background-image: url("../../../images/icons/48/plugin.png"); + background-position: center center; + background-repeat: no-repeat; +} +.oauthapp a { + float: left; } -.hidden { display: none!important; } -.field.radio .field_help { margin-left: 0px; } /** * ICONS */ +.iconspacer { + display: block; + width: 16px; + height: 16px; +} .icon { - display: block; width: 20px; height: 20px; - background-image: url('icons.png'); + display: block; + width: 20px; + height: 20px; + background: url(icons.png) no-repeat; + border: 0; + text-decoration: none; } -/*.icon:hover { - border-bottom: 0px; -}*/ - -.starred { - background-image: url("star.png"); - repeat: no-repeat; +.icon:hover { + border: 0; + text-decoration: none; } -.unstarred { - background-image: url("premium.png"); - repeat: no-repeat; +.icon.drop, +.icon.drophide, .icon.delete { + float: left; +} +.icon.s22 { + display: block; + background: url(icons.png) no-repeat; + width: 22px; + height: 22px; +} +.icon.s22.delete { + display: block; + background-position: -110px 0; +} +.icon.s22.text { + padding: 10px 0px 0px 25px; + width: 200px; +} +.icon.text { + text-indent: 0px; +} +.icon.s16 { + min-width: 16px; + height: 16px; +} +.s16 .add { + background: url("../../../images/icons/16/add.png") no-repeat; +} +.add { + margin: 0px 5px; +} +.article { + background-position: -50px 0; +} +.audio { + background-position: -70px 0; +} +.block { + background-position: -90px 0px; +} +.drop, .delete { + background-position: -110px 0; +} +.drophide { + background-position: -130px 0; +} +.edit { + background-position: -150px 0; +} +.camera { + background-position: -170px 0; +} +.dislike { + background-position: -190px 0; +} +.like { + background-position: -211px 0; +} +.link { + background-position: -230px 0; +} +.globe, .location { + background-position: -50px -20px; +} +.noglobe, .nolocation { + background-position: -70px -20px; +} +.no { + background-position: -90px -20px; +} +.pause { + background-position: -110px -20px; +} +.play { + background-position: -130px -20px; +} +.pencil { + background-position: -151px -18px; +} +.small-pencil { + background-position: -170px -20px; +} +.recycle { + background-position: -190px -20px; +} +.remote-link { + background-position: -210px -20px; +} +.share { + background-position: -230px -20px; +} +.tools { + background-position: -50px -40px; +} +.lock { + background-position: -70px -40px; +} +.unlock { + background-position: -90px -40px; +} +.video { + background-position: -110px -40px; +} +.attach { + background-position: -190px -40px; +} +.language { + background-position: -210px -40px; +} +.starred { + background-position: -130px -60px; +} +.unstarred { + background-position: -150px -60px; } - .tagged { - background-image: url("tag.png"); - repeat: no-repeat; + background-position: -170px -60px; } - - - -.border { +.on { + background-position: -50px -60px; +} +.off { + background-position: -70px -60px; +} +.prev { + background-position: -90px -60px; +} +.next { + background-position: -110px -60px; +} +.icon.dim { + opacity: 0.3; + filter: alpha(opacity=30); +} +.border, .border:hover { border: 1px solid #babdb6; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } - -.article { background-position: -50px 0px;} -.audio { background-position: -70px 0px;} -.block { background-position: -90px 0px;} -.drop { background-position: -110px 0px;} -.drophide { background-position: -130px 0px;} -.edit { background-position: -150px 0px;} -.camera { background-position: -170px 0px;} -.dislike { background-position: -190px 0px;} -.like { background-position: -210px 0px;} -.link { background-position: -230px 0px;} - -.globe { background-position: -50px -20px;} -.noglobe { background-position: -70px -20px;} -.no { background-position: -90px -20px;} -.pause { background-position: -110px -20px;} -.play { background-position: -130px -20px;} -.pencil { background-position: -150px -20px;} -.small-pencil { background-position: -170px -20px;} -.recycle { background-position: -190px -20px;} -.remote-link { background-position: -210px -20px;} -.share { background-position: -230px -20px;} - -.tools { background-position: -50px -40px;} -.lock { background-position: -70px -40px;} -.unlock { background-position: -90px -40px;} -.video { background-position: -110px -40px;} -.youtube { background-position: -130px -40px;} - -.attach { background-position: -190px -40px;} -.language { background-position: -210px -40px;} - - -.on { background-position: -50px -60px;} -.off { background-position: -70px -60px;} -.prev { background-position: -90px -60px;} -.next { background-position: -110px -60px;} - - -.icon.dim { opacity: 0.3;filter:alpha(opacity=30); } - .attachtype { - display: block; width: 20px; height: 23px; - background-image: url('../../../images/content-types.png'); + display: block; + width: 20px; + height: 23px; + background-image: url(../../../images/content-types.png); +} +.type-video { + background-position: 0px 0px; +} +.type-image { + background-position: -20px 0; +} +.type-audio { + background-position: -40px 0; +} +.type-text { + background-position: -60px 0px; +} +.type-unkn { + background-position: -80px 0; } - -.type-video { background-position: 0px 0px; } -.type-image { background-position: -20px 0px; } -.type-audio { background-position: -40px 0px; } -.type-text { background-position: -60px 0px; } -.type-unkn { background-position: -80px 0px; } - /** * footer - */ - .cc-license { margin-top: 100px; font-size: 0.7em; } -footer { display: block; margin: 50px 20%; clear: both; } - + */ +.cc-license { + margin-top: 100px; + font-size: 0.7em; +} +footer { + display: block; + margin: 50px 20%; + clear: both; +} #profile-jot-text { height: 20px; - color:#cccccc; - border: 1px solid #cccccc; + color: #666; + border: 1px solid #ccc; + border-radius: 5px; + width: 99.5%; } + + /** acl **/ #photo-edit-perms-select, #photos-upload-permissions-wrapper, -#profile-jot-acl-wrapper{ - display:block!important; +#profile-jot-acl-wrapper { + display: block !important; } - #acl-wrapper { - width: 690px; - float:left; + width: 690px; + float: left; } #acl-search { - float:right; - background: #ffffff url("../../../images/search_18.png") no-repeat right center; - padding-right:20px; + float: right; + background: #fff url("../../../images/search_18.png") no-repeat right center; + padding-right: 20px; } #acl-showall { - float: left; - display: block; - width: auto; - height: 18px; - background-color: #cccccc; - background-image: url("../../../images/show_all_off.png"); - background-position: 7px 7px; - background-repeat: no-repeat; - padding: 7px 10px 7px 30px; - -webkit-border-radius: 5px ; - -moz-border-radius: 5px; - border-radius: 5px; - color: #999999; + float:left; + display:block; + width:auto; + height:18px; + background-color:#CCC; + background-image:url("../../../images/show_all_off.png"); + background-position:7px 7px; + background-repeat:no-repeat; + padding:7px 10px 7px 30px; + -webkit-border-radius:5px; + -moz-border-radius:5px; + border-radius:5px; + color:#999; } #acl-showall.selected { - color: #000000; - background-color: #ff9900; - background-image: url("../../../images/show_all_on.png"); + color:#000; + background-color:#F90; + background-image:url(../../../images/show_all_on.png); } - #acl-list { - height: 210px; - border: 1px solid #cccccc; - clear: both; - margin-top: 30px; - overflow: auto; + height:210px; + border:1px solid #ccc; + clear:both; + margin-top:30px; + overflow:auto; } #acl-list-content { } .acl-list-item { - display: block; - width: 150px; - height: 30px; - border: 1px solid #cccccc; - margin: 5px; - float: left; + display:block; + width:150px; + height:30px; + border:1px solid #ccc; + margin:5px; + float:left; } -.acl-list-item img{ - width:22px; - height: 22px; - float: left; - margin: 4px; +.acl-list-item img { + width:22px; + height:22px; + float:left; + margin:4px; } -.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;} -.acl-list-item a { - font-size: 8px; - display: block; - width: 40px; - height: 10px; - float: left; - color: #999999; - background-color: #cccccc; - background-position: 3px 3px; - background-repeat: no-repeat; - margin-right: 5px; - -webkit-border-radius: 2px ; - -moz-border-radius: 2px; - border-radius: 2px; - padding-left: 15px; +.acl-list-item p { + height: 12px; + font-size: 10px; + margin: 0; + padding: 2px 0 1px; +} +.acl-list-item a { + font-size:8px; + display:block; + width:40px; + height:10px; + float:left; + color:#999; + background-color:#CCC; + background-position:3px 3px; + background-repeat:no-repeat; + margin-right:5px; + -webkit-border-radius:2px; + -moz-border-radius:2px; + border-radius:2px; + padding-left:15px; } #acl-wrapper a:hover { - text-decoration: none; - color:#000000; + text-decoration:none; + color:#000; +} +.acl-button-show { + background-image:url('../../../images/show_off.png'); +} +.acl-button-hide { + background-image:url('../../../images/hide_off.png'); } -.acl-button-show { background-image: url("../../../images/show_off.png"); } -.acl-button-hide { background-image: url("../../../images/hide_off.png"); } - .acl-button-show.selected { - color: #000000; - background-color: #9ade00; - background-image: url("../../../images/show_on.png"); + color:#000; + background-color:#9ade00; + background-image:url(../../../images/show_on.png); } .acl-button-hide.selected { - color: #000000; - background-color: #ff4141; - background-image: url("../../../images/hide_on.png"); + color:#000; + background-color:#ff4141; + background-image:url(../../../images/hide_on.png); +} +.acl-list-item.groupshow { + border-color:#9ade00; +} +.acl-list-item.grouphide { + border-color:#ff4141; } -.acl-list-item.groupshow { border-color: #9ade00; } -.acl-list-item.grouphide { border-color: #ff4141; } /** /acl **/ @@ -1295,22 +2516,44 @@ footer { display: block; margin: 50px 20%; clear: both; } border:1px solid #cccccc; } .acpopupitem { - background-color:#555753; padding: 4px; + background-color:#555753; + padding: 4px; clear:left; } .acpopupitem img { float: left; margin-right: 4px; } - .acpopupitem.selected { - color: #2e3436; background-color: #eeeeec; + color: #2e3436; + background-color: #eeeeec; +} +.qcomment-wrapper { + padding: 0px; + margin: 2px; + list-style-type: none; +} +.qcomment, .qcomment:hover { + display: inline; + padding: 5px; + margin: 5px; } .qcomment { - opacity: 0; - filter:alpha(opacity=0); + opacity: 0.5; + filter:alpha(opacity=50); } .qcomment:hover { opacity: 1.0; filter:alpha(opacity=100); } +#network-star-link { + margin-top: 10px; +} +.network-star { + float: left; + margin-right: 5px; +} +.network-star.icon.starred { + display: inline-block; +} + diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php new file mode 100644 index 000000000..c72884f1a --- /dev/null +++ b/view/theme/dispy/theme.php @@ -0,0 +1,74 @@ +theme_info = array(); + +$a->page['htmlhead'] .= <<< EOT + +EOT; diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl old mode 100755 new mode 100644 index 09cf64397..b013cfeef --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -38,7 +38,7 @@
{{ endif }} {{ if $item.edpost }} - ' + {{ endif }}
@@ -68,10 +68,10 @@
$item.dislike
-
+
$item.comment
-
+
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl old mode 100755 new mode 100644 index c3638094c..86453fad2 --- a/view/theme/dispy/wallwall_item.tpl +++ b/view/theme/dispy/wallwall_item.tpl @@ -43,7 +43,7 @@
{{ endif }} {{ if $item.edpost }} - ' + {{ endif }}
@@ -59,7 +59,7 @@
$item.body
{{ for $item.tags as $tag }} - $tag + $tag {{ endfor }}
@@ -72,7 +72,7 @@
$item.dislike
-
+
$item.comment
From 09c2f81cb30a74652b81ab48ffb44cfdad097cb6 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sat, 3 Mar 2012 19:20:23 -0500 Subject: [PATCH 4/4] these are more finessing on formatting again Signed-off-by: Simon L'nu --- view/acl_selector.tpl | 2 +- view/theme/duepuntozero/wallwall_item.tpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) mode change 100755 => 100644 view/acl_selector.tpl diff --git a/view/acl_selector.tpl b/view/acl_selector.tpl old mode 100755 new mode 100644 index 3f8a9e7d2..655ea8980 --- a/view/acl_selector.tpl +++ b/view/acl_selector.tpl @@ -19,7 +19,7 @@ $(document).ready(function() { if(typeof acl=="undefined"){ acl = new ACL( baseurl+"/acl", - [$allowcid,$allowgid,$denycid,$denygid] + [ $allowcid,$allowgid,$denycid,$denygid ] ); } }); diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl index 5cb2dbc3b..211906c93 100755 --- a/view/theme/duepuntozero/wallwall_item.tpl +++ b/view/theme/duepuntozero/wallwall_item.tpl @@ -28,8 +28,8 @@
$item.name $item.to $item.owner_name $item.vwall
-
$item.ago
-
+
$item.ago
+
$item.title