Isarra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/282443
Change subject: Set up proper print rules
......................................................................
Set up proper print rules
Print rules should now use proper inch metrics. No idea what happens
if you try to print it somewhere that does not use inches. That part
probably works fine, but the paper size will be different...
Change-Id: I671ef5efbeea1188e721e1e6edc27be115ee7353
---
M extension.json
M resources/ext.screenplay.css
M resources/ext.screenplay.print.css
3 files changed, 47 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Screenplay
refs/changes/43/282443/1
diff --git a/extension.json b/extension.json
index d09bdb9..17d2df0 100644
--- a/extension.json
+++ b/extension.json
@@ -20,7 +20,9 @@
"ResourceModules": {
"ext.screenplay": {
"styles": {
- "ext.screenplay.css": { },
+ "ext.screenplay.css": {
+ "media": "screen"
+ },
"ext.screenplay.print.css": {
"media": "print"
}
diff --git a/resources/ext.screenplay.css b/resources/ext.screenplay.css
index b8ed4ce..417d3eb 100644
--- a/resources/ext.screenplay.css
+++ b/resources/ext.screenplay.css
@@ -35,15 +35,8 @@
* Font is often too big, though this depends entirely on how the skin
set the content font.
*/
font-size: 95%;
- line-height: 1.25;
-}
-
-.sp-shot-heading {
- /* 2 blank lines preceding */
- margin-top: 4ex;
- text-transform: uppercase;
/* Not part of the spec, but helps readability online */
- font-weight: bold;
+ line-height: 1.25;
}
.sp-line {
@@ -69,3 +62,11 @@
/* 1 blank line preceding */
margin-top: 2ex;
}
+
+.sp-shot-heading {
+ /* 2 blank lines preceding */
+ margin-top: 4ex;
+ text-transform: uppercase;
+ /* Not part of the spec, but helps readability online */
+ font-weight: bold;
+}
diff --git a/resources/ext.screenplay.print.css
b/resources/ext.screenplay.print.css
index a8ddf0a..64ce3cd 100644
--- a/resources/ext.screenplay.print.css
+++ b/resources/ext.screenplay.print.css
@@ -1,13 +1,43 @@
/*
- * Some stuff to correct for print.
+ * Print rules; effectively the same but different units
*/
.screenplay {
- margin: 1in 1in 1.5in 1in;
- font-family: 'Courier', 'Courier New', monospace, monospace;
- font-size: 1.24ex;
+ /* width: 8.5" - 2.5", height: 11" - 2" */
+ width: 6in;
+ height: 9in;
+ /* margin: 1in 1in 1in 1.5in; except this is nested in mw, which
probably has a ~1" margin already*/
+ margin: 0 0 0 .5in;
+ font-family: Courier, monospace;
+ font-size: 12pt;
+}
+
+/* These never really belong in it in practice */
+.screenplay br {
+ display: none;
+}
+
+.sp-line {
+ /* right margin: 1.5", left margin: 1" */
+ margin: 0 1.5in 0 1in;
+}
+ .sp-speaker {
+ /* left margin: 2" - 1" */
+ margin: 0 0 0 1in;
+ }
+ .sp-paren {
+ /* right margin: 2" - 1.5", left margin: 1.5 - 1" */
+ margin: 0 1in 0 .5in;
+ }
+
+.sp-line,
+.sp-slug {
+ /* 1 blank line preceding */
+ margin-top: 2.35ex;
}
.sp-shot-heading {
- font-weight: normal;
+ /* 2 blank lines preceding */
+ margin-top: 4.7ex;
+ text-transform: uppercase;
}
--
To view, visit https://gerrit.wikimedia.org/r/282443
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I671ef5efbeea1188e721e1e6edc27be115ee7353
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Screenplay
Gerrit-Branch: master
Gerrit-Owner: Isarra <zhoris...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
