diff --git a/view/contact_block.tpl b/view/contact_block.tpl old mode 100755 new mode 100644 index eb46c6c43c..df56143983 --- a/view/contact_block.tpl +++ b/view/contact_block.tpl @@ -1,7 +1,7 @@

$contacts

{{ if $micropro }} - $viewcontacts + $viewcontacts
{{ for $micropro as $m }} $m diff --git a/view/theme/dispy/contact_template.tpl b/view/theme/dispy/contact_template.tpl index 2aa9b88fed..fbf354b475 100644 --- a/view/theme/dispy/contact_template.tpl +++ b/view/theme/dispy/contact_template.tpl @@ -20,7 +20,8 @@
$contact.name
-
$contact.itemurl
+
+ Profile URL
$contact.network
diff --git a/view/theme/dispy/conversation.tpl b/view/theme/dispy/conversation.tpl index 0b14f1c80a..41b6aeadff 100644 --- a/view/theme/dispy/conversation.tpl +++ b/view/theme/dispy/conversation.tpl @@ -17,5 +17,7 @@ {{ endfor }} {{ if $dropping }} +
$dropping +
{{ endif }} diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl index 93df84aaeb..e72000b4ce 100644 --- a/view/theme/dispy/jot-header.tpl +++ b/view/theme/dispy/jot-header.tpl @@ -1,7 +1,8 @@ + + + - - diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index a9d680d943..177b03f4f8 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -232,7 +232,8 @@ nav a:hover { nav #banner { display: block; position: absolute; - margin-left: 20px; + left: 51px; + top: 25px; } nav #banner #logo-text a { font-size: 40px; @@ -414,8 +415,8 @@ div.jGrowl div.info { padding-left: 58px; } #nav-notifications-menu { - margin-top: 30px; - width: 255px; + margin: 30px 0 0 -45px; + width: 300px; max-height: 400px; overflow: auto; font-size: 9pt; @@ -611,8 +612,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link **/ aside { position: absolute; - right: 8%; - width: 20.5%; + right: 15px; + width: 255px; font-size: smaller; } .vcard .fn { @@ -672,7 +673,7 @@ aside #viewcontacts { **/ #jot { /*width: 785px;*/ - margin: 0px 0 20px 0px; + margin: 10px 0 20px 0px; width: 100%; } #jot #jot-tools { @@ -956,7 +957,7 @@ aside #viewcontacts { * section */ section { - margin: 20px 8% 0 6%; + margin: 20px 6% 0 4%; font-size: 0.8em; padding-right: 250px; min-width: 475px; @@ -965,7 +966,7 @@ section { /** tabs **/ .tabs { list-style: none; - margin: 0; + margin: 10px 0 10px; padding: 0; border-bottom: 1px solid #729fcf; font-size: 14px; @@ -1021,6 +1022,7 @@ section { /*border: 1px #aaa solid;*/ /*border-radius: 5px;*/ padding: 0px; + overflow-x: auto; } .wall-item-photo-menu { display: none; @@ -1918,7 +1920,13 @@ div[id$="wrapper"] br { #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 */ +.delete-checked { + position: absolute; + left: 35px; + margin-top: 20px; +} #item-delete-selected-end { clear: both; } @@ -2100,13 +2108,15 @@ div[id$="wrapper"] br { } .field label { float: left; - width: 200px; + width: 275px; display: block; font-size: 1.077em; + /*font-weight: bold;*/ margin-bottom: 0.2em; margin: 0 10px 0.2em 0; border: 1px #999 solid; padding: 5px; + background: #f2eedf; vertical-align: middle; } .field input {