diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-05-06 13:42:22 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-05-06 13:42:22 -0400 |
| commit | 6950100ff4c9104fd6f980641e7118b909fd44db (patch) | |
| tree | 2af109ca04cd3cd1f8a12a35bc5dbca4cffcb1ce /view | |
| parent | 3011d3768cb524ccf795ed64924649a2e30a036b (diff) | |
| parent | b08fc746d81e9e486988439ae9a51918e9f9ee37 (diff) | |
| download | volse-hubzilla-6950100ff4c9104fd6f980641e7118b909fd44db.tar.gz volse-hubzilla-6950100ff4c9104fd6f980641e7118b909fd44db.tar.bz2 volse-hubzilla-6950100ff4c9104fd6f980641e7118b909fd44db.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into plugin-repo
Diffstat (limited to 'view')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 34 | ||||
| -rwxr-xr-x | view/tpl/acl_selector.tpl | 14 |
2 files changed, 26 insertions, 22 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 48d93025b..547fe9ec3 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -925,9 +925,7 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { #acl-search { padding: 4px; border: 1px solid #ccc; - width: 90%; /* fallback if browser does not support calc() */ - width: calc(100% - 10px); - margin: 0px 0px 10px 10px; + width: 100%; } #acl-search::-webkit-input-placeholder { @@ -944,15 +942,6 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { padding-top: 10px; } -#acl-dialog-description { - font-size: 90%; - color: #888; - padding-bottom: 4px; -} -#acl-dialog-description b { - color: black; -} - #acl-showlimited-description { font-size: 90%; color: #888; @@ -961,16 +950,27 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { } #acl-list { - display: block; border: 1px solid #ccc; + -webkit-border-radius: $radiuspx ; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; +} + +#acl-search-wrapper { + padding: 7px 10px; + background-color: $item_colour; + border-top-left-radius: $radiuspx; + border-top-right-radius: $radiuspx; + border-bottom: 1px solid #ccc; +} + +#acl-list-content-wrapper { + display: block; overflow: auto; clear: both; min-height: 62px; padding: 10px 10px 0px 0px; - -webkit-border-radius: $radiuspx ; - -moz-border-radius: $radiuspx; - border-radius: $radiuspx; - background-color: rgb(238,238,238); + } #jotnets-wrapper, #jotnets-collapse { diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index a3fe73d0c..0df72747a 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -8,9 +8,9 @@ {{/if}} <h4 class="modal-title"><i id="dialog-perms-icon" class="fa fa-fw"></i> {{$aclModalTitle}}</h4> </div> - <div class="modal-body"> + <div class="section-content-wrapper"> {{if $aclModalDesc}} - <div id="acl-dialog-description">{{$aclModalDesc}}</div> + <div id="acl-dialog-description" class="section-content-info-wrapper">{{$aclModalDesc}}</div> {{/if}} {{if $jotnets}} <div class="jotnets-wrapper" role="tab" id="jotnets-wrapper"> @@ -34,9 +34,13 @@ <span id=acl-showlimited-caption>{{$showlimited}}</span> </label> <div id="acl-list"> - <input type="text" id="acl-search" placeholder=" {{$search}}"> - <div id=acl-showlimited-description>{{$showlimitedDesc}}</div> - <div id="acl-list-content"></div> + <div id="acl-search-wrapper"> + <input type="text" id="acl-search" placeholder=" {{$search}}"> + </div> + <div id="acl-list-content-wrapper"> + <div id=acl-showlimited-description>{{$showlimitedDesc}}</div> + <div id="acl-list-content"></div> + </div> </div> </div> |