aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-06-14 10:37:54 +0200
committerFabio Comuni <fabrix.xm@gmail.com>2011-06-14 10:37:54 +0200
commitb1184f3fdeb4dcc6126b7ea8d7ac1a2980c9cbac (patch)
tree07165e07f3c2e57e4719310195f1f2fd0a211c8d /view
parent5882d8d022c14a12ba7b314c96289061bd195ed4 (diff)
parent9b9bd35cba293b86c871c2cfbe15e6d9c4673a7d (diff)
downloadvolse-hubzilla-b1184f3fdeb4dcc6126b7ea8d7ac1a2980c9cbac.tar.gz
volse-hubzilla-b1184f3fdeb4dcc6126b7ea8d7ac1a2980c9cbac.tar.bz2
volse-hubzilla-b1184f3fdeb4dcc6126b7ea8d7ac1a2980c9cbac.zip
Merge remote-tracking branch 'friendika-master/master' into admin
Diffstat (limited to 'view')
-rw-r--r--view/profile_tabs.tpl2
-rw-r--r--view/theme/duepuntozero/style.css23
-rw-r--r--view/theme/loozah/style.css44
3 files changed, 66 insertions, 3 deletions
diff --git a/view/profile_tabs.tpl b/view/profile_tabs.tpl
index 975d069a6..3628ff5ff 100644
--- a/view/profile_tabs.tpl
+++ b/view/profile_tabs.tpl
@@ -3,5 +3,7 @@
<a href="$url" id="profile-tab-status-link" class="profile-tabs" >$status</a>
<a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >$profile</a>
<a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >$photos</a>
+ $events
+ $notes
<div id="profile-tabs-end"></div>
</div> \ No newline at end of file
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 8799726c7..563234238 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2224,7 +2224,8 @@ a.mail-list-link {
}
.eventcal {
- font-size: 24px;
+ float: left;
+ font-size: 20px;
}
#new-event-link {
@@ -2245,6 +2246,17 @@ a.mail-list-link {
.event-start .dtstart, .event-end .dtend {
float: right;
}
+
+.prevcal, .nextcal {
+ float: left;
+ margin-left: 32px;
+ margin-right: 32px;
+ margin-top: 64px;
+}
+.event-calendar-end {
+ clear: both;
+}
+
.calendar {
font-family: Courier, monospace;
@@ -2454,6 +2466,8 @@ a.mail-list-link {
}
+
+
#lang-select-icon {
cursor: pointer;
position: absolute;
@@ -2572,8 +2586,11 @@ a.mail-list-link {
.youtube { background-position: -64px -32px;}
.attach { background-position: -80px -32px; }
.language { background-position: -96px -32px; }
-.on { background-position: -112px -32px; }
-.off { background-position: -128px -32px; }
+.prev { background-position: -112px -32px; }
+.next { background-position: -128px -32px; }
+.on { background-position: -144px -32px; }
+
+.off { background-position: 0px -48px; }
.attachtype {
display: block; width: 20px; height: 23px;
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 0edde248e..a566acadc 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -2423,6 +2423,48 @@ a.mail-list-link {
color: #FF0000;
}
+.eventcal {
+ float: left;
+ font-size: 20px;
+}
+
+#new-event-link {
+ margin-bottom: 10px;
+}
+
+.event-description:before {
+ content: url('../../../images/calendar.png');
+ margin-right: 15px;
+}
+
+.event-start, .event-end {
+ margin-left: 10px;
+ width: 330px;
+ clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+ float: right;
+}
+
+.prevcal, .nextcal {
+ float: left;
+ margin-left: 32px;
+ margin-right: 32px;
+ margin-top: 64px;
+}
+.event-calendar-end {
+ clear: both;
+}
+
+.calendar {
+ font-family: Courier, monospace;
+}
+.today {
+ color: #FF0000;
+}
+
+
#event-start-text, #event-finish-text {
margin-top: 10px;
margin-bottom: 5px;
@@ -2491,6 +2533,8 @@ a.mail-list-link {
.youtube { background-position: -64px -32px;}
.attach { background-position: -80px -32px; }
.language { background-position: -96px -32px; }
+.prev { background-position: -112px -32px; }
+.next { background-position: -128px -32px; }
.attachtype {
display: block; width: 20px; height: 23px;