aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authortommy tomson <thomas.bierey@gmx.de>2012-03-10 13:22:41 +0100
committertommy tomson <thomas.bierey@gmx.de>2012-03-10 13:22:41 +0100
commit0f3255467e8a64af86ca67c6af70edf1d3279640 (patch)
tree98791d46cabe4a15d00cd30a5b5e737690af2a85 /view
parent8fe4645a5d97a66b823744248698c624f7146d5b (diff)
downloadvolse-hubzilla-0f3255467e8a64af86ca67c6af70edf1d3279640.tar.gz
volse-hubzilla-0f3255467e8a64af86ca67c6af70edf1d3279640.tar.bz2
volse-hubzilla-0f3255467e8a64af86ca67c6af70edf1d3279640.zip
fixed login-fields, fixed. notofication.png, changed locations
Diffstat (limited to 'view')
-rwxr-xr-xview/theme/diabook-blue/icons/notifications.pngbin795 -> 727 bytes
-rw-r--r--view/theme/diabook-blue/style.css29
-rw-r--r--view/theme/diabook-blue/wall_item.tpl4
-rw-r--r--view/theme/diabook-blue/wallwall_item.tpl4
-rwxr-xr-xview/theme/diabook/icons/notifications.pngbin758 -> 714 bytes
-rw-r--r--view/theme/diabook/style.css15
-rwxr-xr-xview/theme/diabook/theme.php3
-rw-r--r--view/theme/diabook/wall_item.tpl4
-rw-r--r--view/theme/diabook/wallwall_item.tpl4
9 files changed, 52 insertions, 11 deletions
diff --git a/view/theme/diabook-blue/icons/notifications.png b/view/theme/diabook-blue/icons/notifications.png
index 33ae95c6a..c23673dbd 100755
--- a/view/theme/diabook-blue/icons/notifications.png
+++ b/view/theme/diabook-blue/icons/notifications.png
Binary files differ
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index 7f5fe1fec..51b173f2a 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -652,6 +652,17 @@ nav .nav-menu-icon {
-webkit-border-radius: 5px 5px 0 0;
border-radius: 5px 5px 0 0;
}
+nav .nav-menu-icon:hover {
+ background-color: #308dbf;
+ position: relative;
+ height: 22px;
+ padding: 5px;
+ margin: 0px 7px;
+ -moz-border-radius: 5px 5px 0 0;
+ -webkit-border-radius: 5px 5px 0 0;
+ border-radius: 5px 5px 0 0;
+}
+
nav .nav-menu-icon.selected {
background-color: #fff;
}
@@ -1037,13 +1048,22 @@ section {
width: 800px;
padding: 0px 0px 0px 12px;
}
+#id_username {
+ width: 173px;
+ }
+#id_password {
+ width: 173px;
+ }
+#id_openid_url {
+ width: 173px;
+ }
#contact-edit-end {
- margin-top: 140%;
}
.pager {
padding: 10px;
text-align: center;
font-size: 1.0em;
+ margin-top: 140%;
}
.tabs {
@@ -1075,6 +1095,10 @@ section {
margin-bottom: 0px;
width: 775px;
}
+.tread-wrapper a{
+ color: #1872A2;
+}
+
.wall-item-decor {
position: absolute;
left: 790px;
@@ -1118,6 +1142,7 @@ section {
}
.wall-item-container .wall-item-location {
padding-right: 40px;
+ display: table-cell;
}
.wall-item-container .wall-item-ago {
word-wrap: break-word;
@@ -1173,6 +1198,7 @@ section {
.wall-item-container .wall-item-actions-social {
float: left;
margin-bottom: 1px;
+ display: table-cell;
}
.wall-item-container .wall-item-actions-social a {
margin-right: 1em;
@@ -1183,6 +1209,7 @@ section {
.wall-item-container .wall-item-actions-tools {
float: right;
width: 80px;
+ display: table-cell;done
}
.wall-item-container .wall-item-actions-tools a {
float: right;
diff --git a/view/theme/diabook-blue/wall_item.tpl b/view/theme/diabook-blue/wall_item.tpl
index b1a014949..ebe40fd4e 100644
--- a/view/theme/diabook-blue/wall_item.tpl
+++ b/view/theme/diabook-blue/wall_item.tpl
@@ -46,7 +46,7 @@
</div>
<div class="wall-item-actions">
- <div class="wall-item-location">$item.location&nbsp;</div>
+
<div class="wall-item-actions-social">
@@ -82,7 +82,7 @@
<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
{{ endif }}
</div>
-
+ <div class="wall-item-location">$item.location&nbsp;</div>
</div>
</div>
<div class="wall-item-bottom">
diff --git a/view/theme/diabook-blue/wallwall_item.tpl b/view/theme/diabook-blue/wallwall_item.tpl
index 603a908c5..e02e5a8be 100644
--- a/view/theme/diabook-blue/wallwall_item.tpl
+++ b/view/theme/diabook-blue/wallwall_item.tpl
@@ -52,7 +52,7 @@
</div>
<div class="wall-item-actions">
- <div class="wall-item-location">$item.location&nbsp;</div>
+
<div class="wall-item-actions-social">
@@ -88,7 +88,7 @@
<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
{{ endif }}
</div>
-
+ <div class="wall-item-location">$item.location&nbsp;</div>
</div>
</div>
<div class="wall-item-bottom">
diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png
index 5bdc34f76..270997740 100755
--- a/view/theme/diabook/icons/notifications.png
+++ b/view/theme/diabook/icons/notifications.png
Binary files differ
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 6e3909ab4..ad7119c2a 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -1036,13 +1036,23 @@ section {
width: 800px;
padding: 0px 0px 0px 12px;
}
+#id_username {
+ width: 173px;
+ }
+#id_password {
+ width: 173px;
+ }
+#id_openid_url {
+ width: 173px;
+ }
#contact-edit-end {
- margin-top: 140%;
+
}
.pager {
padding: 10px;
text-align: center;
font-size: 1.0em;
+ margin-top: 140%;
}
.tabs {
@@ -1116,6 +1126,7 @@ section {
}
.wall-item-container .wall-item-location {
padding-right: 40px;
+ display: table-cell;
}
.wall-item-container .wall-item-ago {
word-wrap: break-word;
@@ -1171,6 +1182,7 @@ section {
.wall-item-container .wall-item-actions-social {
float: left;
margin-bottom: 1px;
+ display: table-cell;
}
.wall-item-container .wall-item-actions-social a {
margin-right: 1em;
@@ -1181,6 +1193,7 @@ section {
.wall-item-container .wall-item-actions-tools {
float: right;
width: 80px;
+ display: table-cell;
}
.wall-item-container .wall-item-actions-tools a {
float: right;
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 0a20c9fbc..5a1828ad7 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -13,6 +13,7 @@ $a->theme_info = array(
$a->page['htmlhead'] .= <<< EOT
<script>
+
//contacts
$('html').click(function() {
$('#nav-contacts-linkmenu').removeClass('selected');
@@ -62,5 +63,5 @@ $('html').click(function() {
$('#nav-site-linkmenu').click(function(event){
event.stopPropagation();
});
-</script>
+</script>
EOT;
diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index b1a014949..ebe40fd4e 100644
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@ -46,7 +46,7 @@
</div>
<div class="wall-item-actions">
- <div class="wall-item-location">$item.location&nbsp;</div>
+
<div class="wall-item-actions-social">
@@ -82,7 +82,7 @@
<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
{{ endif }}
</div>
-
+ <div class="wall-item-location">$item.location&nbsp;</div>
</div>
</div>
<div class="wall-item-bottom">
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl
index 603a908c5..e02e5a8be 100644
--- a/view/theme/diabook/wallwall_item.tpl
+++ b/view/theme/diabook/wallwall_item.tpl
@@ -52,7 +52,7 @@
</div>
<div class="wall-item-actions">
- <div class="wall-item-location">$item.location&nbsp;</div>
+
<div class="wall-item-actions-social">
@@ -88,7 +88,7 @@
<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
{{ endif }}
</div>
-
+ <div class="wall-item-location">$item.location&nbsp;</div>
</div>
</div>
<div class="wall-item-bottom">