.gitreview | 2
AllLangHelp_shared.mk | 1
Package_html_media.mk | 2
help3xsl/default.css | 68 ++++++++++---------
help3xsl/help.html | 2
help3xsl/help2.js | 7 --
help3xsl/index.html | 2
help3xsl/index2.html | 2
help3xsl/online_transform.xsl | 4 -
help3xsl/xap_templ_query.xsl | 2
source/media/navigation/collabora-online-logo.svg | 77 ++++++++++++++++++++++
source/media/navigation/favicon.ico |binary
source/media/navigation/libo-symbol-white.svg | 1
source/text/scalc/main0000.xhp | 1
source/text/sdraw/main0000.xhp | 1
source/text/shared/06/youtubevideos.xhp | 23 ------
source/text/shared/main0108.xhp | 2
source/text/simpress/main0000.xhp | 1
source/text/smath/main0000.xhp | 1
source/text/swriter/main0000.xhp | 1
20 files changed, 122 insertions(+), 78 deletions(-)
New commits:
commit 43942c3bca8f0313ad2d4ef097bb9d8fd7601c09
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Thu Aug 9 21:46:38 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri May 15 13:50:01 2020 +0200
[cp] Collabora colors in css
Change-Id: I5f5eeac7d9a95994f8b1ddbe734a7a622013421d
Reviewed-on: https://gerrit.libreoffice.org/58799
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/help3xsl/default.css b/help3xsl/default.css
index 2c493049f..650a604d0 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -210,7 +210,7 @@ table, th, td {
margin-top: 0px;
}
.tableheadcell {
- background: #148603;
+ background: #5c3de2;
color: white;
vertical-align:top;
}
@@ -222,7 +222,7 @@ h4,
h5,
h6 {
margin-bottom: 0.67rem;
- color: #148603;
+ color: #5c3de2;
}
p,
ol,
@@ -233,7 +233,7 @@ td {
h1 {
font-size: 1.83rem;
font-weight: 300;
- border-bottom: 2px solid #148603;
+ border-bottom: 2px solid #5c3de2;
margin-bottom: 1.67rem;
}
h1 a {
@@ -254,8 +254,8 @@ h6 {
font-weight: normal;
}
.howtoget {
- background: #EBE7E9;
- border-left: 4px solid #4E4B55;
+ background: #e4ddff;
+ border-left: 4px solid #5c3de2;
border-radius: 0 4px 4px 0;
box-shadow: 0 2px 2px -2px rgba(0,0,0,0.2);
padding: 0.3em;
@@ -348,17 +348,18 @@ h6 {
z-index: 100;
}
header {
- color: #fff;
- background-color: #18A303;
+ background-color: #fff;
+ color: #5c3de2;
height: 64px;
padding: 8px 8px 8px 16px;
+ border-bottom: 1px solid rgba(0,0,0,0.04);
}
.logo-container {
display: flex;
justify-content: space-between;
}
.logo {
- color: #fff;
+ color: #5c3de2;
text-decoration: none;
display: flex;
}
@@ -388,8 +389,8 @@ header {
-webkit-overflow-scrolling: touch;
}
#langs-nav a, #modules-nav a {
- color: #fff;
- background-color: #233336;
+ color: #0c0c0c;
+ background-color: #f2f2f2;
display: block;
line-height: 1.5;
padding: 3px 6px;
@@ -400,6 +401,7 @@ header {
white-space: nowrap;
}
footer {
+ border-top: 2px solid #5c3de2;
padding: 40px 10px 40px 10px;
background-color: #FCFCFC;
box-shadow: 0 2px 8px 0 rgba(0,0,0,.05);
@@ -420,7 +422,7 @@ footer p {
white-space: nowrap;
}
label[for=accordion-1] {
- color: #148603;
+ color: #5c3de2;
display: block;
padding: 10px 0 10px 20px;
font-size: 22px;
@@ -441,7 +443,7 @@ aside input[type=checkbox]:checked ~ .contents-treeview {
}
.index-label {
font-size: 22px;
- color: #148603;
+ color: #5c3de2;
padding-left: 20px;
margin: 20px 0 0 0;
}
@@ -464,70 +466,70 @@ aside input[type=checkbox]:checked ~ .contents-treeview {
#Bookmarks p {
font-size: 22px;
font-weight: bold;
- color: #148603;
+ color: #5c3de2;
}
#WRITER::before {
content: "WRITER";
display: block;
font-size: 22px;
font-weight: bold;
- color: #148603;
+ color: #5c3de2;
}
#CALC::before {
content: "CALC";
display: block;
font-size: 22px;
font-weight: bold;
- color: #148603;
+ color: #5c3de2;
}
#IMPRESS::before {
content: "IMPRESS";
display: block;
font-size: 22px;
font-weight: bold;
- color: #148603;
+ color: #5c3de2;
}
#DRAW::before {
content: "DRAW";
display: block;
font-size: 22px;
font-weight: bold;
- color: #148603;
+ color: #5c3de2;
}
#BASE::before {
content: "BASE";
display: block;
font-size: 22px;
font-weight: bold;
- color: #148603;
+ color: #5c3de2;
}
#MATH::before {
content: "MATH";
display: block;
font-size: 22px;
font-weight: bold;
- color: #148603;
+ color: #5c3de2;
}
#CHART::before {
content: "CHART";
display: block;
font-size: 22px;
font-weight: bold;
- color: #148603;
+ color: #5c3de2;
}
#BASIC::before {
content: "BASIC";
display: block;
font-size: 22px;
font-weight: bold;
- color: #148603;
+ color: #5c3de2;
}
#SHARED::before {
content: "GLOBAL";
display: block;
font-size: 22px;
font-weight: bold;
- color: #148603;
+ color: #5c3de2;
}
.pagination-container {
text-align: center;
@@ -568,14 +570,15 @@ li.disabled a {
font-style: italic;
}
.xapian-donation {
- border-top: 2px solid #148603;
+ border-top: 2px solid #5c3de3;
background-color: #FCFCFC;
box-shadow: 0 2px 8px 0 rgba(0,0,0,.05);
}
.donation-frame {
- background: #18A303;
+ background: #fff;
position: sticky;
top: 0px;
+ border-bottom: 1px solid rgba(0,0,0,0.04);
}
.donation{
background: #0379BC;
@@ -604,9 +607,10 @@ li.disabled a {
text-align: center;
}
.search-frame {
- background: #18A303;
+ background: #fff;
top: 0px;
position: sticky;
+ border-bottom: 1px solid rgba(0,0,0,0.04);
}
.xapian-omega-search {
margin: auto;
@@ -618,7 +622,7 @@ li.disabled a {
}
#modules:after, #langs:after {
font-size: 30px;
- color: #fff;
+ color: #5c3de2;
content:"⌄";
}
.lang {
@@ -720,7 +724,7 @@ li.disabled a {
}
.contents-treeview label:before {
content: "⊞";
- color: #148603;
+ color: #5c3de2;
width: 16px;
margin: 0 5px 0 0;
display: inline-block;
@@ -761,7 +765,7 @@ li.disabled a {
/* these are buttons, so also reset some default stylings */
#langs, #modules {
cursor: pointer;
- color: #fff;
+ color: #5c3de2;
font-size: 19px;
position: relative;
top: 40px;
@@ -880,7 +884,7 @@ li.disabled a {
align-items: center;
}
footer {
- border-top: 2px solid #148603;
+ border-top: 2px solid #5c3de3;
}
body {
display: grid;
commit 1108a53922bd3b6a6740627d77037e91c65d4761
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Aug 22 09:55:44 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri May 15 13:50:01 2020 +0200
[cp] help page footer
Change-Id: I257d7dd85a896ff69e391a05206c1cb419997331
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 1b02ffe64..849a77f2e 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -242,7 +242,7 @@
</div>
<footer>
<xsl:if test="$online">
- <p><a href="https://www.libreoffice.org/imprint";
target="_blank">Impressum (Legal Info)</a> | <a
href="https://www.libreoffice.org/privacy"; target="_blank">Privacy Policy</a> |
<a href="https://www.documentfoundation.org/statutes.pdf";
target="_blank">Statutes (non-binding English translation)</a> - <a
href="https://www.documentfoundation.org/satzung.pdf"; target="_blank">Satzung
(binding German version)</a> | Copyright information: Unless otherwise
specified, all text and images on this website are licensed under the <a
href="https://www.libreoffice.org/download/license/"; target="_blank">Mozilla
Public License v2.0</a>. “LibreOffice” and “The Document Foundation” are
registered trademarks of their corresponding registered owners or are in actual
use as trademarks in one or more countries. Their respective logos and icons
are also subject to international copyright laws. Use thereof is explained in
our <a href="https://wiki.documentfoundation.org/TradeMark_Policy";
target="_blank">trademark policy</a>. LibreOffice was based on
OpenOffice.org.</p>
+ <p><a href="https://www.collaboraoffice.com/about-us/";
target="_blank">About Us</a> | <a
href="https://www.collaboraoffice.com/privacy-policy/"; target="_blank">Privacy
Policy</a> | Copyright information: Unless otherwise specified, all text and
images on this website are licensed under the <a
href="https://www.mozilla.org/en-US/MPL/2.0/"; target="_blank">Mozilla Public
License v2.0</a>. “LibreOffice” and “The Document Foundation” are registered
trademarks of their corresponding registered owners or are in actual use as
trademarks in one or more countries. Their respective logos and icons are also
subject to international copyright laws. Use thereof is explained in TDF's <a
href="https://wiki.documentfoundation.org/TradeMark_Policy";
target="_blank">trademark policy</a>. Collabora Office is derived from
LibreOffice which was based on OpenOffice.org.</p>
</xsl:if>
<div id="DEBUG" class="debug">
<h3 class="bug">Help content debug info:</h3>
diff --git a/help3xsl/xap_templ_query.xsl b/help3xsl/xap_templ_query.xsl
index 014dfd198..ca9186cbc 100644
--- a/help3xsl/xap_templ_query.xsl
+++ b/help3xsl/xap_templ_query.xsl
@@ -247,7 +247,7 @@ $map{$cgilist{B},<input type=hidden name=B
value="$html{$_}">}
</form>
<hr><div align=right><i><small><a
href="https://xapian.org/";>$html{$version}</a></small></i></div>
<footer>
- <p><a href="https://www.libreoffice.org/imprint";
target="_blank">Impressum (Legal Info)</a> | <a
href="https://www.libreoffice.org/privacy"; target="_blank">Privacy Policy</a> |
<a href="https://www.documentfoundation.org/statutes.pdf";
target="_blank">Statutes (non-binding English translation)</a> - <a
href="https://www.documentfoundation.org/satzung.pdf"; target="_blank">Satzung
(binding German version)</a> | Copyright information: Unless otherwise
specified, all text and images on this website are licensed under the <a
href="https://www.libreoffice.org/download/license/"; target="_blank">Mozilla
Public License v2.0</a>. “LibreOffice” and “The Document Foundation” are
registered trademarks of their corresponding registered owners or are in actual
use as trademarks in one or more countries. Their respective logos and icons
are also subject to international copyright laws. Use thereof is explained in
our <a href="https://wiki.documentfoundation.org/TradeMark_Policy"; targ
et="_blank">trademark policy</a>. LibreOffice was based on OpenOffice.org.</p>
+ <p><a href="https://www.collaboraoffice.com/about-us/";
target="_blank">About Us</a> | <a
href="https://www.collaboraoffice.com/privacy-policy/"; target="_blank">Privacy
Policy</a> | Copyright information: Unless otherwise specified, all text and
images on this website are licensed under the <a
href="https://www.mozilla.org/en-US/MPL/2.0/"; target="_blank">Mozilla Public
License v2.0</a>. “LibreOffice” and “The Document Foundation” are registered
trademarks of their corresponding registered owners or are in actual use as
trademarks in one or more countries. Their respective logos and icons are also
subject to international copyright laws. Use thereof is explained in TDF's <a
href="https://wiki.documentfoundation.org/TradeMark_Policy";
target="_blank">trademark policy</a>. Collabora Office is derived from
LibreOffice which was based on OpenOffice.org.</p>
</footer>
</body>
</html>
commit 98d89dc95df348df33c811456d9cb3c825c3ba51
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Fri May 15 11:59:20 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri May 15 13:50:01 2020 +0200
[cp] Hide 'Please support us!' button
Change-Id: I003b30b6b47e1323f4ef2a504ed72585561a386f
diff --git a/help3xsl/default.css b/help3xsl/default.css
index 24bd72ad2..2c493049f 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -586,6 +586,7 @@ li.disabled a {
max-width: 200px;
color: #ffffff;
text-decoration: none;
+ display: none; /* Collabora */
}
.donation a {
color: white;
commit cbbba1429fcf42870e8e3bd286bf9e61e06e9ba6
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Tue Aug 7 19:09:41 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri May 15 13:50:01 2020 +0200
[cp] Revert the .xhp parts of "Deploy videos in New Help (WIP)"
Partially reverts commit 93ebf037016819613322ef1c39951a3de893ec14.
Change-Id: I21224f97e9c47d5dfeb8e000102237a5664d3d41
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 27c2d26c9..823aabe3a 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -525,7 +525,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
helpcontent2/source/text/shared/05/00000160 \
helpcontent2/source/text/shared/05/new_help \
helpcontent2/source/text/shared/05/err_html \
- helpcontent2/source/text/shared/06/youtubevideos \
helpcontent2/source/text/shared/06/filter_screenshots \
helpcontent2/source/text/shared/06/svx_screenshots \
helpcontent2/source/text/shared/06/optionen_screenshots \
diff --git a/source/text/scalc/main0000.xhp b/source/text/scalc/main0000.xhp
index ab1504912..6341084e7 100644
--- a/source/text/scalc/main0000.xhp
+++ b/source/text/scalc/main0000.xhp
@@ -31,7 +31,6 @@
<body>
<bookmark xml-lang="en-US" branch="hid/SC_HID_SC_WIN_GRIDWIN"
id="bm_id3155335" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_GLOBAL_FALLBACK" id="bm_id3149255"
localize="false"/><paragraph role="heading" id="hd_id3147338" xml-lang="en-US"
level="1">Welcome to the $[officename] Calc Help</paragraph>
-<embed href="text/shared/06/youtubevideos.xhp#whatisit"/>
<paragraph role="heading" id="hd_id3153965" xml-lang="en-US" level="3">How to
Work With $[officename] Calc</paragraph>
<embed href="text/scalc/guide/main.xhp#main"/>
<embed href="text/scalc/main0503.xhp#main0503"/>
diff --git a/source/text/sdraw/main0000.xhp b/source/text/sdraw/main0000.xhp
index 911d45ba9..93bbe2572 100644
--- a/source/text/sdraw/main0000.xhp
+++ b/source/text/sdraw/main0000.xhp
@@ -33,7 +33,6 @@
<bookmark branch="hid/SD_HID_SDGRAPHICVIEWSHELL" xml-lang="en-US"
id="bm_id3155333" localize="false"/><bookmark branch="hid/HID_GLOBAL_FALLBACK"
xml-lang="en-US" id="bm_id3154705" localize="false"/><paragraph role="heading"
level="1" id="hd_id3155960" xml-lang="en-US">Welcome to the $[officename] Draw
Help</paragraph>
- <embed href="text/shared/06/youtubevideos.xhp#whatisit"/>
<paragraph role="heading" level="3" id="hd_id3154022" xml-lang="en-US">How
to Work With $[officename] Draw</paragraph>
<embed href="text/sdraw/guide/main.xhp#main"/>
<embed href="text/sdraw/main0503.xhp#main0503"/>
diff --git a/source/text/shared/06/youtubevideos.xhp
b/source/text/shared/06/youtubevideos.xhp
deleted file mode 100644
index 092fdfde1..000000000
--- a/source/text/shared/06/youtubevideos.xhp
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<helpdocument version="1.0">
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- -->
-
-<meta>
- <topic id="embedyoutubevideo" indexer="include" status="PUBLISH">
- <title id="tit" xml-lang="en-US">YouTube Videos</title>
- <filename>/text/shared/06/youtubevideos.xhp</filename>
- </topic>
-</meta>
-<body>
-<section id="whatisit">
- <paragraph role="paragraph" id="par_ytvideosample" localize="false"
xml-lang="en-US"><object
data="https://www.youtube-nocookie.com/embed/-4boEj8S2JQ";
id="vid_id61521568603544" type="video/youtube" width="560"
height="315"/></paragraph>
-</section>
-</body>
-</helpdocument>
diff --git a/source/text/simpress/main0000.xhp
b/source/text/simpress/main0000.xhp
index 6d87987d5..b4e28c754 100644
--- a/source/text/simpress/main0000.xhp
+++ b/source/text/simpress/main0000.xhp
@@ -33,7 +33,6 @@
<bookmark xml-lang="en-US" branch="hid/SD_HID_SDDRAWVIEWSHELL"
id="bm_id3150861" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_GLOBAL_FALLBACK" id="bm_id3154560"
localize="false"/>
<paragraph role="heading" id="hd_id3150746" xml-lang="en-US" level="1">Welcome
to the $[officename] Impress Help</paragraph>
-<embed href="text/shared/06/youtubevideos.xhp#whatisit"/>
<paragraph role="heading" id="hd_id3153000" xml-lang="en-US" level="3">How to
Work With $[officename] Impress</paragraph>
<embed href="text/simpress/guide/main.xhp#main"/>
<embed href="text/simpress/main0503.xhp#main0503"/>
diff --git a/source/text/smath/main0000.xhp b/source/text/smath/main0000.xhp
index e343f10d0..6e447a8ac 100644
--- a/source/text/smath/main0000.xhp
+++ b/source/text/smath/main0000.xhp
@@ -26,7 +26,6 @@
</meta>
<body>
<paragraph role="heading" id="hd_id3148868" xml-lang="en-US" level="1">Welcome
to the $[officename] Math Help</paragraph>
-<embed href="text/shared/06/youtubevideos.xhp#whatisit"/>
<paragraph role="heading" id="hd_id3153915" xml-lang="en-US" level="3">How to
Work With $[officename] Math</paragraph>
<embed href="text/smath/guide/main.xhp#main"/>
<embed href="text/smath/main0503.xhp#main0503"/>
diff --git a/source/text/swriter/main0000.xhp b/source/text/swriter/main0000.xhp
index 457a0048b..3bff6f76b 100644
--- a/source/text/swriter/main0000.xhp
+++ b/source/text/swriter/main0000.xhp
@@ -33,7 +33,6 @@
<bookmark xml-lang="en-US" branch="hid/SW_HID_EDIT_WIN" id="bm_id3147244"
localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_GLOBAL_FALLBACK" id="bm_id3147247"
localize="false"/>
<paragraph role="heading" id="hd_id3147233" xml-lang="en-US"
level="1">%PRODUCTNAME Writer Help</paragraph>
-<embed href="text/shared/06/youtubevideos.xhp#whatisit"/>
<paragraph role="heading" id="hd_id3147258" xml-lang="en-US" level="3">Working
With %PRODUCTNAME Writer</paragraph>
<embed href="text/swriter/main0503.xhp#main0503"/>
<embed href="text/swriter/guide/main.xhp#main"/>
commit b68ff3958c3fa5a7fd409b2040ab84f1555ffb14
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Thu Aug 9 20:56:03 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri May 15 09:27:45 2020 +0200
[cp] Exchange the logo.
Change-Id: I138d97fd40764ff455354f4ad53f9a7fb72faba8
Reviewed-on: https://gerrit.libreoffice.org/58797
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/Package_html_media.mk b/Package_html_media.mk
index b828c10dd..a990a85a2 100644
--- a/Package_html_media.mk
+++ b/Package_html_media.mk
@@ -306,6 +306,7 @@ $(eval $(call
gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
helpimg/warning_small.png \
helpimg/what-if.png \
helpimg/zellvor.png \
+ navigation/collabora-online-logo.svg \
navigation/favicon.ico \
navigation/libo-base.svg \
navigation/libo-basic.svg \
@@ -314,7 +315,6 @@ $(eval $(call
gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
navigation/libo-draw.svg \
navigation/libo-impress.svg \
navigation/libo-math.svg \
- navigation/libo-symbol-white.svg \
navigation/libo-writer.svg \
screenshots/cui/ui/charnamepage/CharNamePage.png \
screenshots/cui/ui/colorpickerdialog/ColorPicker.png \
diff --git a/help3xsl/default.css b/help3xsl/default.css
index 2c67d206c..24bd72ad2 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -366,12 +366,11 @@ header {
font-size: 24px;
}
.logo .symbol {
- background-image: url(media/navigation/libo-symbol-white.svg);
+ background-image: url(media/navigation/collabora-online-logo.svg);
background-repeat: no-repeat;
background-size: contain;
- width: 52px;
+ width: 60px;
height: 60px;
- margin-right: 10px;
}
[aria-hidden='true'],
[data-a11y-toggle]:not([aria-controls]) {
diff --git a/source/media/navigation/collabora-online-logo.svg
b/source/media/navigation/collabora-online-logo.svg
new file mode 100644
index 000000000..105dbb8b6
--- /dev/null
+++ b/source/media/navigation/collabora-online-logo.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="134.19557mm"
+ height="134.19557mm"
+ viewBox="0 0 134.19557 134.19557"
+ version="1.1"
+ id="svg4519"
+ sodipodi:docname="collabora-online-logo.svg"
+ inkscape:version="0.92.0 unknown">
+ <defs
+ id="defs4513" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.98994949"
+ inkscape:cx="256.04006"
+ inkscape:cy="260.75029"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1301"
+ inkscape:window-height="744"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata4516">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(164.06501,-114.9656)">
+ <polygon
+ id="polygon14"
+ points="17.772,20.172 30.958,32.599 17.914,44.893 17.358,44.386
17.258,20.718 "
+ style="fill:#ffffff"
+ transform="matrix(2.8998956,0,0,2.8998956,-195.59046,87.816779)" />
+ <polygon
+ style="fill:#504999;fill-opacity:1"
+ id="polygon16"
+ points="30.379,33.145 17.914,44.893 28.654,55.638 51.742,32.55
28.561,9.362 17.763,20.162 17.772,20.172 30.379,32.053 30.958,32.599 "
+ transform="matrix(2.8998956,0,0,2.8998956,-195.59046,87.816779)" />
+ <polygon
+ id="polygon18"
+ points="17.358,44.386 17.258,20.718 29.864,32.599 "
+ style="fill:#c8c8c8"
+ transform="matrix(2.8998956,0,0,2.8998956,-195.59046,87.816779)" />
+ <polygon
+ style="fill:#38257a;fill-opacity:1"
+ id="polygon20"
+ points="27.743,35.628 18.807,44.052 31.847,41.483 "
+ transform="matrix(2.8998956,0,0,2.8998956,-195.59046,87.816779)" />
+ </g>
+</svg>
diff --git a/source/media/navigation/libo-symbol-white.svg
b/source/media/navigation/libo-symbol-white.svg
deleted file mode 100644
index bdb8d1647..000000000
--- a/source/media/navigation/libo-symbol-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="26" width="21.5" xmlns="http://www.w3.org/2000/svg";><g
fill="#fff" fill-rule="evenodd" transform="matrix(.31255684 0 0 .31250224
-233.40716 -366.24428)"><path d="m796.28645
1171.974c-.80495-.02-1.59796.4831-1.91259 1.2141-.31466.7309-.131 1.6434.44298
2.2004l17.27601 17.3306c.55718.5581 1.4644.7432 2.20023.4487.73584-.2944
1.256-1.0507
1.2615-1.8338v-17.3628c.002-1.0462-.96414-1.999-2.02478-1.9972z"/><path
d="m748.78346 1171.9733c-1.06249.015-2.01821.9868-2.01636 2.0494v79.1007c-.002
1.0625.9539 2.0338 2.01636 2.0493h64.72168c1.07351 0 2.05112-.9758
2.04941-2.0493v-50.9378c.003-.5376-.21596-1.0732-.59499-1.4544l-27.99758-28.1298c-.37577-.3909-.9122-.6226-1.45442-.6281z"
fill="none"/><path d="m748.78346 1171.9733a2.0460372 2.0460372 0 0 0 -2.01636
2.0494v79.1007a2.0460372 2.0460372 0 0 0 2.01636 2.0493h64.72168a2.0460372
2.0460372 0 0 0 2.04941-2.0493v-50.9378a2.0460372 2.0460372 0 0 0
-.59499-1.4544l-27.99758-28.1298a2.0460372 2.0460372 0 0 0
-1.45442-.6281zm2.04941 4.0
988h33.81526l26.8076 26.94v48.0618h-60.62286z"/></g></svg>
commit ad31119e99c41a1b523c5c227c14d557238996ed
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Aug 20 17:27:01 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri May 15 09:25:23 2020 +0200
[cp] Collabora favicon
Change-Id: I00bfc8fff17435356f393de32b585d12c37fea5e
diff --git a/source/media/navigation/favicon.ico
b/source/media/navigation/favicon.ico
index ee6560bcb..10c055775 100644
Binary files a/source/media/navigation/favicon.ico and
b/source/media/navigation/favicon.ico differ
commit 82fa6c1598676030ab661c84d80749516d006cae
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Aug 27 15:26:05 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri May 15 09:25:03 2020 +0200
[cp] Collabora support link
Change-Id: I980fe8fc2779647bbe1dfce649f06b3cbd36f864
diff --git a/source/text/shared/main0108.xhp b/source/text/shared/main0108.xhp
index e8f8d4d60..0d14529a7 100644
--- a/source/text/shared/main0108.xhp
+++ b/source/text/shared/main0108.xhp
@@ -66,7 +66,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:QuestionAnswers" id="bm_id4124532"
localize="false"/>
<paragraph id="hd_id230120170827196253" role="heading" level="2"
xml-lang="en-US">Get Help Online</paragraph>
-<paragraph id="par_id230120170827196850" role="paragraph"
xml-lang="en-US"><ahelp hid=".uno:QuestionAnswers">Opens the community support
page in the web browser.</ahelp> Use this page to ask questions on using
%PRODUCTNAME. For professional support with service level agreement, refer to
the <link href="https://www.documentfoundation.org/gethelp/support/";><emph>page
of professional %PRODUCTNAME support</emph></link>.</paragraph>
+<paragraph id="par_id230120170827196850" role="paragraph"
xml-lang="en-US"><ahelp hid=".uno:QuestionAnswers">Opens the community support
page in the web browser.</ahelp> Use this page to ask questions on using
%PRODUCTNAME. For professional support with service level agreement, refer to
the <link
href="https://www.collaboraoffice.com/solutions/support-and-services/";>page of
professional %PRODUCTNAME support</link>.</paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:SendFeedback" id="bm_id4134532"
localize="false"/>
<paragraph id="hd_id2752763" role="heading" level="2" xml-lang="en-US">Send
Feedback</paragraph>
commit 514edf1a83a58d73672835c65be53ddbfdef83c2
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sun Aug 26 21:50:46 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri May 15 09:22:40 2020 +0200
[cp] remove TDF Piwik tracker
Change-Id: Icabdcae5d5828417d3540bf36f6bb747001189e3
diff --git a/help3xsl/help.html b/help3xsl/help.html
index df4885a67..f726f211f 100644
--- a/help3xsl/help.html
+++ b/help3xsl/help.html
@@ -9,7 +9,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <meta http-equiv="Content-Security-Policy" content="script-src 'self'
'unsafe-inline' 'unsafe-eval' piwik.documentfoundation.org"/>
+ <meta http-equiv="Content-Security-Policy" content="script-src 'self'
'unsafe-inline' 'unsafe-eval'"/>
</head>
<body>
<script type="text/javascript">
diff --git a/help3xsl/help2.js b/help3xsl/help2.js
index a1739eeaf..8d21092eb 100644
--- a/help3xsl/help2.js
+++ b/help3xsl/help2.js
@@ -190,13 +190,6 @@ if (document.body.getElementsByTagName('meta')) {
_paq.push(['disableCookies']);
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
- (function() {
- var u="//piwik.documentfoundation.org/";
- _paq.push(['setTrackerUrl', u+'piwik.php']);
- _paq.push(['setSiteId', '68']);
- var d=document, g=d.createElement('script'),
s=d.getElementsByTagName('script')[0];
- g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js';
s.parentNode.insertBefore(g,s);
- })();
var system = getParameterByName("System");
} else {
var system = getSystem();
diff --git a/help3xsl/index.html b/help3xsl/index.html
index 69d7ee6af..fa04607c8 100644
--- a/help3xsl/index.html
+++ b/help3xsl/index.html
@@ -9,7 +9,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <meta http-equiv="Content-Security-Policy" content="script-src 'self'
'unsafe-inline' 'unsafe-eval' piwik.documentfoundation.org"/>
+ <meta http-equiv="Content-Security-Policy" content="script-src 'self'
'unsafe-inline' 'unsafe-eval'/>
</head>
<body>
<script type="text/javascript">
diff --git a/help3xsl/index2.html b/help3xsl/index2.html
index ce16c3083..99d34ef69 100644
--- a/help3xsl/index2.html
+++ b/help3xsl/index2.html
@@ -9,7 +9,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <meta http-equiv="Content-Security-Policy" content="script-src 'self'
'unsafe-inline' 'unsafe-eval' piwik.documentfoundation.org"/>
+ <meta http-equiv="Content-Security-Policy" content="script-src 'self'
'unsafe-inline' 'unsafe-eval'"/>
<script type="text/javascript" src="polyfills.js"></script>
<script type="text/javascript" src="hid2file.js"></script>
<script type="text/javascript" src="languages.js"></script>
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 3a6337eaa..1b02ffe64 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -142,7 +142,7 @@
<base href="{$install}"/>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<xsl:if test="$online">
- <meta http-equiv="Content-Security-Policy" content="script-src
'self' 'unsafe-inline' 'unsafe-eval' piwik.documentfoundation.org"/>
+ <meta http-equiv="Content-Security-Policy" content="script-src
'self' 'unsafe-inline' 'unsafe-eval'"/>
</xsl:if>
<title><xsl:value-of select="$titleL10N"/></title>
<link rel="shortcut icon"
href="{$target}media/navigation/favicon.ico"/>
commit 4d7538ca7e34b3f50b818e1a869b9b79002ccd18
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sun Jul 14 20:49:58 2019 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri May 15 09:17:15 2020 +0200
[cp] set branch to distro/collabora/cp-6.4 in .gitreview
Change-Id: I3611766b7aa9da1444d4aab118fc2a10e0f1d706
diff --git a/.gitreview b/.gitreview
index f31508045..b38261551 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=logerrit
port=29418
project=help
defaultremote=logerrit
-defaultbranch=master
+defaultbranch=distro/collabora/cp-6.4
commit ed23e138775ded0f85a3b2294d974af247a0c5df
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Fri May 15 00:29:22 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri May 15 09:15:25 2020 +0200
remove *.google.com and *.googleapis.com from Content-Security-Policy
These are obsolete, since search is based on xapian-omega not on google
search
Change-Id: I1858a3118f6b4778266c4a3d2a6559866ce8cb09
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/94257
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
(cherry picked from commit dc2b016f2014208b27f7af5ad33863b6bd0d760b)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/94266
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/help3xsl/help.html b/help3xsl/help.html
index cc22a2fdf..df4885a67 100644
--- a/help3xsl/help.html
+++ b/help3xsl/help.html
@@ -9,7 +9,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <meta http-equiv="Content-Security-Policy" content="script-src 'self'
'unsafe-inline' 'unsafe-eval' piwik.documentfoundation.org *.google.com
*.googleapis.com"/>
+ <meta http-equiv="Content-Security-Policy" content="script-src 'self'
'unsafe-inline' 'unsafe-eval' piwik.documentfoundation.org"/>
</head>
<body>
<script type="text/javascript">
diff --git a/help3xsl/index.html b/help3xsl/index.html
index 5a319fd04..69d7ee6af 100644
--- a/help3xsl/index.html
+++ b/help3xsl/index.html
@@ -9,7 +9,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <meta http-equiv="Content-Security-Policy" content="script-src 'self'
'unsafe-inline' 'unsafe-eval' piwik.documentfoundation.org *.google.com
*.googleapis.com"/>
+ <meta http-equiv="Content-Security-Policy" content="script-src 'self'
'unsafe-inline' 'unsafe-eval' piwik.documentfoundation.org"/>
</head>
<body>
<script type="text/javascript">
diff --git a/help3xsl/index2.html b/help3xsl/index2.html
index 3f761885f..ce16c3083 100644
--- a/help3xsl/index2.html
+++ b/help3xsl/index2.html
@@ -9,7 +9,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <meta http-equiv="Content-Security-Policy" content="script-src 'self'
'unsafe-inline' 'unsafe-eval' piwik.documentfoundation.org *.google.com
*.googleapis.com"/>
+ <meta http-equiv="Content-Security-Policy" content="script-src 'self'
'unsafe-inline' 'unsafe-eval' piwik.documentfoundation.org"/>
<script type="text/javascript" src="polyfills.js"></script>
<script type="text/javascript" src="hid2file.js"></script>
<script type="text/javascript" src="languages.js"></script>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
