mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-26 11:58:53 +00:00
Merge remote-tracking branch 'cyberalien/ticket/11979' into develop
* cyberalien/ticket/11979: [ticket/11979] Fix errors in dropdown [ticket/11979] Add ability to create dropdown menu to prosilver
This commit is contained in:
commit
4684ba0869
3 changed files with 59 additions and 5 deletions
|
@ -2365,11 +2365,14 @@ fieldset.permissions .padding {
|
||||||
.dropdown .dropdown-contents {
|
.dropdown .dropdown-contents {
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
overflow-y: auto;
|
||||||
background: #fff;
|
background: #fff;
|
||||||
border: 1px solid #b9b9b9;
|
border: 1px solid #b9b9b9;
|
||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
min-width: 40px;
|
||||||
|
max-height: 200px;
|
||||||
box-shadow: 1px 3px 5px rgba(0, 0, 0, 0.2);
|
box-shadow: 1px 3px 5px rgba(0, 0, 0, 0.2);
|
||||||
-webkit-box-sizing: border-box;
|
-webkit-box-sizing: border-box;
|
||||||
-moz-box-sizing: border-box;
|
-moz-box-sizing: border-box;
|
||||||
|
|
|
@ -433,6 +433,39 @@ function parse_document(container)
|
||||||
jumpto($(this));
|
jumpto($(this));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Dropdowns
|
||||||
|
*/
|
||||||
|
container.find('.dropdown-container').each(function() {
|
||||||
|
var $this = $(this),
|
||||||
|
trigger = $this.find('.dropdown-trigger:first'),
|
||||||
|
contents = $this.find('.dropdown'),
|
||||||
|
options = {
|
||||||
|
direction: 'auto',
|
||||||
|
verticalDirection: 'auto'
|
||||||
|
},
|
||||||
|
data;
|
||||||
|
|
||||||
|
if (!trigger.length) {
|
||||||
|
data = $this.attr('data-dropdown-trigger');
|
||||||
|
trigger = data ? $this.children(data) : $this.children('a:first');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!contents.length) {
|
||||||
|
data = $this.attr('data-dropdown-contents');
|
||||||
|
contents = data ? $this.children(data) : $this.children('div:first');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!trigger.length || !contents.length) return;
|
||||||
|
|
||||||
|
if ($this.hasClass('dropdown-up')) options.verticalDirection = 'up';
|
||||||
|
if ($this.hasClass('dropdown-down')) options.verticalDirection = 'down';
|
||||||
|
if ($this.hasClass('dropdown-left')) options.direction = 'left';
|
||||||
|
if ($this.hasClass('dropdown-right')) options.direction = 'right';
|
||||||
|
|
||||||
|
phpbb.registerDropdown(trigger, contents, options);
|
||||||
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adjust HTML code for IE8 and older versions
|
* Adjust HTML code for IE8 and older versions
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -407,6 +407,14 @@ li.responsive-menu .dropdown .dropdown-contents {
|
||||||
padding: 0 5px;
|
padding: 0 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ul.linklist .dropdown-down .dropdown {
|
||||||
|
top: 22px;
|
||||||
|
}
|
||||||
|
|
||||||
|
ul.linklist .dropdown-up .dropdown {
|
||||||
|
bottom: 18px;
|
||||||
|
}
|
||||||
|
|
||||||
ul.linklist .dropdown li {
|
ul.linklist .dropdown li {
|
||||||
clear: both;
|
clear: both;
|
||||||
}
|
}
|
||||||
|
@ -437,10 +445,18 @@ ul.linklist.bulletin li.no-bulletin:before {
|
||||||
|
|
||||||
/* Dropdown menu
|
/* Dropdown menu
|
||||||
----------------------------------------*/
|
----------------------------------------*/
|
||||||
|
.dropdown-container {
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nojs .dropdown-container:hover .dropdown {
|
||||||
|
display: block !important;
|
||||||
|
}
|
||||||
|
|
||||||
.dropdown {
|
.dropdown {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 0;
|
left: 0;
|
||||||
top: 22px;
|
top: 1.2em;
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
border: 1px solid transparent;
|
border: 1px solid transparent;
|
||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
|
@ -449,16 +465,15 @@ ul.linklist.bulletin li.no-bulletin:before {
|
||||||
|
|
||||||
.dropdown-up .dropdown {
|
.dropdown-up .dropdown {
|
||||||
top: auto;
|
top: auto;
|
||||||
bottom: 18px;
|
bottom: 1.2em;
|
||||||
padding: 0 0 9px;
|
padding: 0 0 9px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dropdown-left .dropdown {
|
.dropdown-left .dropdown, .nojs .rightside .dropdown {
|
||||||
left: auto;
|
left: auto;
|
||||||
right: 0;
|
right: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.dropdown .pointer, .dropdown .pointer-inner {
|
.dropdown .pointer, .dropdown .pointer-inner {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
width: 0;
|
width: 0;
|
||||||
|
@ -488,7 +503,7 @@ ul.linklist.bulletin li.no-bulletin:before {
|
||||||
top: auto;
|
top: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dropdown-left .dropdown .pointer {
|
.dropdown-left .dropdown .pointer, .nojs .rightside .dropdown .pointer {
|
||||||
left: auto;
|
left: auto;
|
||||||
right: 10px;
|
right: 10px;
|
||||||
}
|
}
|
||||||
|
@ -507,10 +522,13 @@ ul.linklist.bulletin li.no-bulletin:before {
|
||||||
.dropdown .dropdown-contents {
|
.dropdown .dropdown-contents {
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
overflow-y: auto;
|
||||||
border: 1px solid transparent;
|
border: 1px solid transparent;
|
||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
min-width: 40px;
|
||||||
|
max-height: 200px;
|
||||||
-webkit-box-sizing: border-box;
|
-webkit-box-sizing: border-box;
|
||||||
-moz-box-sizing: border-box;
|
-moz-box-sizing: border-box;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
|
Loading…
Add table
Reference in a new issue