diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-09-01 18:07:06 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-09-01 18:07:06 +0200 |
| commit | 8c758e223e6186a0dbed508dfbd21b704a7cf860 (patch) | |
| tree | 80d0e62ee8195972ae8790e098506bddbf68b924 | |
| parent | 214c5c6d0b2145e9a315cc3c873ed8927680046c (diff) | |
| parent | aafa5b6ed0959cdf8d52cd1358a7b30a6f59e2f5 (diff) | |
| download | forums-8c758e223e6186a0dbed508dfbd21b704a7cf860.tar forums-8c758e223e6186a0dbed508dfbd21b704a7cf860.tar.gz forums-8c758e223e6186a0dbed508dfbd21b704a7cf860.tar.bz2 forums-8c758e223e6186a0dbed508dfbd21b704a7cf860.tar.xz forums-8c758e223e6186a0dbed508dfbd21b704a7cf860.zip | |
Merge pull request #3866 from hanakin/ticket/14038
[Ticket/14038] Jumpbox improvements
* hanakin/ticket/14038:
[ticket/14038] Minor color tweaks
[ticket/14038] Switch to spacer spans
[ticket/14038] Stylize & differintiate
[ticket/14038] Give links some visual love
| -rw-r--r-- | phpBB/styles/prosilver/template/jumpbox.html | 6 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/colours.css | 36 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 42 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/links.css | 4 |
4 files changed, 82 insertions, 6 deletions
diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html index 3096d08318..15c69aeed2 100644 --- a/phpBB/styles/prosilver/template/jumpbox.html +++ b/phpBB/styles/prosilver/template/jumpbox.html @@ -11,7 +11,7 @@ <!-- IF S_DISPLAY_JUMPBOX --> - <div class="dropdown-container dropdown-container-{S_CONTENT_FLOW_END}<!-- 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-{S_CONTENT_FLOW_END}<!-- 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="dropdown-trigger button dropdown-select"> <!-- 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> @@ -20,7 +20,7 @@ <ul class="dropdown-contents"> <!-- BEGIN jumpbox_forums --> <!-- IF jumpbox_forums.FORUM_ID neq -1 --> - <li><!-- BEGIN level --> <!-- END level --><a href="{jumpbox_forums.LINK}">{jumpbox_forums.FORUM_NAME}</a></li> + <li><a href="{jumpbox_forums.LINK}" class="<!-- IF jumpbox_forums.level -->jumpbox-sub-link<!-- ELSEIF jumpbox_forums.S_IS_CAT -->jumpbox-cat-link<!-- ELSE -->jumpbox-forum-link<!-- ENDIF -->"><!-- BEGIN level --><span class="spacer"></span><!-- END level --> <span><!-- IF jumpbox_forums.level --> ↳ <!-- ENDIF --> {jumpbox_forums.FORUM_NAME}</span></a></li> <!-- ENDIF --> <!-- END jumpbox_forums --> </ul> @@ -29,4 +29,4 @@ <!-- ELSE --> <br /><br /> -<!-- ENDIF --> +<!-- ENDIF -->
\ No newline at end of file diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 29cf641df2..c50be43482 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -197,6 +197,42 @@ dl.details dd { background-image: url("./images/icon_pages.gif"); } +.jumpbox .dropdown li { + border-top-color: #CCCCCC; +} + +.jumpbox-cat-link { + background-color: #0076b1; + border-top-color: #0076B1; + color: #FFFFFF; +} + +.jumpbox-cat-link:hover { + background-color: #12A3EB; + border-top-color: #12A3EB; + color: #FFFFFF; +} + +.jumpbox-forum-link { + background-color: #E1EBF2; +} + +.jumpbox-forum-link:hover { + background-color: #F6F4D0; +} + +.jumpbox .dropdown .pointer-inner { + border-color: #E1EBF2 transparent; +} + +.jumpbox-sub-link { + background-color: #E1EBF2; +} + +.jumpbox-sub-link:hover { + background-color: #F1F8FF; +} + /* Miscellaneous styles ---------------------------------------- */ diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 7ecb1bb83f..fe9d269cba 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -487,9 +487,45 @@ ul.linklist.bulletin > li.no-bulletin:before { position: relative; min-width: 40px; max-height: 300px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; +} + +.dropdown-contents a { + display: block; + padding: 5px; +} + + +.jumpbox .dropdown li { + border-top: 1px solid transparent; +} + +.jumpbox .dropdown-select { + margin: 0; +} + +.jumpbox .dropdown-contents { + padding: 0; + text-decoration: none; +} + +.jumpbox .dropdown-contents li { + padding: 0; +} + +.jumpbox .dropdown-contents a { + margin-right: 20px; + padding: 5px 10px; + text-decoration: none; + width: 100%; +} + +.jumpbox .spacer { + display: inline-block; + width: 0px; +} + +.jumpbox .spacer + .spacer { + width: 20px; } .dropdown li { diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css index a2f512443c..7cf45a69ca 100644 --- a/phpBB/styles/prosilver/theme/links.css +++ b/phpBB/styles/prosilver/theme/links.css @@ -58,6 +58,10 @@ li.breadcrumbs span:first-child > a { width: 40px; } +.jumpbox-cat-link, +.jumpbox-forum-link { font-weight: bold; } + + /* Links for forum/topic lists */ a.forumtitle { font-family: "Trebuchet MS", Helvetica, Arial, Sans-serif; |