mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3940 from hanakin/ticket/14206

Browse Source 
[Ticket/14206]Fix jumpbox UI consistency
This commit is contained in:
Marc Alexander
2015-10-07 11:52:08 +02:00
parent 7bda33b525 7806a2f1fd
commit 2695950a61
3 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/styles/prosilver/template/jumpbox.html
View File

@@ -28,7 +28,7 @@
<!-- IF S_DISPLAY_JUMPBOX -->
<div class="jumpbox dropdown-container dropdown-container-right<!-- IF not S_IN_MCP --> dropdown-up<!-- ENDIF --> dropdown-{S_CONTENT_FLOW_BEGIN} dropdown-button-control" id="jumpbox">
<span title="<!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->" class="button dropdown-trigger dropdown-select">
<span title="<!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->" class="button button-secondary dropdown-trigger dropdown-select">
<span><!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF --></span>
<span class="caret"><i class="icon fa-sort-down fa-fw"></i></span>
</span>

17
phpBB/styles/prosilver/theme/colours.css
View File

@@ -637,23 +637,6 @@ Colours and backgrounds for buttons.css
.caret { border-color: #DADADA; }
.caret { border-color: #C7C3BF; }
.jumpbox .button, .jumpbox .button i {
color: #536482;
}
.jumpbox .button:hover {
border-color: #C7C3BF;
}
.jumpbox .button:hover i {
color: #536482;
}
.dropdown-visible .dropdown-select, .dropdown-visible .dropdown-select:hover, .nojs .dropdown-container:hover .dropdown-select {
border-color: #A6B2BA;
color: #105289;
}
.contact-icons a { border-color: #DCDCDC; }
.contact-icons a:hover { background-color: #F2F6F9; }

4
phpBB/styles/prosilver/theme/common.css
View File

@@ -441,12 +441,12 @@ ul.linklist.bulletin > li.no-bulletin:before {
.dropdown .pointer {
right: auto;
left: 10px;
top: 0;
top: -1px;
z-index: 3;
}
.dropdown-up .pointer {
bottom: 0;
bottom: -1px;
top: auto;
}