aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-11-09 14:56:53 -0800
committerredmatrix <redmatrix@redmatrix.me>2015-11-09 14:56:53 -0800
commitcda8fb338068ff8d5393580ee0cb15f8b080fb6f (patch)
treeeaf686fab3c1ae66d954b1eda271c13732aa9cf3 /view
parent862a31007543c292ba3bcd6d56e390d83c1043be (diff)
parent98146eae076a7eff315c4927ad1fc2ee2a06ade8 (diff)
downloadvolse-hubzilla-cda8fb338068ff8d5393580ee0cb15f8b080fb6f.tar.gz
volse-hubzilla-cda8fb338068ff8d5393580ee0cb15f8b080fb6f.tar.bz2
volse-hubzilla-cda8fb338068ff8d5393580ee0cb15f8b080fb6f.zip
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view')
-rw-r--r--view/theme/redbasic/css/style.css7
-rwxr-xr-xview/tpl/acl_selector.tpl2
2 files changed, 2 insertions, 7 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index abafda7b8..45f9021a2 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1382,12 +1382,7 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
border-radius: $radiuspx;
}
-#jotnets-wrapper {
- background-color: rgb(238, 238, 238);
- font-size: 120%;
- border-radius: 4px;
- padding: 7px 10px;
- cursor: pointer;
+#jotnets-wrapper, #jotnets-collapse {
margin-bottom: 18px;
}
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index 63a2900f4..a873457fe 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -8,7 +8,7 @@
<div class="modal-body">
{{if $jotnets}}
<div class="jotnets-wrapper" role="tab" id="jotnets-wrapper">
- <a data-toggle="collapse" href="#jotnets-collapse" aria-expanded="false" aria-controls="jotnets-collapse">{{$jnetModalTitle}} <span class="caret"></span></a>
+ <a data-toggle="collapse" class="btn btn-block btn-default" href="#jotnets-collapse" aria-expanded="false" aria-controls="jotnets-collapse">{{$jnetModalTitle}} <span class="caret"></span></a>
</div>
<div id="jotnets-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="acl-select">
{{$jotnets}}