aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/slackr
diff options
context:
space:
mode:
authorroot <root@debian.(none)>2012-06-01 03:10:57 -0400
committerroot <root@debian.(none)>2012-06-01 03:10:57 -0400
commitbad66a1154b3ef6ba639038218317f7ac5bf43d7 (patch)
treea03244a0005d732412fcfe6a1c8eb5734fcf6b78 /view/theme/slackr
parent88d5d9684a51119f62a60c588b2bf468f71fd884 (diff)
parent93bc29a711637c84a4ffc380078277de89af4e6d (diff)
downloadvolse-hubzilla-bad66a1154b3ef6ba639038218317f7ac5bf43d7.tar.gz
volse-hubzilla-bad66a1154b3ef6ba639038218317f7ac5bf43d7.tar.bz2
volse-hubzilla-bad66a1154b3ef6ba639038218317f7ac5bf43d7.zip
Merge remote branch 'friendica/master'
Diffstat (limited to 'view/theme/slackr')
-rw-r--r--view/theme/slackr/events_reminder.tpl2
-rw-r--r--view/theme/slackr/style.css18
2 files changed, 15 insertions, 5 deletions
diff --git a/view/theme/slackr/events_reminder.tpl b/view/theme/slackr/events_reminder.tpl
index fc13fa68b..99407fc3e 100644
--- a/view/theme/slackr/events_reminder.tpl
+++ b/view/theme/slackr/events_reminder.tpl
@@ -26,7 +26,7 @@
center: '',
right: ''
},
- timeFormat: 'H(:mm)',
+ timeFormat: 'HH(:mm)',
defaultView: 'basicWeek',
height: 50,
eventClick: function(calEvent, jsEvent, view) {
diff --git a/view/theme/slackr/style.css b/view/theme/slackr/style.css
index 82ba795cd..39da7bb6c 100644
--- a/view/theme/slackr/style.css
+++ b/view/theme/slackr/style.css
@@ -43,7 +43,7 @@ nav #site-location {
#profile-jot-text_parent, .mceLayout {
border-radius: 3px;
-moz-border-radius: 3px;
- box-shadow: 3px 3px 10px 0 #000000;
+ box-shadow: 4px 4px 3px 0 #444444;
}
#profile-jot-text:hover {
@@ -66,24 +66,34 @@ nav #site-location {
.wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
border-radius: 3px;
-moz-border-radius: 3px;
- box-shadow: 3px 3px 10px 0 #000000;
+ box-shadow: 4px 4px 3px 0 #444444;
}
#sidebar-page-list img {
border-radius: 3px;
-moz-border-radius: 3px;
- box-shadow: 3px 3px 10px -2px #000000;
+ box-shadow: 4px 4px 3px 0 #444444;
}
.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo, .fc, .profile-jot-text, .group-selected, .nets-selected, .fileas-selected, #profile-jot-submit, .categories-selected {
border-radius: 3px;
-moz-border-radius: 3px;
- box-shadow: 3px 3px 10px 0 #000000;
+ box-shadow: 4px 4px 3px 0 #444444;
+}
+.settings-widget .selected {
+ border-radius: 3px;
+ -moz-border-radius: 3px;
+ box-shadow: 4px 4px 3px 0 #444444;
+}
+
+.photo {
+ border: 1px solid #AAAAAA;
}
.photo-top-photo, .photo-album-photo {
padding: 10px;
max-width: 300px;
+ border: 1px solid #888888;
}
.rotleft1 {