Polish CSS a bit for floats and captions.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32534 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/layouts/stdfloats.inc b/lib/layouts/stdfloats.inc
index cb4f44994c3a393b878cd18207629724313cbcda..49620e1eaa81a8a437d3fa974d7ae886695a86bb 100644 (file)
--- a/lib/layouts/stdfloats.inc
+++ b/lib/layouts/stdfloats.inc
@@ -6,21 +6,6 @@
 
 Format 19
 
-AddToHTMLPreamble
-       <style type="text/css">
-               div.float {
-                       border: 2px solid black;
-               }
-               div.float-caption {
-                       text-align: center;
-                       border: 2px solid black;
-                       padding: 1ex;
-                       margin: 1ex;
-               }
-       </style>
-EndPreamble
-
-
 Float
        Type                  table
        GuiName               Table

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 08811b2ce5ac43279d8053a4d6d2f198752b3b5d..f386af000a2fa89d01cd654c6a01d428a22e42c5 100644 (file)
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -168,8 +168,8 @@ InsetLayout Note:Greyedout
                div.note_greyedout { 
                        display: inline;
                        background-color: #A0A0A0; 
-                       padding-left: 1ex;
-                       padding-right: 1ex;
+                       padding: 0.5ex;
+                       border: 1px black solid;
                }
        EndHTMLStyle
        HTMLIsBlock           false
@@ -277,6 +277,11 @@ InsetLayout Float
          Size                Small
        EndFont
        MultiPar              true
+       HTMLStyle
+               div.float {
+                       border: 2px solid black;
+               }
+       EndHTMLStyle
 End
 
 InsetLayout Wrap
@@ -388,3 +393,15 @@ InsetLayout Info:shortcuts
                span.shortcuts { font-family: sans-serif; }
        EndHTMLStyle
 End
+
+InsetLayout Caption
+       HTMLStyle
+               div.float-caption {
+                       text-align: center;
+                       border: 2px solid black;
+                       padding: 1ex;
+                       margin: 1ex;
+               }
+       EndHTMLStyle
+End
+