Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #642 from marc1706/ticket/641

Browse Source 
[ticket/641] Correctly align portal columns with css
This commit is contained in:
Marc Alexander
2015-07-22 15:22:37 +02:00
parent a1748116f6 8e4380a170
commit 2535ca5ebe
8 changed files with 60 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
styles/prosilver/template/event/overall_footer_page_body_after.html
View File

@@ -20,21 +20,21 @@
<!-- [+] right module area -->
<!-- IF S_RIGHT_COLUMN -->
<div id="portal-right" style="width: {S_PORTAL_RIGHT_COLUMN}px; margin-<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->: -{S_PORTAL_RIGHT_COLUMN}px;">
<!-- BEGIN modules_right -->
<!-- DEFINE $TEMPLATE_FILE = '{modules_right.TEMPLATE_FILE}' -->
<!-- DEFINE $IMAGE_SRC = '{modules_right.IMAGE_SRC}' -->
<!-- DEFINE $IMAGE_WIDTH = '{modules_right.IMAGE_WIDTH}' -->
<!-- DEFINE $IMAGE_HEIGHT = '{modules_right.IMAGE_HEIGHT}' -->
<!-- DEFINE $CUSTOM_CODE = '{modules_right.CODE}' -->
<!-- DEFINE $TITLE = '{modules_right.TITLE}' -->
<!-- DEFINE $MODULE_ID = '{modules_right.MODULE_ID}' -->
<!-- INCLUDE {$TEMPLATE_FILE} -->
<!-- END modules_right -->
<div id="portal-right" style="width: {S_PORTAL_RIGHT_COLUMN}px; margin-<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->: -{S_PORTAL_RIGHT_COLUMN}px;" data-width="{S_PORTAL_RIGHT_COLUMN}" role="gridcell">
<!-- BEGIN modules_right -->
<!-- DEFINE $TEMPLATE_FILE = '{modules_right.TEMPLATE_FILE}' -->
<!-- DEFINE $IMAGE_SRC = '{modules_right.IMAGE_SRC}' -->
<!-- DEFINE $IMAGE_WIDTH = '{modules_right.IMAGE_WIDTH}' -->
<!-- DEFINE $IMAGE_HEIGHT = '{modules_right.IMAGE_HEIGHT}' -->
<!-- DEFINE $CUSTOM_CODE = '{modules_right.CODE}' -->
<!-- DEFINE $TITLE = '{modules_right.TITLE}' -->
<!-- DEFINE $MODULE_ID = '{modules_right.MODULE_ID}' -->
<!-- INCLUDE {$TEMPLATE_FILE} -->
<!-- END modules_right -->
</div>
<!-- ENDIF -->
<!-- [-] right module area -->
<br class="portal-clear" />
</div>
</div>
<!-- ENDIF -->
<!-- [-] right module area -->
<br class="portal-clear" />
</div>
</div>
<!-- ENDIF -->

2
styles/prosilver/template/event/overall_header_page_body_before.html
View File

@@ -3,5 +3,5 @@
<div id="portal-body">
<div class="portal-body-wrapper">
<!-- INCLUDE portal/_block_config.html -->
<div class="portal-body-center" style="margin: 0 <!-- IF S_RIGHT_COLUMN -->{S_PORTAL_RIGHT_COLUMN}px<!-- ELSE -->-{$BLOCK_DISTANCE}<!-- ENDIF --> 0 <!-- IF S_LEFT_COLUMN -->{S_PORTAL_LEFT_COLUMN}px<!-- ELSE -->-{$BLOCK_DISTANCE}<!-- ENDIF -->; padding: 0 {$BLOCK_DISTANCE};">
<div class="portal-body-center" style="margin: <!-- IF S_CONTENT_DIRECTION eq 'rtl' -->0 <!-- IF S_LEFT_COLUMN -->{S_PORTAL_LEFT_COLUMN}px<!-- ELSE -->-{$BLOCK_DISTANCE}<!-- ENDIF --> 0 <!-- IF S_RIGHT_COLUMN -->{S_PORTAL_RIGHT_COLUMN}px<!-- ELSE -->-{$BLOCK_DISTANCE}<!-- ENDIF --><!-- ELSE -->0 <!-- IF S_RIGHT_COLUMN -->{S_PORTAL_RIGHT_COLUMN}px<!-- ELSE -->-{$BLOCK_DISTANCE}<!-- ENDIF --> 0 <!-- IF S_LEFT_COLUMN -->{S_PORTAL_LEFT_COLUMN}px<!-- ELSE -->-{$BLOCK_DISTANCE}<!-- ENDIF --><!-- ENDIF -->; padding: 0 {$BLOCK_DISTANCE};">
<!-- ENDIF -->

