From a0a376e95e78e4c1ac9fb5da30f46cea0b4d0de5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 14 Mar 2017 18:31:19 +0100 Subject: hide nav search behind a button, css fixes and cleanup --- view/css/bootstrap-red.css | 15 ++++-------- view/js/autocomplete.js | 2 +- view/js/main.js | 4 +-- view/php/default.php | 2 +- view/theme/redbasic/css/style.css | 51 ++++++--------------------------------- view/tpl/follow.tpl | 2 +- view/tpl/hdr.tpl | 2 -- view/tpl/nav.tpl | 17 +++++++------ view/tpl/peoplefind.tpl | 2 +- view/tpl/searchbox.tpl | 2 +- 10 files changed, 29 insertions(+), 70 deletions(-) (limited to 'view') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 356d0ae9c..77ec1f5cb 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -17,18 +17,17 @@ nav .badge { font-size: 1rem; } -/* nav overrides end */ - +#navbar-collapse-2.show { + max-height: 100vh; + overflow: auto; +} nav .dropdown-menu { max-height: 70vh; overflow: auto; } -nav .navbar-collapse.in .dropdown-menu { - max-height: none; - overflow: none; -} +/* nav overrides end */ .wall-item-tools .dropdown-menu { min-width: auto; @@ -38,10 +37,6 @@ code { white-space: normal; } -.form-control { - font-size: unset; -} - .panel-group { margin-bottom: 0px; } diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 5a616b6fc..4de9f9c6b 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -60,7 +60,7 @@ function contact_format(item) { var desc = ((item.label) ? item.nick + ' ' + item.label : item.nick); if(typeof desc === 'undefined') desc = ''; if(desc) desc = ' ('+desc+')'; - return "
{2}{3}
".format(item.taggable, item.photo, item.name, desc, item.link); + return "
{2}{3}
".format(item.taggable, item.photo, item.name, desc, item.link); } else return "
" + item.text + "
"; diff --git a/view/js/main.js b/view/js/main.js index db7ad110b..5e3a04abb 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -369,10 +369,10 @@ function NavUpdate() { updateCountsOnly = false; if(data.network || data.home || data.intros || data.mail || data.all_events || data.notify) { - $('#notifications-btn').css('color', 'white').prop('disabled', false); + $('#notifications-btn').removeClass('text-muted').addClass('text-white'); } else { - $('#notifications-btn').css('color', 'grey').prop('disabled', true); + $('#notifications-btn').removeClass('text-white').addClass('text-muted'); $('#navbar-collapse-1').removeClass('in'); } diff --git a/view/php/default.php b/view/php/default.php index c4ba6ae43..b8233ca32 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -7,7 +7,7 @@ > -
+
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 498e816db..0e9eab16a 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -108,34 +108,7 @@ a:focus, cursor: pointer; } -input[type="text"], -input[type="password"], -input[type="submit"], -input[type="file"], -select, -textarea { - font-family: sans-serif, arial, freesans; - font-size: $body_font_size; -} - -input { - padding: 5px; - line-height: 1.5; - border: 1px solid #ccc; - -moz-border-radius: $radiuspx; - border-radius: $radiuspx; -} - -input[type="submit"] { - background-color: #F0F0F0; - font-weight: bold; - color: #0080FF; - text-decoration: none; - padding: 6px 12px; -} - input, optgroup, select, textarea { - color: #333; resize: vertical; } @@ -570,24 +543,16 @@ footer { } #nav-search-spinner { - float: left; - margin: 25px 0px 0px 25px; - color: $nav_active_icon_colour; + float: right; + margin-top: -0.85rem; + margin-right: 1.1rem; } -/* + #nav-search-text { - font-size: 12px; - width: 200px; - height: 20px; - margin-right: 15px; - padding: 0px 5px 0px 5px; - border-radius: $radiuspx; - border-color: $nav_bd; - background-color: #eee; - transition: background-color 300ms ease 0s; + width: 280px; } -*/ + #nav-search-text::-webkit-input-placeholder { font-family: FontAwesome, sans-serif; } @@ -1535,8 +1500,8 @@ nav img { } .usermenu { - width: 2rem; - height: 2rem; + width: 2.2rem; + height: 2.2rem; } .usermenu img { diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl index 240cc7b55..4def1415d 100755 --- a/view/tpl/follow.tpl +++ b/view/tpl/follow.tpl @@ -2,7 +2,7 @@

{{$connect}}

- +
diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl index fa2996be6..5ab7d68fd 100644 --- a/view/tpl/hdr.tpl +++ b/view/tpl/hdr.tpl @@ -1,5 +1,3 @@ - - diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index d3ead3cfe..ab9698d49 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -19,11 +19,8 @@ - {{if $localuser}} - {{/if}} @@ -171,13 +168,17 @@ {{/if}} - +
{{$banner}}
-
    -
  • +