diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-21 07:31:36 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-21 07:31:36 +0200 |
| commit | 7834274bff5e86a7a0eb646f1319b5b9e4bac96f (patch) | |
| tree | 5d0317e3aa203471f152f6ec2533150c5406906a /view | |
| parent | 4f6506657208ebf3eadce3109d1bcd8407c7bdaf (diff) | |
| parent | d2565d0f61c139df6536ec9d90c10d7af29ef9e5 (diff) | |
| download | volse-hubzilla-7834274bff5e86a7a0eb646f1319b5b9e4bac96f.tar.gz volse-hubzilla-7834274bff5e86a7a0eb646f1319b5b9e4bac96f.tar.bz2 volse-hubzilla-7834274bff5e86a7a0eb646f1319b5b9e4bac96f.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view')
| -rw-r--r-- | view/php/default.php | 2 | ||||
| -rw-r--r-- | view/tpl/bookmarkedchats.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/chatroom_new.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/chatrooms.tpl | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/view/php/default.php b/view/php/default.php index 4c8311ef0..6a9cc5517 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -14,7 +14,7 @@ <div id="page-footer"></div> <div id="pause"></div> </section> - <aside id="region_3" class="hidden-sm hidden-xs"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside> + <aside id="region_3" class="hidden-sm hidden-xs hidden-md"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside> </main> <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> </body> diff --git a/view/tpl/bookmarkedchats.tpl b/view/tpl/bookmarkedchats.tpl index 7635bb826..ab4372c25 100644 --- a/view/tpl/bookmarkedchats.tpl +++ b/view/tpl/bookmarkedchats.tpl @@ -1,7 +1,7 @@ {{if $rooms}} <div class="widget"> <h3>{{$header}}</h3> -<ul class="bookmarkchat"> +<ul class="bookmarkchat nav nav-pills nav-stacked"> {{foreach $rooms as $room}} <li><a href="{{$room.xchat_url}}">{{$room.xchat_desc}}</a></li> {{/foreach}} diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl index a559dba54..c02e55c25 100644 --- a/view/tpl/chatroom_new.tpl +++ b/view/tpl/chatroom_new.tpl @@ -2,7 +2,7 @@ <form action="chat" method="post" > {{include file="field_input.tpl" field=$name}} -<button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;" >{{$permissions}}</button> +<button id="dbtn-acl" class="btn btn-default" data-toggle="modal" data-target="#aclModal" onclick="return false;" >{{$permissions}}</button> {{$acl}} <div class="clear"></div> <br /> diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl index c3dae6627..836923231 100644 --- a/view/tpl/chatrooms.tpl +++ b/view/tpl/chatrooms.tpl @@ -2,7 +2,7 @@ {{if $is_owner}} <p> -<a href="{{$baseurl}}/chat/{{$nickname}}/new">{{$newroom}}</a> +<span class="btn btn-default"><a href="{{$baseurl}}/chat/{{$nickname}}/new">{{$newroom}}</a></span> </p> {{/if}} |