From c67633577f276727e1d15106a87517b97c8a4d1a Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 21 Nov 2011 23:23:02 +0100 Subject: [PATCH] [ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632 Remove the previous fix and fix it the way we did it in PHPBB3-10360 for 3.1 PHPBB3-6632 PHPBB3-10485 --- phpBB/styles/prosilver/template/forumlist_body.html | 10 +++++----- phpBB/styles/prosilver/template/search_results.html | 10 +++++----- phpBB/styles/prosilver/template/viewforum_body.html | 10 +++++----- phpBB/styles/prosilver/theme/content.css | 12 ++++++++++-- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html index 2c2a242a9f..bf672e16fc 100644 --- a/phpBB/styles/prosilver/template/forumlist_body.html +++ b/phpBB/styles/prosilver/template/forumlist_body.html @@ -11,9 +11,9 @@
    -
  • +
  • -
    {forumrow.FORUM_NAME}{L_FORUM}
    +
    {forumrow.FORUM_NAME}{L_FORUM}
    {L_TOPICS}
    {L_POSTS}
    {L_LAST_POST}
    @@ -25,8 +25,8 @@
  • -
    -
    +
    +
    {forumrow.FORUM_IMAGE} @@ -36,7 +36,7 @@
    {forumrow.L_MODERATOR_STR}: {forumrow.MODERATORS}
    {forumrow.L_SUBFORUM_STR} {forumrow.SUBFORUMS} -
    +
    {L_REDIRECTS}: {forumrow.CLICKS}
    diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index f2a4435103..014b39de87 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -39,8 +39,8 @@
    • -
      -
      {L_TOPICS}
      +
      +
      {L_TOPICS}
      {L_REPLIES}
      {L_VIEWS}
      {L_LAST_POST}
      @@ -51,8 +51,8 @@
    • -
      -
      style="background-image: url({T_ICONS_PATH}{searchresults.TOPIC_ICON_IMG}); background-repeat: no-repeat;"> +
      +
      style="background-image: url({T_ICONS_PATH}{searchresults.TOPIC_ICON_IMG}); background-repeat: no-repeat;"> {NEWEST_POST_IMG} {searchresults.TOPIC_TITLE} {searchresults.ATTACH_ICON_IMG} {searchresults.UNAPPROVED_IMG} @@ -60,7 +60,7 @@ {searchresults.PAGINATION} {L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} » {searchresults.FIRST_POST_TIME} {L_IN} {searchresults.FORUM_TITLE} ({L_GLOBAL}) -
      +
      {searchresults.TOPIC_REPLIES}
      {searchresults.TOPIC_VIEWS}
      diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index 4ad0990d98..d2952bff2a 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -126,8 +126,8 @@
      • -
        -
        {L_ACTIVE_TOPICS}{L_ANNOUNCEMENTS}{L_TOPICS}
        +
        +
        {L_ACTIVE_TOPICS}{L_ANNOUNCEMENTS}{L_TOPICS}
        {L_REPLIES}
        {L_VIEWS}
        {L_LAST_POST}
        @@ -138,13 +138,13 @@
      • -
        - style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;" title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
        {NEWEST_POST_IMG} {topicrow.TOPIC_TITLE} +
        + style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;" title="{topicrow.TOPIC_FOLDER_IMG_ALT}">{NEWEST_POST_IMG} {topicrow.TOPIC_TITLE} {topicrow.UNAPPROVED_IMG} {REPORTED_IMG}
        {topicrow.PAGINATION} {topicrow.ATTACH_ICON_IMG} {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} -
        +
        {topicrow.REPLIES} {L_REPLIES}
        {topicrow.VIEWS} {L_VIEWS}
        {L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index c278a16dc5..696d5e1cc0 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -29,14 +29,19 @@ ul.topiclist li.row dl { ul.topiclist dt { display: block; float: left; - width: 100%; + width: 50%; font-size: 1.1em; padding-left: 5px; padding-right: 5px; +} + +ul.topiclist .widescreen-optimised dt { + width: 100%; margin-right: -465px; } -ul.topiclist dt .wrap-content { +ul.topiclist .widescreen-optimised dt .wrap-content { + display: block; padding-right: 465px; } @@ -101,6 +106,9 @@ li.header dt, li.header dd { li.header dt { font-weight: bold; +} + +li.header .widescreen-optimised dt { margin-right: -465px; }