diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-10-07 11:52:08 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-10-07 11:52:08 +0200 |
| commit | 2695950a6132edeb5cd86fc005516dc8ce21aa77 (patch) | |
| tree | f7022a8216c51fc48d0a8e455615139f5a46dd70 | |
| parent | 7bda33b52598f5a56f32382455a4a0791c3c7098 (diff) | |
| parent | 7806a2f1fd15b28df3118c6fa4540276dd80435c (diff) | |
| download | forums-2695950a6132edeb5cd86fc005516dc8ce21aa77.tar forums-2695950a6132edeb5cd86fc005516dc8ce21aa77.tar.gz forums-2695950a6132edeb5cd86fc005516dc8ce21aa77.tar.bz2 forums-2695950a6132edeb5cd86fc005516dc8ce21aa77.tar.xz forums-2695950a6132edeb5cd86fc005516dc8ce21aa77.zip | |
Merge pull request #3940 from hanakin/ticket/14206
[Ticket/14206]Fix jumpbox UI consistency
| -rw-r--r-- | phpBB/styles/prosilver/template/jumpbox.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/colours.css | 17 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 4 |
3 files changed, 3 insertions, 20 deletions
diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html index f76c8e82f5..48325b5dbf 100644 --- a/phpBB/styles/prosilver/template/jumpbox.html +++ b/phpBB/styles/prosilver/template/jumpbox.html @@ -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> diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 77c17b568e..b145a75ace 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -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; } diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index b2eebe36f1..219603a969 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -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; } |