6
styles/prosilver/template/portal/_block_config.html
View File

@@ -1,17 +1,17 @@
<!-- Config for the left and right blocks //-->
<!-- DEFINE $LR_BLOCK_H_L = '<div class="forabg"><div class="inner"><ul class="topiclist"><li class="header"><dl><dt style="padding: 0px 0px 2px; white-space: nowrap; margin-bottom: 0px; margin-top: 0px;">' -->
<!-- DEFINE $LR_BLOCK_H_L = '<div class="forabg" role="row"><div class="inner"><ul class="topiclist"><li class="header"><dl><dt style="padding: 0px 0px 2px; white-space: nowrap; margin-bottom: 0px; margin-top: 0px;">' -->
<!-- DEFINE $LR_BLOCK_H_R = '</dt><dd></dd></dl></li></ul><ul class="topiclist forums"><li><dl><dt></dt><dd class="portal-side-wrapper"><div class="portal-side">' -->
<!-- DEFINE $LR_BLOCK_F_L = '</div></dd></dl></li></ul>' -->
<!-- DEFINE $LR_BLOCK_F_R = '</div></div><br class="portal-clear" />' -->
<!-- Config for the center blocks //-->
<!-- DEFINE $C_BLOCK_H_L = '<div class="forabg"><div class="inner"><ul class="topiclist"><li class="header"><dl class="icon"><dt>' -->
<!-- DEFINE $C_BLOCK_H_L = '<div class="forabg" role="row"><div class="inner"><ul class="topiclist"><li class="header"><dl class="icon"><dt>' -->
<!-- DEFINE $C_BLOCK_H_R = '</dt><dd></dd></dl></li></ul>' -->
<!-- DEFINE $C_BLOCK_F_L = ' ' -->
<!-- DEFINE $C_BLOCK_F_R = '</div></div><br class="portal-clear" />' -->
<!-- Config for compact blocks //-->
<!-- DEFINE $CC_BLOCK_H_L = '<div class="forabg"><div class="inner"><ul class="topiclist"><li class="header"><dl class="icon">' -->
<!-- DEFINE $CC_BLOCK_H_L = '<div class="forabg" role="row"><div class="inner"><ul class="topiclist"><li class="header"><dl class="icon">' -->
<!-- DEFINE $CC_BLOCK_H_R = '</dl></li></ul>' -->
<!-- Images-URL //-->

5
styles/prosilver/template/portal/assets/portal.js
View File

@@ -42,21 +42,16 @@ phpbb.b3p_fix_right_column_margin = function() {
} else {
$portal_right.css(marginLeft, - ($portal_right.width() + 1));
}
$portal_right.css('margin-top', $portal_center.height() + 'px');
$portal_left.css('margin-top', $portal_center.height() + 'px');
} else {
$portal_right.css(marginLeft, 0);
$portal_right.css('margin-top', 0);
}
} else {
$portal_right.css('margin-top', '0px');
if (!$portal_center.length && $portal_left.length) {
$portal_right.css(marginLeft, 0);
} else {
$portal_right.css(marginLeft, -portal_right_width);
}
$portal_right.width(portal_right_width);
$portal_left.css('margin-top', 0);
phpbb.b3pFixLeftColumnMargin();
}
};

10
styles/prosilver/template/portal/portal_body.html
View File

