Skip to content

Commit

Permalink
Homepage|Forums: Minor alignment issues, cleanup (redundant style hooks)
Browse files Browse the repository at this point in the history
  • Loading branch information
@danij-deng
danij-deng committed Apr 21, 2014
1 parent d446461 commit 2145362
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 26 deletions.
14 changes: 7 additions & 7 deletions web/forums/skin/template/forumlist_body.html
View file
Expand Up @@ -5,9 +5,9 @@

<!-- IF forumrow.S_IS_CAT or forumrow.S_FIRST_ROW or forumrow.S_NO_CAT -->
<ul class="block nobackground topiclist reslist">
<li class="header">
<li class="forumrow header">
<h1><!-- IF forumrow.S_IS_CAT --><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a><!-- ELSE -->Subforums<!-- ENDIF --></h1>
<dl class="forumrow">
<dl>
<dd class="exlcnt lastpost"><span>{L_LAST_POST}</span></dd>
<dd class="exlcnt posts" >{L_POSTS}</dd>
<dd class="exlcnt topics" >{L_TOPICS}</dd>
Expand All @@ -18,7 +18,7 @@ <h1><!-- IF forumrow.S_IS_CAT --><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORU
<!-- ENDIF -->

<!-- IF not forumrow.S_IS_CAT -->
<li id="forum_{forumrow.FORUM_NAME}">
<li id="forum_{forumrow.FORUM_NAME}" class="forumrow">
<article>
<header class="expcol" title="{forumrow.FORUM_FOLDER_IMG_ALT}">
<!-- IF S_ENABLE_FEEDS and forumrow.S_FEED_ENABLED --><!-- <a class="feed-icon-forum" title="{L_FEED} - {forumrow.FORUM_NAME}" href="{U_FEED}?f={forumrow.FORUM_ID}"><img src="{T_THEME_PATH}/images/feed.gif" alt="{L_FEED} - {forumrow.FORUM_NAME}" /></a> --><!-- ENDIF -->
Expand All @@ -30,9 +30,9 @@ <h2><a href="{forumrow.U_VIEWFORUM}" class="forumtitle">{forumrow.FORUM_NAME}</a
<!-- IF 0 -->
<dl class="forumrow icon" style="background-image: url({forumrow.FORUM_FOLDER_IMG_SRC}); background-repeat: no-repeat; background-position-x: 2px;">
<!-- ENDIF -->
<dl class="expcol forumrow icon">
<dl class="expcol icon">
<!-- IF forumrow.CLICKS -->
<dt class="inlcnt">{L_REDIRECTS}</dt>
<dt>{L_REDIRECTS}</dt>
<dd class="exlcol redirect">{forumrow.CLICKS}</dd>
<!-- ELSEIF not forumrow.S_IS_LINK -->
<dt></dt>
Expand All @@ -42,9 +42,9 @@ <h2><a href="{forumrow.U_VIEWFORUM}" class="forumtitle">{forumrow.FORUM_NAME}</a
<!-- IF forumrow.LAST_POST_TIME --><!-- IF not S_IS_BOT --><a href="{forumrow.U_LAST_POST}">{LAST_POST_IMG}</a> <span class="inlcnt">{L_LAST_POST}</span> <!-- ENDIF --><time datetime="{forumrow.LAST_POST_TIMEISO861}">{forumrow.LAST_POST_TIME}</time> {L_POST_BY_AUTHOR} {forumrow.LAST_POSTER_FULL}<!-- ELSE -->{L_NO_POSTS}<!-- ENDIF -->
</span>
</dd>
<dt class="inlcnt" style="clear:both">posts.</dt>
<dt style="clear:both">posts.</dt>
<dd class="exlcol posts" >{forumrow.POSTS}</dd>
<dt class="inlcnt">topics,</dt>
<dt>topics,</dt>
<dd class="exlcol topics" >{forumrow.TOPICS}</dd>
<!-- ENDIF -->
</dl>
Expand Down
12 changes: 6 additions & 6 deletions web/forums/skin/template/search_results.html
View file
Expand Up @@ -45,10 +45,10 @@
<!-- IF S_SHOW_TOPICS -->
<!-- IF .searchresults -->
<ul class="block nobackground topiclist reslist">
<li class="header">
<li class="forumrow header">
<h1><!-- IF SEARCH_TITLE -->{SEARCH_TITLE} ({TOTAL_MATCHES})<!-- ELSE -->{SEARCH_MATCHES}<!-- ENDIF --><!-- IF SEARCH_WORDS -->: <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h1>
<!-- IF IGNORED_WORDS --> <p>{L_IGNORED_TERMS}: <strong>{IGNORED_WORDS}</strong></p><!-- ENDIF -->
<dl class="forumrow icon">
<dl class="icon">
<dd class="exlcnt lastpost"><span>{L_LAST_POST}</span></dd>
<dd class="exlcnt posts" >{L_REPLIES}</dd>
<dd class="exlcnt views" >{L_VIEWS}</dd>
Expand All @@ -58,7 +58,7 @@ <h1><!-- IF SEARCH_TITLE -->{SEARCH_TITLE} ({TOTAL_MATCHES})<!-- ELSE -->{SEARCH
<ol class="block topiclist reslist topics">

<!-- BEGIN searchresults -->
<li>
<li class="forumrow">
<article>
<header class="expcol" <!-- IF searchresults.TOPIC_ICON_IMG -->style="background-image: url({T_ICONS_PATH}{searchresults.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF -->>
<!-- IF searchresults.PAGINATION --><strong class="pagination"><span>{searchresults.PAGINATION}</span></strong><!-- ENDIF -->
Expand All @@ -77,12 +77,12 @@ <h2>
<!-- IF 0 -->
<dl class="icon" style="background-image: url({searchresults.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
<!-- ENDIF -->
<dl class="expcol forumrow icon">
<dl class="expcol icon">
<dt></dt>
<dd class="exlcol lastpost"><!-- IF not S_IS_BOT --><a href="{searchresults.U_LAST_POST}">{LAST_POST_IMG}</a> <span class="inlcnt">{L_LAST_POST}</span> <!-- ENDIF --><time datetime="{searchresults.LAST_POST_TIMEISO861}">{searchresults.LAST_POST_TIME}</time> {L_POST_BY_AUTHOR} {searchresults.LAST_POST_AUTHOR_FULL}
<dt class="inlcnt" style="clear:both">replies.</dt>
<dt style="clear:both">replies.</dt>
<dd class="exlcol posts">{searchresults.TOPIC_REPLIES}</dd>
<dt class="inlcnt">views,</dt>
<dt>views,</dt>
<dd class="exlcol views">{searchresults.TOPIC_VIEWS}</dd>
</dd>
</dl>
Expand Down
12 changes: 6 additions & 6 deletions web/forums/skin/template/viewforum_body.html
View file
Expand Up @@ -129,9 +129,9 @@ <h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED --

<!-- IF topicrow.S_FIRST_ROW or not topicrow.S_TOPIC_TYPE_SWITCH -->
<ul class="block nobackground topiclist reslist <!-- IF topicrow.S_TOPIC_TYPE_SWITCH and (topicrow.S_POST_ANNOUNCE or topicrow.S_POST_GLOBAL) --> announcement<!-- ENDIF -->">
<li class="header">
<li class="forumrow header">
<h1><!-- IF S_DISPLAY_ACTIVE -->{L_ACTIVE_TOPICS}<!-- ELSEIF topicrow.S_TOPIC_TYPE_SWITCH and (topicrow.S_POST_ANNOUNCE or topicrow.S_POST_GLOBAL) -->{L_ANNOUNCEMENTS}<!-- ELSE --><!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ELSE -->{L_TOPICS}<!-- ENDIF --><!-- ENDIF --></h1>
<dl class="forumrow icon">
<dl class="icon">
<dd class="exlcnt lastpost"><span>{L_LAST_POST}</span></dd>
<dd class="exlcnt posts" >{L_REPLIES}</dd>
<dd class="exlcnt views" >{L_VIEWS}</dd>
Expand All @@ -141,7 +141,7 @@ <h1><!-- IF S_DISPLAY_ACTIVE -->{L_ACTIVE_TOPICS}<!-- ELSEIF topicrow.S_TOPIC_TY
<ol class="block topiclist reslist topics">
<!-- ENDIF -->

<li class="<!-- IF topicrow.S_POST_GLOBAL --> global-announce<!-- ENDIF --><!-- IF topicrow.S_POST_ANNOUNCE --> announce<!-- ENDIF --><!-- IF topicrow.S_POST_STICKY --> sticky<!-- ENDIF --><!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ENDIF -->">
<li class="forumrow<!-- IF topicrow.S_POST_GLOBAL --> global-announce<!-- ENDIF --><!-- IF topicrow.S_POST_ANNOUNCE --> announce<!-- ENDIF --><!-- IF topicrow.S_POST_STICKY --> sticky<!-- ENDIF --><!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ENDIF -->">
<article>
<header class="expcol" <!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
<!-- IF topicrow.PAGINATION --><strong class="pagination"><span>{topicrow.PAGINATION}</span></strong><!-- ENDIF -->
Expand All @@ -156,12 +156,12 @@ <h2><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWES
<!-- IF 0 -->
<dl class="forumrow icon" style="background-image: url({topicrow.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
<!-- ENDIF -->
<dl class="expcol forumrow icon">
<dl class="expcol icon">
<dt></dt>
<dd class="exlcol lastpost"><!-- IF not S_IS_BOT --><a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <span class="inlcnt">{L_LAST_POST}</span> <!-- ENDIF --><time datetime="{topicrow.LAST_POST_TIMEISO861}">{topicrow.LAST_POST_TIME}</time> {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}</span>
<dt class="inlcnt" style="clear:both">replies.</dt>
<dt style="clear:both">replies.</dt>
<dd class="exlcol posts" >{topicrow.REPLIES}</dd>
<dt class="inlcnt">views,</dt>
<dt>views,</dt>
<dd class="exlcol views" >{topicrow.VIEWS}</dd>
</dd>
</dl>
Expand Down
14 changes: 7 additions & 7 deletions web/style.css
View file
Expand Up @@ -23,10 +23,11 @@ span.inlcnt { padding: 0.4ex; }
.reslist > li { vertical-align: top; /* clear fix */ height: 1%; overflow: hidden; }
.reslist dt,
.reslist dd { float: right; margin: 0; }
.reslist dt { margin-left: .2em; margin-right: .2em; }
.reslist dt { margin-left: .2em; margin-right: .2em; display:none; }
/* responsive column expansion */
@media handheld, only screen and (max-width: 480px) {
.reslist .expcol { width:100%; }
.reslist dt { display:initial; }
}
/* responsive column exclusion */
@media handheld, only screen and (max-width: 480px) {
Expand Down Expand Up @@ -95,7 +96,7 @@ label { cursor:help; }
display: none;
}

code br, .topiclist br, .post br, .content br {
code br, /*.topiclist br,*/ .post br, .content br {
display:inline;
margin:0;
}
Expand Down Expand Up @@ -338,16 +339,17 @@ table.table1 tbody td {
border-radius: 4px;
}

.topiclist { font-size: .75em; }
.topiclist li { padding: 11px 22px; margin: 2px; }

.topiclist li.header {
border-width: 0;
color: white;
font-size: 1.4em;
font-size: 1.2em;
font-weight: 300;
text-shadow: 0px 1px 1px #666;
white-space: nowrap;
margin-top: 0;
margin-bottom: 0;
}

.block.topiclist { padding: 0; }
Expand All @@ -363,9 +365,7 @@ table.table1 tbody tr.hover {

.topiclist { list-style-type: none; }

/*.forumrow .main { width: 44%; }*/

/*.forumrow dd { margin-left: 20px; }*/
.forumrow { font-size: .75em; }
.forumrow .posts,
.forumrow .topics,
.forumrow .views { width: 25%; text-align: center; }
Expand Down

0 comments on commit 2145362

Please sign in to comment.