diff --git a/web/forums/skin/template/forumlist_body.html b/web/forums/skin/template/forumlist_body.html index 5d03814165..6083a27a84 100644 --- a/web/forums/skin/template/forumlist_body.html +++ b/web/forums/skin/template/forumlist_body.html @@ -1,36 +1,41 @@ - + + - -
    +
    + +
    1. -
    +
+ diff --git a/web/forums/skin/template/index_body.html b/web/forums/skin/template/index_body.html index 3b807c4a7d..049f1e0b69 100644 --- a/web/forums/skin/template/index_body.html +++ b/web/forums/skin/template/index_body.html @@ -3,25 +3,25 @@ -
-
-
@@ -56,12 +56,16 @@

{L_BIRTHDAYS}

{L_CONGRATULATIONS}: {BIRTHDAY_LIST}{L_NO_BIRTHDAYS}

-

{L_STATISTICS}

-

{TOTAL_POSTS} • {TOTAL_TOPICS} • {TOTAL_USERS}

{RECORD_USERS}

{NEWEST_USER}

+
    +
  • {TOTAL_POSTS}
    • +
  • {TOTAL_TOPICS}
    • +
  • {TOTAL_USERS}
    • +
+

{RECORD_USERS}

+

{NEWEST_USER}

-
diff --git a/web/forums/skin/template/overall_footer.html b/web/forums/skin/template/overall_footer.html index 221d2e4c73..bbcbc54d02 100644 --- a/web/forums/skin/template/overall_footer.html +++ b/web/forums/skin/template/overall_footer.html @@ -1,14 +1,13 @@ - +
{RUN_CRON_TASK} diff --git a/web/forums/skin/template/overall_header.html b/web/forums/skin/template/overall_header.html index 33cebc1e81..9e14e688a6 100644 --- a/web/forums/skin/template/overall_header.html +++ b/web/forums/skin/template/overall_header.html @@ -116,34 +116,36 @@

Forums

-
+
diff --git a/web/forums/skin/template/search_results.html b/web/forums/skin/template/search_results.html index b265efb405..f009d694d1 100644 --- a/web/forums/skin/template/search_results.html +++ b/web/forums/skin/template/search_results.html @@ -46,9 +46,9 @@
  • -

    {SEARCH_TITLE} ({TOTAL_MATCHES}){SEARCH_MATCHES}: {SEARCH_WORDS}

    +

    {SEARCH_TITLE} ({TOTAL_MATCHES}){SEARCH_MATCHES}: {SEARCH_WORDS}

    {L_IGNORED_TERMS}: {IGNORED_WORDS}

    -
    +
    {L_LAST_POST}
    {L_REPLIES}
    {L_VIEWS}
    @@ -79,11 +79,11 @@

    -
    {LAST_POST_IMG} {L_LAST_POST} {L_POST_BY_AUTHOR} {searchresults.LAST_POST_AUTHOR_FULL} +
    {LAST_POST_IMG} {L_LAST_POST} {L_POST_BY_AUTHOR} {searchresults.LAST_POST_AUTHOR_FULL}
    replies.
    -
    {searchresults.TOPIC_REPLIES}
    +
    {searchresults.TOPIC_REPLIES}
    views,
    -
    {searchresults.TOPIC_VIEWS}
    +
    {searchresults.TOPIC_VIEWS}
    diff --git a/web/forums/skin/template/viewforum_body.html b/web/forums/skin/template/viewforum_body.html index c644cdab2b..470d609e9d 100644 --- a/web/forums/skin/template/viewforum_body.html +++ b/web/forums/skin/template/viewforum_body.html @@ -2,7 +2,7 @@ - +

@@ -125,13 +125,15 @@

{L_LOGIN_LOGOUT} + +
@@ -197,14 +197,14 @@

