summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2022-10-04 12:15:15 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2022-10-07 23:16:33 +0000
commit7f7e493baf784c99d590bc834e92271d8996d60c (patch)
treed2cc190ac7b2b64bf4240b229e6390f16ffbe7fb
parentc3e859b423e948d3b3483fdaf15f4aeb167e77f1 (diff)
Add a style-hack to work around PlanetQt's broken en and strong
Until PlanetQt merges my proposed fix, or comes up with a better one, we can kludge it in via the template diff for QUIPs. Task-number: QTWEBSITE-1071 Change-Id: I74a59ad4f6d029fb7f4e506f28e4d99f9f9ca3e7 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--scripts/template.diff18
1 files changed, 12 insertions, 6 deletions
diff --git a/scripts/template.diff b/scripts/template.diff
index c1e49fc..ff508c1 100644
--- a/scripts/template.diff
+++ b/scripts/template.diff
@@ -1,6 +1,6 @@
---- planetqt/template.qt 2022-09-08 14:35:37.086932542 +0200
-+++ scripts/template.html 2022-09-08 14:42:36.624911663 +0200
-@@ -9,8 +9,8 @@
+--- planetqt/template.qt 2022-10-03 14:44:25.447587715 +0200
++++ scripts/template.html 2022-10-04 12:10:46.179761455 +0200
+@@ -9,12 +9,14 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
@@ -11,7 +11,13 @@
<link rel="shortcut icon" href="favicon.ico" />
<link href='http://fonts.googleapis.com/css?family=Open+Sans:700,300,400' rel='stylesheet' type='text/css'>
<link rel="stylesheet" type="text/css" href="online.css" />
-@@ -82,32 +82,14 @@
+ <link rel="stylesheet" type="text/css" href="style.css" />
++ <!-- Can remove this style hack once QTWEBSITE-1071 is fixed in planetqt's master -->
++ <style type="text/css"> em { font-style: italic; } strong { font-weight: bold; } </style>
+
+ <script type="text/javascript" src="http://d3hp9ud7yvwzy0.cloudfront.net/wp-content/themes/oneqt/js/combo.js.gzip"></script>
+ <script type="text/javascript" src="main.js"></script>
+@@ -82,32 +84,14 @@
</div>
<div class="content">
<div class="wrapper">
@@ -52,7 +58,7 @@
</div>
</div>
<div id="footer">
-@@ -173,7 +155,7 @@
+@@ -173,7 +157,7 @@
<a href="http://www.qt.io/about-us/" target="_blank" class="theqtcompany"></a>
<div class="footer-social clearfix">
<div class="facebook">
@@ -61,7 +67,7 @@
</div>
<div class="twitter">
<iframe id="twitter-widget-0" scrolling="no" frameborder="0" allowtransparency="true" src="//platform.twitter.com/widgets/follow_button.33b190ea0cba008796487b65df7f6d8e.en.html#_=1414403615717&amp;id=twitter-widget-0&amp;lang=en&amp;screen_name=qtproject&amp;show_count=true&amp;show_screen_name=false&amp;size=m" class="twitter-follow-button twitter-follow-button" title="Twitter Follow Button" data-twttr-rendered="true" style="width: 160px; height: 20px;"></iframe>
-@@ -185,7 +167,7 @@
+@@ -185,7 +169,7 @@
<div class="container clearfix no_discs">
<ul id="menu-footer-submenu" class="right clearfix"><li class="menu-item"><a href="http://www.qtworldsummit.com">Qt World Summit</a></li>
<li class="menu-item"><a title="Sign into your account." href="https://account.qt.io/login">Sign In</a></li>