diff options
| author | Olivier Hallot <olivier.hallot@libreoffice.org> | 2018-04-25 08:29:49 -0300 |
|---|---|---|
| committer | Olivier Hallot <olivier.hallot@libreoffice.org> | 2018-04-26 13:47:22 +0200 |
| commit | d5e4c4c48f6d132ee8e4c48c804809ec44e376f6 (patch) | |
| tree | 828fa27cdb4c6c8ee1f64299ff4798670aa90133 /help3xsl | |
| parent | 133eb760436feb2c70d8079b5be1bcb560a261e2 (diff) | |
Replace "howtoget" table by div + CSS flexdoc
Change-Id: Ie79c7345af176edcae3ec99a36a466e8b9978d07
Reviewed-on: https://gerrit.libreoffice.org/53444
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Diffstat (limited to 'help3xsl')
| -rw-r--r-- | help3xsl/default.css | 17 | ||||
| -rw-r--r-- | help3xsl/online_transform.xsl | 49 |
2 files changed, 34 insertions, 32 deletions
diff --git a/help3xsl/default.css b/help3xsl/default.css index 0fb0b9670b..3a6ec79c2c 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -139,12 +139,6 @@ table, th, td { vertical-align:top; } -.howtogetheader { - font-weight: bold; - border: 1px solid #999999; - background: #FFFFFF; - padding: 3px; -} h1, h2, h3, @@ -192,9 +186,18 @@ h6 { } .howtoget { background: #CCF4C6; + padding: 0.3em; + display: flex; + flex-direction: column; + border: 1px #999999 solid; +} +.howtogetheader { + font-weight: bold; + border: 1px solid #999999; + background: #FFFFFF; + padding: 0.3em; } .howtogetbody { - background: #CCF4C6; margin: 0px; } .wide { diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index e6d6838b7e..4cf2b4d6b6 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -928,30 +928,27 @@ <xsl:variable name="archive" select="'shared'"/> <xsl:variable name="tmp_href"><xsl:value-of select="concat($urlpre,'text/shared/00/00000004.xhp')"/></xsl:variable> <xsl:variable name="tmp_doc" select="document($tmp_href)"/> - <table class="howtoget" width="100%" border="1" cellpadding="3" cellspacing="0"> - <tr> - <td> - <p class="howtogetheader"><xsl:apply-templates select="$tmp_doc//variable[@id='wie']"/></p> - <div class="howtogetbody"> - <xsl:choose> - <xsl:when test="$linkhref = ''"> <!-- new style --> - <xsl:apply-templates/> - </xsl:when> - <xsl:otherwise> <!-- old style --> - <xsl:variable name="href"><xsl:value-of select="concat($urlpre,substring-before($linkhref,'#'))"/></xsl:variable> - <xsl:variable name="anc"><xsl:value-of select="substring-after($linkhref,'#')"/></xsl:variable> - <xsl:variable name="docum" select="document($href)"/> - - <xsl:call-template name="insertembed"> - <xsl:with-param name="doc" select="$docum" /> - <xsl:with-param name="anchor" select="$anc" /> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </div> - </td> - </tr> - </table> + <div class="howtoget"> + <div> + <p class="howtogetheader"><xsl:apply-templates select="$tmp_doc//variable[@id='wie']"/></p> + </div> + <div class="howtogetbody"> + <xsl:choose> + <xsl:when test="$linkhref = ''"> <!-- new style --> + <xsl:apply-templates/> + </xsl:when> + <xsl:otherwise> <!-- old style --> + <xsl:variable name="href"><xsl:value-of select="concat($urlpre,substring-before($linkhref,'#'))"/></xsl:variable> + <xsl:variable name="anc"><xsl:value-of select="substring-after($linkhref,'#')"/></xsl:variable> + <xsl:variable name="docum" select="document($href)"/> + <xsl:call-template name="insertembed"> + <xsl:with-param name="doc" select="$docum" /> + <xsl:with-param name="anchor" select="$anc" /> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </div> + </div> <br/> </xsl:template> @@ -1246,21 +1243,23 @@ <table border="1" class="{@class}" cellpadding="0" cellspacing="0" width="100%" > <xsl:apply-templates /> </table> + <br/> </xsl:when> <xsl:when test="not(@class='')"> <table border="1" class="{@class}" cellpadding="0" cellspacing="0" > <xsl:apply-templates /> </table> + <br/> </xsl:when> <xsl:otherwise> <table border="1" class="border" cellpadding="0" cellspacing="0" > <xsl:apply-templates /> </table> + <br/> </xsl:otherwise> </xsl:choose> - <br/> </xsl:template> <xsl:template name="resolveembed"> |