Changeset:
83560c204a88
https://sourceforge.net/p/mrbs/hg-code/ci/83560c204a886c2113bf5ccb3c2184c722f09f19
Author:
Campbell Morrison <[email protected]>
Date:
Fri Mar 17 10:14:34 2017 +0000
Log message:
Moved colons in trailer out of HTML and into CSS.
diffstat:
web/css/mrbs-ielte8.css | 2 +
web/css/mrbs.css.php | 94 ++++++++++++++++++++++++++++++++++++++----------
web/trailer.inc | 9 +++-
3 files changed, 82 insertions(+), 23 deletions(-)
diffs (175 lines):
diff -r 40787df1fa35 -r 83560c204a88 web/css/mrbs-ielte8.css
--- a/web/css/mrbs-ielte8.css Fri Mar 17 09:50:05 2017 +0000
+++ b/web/css/mrbs-ielte8.css Fri Mar 17 10:14:34 2017 +0000
@@ -5,11 +5,13 @@
pseudo-class (':') */
label:after,
+.trailer_label a:after,
.list td:first-child:after {
content: ':';
}
[lang="fr"] label:after,
+[lang="fr"] .trailer_label a:after,
[lang="fr"] .list td:first-child:after {
content: '\0000a0:'; /* before the colon */
}
diff -r 40787df1fa35 -r 83560c204a88 web/css/mrbs.css.php
--- a/web/css/mrbs.css.php Fri Mar 17 09:50:05 2017 +0000
+++ b/web/css/mrbs.css.php Fri Mar 17 10:14:34 2017 +0000
@@ -70,11 +70,13 @@
fieldset fieldset legend {font-size: 0} /* for IE: even if there is no
legend text, IE allocates space */
label::after,
+.trailer_label a::after,
.list td:first-child::after {
content: ':';
}
[lang="fr"] label::after,
+[lang="fr"] .trailer_label a::after,
[lang="fr"] .list td:first-child::after {
content: '\0000a0:'; <?php // before the colon ?>
}
@@ -1108,9 +1110,24 @@
div#cal_this {float: left; margin-left: 1.0em}
div#cal_next {float: left; margin-left: 1.0em}
-table.calendar {border-spacing: 0; border-collapse: collapse}
-.calendar th {min-width: 2.0em; text-align: center; font-weight: normal;
background-color: transparent; color: <?php echo $standard_font_color ?>}
-.calendar td {text-align: center; font-size: x-small}
+table.calendar {
+ border-spacing: 0;
+ border-collapse: collapse;
+}
+
+.calendar th {
+ min-width: 2.0em;
+ text-align: center;
+ font-weight: normal;
+ background-color: transparent;
+ color: <?php echo $standard_font_color ?>;
+}
+
+.calendar td {
+ text-align: center;
+ font-size: x-small;
+}
+
<?php
// set the styling for the "hidden" days in the mini-cals
?>
@@ -1189,25 +1206,62 @@
/* ------------ TRAILER.INC ---------------------*/
-div#trailer {border-top: 1px solid <?php echo $trailer_border_color ?>;
- border-bottom: 1px solid <?php echo $trailer_border_color ?>;
- float: left;
- clear: left;
- margin-top: 1.0em; margin-bottom: 1.5em;
- padding-top: 0.3em; padding-bottom: 0.3em}
-#trailer div {float: left; width: 100%}
-#trailer div.trailer_label {float: left; clear: left; width: 20%; max-width:
9.0em; font-weight: bold}
-#trailer div.trailer_links {float: left; width: 79%} /* 79 to
avoid rounding problems */
-.trailer_label span {margin-right: 1.0em}
+div#trailer {
+ border-top: 1px solid <?php echo $trailer_border_color ?>;
+ border-bottom: 1px solid <?php echo $trailer_border_color ?>;
+ float: left;
+ clear: left;
+ margin-top: 1.0em; margin-bottom: 1.5em;
+ padding-top: 0.3em; padding-bottom: 0.3em;
+}
-#trailer span.current {font-weight: bold}
-#trailer span.hidden {font-weight: normal;
- background-color: <?php echo $body_background_color ?>; /* hack: only
necessary for IE6 to prevent blurring with opacity */
- opacity: 0.5} /* if you change this value, change it in the IE sheets as
well */
-#trailer .current a {color: <?php echo $highlight_font_color ?>}
+#trailer div {
+ float: left;
+ width: 100%;
+}
-div#simple_trailer {clear: both; text-align: center; padding-top: 1.0em;
padding-bottom: 2.0em}
-#simple_trailer a {padding: 0 1.0em 0 1.0em}
+#trailer div.trailer_label {
+ float: left;
+ clear: left;
+ width: 20%;
+ max-width: 9.0em;
+ font-weight: bold;
+}
+
+#trailer div.trailer_links {
+ float: left;
+ width: 79%; /* 79 to avoid rounding problems */
+ padding-left: 1em;
+}
+
+.trailer_label span {
+ margin-right: 1.0em;
+}
+
+#trailer span.current {
+ font-weight: bold;
+}
+
+#trailer span.hidden {
+ font-weight: normal;
+ background-color: <?php echo $body_background_color ?>; /* hack: only
necessary for IE6 to prevent blurring with opacity */
+ opacity: 0.5; /* if you change this value, change it in the IE sheets as
well */
+}
+
+#trailer .current a {
+ color: <?php echo $highlight_font_color ?>;
+}
+
+div#simple_trailer {
+ clear: both;
+ text-align: center;
+ padding-top: 1.0em;
+ padding-bottom: 2.0em;
+}
+
+#simple_trailer a {
+ padding: 0 1.0em 0 1.0em;
+}
/* ------------ VIEW_ENTRY.PHP ------------------*/
diff -r 40787df1fa35 -r 83560c204a88 web/trailer.inc
--- a/web/trailer.inc Fri Mar 17 09:50:05 2017 +0000
+++ b/web/trailer.inc Fri Mar 17 10:14:34 2017 +0000
@@ -58,7 +58,8 @@
// DAYS
$output .= "<div id=\"viewday\">\n";
$output .= "<div class=\"trailer_label\">\n";
- $output .= "<a
href=\"day.php?year=$year&month=$month&day=$day$params\">" .
get_vocab("viewday") .":</a>\n";
+ $output .= "<a
href=\"day.php?year=$year&month=$month&day=$day$params\">" .
+ get_vocab("viewday") . "</a>\n";
$output .= "</div>\n";
$output .= "<div class=\"trailer_links\">\n";
@@ -113,7 +114,8 @@
// WEEKS
$output .= "<div id=\"viewweek\">\n";
$output .= "<div class=\"trailer_label\">\n";
- $output .= "<a
href=\"week.php?year=$year&month=$month&day=$day$params\">".get_vocab("viewweek").":</a>\n";
+ $output .= "<a
href=\"week.php?year=$year&month=$month&day=$day$params\">" .
+ get_vocab("viewweek") . "</a>\n";
$output .= "</div>\n";
$ctime = mktime(0, 0, 0, $month, $day, $year);
@@ -168,7 +170,8 @@
// MONTHS
$output .= "<div id=\"viewmonth\">\n";
$output .= "<div class=\"trailer_label\">\n";
- $output .= "<a
href=\"month.php?year=$year&month=$month&day=$day$params\">".get_vocab("viewmonth").":</a>\n";
+ $output .= "<a
href=\"month.php?year=$year&month=$month&day=$day$params\">" .
+ get_vocab("viewmonth") . "</a>\n";
$output .= "</div>\n";
$output .= "<div class=\"trailer_links\">\n";
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
