aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorManuel Jiménez Friaza <mjfriaza@openmailbox.org>2018-12-13 12:34:04 +0100
committerManuel Jiménez Friaza <mjfriaza@openmailbox.org>2018-12-13 12:34:04 +0100
commit618d673947dc627dcdac3f9b6da7f31123472b05 (patch)
treedfa52436ec997eec5795b5dee247b3e4f6fa6557 /view
parent4cd5529027efa19288ddce125f0d41ccb5519578 (diff)
parent6bea3d6bfc984e6f30867f00be5a92b5cd5be925 (diff)
downloadvolse-hubzilla-618d673947dc627dcdac3f9b6da7f31123472b05.tar.gz
volse-hubzilla-618d673947dc627dcdac3f9b6da7f31123472b05.tar.bz2
volse-hubzilla-618d673947dc627dcdac3f9b6da7f31123472b05.zip
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'view')
-rw-r--r--view/theme/redbasic/schema/dark.css19
-rwxr-xr-xview/tpl/photo_view.tpl2
2 files changed, 20 insertions, 1 deletions
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index 71f7bc393..e958d9ee7 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -326,6 +326,17 @@ a.text-dark:focus, a.text-dark:hover {
color: #ddd !important;
}
+.badge-warning {
+ background-color: #ffc927;
+}
+.badge-warning a.text-dark {
+ color: #333 !important;
+}
+.badge-warning a.text-dark:focus, .badge-warning a.text-dark:hover {
+ color: red !important;
+ text-decoration: none;
+}
+
.group-selected, .fileas-selected, .categories-selected, .search-selected, a.active {
color: #fff !important;
text-decoration: underline !important;
@@ -480,3 +491,11 @@ pre {
.widget-nav-pills-checkbox:hover + a {
background-color: #222;
}
+
+/* change color of [hl] tag: */
+div.wall-item-body span /*strong:only-of-type */{
+ color: #1212b6;
+ padding: 2px 3px;
+/* font-weight: 500; */
+ white-space: nowrap;
+}
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 105cf0ac8..6d566cab9 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -99,7 +99,7 @@
<div id="photo-edit-end" class="clear"></div>
</div>
<div id="photo-view-wrapper">
- <div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;"><img style="width: 100%;" src="{{$photo.src}}"></a></div>
+ <div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="{{$onclick}}"><img style="width: 100%;" src="{{$photo.src}}"></a></div>
<div id="photo-photo-end" class="clear"></div>
{{if $tags}}
<div class="photo-item-tools-left" id="in-this-photo">