diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-09 16:52:00 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-09 16:52:00 -0700 |
| commit | 03357481f73d506ae36be9858dc757842408c6a9 (patch) | |
| tree | a69772d6caf71f4986a26eb80d00ac4e8750b995 /view | |
| parent | ec1dcb8f2eccfd1a0dfc9c7eccea788a4b385e41 (diff) | |
| parent | 805e2a28ee81febee2742587a1640b5fae1387a2 (diff) | |
| download | volse-hubzilla-03357481f73d506ae36be9858dc757842408c6a9.tar.gz volse-hubzilla-03357481f73d506ae36be9858dc757842408c6a9.tar.bz2 volse-hubzilla-03357481f73d506ae36be9858dc757842408c6a9.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
install/schema_mysql.sql
mod/home.php
mod/page.php
view/nl/messages.po
view/nl/strings.php
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/main.js | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 12 | ||||
| -rwxr-xr-x | view/tpl/admin_site.tpl | 3 |
3 files changed, 15 insertions, 2 deletions
diff --git a/view/js/main.js b/view/js/main.js index 35944e13f..625ac5b01 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -372,7 +372,7 @@ function NavUpdate() { if($('#live-network').length) { src = 'network'; liveUpdate(); } if($('#live-channel').length) { src = 'channel'; liveUpdate(); } - if($('#live-home').length) { src = 'home'; liveUpdate(); } + if($('#live-public').length) { src = 'public'; liveUpdate(); } if($('#live-display').length) { src = 'display'; liveUpdate(); } if($('#live-search').length) { src = 'search'; liveUpdate(); } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f391c84e3..a671a6671 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2053,6 +2053,18 @@ nav .badge.mail-update:hover { padding: 7px 10px; } +.nav-tabs.nav-justified > .active > a, +.nav-tabs.nav-justified > .active > a:hover, +.nav-tabs.nav-justified > .active > a:focus { + border-bottom-color: transparent; +} + +.nav-tabs > li.active > a, +.nav-tabs > li.active > a:hover, +.nav-tabs > li.active > a:focus { + background-color: transparent; +} + #tabs-collapse-1 { padding: 0px; margin-bottom: 25px; diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 225b281cc..eabb6f067 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -46,7 +46,8 @@ {{include file="field_select.tpl" field=$language}} {{include file="field_select.tpl" field=$theme}} {{include file="field_select.tpl" field=$theme_mobile}} - {{include file="field_checkbox.tpl" field=$no_login_on_homepage}} + {{include file="field_input.tpl" field=$frontpage}} + {{include file="field_checkbox.tpl" field=$login_on_homepage}} <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> |