{NEWES
-

{L_WHO_IS_ONLINE}{L_WHO_IS_ONLINE}

+

{L_WHO_IS_ONLINE}{L_WHO_IS_ONLINE}

{LOGGED_IN_USER_LIST}

-

{L_FORUM_PERMISSIONS}

+

{L_FORUM_PERMISSIONS}

{rules.RULE}

diff --git a/web/forums/skin/theme/stylesheet.css b/web/forums/skin/theme/stylesheet.css index d00d3ebe51..a034d4226a 100644 --- a/web/forums/skin/theme/stylesheet.css +++ b/web/forums/skin/theme/stylesheet.css @@ -32,7 +32,6 @@ ul.linklist { display: block; margin: 0; padding:0; - font-size: .8em; white-space: nowrap; } @@ -53,35 +52,38 @@ ul.linklist.rightside li { text-align: right; } -ul.navlinks { - padding-bottom: 1px; - margin-bottom: 1px; - font-weight: bold; - /*font-family: Verdana, Arial, Helvetica, sans-serif;*/ - font-size: 12pt; -} - .linklist.leftside li:not(:first-of-type):before { content: '\2022\a0'; + color: #666; + font-weight: bold; } .linklist.rightside li:not(:first-of-type):after { content: '\a0\2022'; + color: #666; + font-weight: bold; } .leftside { + float:left; margin-left: 0; margin-right: 5px; text-align: left; } .rightside { - float: right; margin-left: 5px; margin-right: 0; text-align: right; } +ul.navlinks { + padding-bottom: 1px; + margin-bottom: 1px; + font-weight: bold; + font-size: 12pt; +} + /* Table styles ----------------------------------------*/ table.table1 { @@ -373,7 +375,7 @@ p.rules { */ /* Links for forum/topic lists */ -.forumtitle, .topictitle { +/*.forumtitle,*/ .topictitle { /*font-family: Verdana, Arial, Helvetica, sans-serif;*/ font-size: 1.1em; /*font-weight: bold;*/ @@ -1596,10 +1598,10 @@ textarea { line-height: 1.4em; } -label { +/*label { cursor: default; vertical-align: middle; -} +}*/ /* Definition list layout for forms ---------------------------------------- */ @@ -1860,7 +1862,7 @@ html>body dd label input { vertical-align: text-bottom; } /* Align checkboxes/ra } /* navbar fix */ -* html .clearfix, * html .navbar, ul.linklist { +* html .navbar { overflow: hidden; } diff --git a/web/style.css b/web/style.css index 833a310e5e..fa41179794 100644 --- a/web/style.css +++ b/web/style.css @@ -6,8 +6,10 @@ p, h1, h2, h3, h4, h5, h6, h7, h8, h9 { margin-top: 0; } dl, ol, ul { padding: 0; margin: 0; } +p { clear: both; } + /* fixes */ -.clearfix { height: 1%; overflow: hidden; } +.clearfix { height: 1%; overflow: hidden; } /* responsive content inclusion */ .inlcnt { display: none; } @@ -17,6 +19,8 @@ span.inlcnt { padding: 0.4ex; } /* responsive content exclusion */ @media handheld, only screen and (max-width: 480px) { .exlcnt { display:none; } } +.forumrow .expcol { width: 50%; } + /** * Responsive list with dynamic column expansion */ @@ -25,6 +29,7 @@ span.inlcnt { padding: 0.4ex; } .reslist dd { float: right; margin: 0; } .reslist dt { margin-left: .2em; margin-right: .2em; display:none; } /* responsive column expansion */ +.reslist .expcol { display: inline-block; float: left; } @media handheld, only screen and (max-width: 480px) { .reslist .expcol { width:100%; } .reslist dt { display:block; } @@ -35,22 +40,11 @@ span.inlcnt { padding: 0.4ex; } .reslist dl > dd.exlcol { width:auto; margin-left: 0; } } -.topiclist > li > h1, -.topiclist > li > dl, -.topiclist > li > article header, -.topiclist > li > article dl { -width: 50%; -display: inline-block; -float: left; -} - body { background: #282D2B url(panoramarotator) no-repeat fixed; background-position: center 100%; background-size: 200% 200%; - color: #A7A29C; - font-family: "Open Sans",sans-serif !important; font-size: 100%; font-weight: 400; @@ -65,6 +59,8 @@ body { vertical-align: baseline; } +body, a p { color: #A7A29C; } + @media only screen and (min-width: 476px) { body { margin: 1.2em; } } @@ -84,7 +80,7 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { color: #F0F0F0; } -label { cursor:help; } +/*label { cursor:help; }*/ /* ------- begin old forum normalization ------- */ @@ -325,9 +321,9 @@ table.directory td { font-size: small; } -table.directory tbody tr, +.topiclist > li, dl.codebox, -.topiclist li, +table.directory tbody tr, table.table1 tbody td { border-color: #333; border-style: solid; @@ -335,7 +331,7 @@ table.table1 tbody td { border-radius: 4px; } -.topiclist li { padding: 11px 22px; margin: 2px; } +.topiclist > li { padding: 11px 22px 11px 16px; margin: 2px; } .topiclist li.header { border-width: 0; @@ -367,21 +363,20 @@ table.table1 tbody tr.hover { .forumrow .views { width: 25%; text-align: center; } .forumrow .lastpost { width: 49%; } -.forumrow .icon { - min-height: 35px; - background-position: 7px 50%; /* Position of folder icon */ +.forumitem header > a { + background-image: url("forums/styles/Deng/imageset/forum_read.png"); background-repeat: no-repeat; + background-position-y: 50%; + padding-left: 48px; /* padding - margin + image_width */ + display: block; + height: 100%; } -.forumrow .icon dt { /*padding-left: 45px; /*folder icon spacing*/ } -.forumrow a.subforum { - background-image: none; - background-position: 0 50%; - background-repeat: no-repeat; - position: relative; - white-space: nowrap; - padding: 0 0 0 12px; -} +.forumitem.unread header > a { background-image: url("forums/styles/Deng/imageset/forum_unread.png"); } +.forumitem.locked header > a { background-image: url("forums/styles/Deng/imageset/forum_read_locked.png"); } +.forumitem.locked.unread header > a { background-image: url("forums/styles/Deng/imageset/forum_unread_locked.png"); } + +.forumitem .subforums { margin-left: 48px; } /* ---- */ @@ -679,8 +674,8 @@ ol.jumplist li { } #menu li.logo a { - padding-top: 48px; - padding-bottom: 33px; + padding-top: 28px; + padding-bottom: 28px; padding-left: 68px; outline: 0 none; }