@@ -3,7 +3,7 @@
<div id="portal-body" role="grid">
<!-- IF S_TOP_COLUMN -->
<div id="portal-top" role="gridcell">
<div id="portal-top" role="rowgroup">
<!-- [+] top module area -->
<ul>
<li>
@@ -25,7 +25,7 @@
<!-- [+] center module area -->
<!-- IF S_CENTER_COLUMN -->
<div id="portal-center-wrapper">
<div id="portal-center" style="margin: 0 <!-- IF S_RIGHT_COLUMN -->{S_PORTAL_RIGHT_COLUMN}px<!-- ELSE -->-{$BLOCK_DISTANCE}<!-- ENDIF --> 0 <!-- IF S_LEFT_COLUMN -->{S_PORTAL_LEFT_COLUMN}px<!-- ELSE -->-{$BLOCK_DISTANCE}<!-- ENDIF -->; padding: 0 {$BLOCK_DISTANCE};" role="gridcell">
<div id="portal-center" style="margin: 0 <!-- IF S_RIGHT_COLUMN -->{S_PORTAL_RIGHT_COLUMN}px<!-- ELSE -->-{$BLOCK_DISTANCE}<!-- ENDIF --> 0 <!-- IF S_LEFT_COLUMN -->{S_PORTAL_LEFT_COLUMN}px<!-- ELSE -->-{$BLOCK_DISTANCE}<!-- ENDIF -->; padding: 0 {$BLOCK_DISTANCE};" role="rowgroup">
<!-- BEGIN modules_center -->
<!-- DEFINE $TEMPLATE_FILE = '{modules_center.TEMPLATE_FILE}' -->
<!-- DEFINE $IMAGE_SRC = '{modules_center.IMAGE_SRC}' -->
@@ -46,7 +46,7 @@
<!-- [-] center module area -->
<!-- [+] left module area -->
<!-- IF S_LEFT_COLUMN -->
<div id="portal-left" style="width: {S_PORTAL_LEFT_COLUMN}px;" role="gridcell">
<div id="portal-left" style="width: {S_PORTAL_LEFT_COLUMN}px;" role="rowgroup">
<!-- BEGIN modules_left -->
<!-- DEFINE $TEMPLATE_FILE = '{modules_left.TEMPLATE_FILE}' -->
<!-- DEFINE $IMAGE_SRC = '{modules_left.IMAGE_SRC}' -->
@@ -63,7 +63,7 @@
<!-- [+] right module area -->
<!-- IF S_RIGHT_COLUMN -->
<div id="portal-right" style="width: {S_PORTAL_RIGHT_COLUMN}px; margin-<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->: -{S_PORTAL_RIGHT_COLUMN}px;" data-width="{S_PORTAL_RIGHT_COLUMN}" role="gridcell">
<div id="portal-right" style="width: {S_PORTAL_RIGHT_COLUMN}px; margin-<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->: -{S_PORTAL_RIGHT_COLUMN}px;" data-width="{S_PORTAL_RIGHT_COLUMN}" role="rowgroup">
<!-- BEGIN modules_right -->
<!-- DEFINE $TEMPLATE_FILE = '{modules_right.TEMPLATE_FILE}' -->
<!-- DEFINE $IMAGE_SRC = '{modules_right.IMAGE_SRC}' -->
@@ -79,7 +79,7 @@
<!-- [-] right module area -->
<br class="portal-clear" />
<!-- IF S_BOTTOM_COLUMN -->
<div id="portal-bottom" role="gridcell">
<div id="portal-bottom" role="rowgroup">
<!-- [+] bottom module area -->
<ul>
<li>

4
styles/prosilver/theme/portal_all.css
View File

@@ -4,6 +4,10 @@
display: block;
}
.rtl .portal-body-wrapper {
float: right;
}
#portal-page-body {
clear: both;
margin: 4px 0;

11
styles/prosilver/theme/portal_all_responsive.css
View File

@@ -7,9 +7,20 @@
margin-right: 60%;
}
.rtl .portal-body-center ul.topiclist dt .list-inner {
margin-right: 0;
margin-left: 60%;
}
.portal-body-center ul.topiclist dt {
margin-right: -60%;
}
.rtl .portal-body-center ul.topiclist dt {
margin-right: 0;
margin-left: -60%;
}
.portal-body-center dd.lastpost { width: auto; }
}

22
styles/prosilver/theme/portal_responsive.css
View File

@@ -23,8 +23,26 @@
@media only screen and (max-width: 895px), only screen and (max-device-width: 895px)
{
div#portal-right { width: 49% !important; }
div#portal-left { width: 50% !important; }
div#portal-right {
width: 49% !important;
margin-left: 1% !important;
}
div#portal-left {
width: 50% !important;
margin-left: 0 !important;
}
.rtl div#portal-right {
margin-left: 0 !important;
margin-right: 1% !important;
}
.rtl div#portal-left {
margin-left: 0 !important;
margin-right: 0 !important;
}
div#portal-center {
margin-right: 0 !important;
margin-left: 0 !important;