clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9830 from Extarys/actionfade 

fix: undefined search tag, sidebar colors #9789, #9811
This commit is contained in:
Hypolite Petovan 2021-01-20 11:01:44 -05:00 committed by GitHub
parent dc842f4f37 d5879045fa
commit 0668b2dfd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
view/theme/frio/css/style.css
View File

@ -643,17 +643,33 @@ nav.navbar .nav > li > button:focus
right: -2px; right: -2px;
background-color: #ff8989; 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 li,
#myNavmenu a { #myNavmenu a {
background-color: $nav_bg; background-color: $nav_bg;
color: $nav_icon_color; color: $nav_icon_color;
} }
#myNavmenu li.list-group-item {
border-color: $background_color;
}
#myNavmenu a {
display: block;
}
#myNavmenu li.nav-sitename { #myNavmenu li.nav-sitename {
font-weight: bold; font-weight: bold;
} }
#myNavmenu {
top: 50px;
}
#topbar-first .dropdown.account li#nav-sitename { #topbar-first .dropdown.account li#nav-sitename {
padding-left: 15px; padding-left: 15px;
padding-right: 15px; padding-right: 15px;
@ -2045,6 +2061,10 @@ ul.tabs li a {
ul.tabs li:hover, ul.tabs li.active { ul.tabs li:hover, ul.tabs li.active {
border-bottom-width: 4px; border-bottom-width: 4px;
} }
ul.tabbar ul.tabs-extended:hover li.dropdown {
border-bottom: 0;
}
ul.tabbar ul.tabs-extended li.active { ul.tabbar ul.tabs-extended li.active {
width: 100%; width: 100%;
border-bottom-width: 2px; border-bottom-width: 2px;
@ -2053,14 +2073,18 @@ ul.tabbar ul.tabs-extended li.active a {
background: none; background: none;
} }
ul.dropdown-menu li:hover { 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 */
.dropdown-menu li a, .dropdown-menu li a,
.dropdown-menu li .btn-link { .dropdown-menu li .btn-link {
color: $link_color; color: $font_color_darker;
} }
.dropdown-menu li > :hover, .dropdown-menu li > :hover,
.dropdown-menu li > :visited, .dropdown-menu li > :visited,

9
view/theme/frio/js/theme.js
View File

@ -136,7 +136,7 @@ $(document).ready(function(){
// initialize the bootstrap-select // initialize the bootstrap-select
$('.selectpicker').selectpicker(); $('.selectpicker').selectpicker();
// add search-heading to the seccond navbar // add search-heading to the second navbar
if( $(".search-heading").length) { if( $(".search-heading").length) {
$(".search-heading").appendTo("#topbar-second > .container > #tabmenu"); $(".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 // get the text of the heading (we catch the plain text because we don't
// want to have a h4 heading in the navbar // want to have a h4 heading in the navbar
var searchText = $(".section-title-wrapper > h2").html(); 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 <h4> heading and give it a class // insert the plain text in a <h4> heading and give it a class
var newText = '<h4 class="search-heading">'+searchText+'</h4>'; var newText = '<h4 class="search-heading">'+searchText+'</h4>';
// append the new heading to the navbar // append the new heading to the navbar