aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/dispy
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-04-08 10:07:39 +0200
committerMichael Vogel <icarus@dabo.de>2012-04-08 10:07:39 +0200
commitce0eac44b5035b8f46259b6665826a94b633ec4e (patch)
tree72be41253ec910e6488e34bb5181c359036da9dd /view/theme/dispy
parentcb4c7cdb3ef8027d17682c9cb7a29906f0508c80 (diff)
parente3b2ac0735c908357dafb8670339fd34d3e2e6c0 (diff)
downloadvolse-hubzilla-ce0eac44b5035b8f46259b6665826a94b633ec4e.tar.gz
volse-hubzilla-ce0eac44b5035b8f46259b6665826a94b633ec4e.tar.bz2
volse-hubzilla-ce0eac44b5035b8f46259b6665826a94b633ec4e.zip
Merge commit 'upstream/master'
Diffstat (limited to 'view/theme/dispy')
-rw-r--r--view/theme/dispy/style.css7
-rw-r--r--view/theme/dispy/theme.php4
2 files changed, 8 insertions, 3 deletions
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index f8287c6ec..622cf5734 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -63,8 +63,8 @@ option {
color: #222;
background: #efefef;
}
-li {
- padding: 0 0 0 2px;
+ul, ol {
+ padding: 0;
}
/* remember to define focus styles! */
:focus {
@@ -2603,7 +2603,8 @@ div[id$="wrapper"] br {
}
.icon.drop,
.icon.drophide, .icon.delete {
- float: left;
+ float: right;
+ margin: 5px;
}
.icon.s22.delete {
display: block;
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index f3c54caf9..d0f6797cb 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -9,6 +9,10 @@
* Screenshot: <a href="screenshot.jpg">Screenshot</a>
*/
+$a->theme_info = array(
+ 'extends' => 'dispy',
+);
+
$a->page['htmlhead'] .= <<< EOT
<script>
$(document).ready(function() {