merge conflicting on stripping spaces

[librarian.git] / librarian / epub / style.css

diff --git a/librarian/epub/style.css b/librarian/epub/style.css
index 622c8da..f279ca8 100644 (file)
--- a/librarian/epub/style.css
+++ b/librarian/epub/style.css
@@ -75,10 +75,10 @@ a img {
 
 .h4
 {
-       font-size: 1em;
+    font-size: 1em;
     margin: 0;
     margin-top: 1.5em;
-       line-height: 1.5em;
+    line-height: 1.5em;
 }
 
 p
@@ -370,3 +370,19 @@ p.minor {
 p.footer {
     margin-top: 2em;
 }
+
+img.latex {
+    display: inline;
+}
+
+.note_red {
+    display: block;
+    width: 50%;
+    float: right;
+    clear: both;
+    margin: 10pt;
+    padding: 0pt 5pt;
+    background-color: #d0d0d0;
+    font-style: italic;
+    font-size: 0.8em;
+}
\ No newline at end of file