From 61af10b6ce8a27de32c0f0e36b98a686a13d7f21 Mon Sep 17 00:00:00 2001 From: Extarys Date: Wed, 20 Jan 2021 09:21:57 -0500 Subject: [PATCH 1/3] fix: undefined search tag #9789 --- view/theme/frio/js/theme.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js index b63073966..18ead816e 100644 --- a/view/theme/frio/js/theme.js +++ b/view/theme/frio/js/theme.js @@ -136,7 +136,7 @@ $(document).ready(function(){ // initialize the bootstrap-select $('.selectpicker').selectpicker(); - // add search-heading to the seccond navbar + // add search-heading to the second navbar if( $(".search-heading").length) { $(".search-heading").appendTo("#topbar-second > .container > #tabmenu"); } @@ -147,6 +147,13 @@ $(document).ready(function(){ // get the text of the heading (we catch the plain text because we don't // want to have a h4 heading in the navbar var searchText = $(".section-title-wrapper > h2").html(); + + // temporary workaround to avoid 'undefined' being displayed (issue #9789) + // https://github.com/friendica/friendica/issues/9789 + // TODO: find a way to localize this string + if(typeof searchText === "undefined") { + searchText = "No results"; + } // insert the plain text in a

heading and give it a class var newText = '

'+searchText+'

'; // append the new heading to the navbar From fcd23670897acebf205c6cd7af7af2ec4ccb9041 Mon Sep 17 00:00:00 2001 From: Extarys Date: Wed, 20 Jan 2021 09:26:22 -0500 Subject: [PATCH 2/3] fix: frio mobile: right sidebar colors --- view/theme/frio/css/style.css | 47 +++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 2e4776111..3a86de02a 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -417,9 +417,17 @@ nav.navbar { z-index: 1030; color: $nav_icon_color; } +@media screen and (max-width: 767px) { + #topbar-first, + nav.navbar { + padding: 0 2px; + } +} + #topbar-first .navbar-toggle { margin-top: 5px; margin-bottom: 0; + margin-right: 0; } #topbar-first .nav > li > a, #topbar-first .nav > li > button, @@ -635,17 +643,33 @@ nav.navbar .nav > li > button:focus right: -2px; background-color: #ff8989; } +#myNavmenu { + top: 50px; + background-color: $background_color; + border-top: 0; + border-right: 0; + border-bottom: 0; + border-left-color: $nav_icon_color; + box-shadow: 0 0 3px black; +} +#myNavmenu ul, #myNavmenu ul li:first-child, #myNavmenu ul, #myNavmenu ul li:last-child { + border-radius: 0; +} #myNavmenu li, #myNavmenu a { background-color: $nav_bg; color: $nav_icon_color; } + +#myNavmenu li.list-group-item { + border-color: $background_color; +} +#myNavmenu a { + display: block; +} #myNavmenu li.nav-sitename { font-weight: bold; } -#myNavmenu { - top: 50px; -} #topbar-first .dropdown.account li#nav-sitename { padding-left: 15px; padding-right: 15px; @@ -2037,6 +2061,10 @@ ul.tabs li a { ul.tabs li:hover, ul.tabs li.active { border-bottom-width: 4px; } +ul.tabbar ul.tabs-extended:hover li.dropdown { + border-bottom: 0; +} + ul.tabbar ul.tabs-extended li.active { width: 100%; border-bottom-width: 2px; @@ -2045,14 +2073,19 @@ ul.tabbar ul.tabs-extended li.active a { background: none; } ul.dropdown-menu li:hover { - border-bottom-width: 0; + border-bottom: 0; +} +.dropdown-menu li { + display: block; + width: 100%; + box-sizing: border-box; } - - /* Dropdown Menu */ .dropdown-menu li a, .dropdown-menu li .btn-link { - color: $link_color; + /* color: $link_color; */ + color: $font_color_darker; + } .dropdown-menu li > :hover, .dropdown-menu li > :visited, From d5879045fad2d3f59563f6f4c5f8f58c326888a3 Mon Sep 17 00:00:00 2001 From: Extarys Date: Wed, 20 Jan 2021 10:44:59 -0500 Subject: [PATCH 3/3] remove comment --- view/theme/frio/css/style.css | 1 - 1 file changed, 1 deletion(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 3a86de02a..2ad28b5a0 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -2083,7 +2083,6 @@ ul.dropdown-menu li:hover { /* Dropdown Menu */ .dropdown-menu li a, .dropdown-menu li .btn-link { - /* color: $link_color; */ color: $font_color_darker; }