diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-19 21:51:21 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-19 21:51:21 -0800 |
| commit | 250d947667b1500633d80b043ac3760be21446fc (patch) | |
| tree | 66e3a68e1dbd901642e5cb59a7f4e1efd2e717d8 | |
| parent | 6a49e3124e193edf57005873e825bf8328649183 (diff) | |
| download | volse-hubzilla-250d947667b1500633d80b043ac3760be21446fc.tar.gz volse-hubzilla-250d947667b1500633d80b043ac3760be21446fc.tar.bz2 volse-hubzilla-250d947667b1500633d80b043ac3760be21446fc.zip | |
cloud tiles: use folder-o for folders and set the icon colour to something a bit less harsh than the link colour for system icons. Dark solid blue folders are a bit overwhelming, as is the default text_colour (black)
| -rw-r--r-- | Zotlabs/Module/Ping.php | 3 | ||||
| -rw-r--r-- | include/text.php | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 4 | ||||
| -rw-r--r-- | view/tpl/cloud_directory.tpl | 4 |
4 files changed, 10 insertions, 5 deletions
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index 8644b8326..406e554d1 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -492,10 +492,11 @@ class Ping extends \Zotlabs\Web\Controller { $t3 = dba_timer(); if($vnotify & (VNOTIFY_NETWORK|VNOTIFY_CHANNEL)) { + $r = q("SELECT id, item_wall FROM item WHERE item_unseen = 1 and uid = %d $item_normal - AND author_xchan != '%s'", + AND author_xchan != '%s' $sql_extra ", intval(local_channel()), dbesc($ob_hash) ); diff --git a/include/text.php b/include/text.php index ee8318d7c..343e3f00b 100644 --- a/include/text.php +++ b/include/text.php @@ -2704,8 +2704,8 @@ function linkify_tags($a, &$body, $uid, $diaspora = false) { function getIconFromType($type) { $iconMap = array( //Folder - t('Collection') => 'fa-folder', - 'multipart/mixed' => 'fa-folder', //dirs in attach use this mime type + t('Collection') => 'fa-folder-o', + 'multipart/mixed' => 'fa-folder-o', //dirs in attach use this mime type //Common file 'application/octet-stream' => 'fa-file-o', //Text diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5f31004ff..b3cd9c9f8 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -105,6 +105,10 @@ a, color: $link_colour; } +.cloud-icon.tiles i { + color: #aaa; +} + a:hover, a:focus, .fakelink:hover, diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 3ae8cbf35..a9840a0b8 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -3,7 +3,7 @@ {{if $parentpath}} <div class="cloud-container" > - <div class="cloud-icon"><a href="{{$parentpath.path}}"> + <div class="cloud-icon tiles"><a href="{{$parentpath.path}}"> <i class="fa fa-fw fa-level-up" ></i> </a> </div> @@ -14,7 +14,7 @@ {{foreach $entries as $item}} <div class="cloud-container"> - <div class="cloud-icon"><a href="{{$item.fullPath}}"> + <div class="cloud-icon tiles"><a href="{{$item.fullPath}}"> {{if $item.photo_icon}} <img src="{{$item.photo_icon}}" title="{{$item.type}}" > {{else}} |