.gitreview | 2
Package_html_media.mk | 2
help3xsl/default.css | 85 ++++++++++++----------
help3xsl/help.html | 2
help3xsl/help2.js | 7 -
help3xsl/index.html | 2
help3xsl/index2.html | 2
help3xsl/online_transform.xsl | 35 ++-------
source/media/navigation/collabora-online-logo.svg | 77 +++++++++++++++++++
source/media/navigation/favicon.ico |binary
source/media/navigation/libo-symbol-white.svg | 1
source/text/shared/main0108.xhp | 2
12 files changed, 142 insertions(+), 75 deletions(-)
New commits:
commit 1d676362d3ee806770ae2abf10ac32f30f97e362
Author: Adolfo Jayme Barrientos <fit...@ubuntu.com>
AuthorDate: Thu Sep 6 04:24:45 2018 -0500
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Jul 14 21:18:57 2019 +0200
.howtoget, now more Collabora-y
Commit cef6bdec37d8001d8f8c2c0f30c3a44500e38ec6 mass-changed
LibreOffice’s green with Collabora’s purple, but .howtoget divs,
having a pale green background, looked very discordant.
Change-Id: I05ade2f92f49764b199214ef64cf4091169d61cf
Reviewed-on: https://gerrit.libreoffice.org/60079
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 b6036f789..7d2adffd5 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -254,7 +254,7 @@ h6 {
font-weight: normal;
}
.howtoget {
- background: #CCF4C6;
+ 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);
commit a4be3f6db22621c0680b3bf382b0387d56aacbbe
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Aug 27 15:26:05 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Jul 14 21:18:57 2019 +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 3b04bb755fa447d5fbf1669bddb55725b667b201
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Aug 27 14:40:01 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Jul 14 21:18:57 2019 +0200
[cp] Xapian search styling
Change-Id: I59d8ca6a1c2c5e6310393c69c8f647a22479eee7
diff --git a/help3xsl/default.css b/help3xsl/default.css
index e2bb6b30a..b6036f789 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -601,7 +601,7 @@ li.disabled a {
background-color: #5c3de2;
border: 3px solid #5c3de2;
border-radius: 8px;
- color: #5c3de2;
+ color: white;
padding: 5px 30px;
text-align: center;
text-decoration: none;
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index abf8c0f81..40dddc353 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -222,6 +222,7 @@
<div class="xapian-omega-search">
<form name="P" method="get" action="/cgi-bin/omega/omega"
target="_top">
<input type="hidden" name="DB" value="{$lang}"/>
+ <input type="hidden" name="FMT" value="cp-query"/>
<input type="hidden" name="DEFAULTOP" value="and"/>
<input id="omega-autofocus" type="search" name="P"
size="65"/>
<input type="submit"
class="xapian-omega-search-button" value="🔍"/>
commit 4aeac3fa2e9c50c8e32e17e4afb6241264e98ef2
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Aug 27 08:43:05 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Jul 14 21:18:57 2019 +0200
[cp] replace Google Search to Xapian Omega search
Change-Id: I0defae3675b0686e15e943ff08014ac98bcbbcbf
diff --git a/help3xsl/default.css b/help3xsl/default.css
index ee6707300..e2bb6b30a 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -593,10 +593,23 @@ li.disabled a {
font-size:1.2rem;
text-align: center;
}
-.google-search {
- max-width: 300px;
+.xapian-omega-search {
+ max-width: 800px;
margin: 40px auto 0 auto;
}
+.xapian-omega-search-button {
+ background-color: #5c3de2;
+ border: 3px solid #5c3de2;
+ border-radius: 8px;
+ color: #5c3de2;
+ padding: 5px 30px;
+ text-align: center;
+ text-decoration: none;
+ display: inline-block;
+ font-size: 24px;
+ margin: 4px 10px;
+ cursor: pointer;
+}
.modules {
border-bottom: 2px solid #f3f3f3;
background-color: #233336;
@@ -785,7 +798,7 @@ li.disabled a {
.rightside {
grid-area: rightside;
}
- .google-donation {
+ .xapian-omega-search {
grid-area: google;
position: sticky;
top: 0px;
diff --git a/help3xsl/help.html b/help3xsl/help.html
index 58115f9cf..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' *.google.com *.googleapis.com"/>
+ <meta http-equiv="Content-Security-Policy" content="script-src 'self'
'unsafe-inline' 'unsafe-eval'"/>
</head>
<body>
<script type="text/javascript">
diff --git a/help3xsl/index.html b/help3xsl/index.html
index d1129527d..161ab952f 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' *.google.com *.googleapis.com"/>
+ <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 c0281b1d0..6784f592c 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' *.google.com *.googleapis.com"/>
+ <meta http-equiv="Content-Security-Policy" content="script-src 'self'
'unsafe-inline' 'unsafe-eval'"/>
<script type="text/javascript" src="help2.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 38716891e..abf8c0f81 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' *.google.com *.googleapis.com"/>
+ <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"/>
@@ -219,23 +219,14 @@
</div>
<div class="google-donation">
<xsl:if test="$online">
- <div class="google-search">
- <script type="text/javascript">
- <![CDATA[
- (function() {]]>
- <xsl:call-template name="getToken"><xsl:with-param
name="lang" select="$lang"/></xsl:call-template>
- <![CDATA[
- var gcse = document.createElement('script');
- gcse.type = 'text/javascript';
- gcse.async = true;
- gcse.src = 'https://cse.google.com/cse.js?cx=' + cx;
- var s = document.getElementsByTagName('script')[0];
- s.parentNode.insertBefore(gcse, s);
- })();
- ]]>
- </script>
- <xsl:text
disable-output-escaping="yes"><gcse:search></gcse:search></xsl:text>
- </div>
+ <div class="xapian-omega-search">
+ <form name="P" method="get" action="/cgi-bin/omega/omega"
target="_top">
+ <input type="hidden" name="DB" value="{$lang}"/>
+ <input type="hidden" name="DEFAULTOP" value="and"/>
+ <input id="omega-autofocus" type="search" name="P"
size="65"/>
+ <input type="submit"
class="xapian-omega-search-button" value="🔍"/>
+ </form>
+ </div>
</xsl:if>
</div>
<footer>
commit 1d522f23278d6c056bb183da114170e55ec8ecd2
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sun Aug 26 21:50:46 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Jul 14 21:18:57 2019 +0200
[cp] remove TDF Piwik tracker
Change-Id: Icabdcae5d5828417d3540bf36f6bb747001189e3
diff --git a/help3xsl/help.html b/help3xsl/help.html
index cc22a2fdf..58115f9cf 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' *.google.com *.googleapis.com"/>
</head>
<body>
<script type="text/javascript">
diff --git a/help3xsl/help2.js b/help3xsl/help2.js
index 0003b72d8..0575905e4 100644
--- a/help3xsl/help2.js
+++ b/help3xsl/help2.js
@@ -188,13 +188,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 5a319fd04..d1129527d 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' *.google.com *.googleapis.com"/>
</head>
<body>
<script type="text/javascript">
diff --git a/help3xsl/index2.html b/help3xsl/index2.html
index 0321b7a39..c0281b1d0 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' *.google.com *.googleapis.com"/>
<script type="text/javascript" src="help2.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 db1d9c483..38716891e 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 *.google.com
*.googleapis.com"/>
+ <meta http-equiv="Content-Security-Policy" content="script-src
'self' 'unsafe-inline' 'unsafe-eval' *.google.com *.googleapis.com"/>
</xsl:if>
<title><xsl:value-of select="$titleL10N"/></title>
<link rel="shortcut icon"
href="{$target}media/navigation/favicon.ico"/>
commit 8834b67d2752a10cab40dbdd044adb850a224cfb
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Aug 22 09:55:44 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Jul 14 21:01:53 2019 +0200
[cp] help page footer
Change-Id: I257d7dd85a896ff69e391a05206c1cb419997331
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 6ba6e038e..db1d9c483 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -240,7 +240,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>
commit 098208e69ac05baafc559ee3366b5115b57f1416
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Aug 20 17:27:01 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Jul 14 21:00:22 2019 +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 69c3e3a373e659a245a5e5ca30d716595fd471ad
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Aug 20 14:01:00 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Jul 14 20:58:55 2019 +0200
[cp] Collabora purple in css
Change-Id: I6295a5d7e83731f7ccf3ca3e0f85ca6778dbe224
diff --git a/help3xsl/default.css b/help3xsl/default.css
index 9546d300c..ee6707300 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -1,4 +1,4 @@
-/*
+de/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
@@ -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: #CCF4C6;
+ 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;
@@ -308,7 +308,7 @@ h6 {
font-size: 1rem;
font-weight: bold;
padding: 1px;
- border: solid 1px #148603;
+ border: solid 1px #5c3de2;
}
#DisplayArea {
background-color: #FCFCFC;
@@ -395,6 +395,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);
@@ -413,7 +414,7 @@ footer p {
opacity: 0;
}
label[for=accordion-1] {
- color: #148603;
+ color: #5c3de2;
display: block;
padding: 10px 0 10px 20px;
font-size: 22px;
@@ -434,7 +435,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;
}
@@ -453,70 +454,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;
@@ -703,7 +704,7 @@ li.disabled a {
}
.contents-treeview label:before {
content: "⊞";
- color: #148603;
+ color: #5c3de2;
width: 16px;
margin: 0 5px 0 0;
display: inline-block;
commit 30220e3984ce1a1ff6fe49f5cfb10a8c32a8f1fc
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Thu Aug 9 21:46:38 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Jul 14 20:54:16 2019 +0200
[cp] Update the header 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 013f987f1..9546d300c 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -344,22 +344,20 @@ h6 {
.embedded {}
.header-extrawurst {
grid-area: header;
- position: sticky;
- top: 0px;
- background-color: #18A303;
- z-index: 1000;
}
-header {
- color: #fff;
+header {
+ 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;
}
@@ -385,8 +383,8 @@ header {
-webkit-overflow-scrolling: touch;
}
.lang nav a, .modules nav a {
- color: #fff;
- background-color: #233336;
+ color: #0c0c0c;
+ background-color: #f2f2f2;
display: block;
line-height: 1.5;
padding: 3px 6px;
@@ -604,7 +602,7 @@ li.disabled a {
}
.modules label:after, .lang label:after {
font-size: 30px;
- color: #fff;
+ color: #5c3de2;
content:"⌄";
}
.lang {
@@ -745,7 +743,7 @@ li.disabled a {
}
.lang label, .modules label {
cursor: pointer;
- color: #fff;
+ color: #5c3de2;
font-size: 19px;
position: relative;
top: 40px;
commit 7c51cfd9304cbb06dff533d532a4017718cc3e63
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Thu Aug 9 20:56:03 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Jul 14 20:51:55 2019 +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 cb5c289fc..57b7d30b8 100644
--- a/Package_html_media.mk
+++ b/Package_html_media.mk
@@ -301,6 +301,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 \
@@ -309,7 +310,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 391403e72..013f987f1 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -367,12 +367,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;
}
.lang nav, .modules nav {
z-index: 100;
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 531748fea683fd0ccb651eaed637f0b8053cb541
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Thu Aug 9 20:10:07 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Jul 14 20:51:36 2019 +0200
[cp] Avoid the donation link.
Change-Id: Ifcf7cf9d3eddcbd2698331f3ca22410427107fb0
Reviewed-on: https://gerrit.libreoffice.org/58796
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index f3b71bac9..6ba6e038e 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -236,11 +236,6 @@
</script>
<xsl:text
disable-output-escaping="yes"><gcse:search></gcse:search></xsl:text>
</div>
- <div class="donation">
- <p><a
href="https://www.libreoffice.org/donate/?pk_campaign=help"; target ="_blank">
- <xsl:value-of select="$ui_donate"/>
- </a></p>
- </div>
</xsl:if>
</div>
<footer>
commit 69f02fbdecc2289a45fa7b204b27ecaeb72f4b30
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sun Jul 14 20:49:58 2019 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Jul 14 20:49:58 2019 +0200
set branch to distro/collabora/cp-6.2 in .gitreview
Change-Id: I3611766b7aa9da1444d4aab118fc2a10e0f1d706
diff --git a/.gitreview b/.gitreview
index f31508045..78b073b0d 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=logerrit
port=29418
project=help
defaultremote=logerrit
-defaultbranch=master
+defaultbranch=distro/collabora/cp-6.2
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
