aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authorSebastian Egbers <sebastian@egbers.info>2012-06-25 13:59:39 +0200
committerSebastian Egbers <sebastian@egbers.info>2012-06-25 13:59:39 +0200
commit020deedd7c68ce016b65056062d85567c91c3d37 (patch)
treeb07a71b2d57d5dfae527ab9e2a6f42423bc8b327 /view/theme
parentcbf1cab0da2b67c8a88f301ce9ce6b83db27ec0b (diff)
parent7ea5917bf794c431fe304fa25380f19a6927cf63 (diff)
downloadvolse-hubzilla-020deedd7c68ce016b65056062d85567c91c3d37.tar.gz
volse-hubzilla-020deedd7c68ce016b65056062d85567c91c3d37.tar.bz2
volse-hubzilla-020deedd7c68ce016b65056062d85567c91c3d37.zip
Merge branch 'master' of https://github.com/friendica/friendica
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/dispy/conversation.tpl5
-rw-r--r--view/theme/dispy/dark/style.css3
-rw-r--r--view/theme/dispy/dark/style.less5
-rw-r--r--view/theme/dispy/jot.tpl55
-rw-r--r--view/theme/dispy/light/style.css3
-rw-r--r--view/theme/dispy/light/style.less5
-rw-r--r--view/theme/dispy/wall_item.tpl6
-rw-r--r--view/theme/dispy/wallwall_item.tpl6
-rw-r--r--view/theme/duepuntozero/style.css3
9 files changed, 52 insertions, 39 deletions
diff --git a/view/theme/dispy/conversation.tpl b/view/theme/dispy/conversation.tpl
index ca1b560a6..4a93dacf3 100644
--- a/view/theme/dispy/conversation.tpl
+++ b/view/theme/dispy/conversation.tpl
@@ -19,8 +19,9 @@
<div id="conversation-end"></div>
{{ if $dropping }}
-<div class="delete-checked">
-<a href="#" onclick="deleteCheckedItems();return false;"><span class="icon delete"></span><span class="s22 text" onmouseover="imgbright(this);" onmouseout="imgdull(this);">$dropping</span></a>
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems(); return false;">
+ <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+ <div id="item-delete-selected-desc" >$dropping</div>
</div>
<div id="item-delete-selected-end"></div>
{{ endif }}
diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
index 327b053ab..bf23cf625 100644
--- a/view/theme/dispy/dark/style.css
+++ b/view/theme/dispy/dark/style.css
@@ -391,8 +391,9 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;}
.item-select{opacity:0.1;margin:5px 0 0 6px !important;}.item-select:hover{opacity:1;}
.checkeditem{opacity:1;}
#item-delete-selected{margin-top:30px;}
-.delete-checked{position:absolute;left:35px;margin-top:20px;}
+#item-delete-selected{position:absolute;left:35px;margin-top:20px;}
#item-delete-selected-icon{float:left;margin-right:5px;}
+#item-delete-selected-desc{font-size:smaller;}
.fc-state-highlight{background:#eeeecc;color:#2e2f2e;}
.directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;}
#group-sidebar{margin-bottom:10px;}
diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
index e3966683b..1c2dc0665 100644
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -2373,7 +2373,7 @@ div {
}
/* was tired of having no way of moving it around, so
* here's a little 'hook' to do so */
-.delete-checked {
+#item-delete-selected {
position: absolute;
left: 35px;
margin-top: 20px;
@@ -2382,6 +2382,9 @@ div {
float: left;
margin-right: 5px;
}
+#item-delete-selected-desc {
+ font-size: smaller;
+}
.fc-state-highlight {
background: @main_colour;
color: @bg_colour;
diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl
index c6b339457..563d58ce4 100644
--- a/view/theme/dispy/jot.tpl
+++ b/view/theme/dispy/jot.tpl
@@ -19,31 +19,32 @@
<div id="jot-tools" class="jothidden" style="display:none">
<div id="profile-jot-submit-wrapper" class="jothidden">
- <div id="profile-upload-wrapper" style="display: $visitor;">
- <div id="wall-image-upload-div"><a class="icon camera" href="#" onclick="return false;" id="wall-image-upload" title="$upload"></a></div>
- </div>
- <div id="profile-attach-wrapper" style="display: $visitor;">
- <div id="wall-file-upload-div"><a class="icon attach" href="#" onclick="return false;" id="wall-file-upload" title="$attach"></a></div>
- </div>
- <div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);">
- <a class="icon link" id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink"></a>
- </div>
- <div id="profile-video-wrapper" style="display: $visitor;">
- <a class="icon video" id="profile-video" onclick="jotVideoURL();return false;" title="$video"></a>
- </div>
- <div id="profile-audio-wrapper" style="display: $visitor;">
- <a class="icon audio" id="profile-audio" onclick="jotAudioURL();return false;" title="$audio"></a>
- </div>
- <div id="profile-location-wrapper" style="display: $visitor;">
- <a class="icon globe" id="profile-location" onclick="jotGetLocation();return false;" title="$setloc"></a>
- </div>
- <div id="profile-nolocation-wrapper" style="display: none;">
- <a class="icon noglobe" id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc"></a>
- </div>
+ <div id="profile-upload-wrapper" style="display: $visitor;">
+ <div id="wall-image-upload-div"><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
+ </div>
+ <div id="profile-attach-wrapper" style="display: $visitor;">
+ <div id="wall-file-upload-div"><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
+ </div>
- <div id="profile-jot-plugin-wrapper">
- $jotplugins
- </div>
+ <div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);">
+ <a id="profile-link" class="icon link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink"></a>
+ </div>
+ <div id="profile-video-wrapper" style="display: $visitor;">
+ <a id="profile-video" class="icon video" onclick="jotVideoURL();return false;" title="$video"></a>
+ </div>
+ <div id="profile-audio-wrapper" style="display: $visitor;">
+ <a id="profile-audio" class="icon audio" onclick="jotAudioURL();return false;" title="$audio"></a>
+ </div>
+ <div id="profile-location-wrapper" style="display: $visitor;">
+ <a id="profile-location" class="icon globe" onclick="jotGetLocation();return false;" title="$setloc"></a>
+ </div>
+ <div id="profile-nolocation-wrapper" style="display: none;">
+ <a id="profile-nolocation" class="icon noglobe" onclick="jotClearLocation();return false;" title="$noloc"></a>
+ </div>
+
+ <div id="profile-jot-plugin-wrapper">
+ $jotplugins
+ </div>
<a class="icon-text-preview pointer"></a><a id="jot-preview-link" class="pointer" onclick="preview_post(); return false;" title="$preview">$preview</a>
<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
@@ -57,16 +58,16 @@
</div> <!-- /#jot-tools -->
<div id="jot-preview-content" style="display:none;"></div>
+
<div style="display: none;">
<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
$acl
<hr style="clear:both" />
- <div id="profile-jot-email-label">$emailcc</div>
- <input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
+ <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
<div id="profile-jot-email-end"></div>
$jotnets
</div>
</div>
</form>
-{{ if $content }}<script>initEditor();</script>{{ endif }}
+ {{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css
index 194609428..cbf0168f1 100644
--- a/view/theme/dispy/light/style.css
+++ b/view/theme/dispy/light/style.css
@@ -391,8 +391,9 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;}
.item-select{opacity:0.1;margin:5px 0 0 6px !important;}.item-select:hover{opacity:1;}
.checkeditem{opacity:1;}
#item-delete-selected{margin-top:30px;}
-.delete-checked{position:absolute;left:35px;margin-top:20px;}
+#item-delete-selected{position:absolute;left:35px;margin-top:20px;}
#item-delete-selected-icon{float:left;margin-right:5px;}
+#item-delete-selected-desc{font-size:smaller;}
.fc-state-highlight{background:#eeeeec;color:#111111;}
.directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;}
#group-sidebar{margin-bottom:10px;}
diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
index b0fab994c..c5624841e 100644
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@@ -2374,7 +2374,7 @@ div {
}
/* was tired of having no way of moving it around, so
* here's a little 'hook' to do so */
-.delete-checked {
+#item-delete-selected {
position: absolute;
left: 35px;
margin-top: 20px;
@@ -2383,6 +2383,9 @@ div {
float: left;
margin-right: 5px;
}
+#item-delete-selected-desc {
+ font-size: smaller;
+}
.fc-state-highlight {
background: @bg_colour;
color: @main_colour;
diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index 115f05ad7..8ffae0403 100644
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -78,9 +78,9 @@
</div>
</div>
<div class="wall-item-wrapper-end"></div>
- <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
- <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
- <div class="wall-item-comment-wrapper">
+ <div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
+ <div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
+ <div class="wall-item-comment-wrapper" >
$item.comment
</div>
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl
index da5fa13b3..84da598cd 100644
--- a/view/theme/dispy/wallwall_item.tpl
+++ b/view/theme/dispy/wallwall_item.tpl
@@ -64,7 +64,7 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick
{{ if $item.edpost }}
<li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li>
{{ endif }}
-
+
<li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
@@ -86,8 +86,8 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick
</div>
</div>
<div class="wall-item-wrapper-end"></div>
- <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
- <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
+ <div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
+ <div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
<div class="wall-item-comment-separator"></div>
<div class="wall-item-comment-wrapper">
$item.comment
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index de366210b..ea3a2da9c 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -1644,6 +1644,9 @@ input#dfrn-url {
display:block!important;
}
+#photos-usage-message {
+ margin-bottom: 15px;
+}
#acl-wrapper {