makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-29 14:48:53 +00:00
Code Issues Projects Releases Packages 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
commit 2695950a61
3 changed files with 3 additions and 20 deletions
Show stats 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 --> <!-- 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"> <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><!-- 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 class="caret"><i class="icon fa-sort-down fa-fw"></i></span>
</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: #DADADA; }
.caret { border-color: #C7C3BF; } .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 { border-color: #DCDCDC; }
.contact-icons a:hover { background-color: #F2F6F9; } .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 { .dropdown .pointer {
right: auto; right: auto;
left: 10px; left: 10px;
top: 0; top: -1px;
z-index: 3; z-index: 3;
} }
.dropdown-up .pointer { .dropdown-up .pointer {
bottom: 0; bottom: -1px;
top: auto; top: auto;
} }