aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Miday <midaym@gmail.com>2015-08-30 18:30:40 +0200
committerMichael Miday <midaym@gmail.com>2015-08-30 18:30:40 +0200
commit0e26b4e68f36d7c98ee049b48fc5c0f0e89b7f46 (patch)
tree80dada0b4c192dd36562cb6abc6ea0f39d2f217d
parent5b112b974f7229fc6aa5e08b332dd3b53e0112ad (diff)
downloadforums-0e26b4e68f36d7c98ee049b48fc5c0f0e89b7f46.tar
forums-0e26b4e68f36d7c98ee049b48fc5c0f0e89b7f46.tar.gz
forums-0e26b4e68f36d7c98ee049b48fc5c0f0e89b7f46.tar.bz2
forums-0e26b4e68f36d7c98ee049b48fc5c0f0e89b7f46.tar.xz
forums-0e26b4e68f36d7c98ee049b48fc5c0f0e89b7f46.zip
[ticket/14038] Stylize & differintiate
-rw-r--r--phpBB/styles/prosilver/template/jumpbox.html6
-rw-r--r--phpBB/styles/prosilver/theme/colours.css26
-rw-r--r--phpBB/styles/prosilver/theme/common.css33
-rw-r--r--phpBB/styles/prosilver/theme/links.css4
4 files changed, 62 insertions, 7 deletions
diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html
index 5cc8a8ca83..cacf54b478 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><a href="{jumpbox_forums.LINK}" class="<!-- IF jumpbox_forums.level -->jumpbox-link<!-- ELSE -->jumpbox-header-link<!-- ENDIF -->"><!-- IF jumpbox_forums.level -->&nbsp; &nbsp; &#124;<!-- ENDIF --><!-- BEGIN level -->&ndash;&ndash;<!-- END level --> <span>{jumpbox_forums.FORUM_NAME}</span></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 -->&nbsp; &nbsp; &nbsp;<!-- END level --> <!-- IF jumpbox_forums.level -->&#8627; &nbsp;<!-- ENDIF --> <span>{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..8c8f550c70 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -197,6 +197,32 @@ dl.details dd {
background-image: url("./images/icon_pages.gif");
}
+.jumpbox .dropdown li {
+ border-top-color: #0076B1;
+}
+
+.jumpbox-cat-link {
+ background-color: #0076b1;
+ color: #FFFFFF;
+}
+
+.jumpbox-cat-link:hover {
+ background-color: #12A3EB;
+ color: #FFFFFF;
+}
+
+.jumpbox-forum-link {
+ background-color: #E1EBF2;
+}
+
+.jumpbox-forum-link:hover {
+ background-color: #F6F4D0;
+}
+
+.jumpbox-sub-link {
+ background-color: #E1EBF2;
+}
+
/* Miscellaneous styles
---------------------------------------- */
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 7ecb1bb83f..516832a733 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -487,9 +487,36 @@ 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%;
}
.dropdown li {
diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css
index 7e7f7011ff..7cf45a69ca 100644
--- a/phpBB/styles/prosilver/theme/links.css
+++ b/phpBB/styles/prosilver/theme/links.css
@@ -58,7 +58,9 @@ li.breadcrumbs span:first-child > a {
width: 40px;
}
-.jumpbox-header-link { font-weight: bold; }
+.jumpbox-cat-link,
+.jumpbox-forum-link { font-weight: bold; }
+
/* Links for forum/topic lists */
a.forumtitle {