diff options
| author | zotlabs <mike@macgirvin.com> | 2017-07-02 18:57:21 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-07-02 18:57:21 -0700 |
| commit | 41111bcdadcd16ebc4f078fc812eb5a290f185e5 (patch) | |
| tree | 0bddfc473649a96048465f78e9033c2f43669110 /view/tpl | |
| parent | 08c0729f5ff8ac97c27db08ae2dde1a052c71e25 (diff) | |
| parent | 133292e241f9408ff793aa95aceec00c808fbd68 (diff) | |
| download | volse-hubzilla-41111bcdadcd16ebc4f078fc812eb5a290f185e5.tar.gz volse-hubzilla-41111bcdadcd16ebc4f078fc812eb5a290f185e5.tar.bz2 volse-hubzilla-41111bcdadcd16ebc4f078fc812eb5a290f185e5.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/chatrooms.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/item_categories.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/photo_albums.tpl | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl index d3eeed24f..0e6847608 100644 --- a/view/tpl/chatrooms.tpl +++ b/view/tpl/chatrooms.tpl @@ -27,7 +27,7 @@ <ul id="panel-{{$room.cr_id}}" class="lockview-panel dropdown-menu"></ul> {{/if}} </td> - <td><span class="badge badge-default">{{$room.cr_inroom}}</span></td> + <td><span class="badge badge-secondary">{{$room.cr_inroom}}</span></td> </tr> {{/foreach}} </table> diff --git a/view/tpl/item_categories.tpl b/view/tpl/item_categories.tpl index e1b183c0d..fa07fa39f 100644 --- a/view/tpl/item_categories.tpl +++ b/view/tpl/item_categories.tpl @@ -1,7 +1,7 @@ {{if $categories}} <!--div class="categorytags"--> {{foreach $categories as $cat}} -<span class="item-category badge badge-pill badge-warning"><i class="fa fa-asterisk"></i> {{if $cat.url}}<a class="text-white" href="{{$cat.url}}">{{$cat.term}}</a>{{else}}{{$cat.term}}{{/if}}</span> +<span class="item-category badge badge-pill badge-warning"><i class="fa fa-asterisk"></i> {{if $cat.url}}<a class="text-dark" href="{{$cat.url}}">{{$cat.term}}</a>{{else}}{{$cat.term}}{{/if}}</span> {{/foreach}} <!--/div--> {{/if}} diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 4719e1b17..f71feafe6 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -79,7 +79,7 @@ <li class="nav-item dropdown net-button" style="display: none;"> <a class="nav-link" href="#" title="{{$nav.network.3}}" id="{{$nav.network.4}}" data-toggle="dropdown" rel="#nav-network-menu"> <i class="fa fa-fw fa-th"></i> - <span class="badge badge-pill badge-default net-update"></span> + <span class="badge badge-pill badge-secondary net-update"></span> </a> <div id="nav-network-menu" class="dropdown-menu" rel="network"> <a class="dropdown-item" id="nav-network-see-all" href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a> @@ -118,7 +118,7 @@ <li class="nav-item dropdown all_events-button" style="display: none;"> <a class="nav-link" href="#" title="{{$nav.all_events.3}}" id="{{$nav.all_events.4}}" data-toggle="dropdown" rel="#nav-all_events-menu"> <i class="fa fa-fw fa-calendar"></i> - <span class="badge badge-pill badge-default all_events-update"></span> + <span class="badge badge-pill badge-secondary all_events-update"></span> </a> <div id="nav-all_events-menu" class="dropdown-menu" rel="all_events"> <a class="dropdown-item" id="nav-all_events-see-all" href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a> diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl index a238e61bc..83bdd95e7 100755 --- a/view/tpl/photo_albums.tpl +++ b/view/tpl/photo_albums.tpl @@ -5,7 +5,7 @@ {{if $albums}} {{foreach $albums as $al}} {{if $al.shorttext}} - <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge badge-default float-right">{{$al.total}}</span>{{$al.shorttext}}</a></li> + <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge badge-secondary float-right">{{$al.total}}</span>{{$al.shorttext}}</a></li> {{/if}} {{/foreach}} {{/if}} |