[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 00f8970a292d6876c29f2d2d4ca7958d832743e9 Author: Olivier Hallot AuthorDate: Fri Dec 1 15:44:46 2023 -0300 Commit: Olivier Hallot CommitDate: Fri Dec 1 19:48:41 2023 +0100 CSS: "literal" must wrap normally. Change-Id: Ib0ee56bd4a93d14467bec0ae607477dbbd86cbd8 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160226 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 62f62d313c..b54f9fe725 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -126,7 +126,7 @@ pre, word-wrap: anywhere; } .literal { -white-space: nowrap; +white-space: normal; } .smathcode { border-radius: 2px;
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |3 +++ 1 file changed, 3 insertions(+) New commits: commit ffaa9e1adb04a683ec87eb5c4c35387384e32702 Author: Olivier Hallot AuthorDate: Thu Aug 31 12:43:26 2023 -0300 Commit: Olivier Hallot CommitDate: Thu Aug 31 21:21:07 2023 +0200 Prevent literal words to wrap in lines. Applies mostly on table columns Change-Id: Ie18b84d9a052f4b189f06c43132457a3a925dcaa Reviewed-on: https://gerrit.libreoffice.org/c/help/+/156354 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 7ce0da75f3..539a7da2fb 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -125,6 +125,9 @@ pre, font-family: var(--font_mono); word-wrap: anywhere; } +.literal { +white-space: nowrap; +} .smathcode { border-radius: 2px; padding: 1px 3px;
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit c6cea6707879ad1c8f5bd11ff26b774f2e59b013 Author: Adolfo Jayme Barrientos AuthorDate: Mon Jan 30 14:46:07 2023 -0600 Commit: Adolfo Jayme Barrientos CommitDate: Mon Jan 30 14:46:07 2023 -0600 tdf#142380 Use CSS variable for background color Change-Id: Ia70389ced5e8b698c034f9eec8cb4f030d27dd81 diff --git a/help3xsl/default.css b/help3xsl/default.css index abf75f69c1..7ce0da75f3 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -31,6 +31,7 @@ do not break anything related to layout by scaling. :root { --font_mono: Menlo, "Cascadia Mono", "Cascadia Code", Consolas, "DejaVu Sans Mono", monospace; --font_body: Ubuntu, Cantarell, "Segoe UI Variable", "Segoe UI", "Noto Sans", "DejaVu Sans", "Lucida Grande", sans-serif, FreeSerif, NanumGothic, "Noto Sans Tibetan", Taprom; + --background-color: #f7f8f7; } body, @@ -90,7 +91,7 @@ h6, pointer-events: auto; } body { -background-color: #F7F8F7; +background-color: var(--background-color); margin: 0; line-height: normal; } @@ -400,10 +401,10 @@ h6 { } /* You Tube matters */ .youtube_placeholder{ -border: 1px solid #eee; +border: 1px dashed #eee; max-width:700px; padding: 10px; -background-color: #eee; +background-color: var(--background-color); text-align: center; } .youtube_button {
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/help2.js
help3xsl/default.css | 14 +++--- help3xsl/help2.js| 14 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) New commits: commit 77d02e65e9acae649867fe67cdba46f30e58a7e0 Author: Adolfo Jayme Barrientos AuthorDate: Tue Dec 13 05:01:43 2022 -0600 Commit: Adolfo Jayme Barrientos CommitDate: Tue Dec 13 05:01:48 2022 -0600 tdf#152491 Update CSS coloring to match new icons https://wiki.documentfoundation.org/Design/Branding#LibreOffice_application_colors Change-Id: I914ddfd14f0ca351f4eed5eb14ed8ea6ed904422 diff --git a/help3xsl/default.css b/help3xsl/default.css index 3740504722..abf75f69c1 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -540,42 +540,42 @@ aside input[type=checkbox]:checked ~ .contents-treeview { display: block; font-size: 22px; font-weight: bold; -color: #0369a3; +color: #083fa6; } #CALC::before { content: "Calc"; display: block; font-size: 22px; font-weight: bold; -color: #43c330; +color: #007c3c; } #IMPRESS::before { content: "Impress"; display: block; font-size: 22px; font-weight: bold; -color: #a33e03; +color: #d0120d; } #DRAW::before { content: "Draw"; display: block; font-size: 22px; font-weight: bold; -color: #c99c00; +color: #cb6d30; } #BASE::before { content: "Base"; display: block; font-size: 22px; font-weight: bold; -color: #8e03a3; +color: #7324a9; } #MATH::before { content: "Math"; display: block; font-size: 22px; font-weight: bold; -color: darkslategray; +color: #c10018; } #CHART::before { content: "Chart"; @@ -596,7 +596,7 @@ aside input[type=checkbox]:checked ~ .contents-treeview { display: block; font-size: 22px; font-weight: bold; -color: gray; +color: darkslategray; } .pagination-container { text-align: center; diff --git a/help3xsl/help2.js b/help3xsl/help2.js index 5b9b2a970b..728453134b 100644 --- a/help3xsl/help2.js +++ b/help3xsl/help2.js @@ -70,15 +70,15 @@ function setSystemSpan(spanZ) { function moduleColor (module) { switch (module){ -case "WRITER" : {color="#0369A3"; break;} -case "CALC" : {color="#43C330"; break;} +case "WRITER" : {color="#083fa6"; break;} +case "CALC" : {color="#007c3c"; break;} case "CHART" : {color="darkcyan"; break;} -case "IMPRESS": {color="#A33E03"; break;} -case "DRAW" : {color="#C99C00"; break;} -case "BASE" : {color="#8E03A3"; break;} +case "IMPRESS": {color="#d0120d"; break;} +case "DRAW" : {color="#cb6d30"; break;} +case "BASE" : {color="#7324a9"; break;} case "BASIC" : {color="black"; break;} -case "MATH" : {color="darkslategray"; break;} -case "SHARED" : {color="gray"; break;} +case "MATH" : {color="#c10018"; break;} +case "SHARED" : {color="darkslategray"; break;} default : {color="#18A303"; break;} } document.getElementById("TopLeftHeader").style.background = color;
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b190949bdc9482030154e4db6de1ffbd4215942c Author: Adolfo Jayme Barrientos AuthorDate: Mon Jun 20 08:10:06 2022 -0500 Commit: Adolfo Jayme Barrientos CommitDate: Mon Jun 20 15:12:21 2022 +0200 Remove unreadable, obsolete fonts Change-Id: Ic1a9839b1819c6b455ded63e120b32c5995e58c8 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136153 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/help3xsl/default.css b/help3xsl/default.css index cbf8f47cf..374050472 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -29,7 +29,7 @@ do not break anything related to layout by scaling. */ :root { - --font_mono: Menlo, Consolas, "DejaVu Sans Mono", "Nimbus Mono L", "Lucida Sans Typewriter", "Courier New", Courier, Monaco, monospace; + --font_mono: Menlo, "Cascadia Mono", "Cascadia Code", Consolas, "DejaVu Sans Mono", monospace; --font_body: Ubuntu, Cantarell, "Segoe UI Variable", "Segoe UI", "Noto Sans", "DejaVu Sans", "Lucida Grande", sans-serif, FreeSerif, NanumGothic, "Noto Sans Tibetan", Taprom; }
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 8db4f0bd980c14b969f8bc08d3a1ecac7d5f7336 Author: Adolfo Jayme Barrientos AuthorDate: Mon Jun 20 07:33:21 2022 -0500 Commit: Adolfo Jayme Barrientos CommitDate: Mon Jun 20 14:38:15 2022 +0200 tdf#142380 tdf#142531 Update font stack, w/o “system-ui” Change-Id: I1e6f27883b707147fdd07cdca2ca56e99a9fdc95 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136152 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Jenkins diff --git a/help3xsl/default.css b/help3xsl/default.css index bb3a2bc7d..cbf8f47cf 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -30,6 +30,7 @@ do not break anything related to layout by scaling. */ :root { --font_mono: Menlo, Consolas, "DejaVu Sans Mono", "Nimbus Mono L", "Lucida Sans Typewriter", "Courier New", Courier, Monaco, monospace; + --font_body: Ubuntu, Cantarell, "Segoe UI Variable", "Segoe UI", "Noto Sans", "DejaVu Sans", "Lucida Grande", sans-serif, FreeSerif, NanumGothic, "Noto Sans Tibetan", Taprom; } body, @@ -43,7 +44,7 @@ h6, .listitem, .listitemintable, .tablecontent { -font-family: -apple-system, "Segoe UI", sans-serif, Roboto, Ubuntu, Cantarell, "Noto Sans", "DejaVu Sans", "Lucida Grande", "Helvetica Neue", Helvetica, Arial, FreeSerif, NanumGothic, "Noto Sans Tibetan", Taprom; +font-family: var(--font_body); } .input { background-color: rgba(0,0,0,0.04);
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/help.js help3xsl/online_transform.xsl helpers/xmlhelp.dtd
help3xsl/default.css |2 +- help3xsl/help.js |3 ++- help3xsl/online_transform.xsl | 18 +++--- helpers/xmlhelp.dtd | 11 +++ 4 files changed, 25 insertions(+), 9 deletions(-) New commits: commit cfa7975316e7fa8e88a2c2e06ad37240d1b6e057 Author: Olivier Hallot AuthorDate: Sat May 14 15:19:49 2022 -0300 Commit: Olivier Hallot CommitDate: Sun May 15 13:56:18 2022 +0200 Add SQL code colorization to Help pages Change-Id: I2c74e63c67a323a6e6b726da352dd23e1a88d886 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/134329 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 69d86fb2c..bb3a2bc7d 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -314,7 +314,7 @@ h6 { color: red; text-align: left; } - +.sqlcode, .pycode, .bascode { border: solid 5px transparent; diff --git a/help3xsl/help.js b/help3xsl/help.js index 65493ab0c..3e9c0fe11 100644 --- a/help3xsl/help.js +++ b/help3xsl/help.js @@ -148,10 +148,11 @@ function debounce(fn, wait, indexList) { }; } -// copy pycode and bascode to clipboard on mouse click +// copy pycode, sqlcode and bascode to clipboard on mouse click // Show border when copy is done divcopyable(document.getElementsByClassName("bascode")); divcopyable(document.getElementsByClassName("pycode")); +divcopyable(document.getElementsByClassName("sqlcode")); function divcopyable(itemcopyable){ for (var i = 0, len = itemcopyable.length; i < len; i++) { diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index a9de0d4f5..ab703aaca 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -490,7 +490,7 @@ - + @@ -533,7 +533,7 @@ - + @@ -989,7 +989,6 @@ - http://schema.org/SoftwareSourceCode; itemprop="codeSampleType" content="snippet"> @@ -1003,6 +1002,19 @@ + +http://schema.org/SoftwareSourceCode; itemprop="codeSampleType" content="snippet"> + + + + + +http://schema.org/SoftwareSourceCode; itemprop="codeSampleType" content="snippet"> + + + + + diff --git a/helpers/xmlhelp.dtd b/helpers/xmlhelp.dtd index fcb1076b5..99eac47f9 100644 --- a/helpers/xmlhelp.dtd +++ b/helpers/xmlhelp.dtd @@ -24,6 +24,7 @@ Version 06-Jun-2017 Version Nov 2018 Added extensions: H1, .. H6, menuitem, keycode, literal input, widget, note, tip, warning + Added extensions: pycode, sqlcode, bascode --> @@ -43,7 +44,9 @@ Version Nov 2018 - + + + - + @@ -81,7 +84,7 @@ Version Nov 2018 date CDATA #REQUIRED > - + @@ -207,7 +210,7 @@ Version Nov 2018 localize CDATA #IMPLIED > - +
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl source/text
help3xsl/default.css| 48 help3xsl/online_transform.xsl | 10 +- source/text/shared/06/youtubevideos.xhp |2 - source/text/shared/help/browserhelp.xhp |4 ++ 4 files changed, 60 insertions(+), 4 deletions(-) New commits: commit d9880014fd80f412d10b2f7536c45941552c4760 Author: Olivier Hallot AuthorDate: Wed May 11 14:07:02 2022 -0300 Commit: Olivier Hallot CommitDate: Fri May 13 18:46:34 2022 +0200 Fix YouTube display for Help online/offline + Enhance button CSS display + Refactor XSLT + Refactor XHP Change-Id: I58e46c31a97ad49eb25a4489994aae5dac62dbc3 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/134207 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index bc053cc70..69d86fb2c 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -397,6 +397,54 @@ h6 { [data-a11y-toggle]:not([aria-controls]) { display: none; } +/* You Tube matters */ +.youtube_placeholder{ +border: 1px solid #eee; +max-width:700px; +padding: 10px; +background-color: #eee; +text-align: center; +} +.youtube_button { + appearance: none; + backface-visibility: hidden; + background-color: #27ae60; + border-radius: 8px; + border-style: none; + box-shadow: rgba(39, 174, 96, .15) 0 4px 9px; + box-sizing: border-box; + color: #fff; + cursor: pointer; + display: inline-block; + font-size: 16px; + font-weight: 600; + letter-spacing: normal; + line-height: 1.5; + outline: none; + overflow: hidden; + padding: 13px 20px; + position: relative; + text-align: center; + text-decoration: none; + transform: translate3d(0, 0, 0); + transition: all .3s; + user-select: none; + -webkit-user-select: none; + touch-action: manipulation; + vertical-align: top; + white-space: nowrap; +} +.youtube_button:hover { + background-color: #1e8449; + opacity: 1; + transform: translateY(0); + transition-duration: .35s; + box-shadow: rgba(39, 174, 96, .2) 0 6px 12px; +} +.youtube_button:active { + transform: translateY(2px); + transition-duration: .35s; +} #langs-nav:not([aria-hidden='true']), #modules-nav:not([aria-hidden='true']) { z-index: 100; diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index a9c47ae1e..a9de0d4f5 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -109,6 +109,9 @@ + + +
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl helpers/xmlhelp.dtd source/text
help3xsl/default.css | 27 ++ help3xsl/online_transform.xsl|7 - helpers/xmlhelp.dtd |7 - source/text/sbasic/shared/03/lib_ScriptForge.xhp | 28 +-- 4 files changed, 50 insertions(+), 19 deletions(-) New commits: commit 5bab8a2d2530d7487064a2560c440269018a56b9 Author: Ilmari Lauhakangas AuthorDate: Mon Apr 18 12:41:48 2022 +0300 Commit: Ilmari Lauhakangas CommitDate: Tue Apr 19 14:51:33 2022 +0200 tdf#148621 Make ScriptForge service tables mobile-friendly - Introduce element - While considering text-align, I noticed we do not take RTL languages into account. A CSS rule 'html[dir=ltr] th' was added, which does nothing at the moment. We should look into directionality. Change-Id: Ib59aa0c508529c0beaa35542d96bd5cc1aa4db29 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/133114 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 2c5e59ac0..bc053cc70 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -212,6 +212,9 @@ table, th, td { border-right: 0; padding: 0.3em; } +html[dir=ltr] th { +text-align: left; +} .tablehead, .tableheadintable { font-weight: bold; @@ -226,6 +229,17 @@ table, th, td { font-size: 0.98rem; } +/* ScriptForge service tables */ +.sf_table { +min-width: 100%; +} +.sf_table thead { +display: none; +} +.sf_table tr, .sf_table td { +display: block; +} + h1, h2, h3, @@ -840,6 +854,19 @@ li.disabled a { max-width: 200px; width: 100% } +/* ScriptForge service tables */ +.sf_table { +min-width: auto; +} +.sf_table thead { +display: table-header-group; +} +.sf_table tr { +display: table-row; +} +.sf_table td { +display: table-cell; +} } @media screen and (min-width: 1440px) { #Contents { diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 465415ea2..70c7ab0af 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -732,7 +732,7 @@ - + @@ -744,7 +744,7 @@ - + @@ -758,6 +758,9 @@ + + + diff --git a/helpers/xmlhelp.dtd b/helpers/xmlhelp.dtd index 6a4ef9778..fcb1076b5 100644 --- a/helpers/xmlhelp.dtd +++ b/helpers/xmlhelp.dtd @@ -228,7 +228,7 @@ Version Nov 2018 select (sys | appl | distrib | target | ver | lang) #REQUIRED > - + + + + Services provided by the ScriptForge library - - - - Category - - - Services - - - - - - - - + + + + + Category + + + Services + + + %PRODUCTNAME Basic @@ -241,4 +237,4 @@ All ScriptForge Basic routines or identifiers that are prefixed with an underscore character "_" are reserved for internal use. They are not meant be used in Basic macros or Python scripts. - \ No newline at end of file +
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl help3xsl/prism.css help3xsl/prism.js source/text
help3xsl/default.css |6 help3xsl/online_transform.xsl |2 help3xsl/prism.css |2 help3xsl/prism.js | 201 ++ source/text/sbasic/shared/03/lib_tools.xhp | 2280 + 5 files changed, 969 insertions(+), 1522 deletions(-) New commits: commit 24828f91e22842cdaf64faf7d22a028541e5746c Author: Ilmari Lauhakangas AuthorDate: Sat Apr 16 16:42:40 2022 +0300 Commit: Olivier Hallot CommitDate: Sun Apr 17 16:38:31 2022 +0200 tdf#148621 Improve Basic Help layout - Get rid of tables - Add normalize-whitespace Prism plugin to get rid of useless indents - Fix code blocks poking through sticky header - Add some word wrapping CSS to fix mobile-unfriendliness Change-Id: I73fd1e0678624b0d4bd5561f50e80990db5567be Reviewed-on: https://gerrit.libreoffice.org/c/help/+/133096 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 085d323a9..2c5e59ac0 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -121,6 +121,7 @@ pre, display: inline; padding: 1px 3px; font-family: var(--font_mono); +word-wrap: anywhere; } .smathcode { border-radius: 2px; @@ -178,6 +179,10 @@ pre, .noteicon, .notetext { padding:0.3em; } +/* Override some Prism.js styles */ +code[class*="language-"], pre[class*="language-"] { +white-space: pre-wrap; +} /* Table related classes */ @@ -603,6 +608,7 @@ li.disabled a { background: #18A303; top: 0px; position: sticky; +z-index: 100; } .xapian-omega-search { margin: auto; diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 0751d7a86..465415ea2 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -143,8 +143,8 @@ - + diff --git a/help3xsl/prism.css b/help3xsl/prism.css index f974d0c87..79d07d18a 100644 --- a/help3xsl/prism.css +++ b/help3xsl/prism.css @@ -1,5 +1,5 @@ /* PrismJS 1.27.0 -https://prismjs.com/download.html#themes=prism-coy=markup+css+clike+javascript+python+visual-basic=line-numbers */ +https://prismjs.com/download.html#themes=prism-coy=markup+css+clike+javascript+python+visual-basic=line-numbers+normalize-whitespace */ /** * prism.js Coy theme for JavaScript, CoffeeScript, CSS and HTML * Based on https://github.com/tshedor/workshop-wp-theme (Example: http://workshop.kansan.com/category/sessions/basics or http://workshop.timshedor.com/category/sessions/basics); diff --git a/help3xsl/prism.js b/help3xsl/prism.js index 546388f44..4e00aeb04 100644 --- a/help3xsl/prism.js +++ b/help3xsl/prism.js @@ -1,5 +1,5 @@ /* PrismJS 1.27.0 -https://prismjs.com/download.html#themes=prism-coy=markup+css+clike+javascript+python+visual-basic=line-numbers */ +https://prismjs.com/download.html#themes=prism-coy=markup+css+clike+javascript+python+visual-basic=line-numbers+normalize-whitespace */ /// var _self = (typeof window !== 'undefined') @@ -2067,3 +2067,202 @@ Prism.languages.vba = Prism.languages['visual-basic']; }()); +(function () { + + if (typeof Prism === 'undefined') { + return; + } + + var assign = Object.assign || function (obj1, obj2) { + for (var name in obj2) { + if (obj2.hasOwnProperty(name)) { + obj1[name] = obj2[name]; + } + } + return obj1; + }; + + function NormalizeWhitespace(defaults) { + this.defaults = assign({}, defaults); + } + + function toCamelCase(value) { + return value.replace(/-(\w)/g, function (match, firstChar) { + return firstChar.toUpperCase(); + }); + } + + function tabLen(str) { + var res = 0; + for (var i = 0; i < str.length; ++i) { + if (str.charCodeAt(i) == '\t'.charCodeAt(0)) { + res += 3; + } + } + return str.length + res; + } + + NormalizeWhitespace.prototype = { + setDefaults: function (defaults) { + this.defaults = assign(this.defaults, defaults); + }, + normalize: function (input, settings) { + settings = assign(this.defaults, settings); + + for (var name in settings) { + var methodName = toCamelCase(name); + if (name !== 'normalize' && methodName !== 'setDefaults' && + settings[name] && this[methodName]) { + input = this[methodName].call(this, input, settings[name]); +
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |2 -- 1 file changed, 2 deletions(-) New commits: commit d16329383f7ff6ce14d00dec6670de29343bae26 Author: Ilmari Lauhakangas AuthorDate: Thu Jan 27 19:27:20 2022 +0200 Commit: Olivier Hallot CommitDate: Thu Jan 27 21:43:23 2022 +0100 Remove max-width from menus Change-Id: I7d59fb7161af41449cd0a1508f38143c241d50d0 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/129061 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index a90644025..085d323a9 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -780,8 +780,6 @@ li.disabled a { display: flex; flex-direction: column; overflow-y: auto; -overflow-x: hidden; -max-width: 160px; max-height: 480px; position: absolute; }
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit df6f47ebcb1caf2a9791661de0fa8c484efd0515 Author: Ilmari Lauhakangas AuthorDate: Mon Jan 17 16:28:00 2022 +0200 Commit: Ilmari Lauhakangas CommitDate: Mon Jan 17 15:30:07 2022 +0100 tdf#129697 Use LIBREOFFICE instead of GLOBAL as index heading Change-Id: I8c00eb4ed888eb8b2e898144141ef1c5a659bb49 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/128503 Tested-by: Jenkins Tested-by: Ilmari Lauhakangas Reviewed-by: Ilmari Lauhakangas diff --git a/help3xsl/default.css b/help3xsl/default.css index ad65b34a5..2f770c611 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -524,7 +524,7 @@ aside input[type=checkbox]:checked ~ .contents-treeview { color: black; } #SHARED::before { -content: "GLOBAL"; +content: "LIBREOFFICE"; display: block; font-size: 22px; font-weight: bold;
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/help2.js Package_html_media.mk source/media
Package_html_media.mk |1 + help3xsl/default.css |6 +- help3xsl/help2.js |1 + source/media/navigation/libo-symbol-black.svg |1 + 4 files changed, 8 insertions(+), 1 deletion(-) New commits: commit eb1bf86ac137d050daaaed114a70c29002acc4fe Author: Ilmari Lauhakangas AuthorDate: Thu Jan 13 16:25:47 2022 +0200 Commit: Olivier Hallot CommitDate: Thu Jan 13 16:12:10 2022 +0100 tdf#123318 Add navigation menu entry LibreOffice for Shared Change-Id: Ibd46738e03721127e07ee1575e0a925fc36fbe9d Reviewed-on: https://gerrit.libreoffice.org/c/help/+/128382 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/Package_html_media.mk b/Package_html_media.mk index 66cd339f1..784486c3f 100644 --- a/Package_html_media.mk +++ b/Package_html_media.mk @@ -378,6 +378,7 @@ $(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-black.svg \ navigation/libo-symbol-white.svg \ navigation/libo-writer.svg \ screenshots/modules/scalc/ui/deletecells/DeleteCellsDialog.png \ diff --git a/help3xsl/default.css b/help3xsl/default.css index 66dd59271..ad65b34a5 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -630,6 +630,7 @@ li.disabled a { display: none; } +.libreoffice-icon, .calc-icon, .chart-icon, .writer-icon, @@ -643,6 +644,9 @@ li.disabled a { position: relative; margin-right: 5px; } +.libreoffice-icon { +background-image: url(media/navigation/libo-symbol-black.svg); +} .calc-icon { background-image: url(media/navigation/libo-calc.svg); } @@ -777,7 +781,7 @@ li.disabled a { flex-direction: column; overflow-y: auto; overflow-x: hidden; -max-width: 120px; +max-width: 160px; max-height: 480px; position: absolute; } diff --git a/help3xsl/help2.js b/help3xsl/help2.js index f40492afb..3a45f7f60 100644 --- a/help3xsl/help2.js +++ b/help3xsl/help2.js @@ -187,6 +187,7 @@ function setupModules(lang) { var modulesNav = document.getElementById('modules-nav'); if (!modulesNav.classList.contains('loaded')) { var html = +'LibreOffice' + 'Writer' + 'Calc' + 'Impress' + diff --git a/source/media/navigation/libo-symbol-black.svg b/source/media/navigation/libo-symbol-black.svg new file mode 100644 index 0..b4756d5fe --- /dev/null +++ b/source/media/navigation/libo-symbol-black.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1fbed0448d0d1d77532fe3abb5be05fc13d93bdb Author: Olivier Hallot AuthorDate: Wed Jan 5 12:00:51 2022 -0300 Commit: Ilmari Lauhakangas CommitDate: Wed Jan 5 18:18:18 2022 +0100 Improve paragraph spacing in text Add more space below paragraphs. Change-Id: Ie282883229bcc1471aed6c35ef57d1ec909996b5 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/128013 Tested-by: Jenkins Tested-by: Ilmari Lauhakangas Reviewed-by: Ilmari Lauhakangas diff --git a/help3xsl/default.css b/help3xsl/default.css index ccc61e331..66dd59271 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -234,7 +234,7 @@ p, ol, td { font-size: 1.15rem; -margin: 2px 0 2px 0; +margin: 2px 0 10px 0; } h1 { font-size: 1.83rem;
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e36e33937f9cda7fde9ab56f9eb25f6f549700c7 Author: Kevin Suo AuthorDate: Mon May 31 23:34:25 2021 +0800 Commit: Olivier Hallot CommitDate: Mon May 31 18:18:39 2021 +0200 tdf#142531: fix help css for Simplified Chinese display on Linux The font "system-ui" may cause trouble in some system, although it may look good in several systems. See e.g. https://infinnie.github.io/blog/2017/systemui.html. This change removes the "system-ui" font from the list, still put "Segoe UI" before any others, but moves "sans-serif" forward so that it falls back to the UI font in most linux distros. Tested on Win10 and this does not impact the display for English or Chinese, but really improves a lot on Linux (Fedora 32 for me). Change-Id: I1cba731cb846d1dc8c708b12510167c48de539e5 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/116487 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 29cb0f010..2eff6c39f 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -40,7 +40,7 @@ h6, .listitem, .listitemintable, .tablecontent { -font-family: -apple-system, system-ui, "Segoe UI", Roboto, Ubuntu, Cantarell, "Noto Sans", "DejaVu Sans", "Lucida Grande", "Helvetica Neue", Helvetica, Arial, sans-serif, FreeSerif, NanumGothic, "Noto Sans Tibetan", Taprom; +font-family: -apple-system, "Segoe UI", sans-serif, Roboto, Ubuntu, Cantarell, "Noto Sans", "DejaVu Sans", "Lucida Grande", "Helvetica Neue", Helvetica, Arial, FreeSerif, NanumGothic, "Noto Sans Tibetan", Taprom; } .input { background-color: rgba(0,0,0,0.04); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css helpers/convertfilters.py source/text
help3xsl/default.css|6 helpers/convertfilters.py | 235 +++- source/text/shared/guide/convertfilters.xhp | 1401 ++-- 3 files changed, 696 insertions(+), 946 deletions(-) New commits: commit 226a545d33667a0c9526593a5182ac0a849933e2 Author: Kevin Suo AuthorDate: Sun May 30 20:39:31 2021 +0800 Commit: Olivier Hallot CommitDate: Mon May 31 16:45:00 2021 +0200 tdf#142417: Improve convertfilters.py and add API Names column This commit involves two parts: 1. Improved the convertfilters.py helper script to make sure the generated convertfilters.xhp file is complete, accurate and containing no duplicated entries, and also add codes to also generate API Names column, as discussed in tdf#142417. Importantly, the code is modified to generate fixed IDs, rather than the previously random IDs or sequential IDs which may make the PO translation strings to show fuzzy when the file is re-generated. 2. This helper script is run and the convertfilters.xhp is updated. 3. The default css is modified to better display the page. There is no need to set overflow=auto for the DisplayArea, otherwise the scrollbar goes to the bottom of that area which is not visible. Also added a css class to display smaller fonts for the table. Change-Id: I8a5c73c9d6a0c0b44fc7db6cb67b140bfeb8b4be Reviewed-on: https://gerrit.libreoffice.org/c/help/+/116405 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index ce1dd77f8..29cb0f010 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -196,8 +196,6 @@ table { background: #FEFEFE; box-shadow: rgba(0,0,0,0.08) 0 1px 5px 0; border-collapse: collapse; -margin-left: auto; -margin-right: auto; } table, th, td { border-top: 0; @@ -216,6 +214,10 @@ table, th, td { vertical-align:top; } +.table_font_small { +font-size: 0.98rem; +} + h1, h2, h3, diff --git a/helpers/convertfilters.py b/helpers/convertfilters.py old mode 100644 new mode 100755 index 209a78c1d..dcb25af00 --- a/helpers/convertfilters.py +++ b/helpers/convertfilters.py @@ -6,106 +6,173 @@ # 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/. # -# Run this in instdir/share/registry/ +# This script is used to generate the convertfilters.xhp file located +# in helpcontent2/source/text/shared/guide. +# +# Run this script followed by the path of instdir/share/registry/ +# i.e.: ./convertfilters.py /path/to/source/core/instdir/share/registry +# # Requires Python 3.6 or greater. +import os import sys import random import time from math import floor from lxml import etree +output_file_path = os.path.join(os.path.dirname(sys.argv[0]), "convertfilters.xhp") +try: +registry_dir = sys.argv[1] +except IndexError: +print("Usage: ./convertfilters.py /path/to/source/core/instdir/share/registry") +sys.exit(1) + +if not os.path.exists(registry_dir): +print(f"{registry_dir} does not exist. Make sure you have built the core repo before running this script") +sys.exit(1) + modules = ["writer.xcd","calc.xcd","impress.xcd","draw.xcd","math.xcd","base.xcd","graphicfilter.xcd"] -def rdm(prefix): -return prefix + "_id" + str(floor(random.random() * 1000) + 1) + str(int(time.time())) +def gen_id(apiname): +'''This function accepts module name and an API Name of the filter, and then generate +a unique ID. API Names are used since they are unique within the page. + +Do not use random numbers or sequence-count numbers here since it will cause all words to be "fuzzy" in PO files +when the xhp file is regenerated. +''' +apiname = apiname.replace(" ", "_") +apiname = apiname.replace("(", "_") +apiname = apiname.replace(")", "_") +apiname = apiname.replace("/", "_") + +return apiname -output = "" -output += f'\n' -output += f'\n' -output += f'\n' -output += f'\n' -output += f'\n' -output += f'File Conversion Filters Tables\n' -output += f'/text/shared/guide/convertfilters.xhp\n' -output += f'\n\n\n' -output += f'\n' -output += f'\n' -output += f'filters;document conversion\n' -output += f'document conversion;filters\n' -output += f'convert-to;filters\n' -output += f'command line document conversion;filters\n' -output += f'module file filters\n' -output += f'\n' -output += f'File Conversion Filter Names\n' -output += f'Tables with filter names for command line document conversion.\n' -output += f'\n' -output += f'Filter nameMedia typeFile name extensions\n' +output = ''' + + + + +File Conversion Filters Tables +/text/shared/guide/convertfilters.xhp + + + + + +filters;document conversion +document conversion;filters +convert-to;filters +command
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) New commits: commit e694812962ffc63f54e130446a0cac49f048bca0 Author: Adolfo Jayme Barrientos AuthorDate: Mon Mar 22 15:46:49 2021 -0600 Commit: Adolfo Jayme Barrientos CommitDate: Mon Mar 22 15:46:49 2021 -0600 CSS: Initial teeny-tiny changes towards tdf#139926 Since I keep procrastinating on the Online Help redesign, let’s do it incrementally. Change-Id: I2e7ebc1d3d9df8f6b7425dcae50464d463d7f0c3 diff --git a/help3xsl/default.css b/help3xsl/default.css index 197052902..ce1dd77f8 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -155,21 +155,21 @@ pre, .warning { display:flex; align-items: center; -border-radius: 0 4px 4px 0; -box-shadow: 0 2px 2px -2px rgba(0,0,0,0.2); +border-radius: 2px; +box-shadow: 0 2px 5px -3px rgb(0 0 0 / 10%); padding: 0.2em; margin-top: 15px; } .note { -border-left: 3px solid #309048; +border-left: 2px solid #309048; background-color: #d9f1dd; } .tip { -border-left: 3px solid #0063b1; +border-left: 2px solid #0063b1; background-color: #cde5f7; } .warning { -border-left: 3px solid #ed8733; +border-left: 2px solid #ed8733; background-color: #f6f1d2; } .noteicon, .notetext { @@ -228,7 +228,7 @@ h6 { p, ol, td { -font-size: 1.17rem; +font-size: 1.15rem; margin: 2px 0 2px 0; } h1 { @@ -256,10 +256,10 @@ h6 { } .howtoget { background: #EBE7E9; -border-left: 3px solid #4E4B55; -border-radius: 0 4px 4px 0; -box-shadow: 0 2px 2px -2px rgba(0,0,0,0.2); -padding: 0.3em; +border-left: 2px solid #4E4B55; +border-radius: 2px; +box-shadow: 0 2px 5px -3px rgb(0 0 0 / 10%); +padding: 0.2em; display: flex; flex-direction: column; } @@ -450,7 +450,7 @@ aside input[type=checkbox]:checked ~ .contents-treeview { padding-left: 15px; } .index a { -font-size: 16px; +font-size: 15px; display: block; } .index .hidden { @@ -578,7 +578,7 @@ li.disabled a { top: 0px; } .donation{ -background: linear-gradient(90deg, #4275b2 0%, #4eaa88 100%); +border: 1px solid #f1c62a; border-radius: 2px; padding: 5px 10px; margin: auto; @@ -593,7 +593,7 @@ li.disabled a { text-decoration: none; } .donation p { -font-size:1.2rem; +font-size:1rem; text-align: center; } #SearchFrame { @@ -671,7 +671,7 @@ li.disabled a { padding: 0; margin: 0; list-style: none; -font-size: 16px; +font-size: 15px; } .contents-treeview { -moz-user-select: none; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |1 + 1 file changed, 1 insertion(+) New commits: commit 4c9cd88154a6130360ac550b7e406ea0b59a4994 Author: Ilmari Lauhakangas AuthorDate: Sat Oct 24 12:46:27 2020 +0300 Commit: Ilmari Lauhakangas CommitDate: Sat Oct 24 11:58:50 2020 +0200 Use z-index: 100 for TopLeftHeader The tooltip functionality was making things messy with the sticky header Change-Id: I8a77b11c950c54f00bde0c040a2945f503f993b5 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104749 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas diff --git a/help3xsl/default.css b/help3xsl/default.css index bd4819181..197052902 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -340,6 +340,7 @@ h6 { display: flex; flex-wrap: wrap; justify-content: flex-start; +z-index: 100; } .dropdowns { /* allow for scrolling */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |6 +- 1 file changed, 1 insertion(+), 5 deletions(-) New commits: commit eefef8231b5fbbb4148fa57a5a01b5c160a4ad9b Author: Ilmari Lauhakangas AuthorDate: Mon Sep 28 14:46:20 2020 +0300 Commit: Adolfo Jayme Barrientos CommitDate: Mon Sep 28 13:51:02 2020 +0200 Keep logo text colour white even when visited Change-Id: I5cad9cdaf606b2b809c8e8a39a0dbf82ce15f919 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/103548 Tested-by: Jenkins Tested-by: Adolfo Jayme Barrientos Reviewed-by: Adolfo Jayme Barrientos diff --git a/help3xsl/default.css b/help3xsl/default.css index 5502308ad..bd4819181 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -352,14 +352,10 @@ h6 { justify-content: space-between; flex-direction: column; } -symbol, .logo { +.symbol, .logo, .logo:hover, .logo:visited { color: #fff; text-decoration: none; } -.logo:hover { -text-decoration: none; -color: #fff; -} .logo p { font-size: 24px; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 1e21cf1fa77421ab7abd52d55af1662a6890766e Author: Adolfo Jayme Barrientos AuthorDate: Thu Sep 10 09:48:08 2020 -0500 Commit: Adolfo Jayme Barrientos CommitDate: Thu Sep 10 09:48:08 2020 -0500 CSS: Separate this rule out of the block Change-Id: I1c7ea2603fcbb8a6668cde831848246bb4d1c3a4 diff --git a/help3xsl/default.css b/help3xsl/default.css index 5e1a75702..5502308ad 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -560,11 +560,13 @@ li.disabled a { outline: none; padding: 0 .25em; transition: all 0.30s ease-in-out; -width: 100%; } #search-bar:focus, input:focus { border: 1px solid #0EA5FB; } +#search-bar { +width: 100%; +} #search-bar::placeholder { font-style: italic; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css | 56 --- 1 file changed, 31 insertions(+), 25 deletions(-) New commits: commit 0b73d5eb91c2e1d1c179dccc9e81be0f0451c719 Author: Adolfo Jayme Barrientos AuthorDate: Thu Sep 10 09:13:24 2020 -0500 Commit: Adolfo Jayme Barrientos CommitDate: Thu Sep 10 09:13:24 2020 -0500 Online help CSS: improve link colors so Olivier doesn’t hate me Change-Id: Ia03fdfe89ac578891458b19657486d398d4bc1b4 diff --git a/help3xsl/default.css b/help3xsl/default.css index f5da03bc8..5e1a75702 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -91,15 +91,18 @@ body { line-height: normal; } ::selection { -background: #A0F3FF; +background: #FFEB9F; } a { -text-decoration-color: #D2D4DA; -color: #3CA2E2; +text-decoration-color: rgba(0,0,0,0.15); +color: #0461e0; } a:hover { text-decoration: underline; -color: #5FB3E7; +color: #023a86; +} +a:visited { +color: #633363; } pre, .code, @@ -418,7 +421,7 @@ footer p { white-space: nowrap; } label[for=accordion-1] { -color: #148603; +color: #26; display: block; padding: 10px 0 10px 20px; font-size: 22px; @@ -439,7 +442,7 @@ aside input[type=checkbox]:checked ~ .contents-treeview { } .index-label { font-size: 22px; -color: #148603; +color: #26; padding-left: 20px; margin: 20px 0 0 0; } @@ -469,63 +472,63 @@ aside input[type=checkbox]:checked ~ .contents-treeview { display: block; font-size: 22px; font-weight: bold; -color: #148603; +color: #0369a3; } #CALC::before { content: "CALC"; display: block; font-size: 22px; font-weight: bold; -color: #148603; +color: #43c330; } #IMPRESS::before { content: "IMPRESS"; display: block; font-size: 22px; font-weight: bold; -color: #148603; +color: #a33e03; } #DRAW::before { content: "DRAW"; display: block; font-size: 22px; font-weight: bold; -color: #148603; +color: #c99c00; } #BASE::before { content: "BASE"; display: block; font-size: 22px; font-weight: bold; -color: #148603; +color: #8e03a3; } #MATH::before { content: "MATH"; display: block; font-size: 22px; font-weight: bold; -color: #148603; +color: darkslategray; } #CHART::before { content: "CHART"; display: block; font-size: 22px; font-weight: bold; -color: #148603; +color: darkcyan; } #BASIC::before { content: "BASIC"; display: block; font-size: 22px; font-weight: bold; -color: #148603; +color: black; } #SHARED::before { content: "GLOBAL"; display: block; font-size: 22px; font-weight: bold; -color: #148603; +color: gray; } .pagination-container { text-align: center; @@ -539,7 +542,7 @@ aside input[type=checkbox]:checked ~ .contents-treeview { text-decoration: none; } li.active { -background-color: #6E7487; +background-color: #023a86; } li.active a { color: #fff; @@ -548,7 +551,7 @@ li.disabled a { opacity: 0.4; pointer-events: none; } -#search-bar { +#search-bar, input { border: 1px solid #CCC; box-shadow: inset 0 1px 1px rgba(0,0,0,0.1); box-sizing: border-box; @@ -559,7 +562,7 @@ li.disabled a { transition: all 0.30s ease-in-out; width: 100%; } -#search-bar:focus { +#search-bar:focus, input:focus { border: 1px solid #0EA5FB; } #search-bar::placeholder { @@ -576,15 +579,19 @@ li.disabled a { top: 0px; } .donation{ -background: #6E7487; -padding: 5px 10px 5px 10px; +background: linear-gradient(90deg, #4275b2 0%, #4eaa88 100%); +border-radius: 2px; +padding: 5px 10px; margin: auto; max-width: 200px; color: #ff; -text-decoration: none; +} +.donation:hover { +background: linear-gradient(90deg, #1c71d8 0%, #30c877 100%); } .donation a { color: white; +text-decoration: none; } .donation p { font-size:1.2rem; @@ -707,7 +714,7 @@ li.disabled a { } .contents-treeview label:before { content: "⊞"; -color: #148603; +color: #0461e0; width: 16px; margin: 0 5px 0 0; display: inline-block; @@ -716,9 +723,8 @@ li.disabled a { content: "⊟"; } .contents-current { -background: rgba(0,0,0,0.05); +background: rgba(0,0,0,0.1); border-left: 2px solid #6E7487; -font-weight: 600; margin-left: -12px; padding-left: 10px; } @@ -871,7 +877,7 @@ li.disabled a { } body { display: grid; -grid-template-columns: 360px 100px 300px 1fr; +grid-template-columns: 320px 100px 300px 1fr; grid-template-rows: minmax(1em, auto) minmax(1em, auto) 1fr minmax(1em, auto); grid-template-areas: "header header search donation" "rightside main main
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css | 29 +++-- 1 file changed, 7 insertions(+), 22 deletions(-) New commits: commit 4847445f1d2ba57767dfb3be236b112e7187a04d Author: Adolfo Jayme Barrientos AuthorDate: Wed Jun 24 17:26:16 2020 -0500 Commit: Adolfo Jayme Barrientos CommitDate: Wed Jun 24 17:26:16 2020 -0500 tdf#133640 Replace problematic colors to make links discernible … and add back their default underlines, but dimmed. I still think this looks busy, but I shall get used to it. It’s more a11y-friendly this way. Also, the old, green footer line is gone, since it doesn’t really fit in since commit 4d6b5e5f74c50cc440a46fada8fa89ad2f946749. Change-Id: Ie9feb3cc232ec249dbe323c2ec4b761c12e91ad6 diff --git a/help3xsl/default.css b/help3xsl/default.css index 6ce1e1d06..f5da03bc8 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -94,12 +94,12 @@ body { background: #A0F3FF; } a { -text-decoration: none; -color: #0379BC; +text-decoration-color: #D2D4DA; +color: #3CA2E2; } a:hover { text-decoration: underline; -color: #0499EE; +color: #5FB3E7; } pre, .code, @@ -400,9 +400,7 @@ symbol, .logo { white-space: nowrap; } footer { -padding: 40px 10px 40px 10px; -background-color: #FCFCFC; -box-shadow: 0 2px 8px 0 rgba(0,0,0,.05); +padding: 30px 20px; } footer p { font-size: 0.98rem; @@ -541,7 +539,7 @@ aside input[type=checkbox]:checked ~ .contents-treeview { text-decoration: none; } li.active { -background-color: #0379BC; +background-color: #6E7487; } li.active a { color: #fff; @@ -578,9 +576,7 @@ li.disabled a { top: 0px; } .donation{ -background: #0379BC; -background-image: linear-gradient(to bottom, #3498db, #2980b9); -border-radius: 8px; +background: #6E7487; padding: 5px 10px 5px 10px; margin: auto; max-width: 200px; @@ -590,14 +586,6 @@ li.disabled a { .donation a { color: white; } -.donation a:hover { -color: white; -text-decoration: none; -} -.donation:hover{ -background: #0379BC; -background-image: linear-gradient(to bottom, #3cb0fd, #3498db); -} .donation p { font-size:1.2rem; text-align: center; @@ -729,7 +717,7 @@ li.disabled a { } .contents-current { background: rgba(0,0,0,0.05); -border-left: 2px solid #0379BC; +border-left: 2px solid #6E7487; font-weight: 600; margin-left: -12px; padding-left: 10px; @@ -881,9 +869,6 @@ li.disabled a { justify-content: space-between; align-items: center; } -footer { -border-top: 2px solid #148603; -} body { display: grid; grid-template-columns: 360px 100px 300px 1fr; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit 47b0c69b0a1cefe027366d6e01f4f14470edaa2f Author: Adolfo Jayme Barrientos AuthorDate: Tue Jun 23 08:59:52 2020 -0500 Commit: Adolfo Jayme Barrientos CommitDate: Tue Jun 23 08:59:52 2020 -0500 Update CSS box colors to match new Colibre Change-Id: I5ed9fdcad79fc34032e6c8d1536aaaf12d32e177 diff --git a/help3xsl/default.css b/help3xsl/default.css index 2d1b2cc4a..6ce1e1d06 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -158,16 +158,16 @@ pre, margin-top: 15px; } .note { -border-left: 4px solid #61897C; -background-color: #D9E7E2; +border-left: 3px solid #309048; +background-color: #d9f1dd; } .tip { -border-left: 4px solid #4866AD; -background-color: #CDD5E8; +border-left: 3px solid #0063b1; +background-color: #cde5f7; } .warning { -border-left: 4px solid #D5B177; -background-color: #F9EEDC; +border-left: 3px solid #ed8733; +background-color: #f6f1d2; } .noteicon, .notetext { padding:0.3em; @@ -253,7 +253,7 @@ h6 { } .howtoget { background: #EBE7E9; -border-left: 4px solid #4E4B55; +border-left: 3px solid #4E4B55; border-radius: 0 4px 4px 0; box-shadow: 0 2px 2px -2px rgba(0,0,0,0.2); padding: 0.3em; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl
help3xsl/default.css | 59 +- help3xsl/online_transform.xsl | 44 +++ 2 files changed, 58 insertions(+), 45 deletions(-) New commits: commit 24901fb947d0d7adeaefbbddd8d2bad89e49e378 Author: Ilmari Lauhakangas AuthorDate: Sun Jun 7 16:04:09 2020 +0300 Commit: Olivier Hallot CommitDate: Sun Jun 7 15:41:42 2020 +0200 Improve web help header Header with symbol, logo and navigation dropdowns now uses grid layout when screen width is desktop. Change-Id: I00612ebe04110b3608d9534c0ebdb23d5b788c54 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95668 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 323f79e06..2d1b2cc4a 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -134,7 +134,6 @@ pre, font-weight: bold; } .keycode { -/*font-weight: bold;*/ font-family: Menlo, Consolas, "DejaVu Sans Mono", "Nimbus Mono L", "Lucida Sans Typewriter", "Courier New", Courier, Monaco, monospace; } .widget{ @@ -334,32 +333,43 @@ h6 { grid-area: header; position: sticky; top: 0px; -z-index: 100; -} -header { color: #fff; -height: 64px; -padding: 8px 8px 8px 16px; +display: flex; +flex-wrap: wrap; +justify-content: flex-start; } -.logo-container { +.dropdowns { +/* allow for scrolling */ +overflow-x: auto; +overflow-y: hidden; +/* make it smooth on iOS */ +-webkit-overflow-scrolling: touch; +grid-area: dropdowns; display: flex; justify-content: space-between; +flex-direction: column; } -.logo { +symbol, .logo { color: #fff; text-decoration: none; -display: flex; +} +.logo:hover { +text-decoration: none; +color: #fff; } .logo p { font-size: 24px; } -.logo .symbol { +.symbol { +grid-area: symbol; +padding: 8px 8px 8px 20px; +} +.symbol div { background-image: url(media/navigation/libo-symbol-white.svg); background-repeat: no-repeat; background-size: contain; width: 52px; height: 60px; -margin-right: 10px; } [data-a11y-toggle]:not([aria-controls]) { @@ -740,6 +750,11 @@ li.disabled a { } } @media screen and (min-width: 960px) { +.dropdowns { +flex-direction: row; +overflow-y: auto; +overflow-x: hidden; +} #langs-nav, #modules-nav { display: none; } @@ -752,13 +767,11 @@ li.disabled a { cursor: pointer; color: #fff; font-size: 19px; -position: relative; -top: 40px; display: block; background: transparent; border: none; text-transform: none; -padding:0; +padding: 0; line-height: normal; } @@ -766,12 +779,11 @@ li.disabled a { #langs-nav:not([aria-hidden='true']), #modules-nav:not([aria-hidden='true']) { display: flex; flex-direction: column; -max-width: 120px; overflow-y: auto; overflow-x: hidden; +max-width: 120px; max-height: 480px; position: absolute; -top: 80px; } #modules-nav { background-color: #101820; @@ -803,16 +815,9 @@ li.disabled a { grid-area: footer; } .lang { -position: absolute; -top: 0; -left: 200px; background-color: transparent; } .modules { -width: 120px; -position: absolute; -top: 0; -left: 80px; border: none; background-color: transparent; } @@ -856,6 +861,14 @@ li.disabled a { /* Use @supports to sneak these rules past IE */ @supports (grid-area: auto) { @media screen and (min-width: 960px) { +#TopLeftHeader { +display: grid; +align-items: end; +grid-template-columns: auto auto; +grid-template-rows: auto auto; +grid-template-areas: "symbol logo" +"symbol dropdowns" +} #SearchFrame { grid-area: search; display: flex; diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 1f5d93467..3a934dcb2 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -164,30 +164,30 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - + - - + + + + +
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |4 1 file changed, 4 insertions(+) New commits: commit c6409aa8d0e0c6342cb397f906ac602201581a27 Author: Olivier Hallot AuthorDate: Wed Jun 3 09:52:51 2020 -0300 Commit: Olivier Hallot CommitDate: Wed Jun 3 15:00:52 2020 +0200 Fix [aria-hidden] topix in CSS Change-Id: Ifbc5d8d7a3ffc92965a78062c5943b5e94081bf0 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95434 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index dd647d14f..323f79e06 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -362,6 +362,10 @@ header { margin-right: 10px; } +[data-a11y-toggle]:not([aria-controls]) { + display: none; +} + #langs-nav:not([aria-hidden='true']), #modules-nav:not([aria-hidden='true']) { z-index: 100; /* line them up horizontally */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/prism.css help3xsl/prism.js help3xsl/README.prism.js.txt
help3xsl/README.prism.js.txt |5 help3xsl/default.css |7 help3xsl/prism.css |6 help3xsl/prism.js| 1069 --- 4 files changed, 709 insertions(+), 378 deletions(-) New commits: commit 7b5fe18bbcca0811ae386c9230bf5f3d9da88acb Author: Olivier Hallot AuthorDate: Fri May 29 16:45:56 2020 -0300 Commit: Olivier Hallot CommitDate: Sun May 31 16:11:47 2020 +0200 Update prism.js to latest version Update prism.js and companion css to latest version Fixes the Currency and Type keyword highlight Fixes line numbering interference with a11y-toggle.js Change-Id: Ibbb5c95790e1366f0a1dbc497d8741e69a0a3957 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95173 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/README.prism.js.txt b/help3xsl/README.prism.js.txt index 581a1fe71..fe0acc0d2 100644 --- a/help3xsl/README.prism.js.txt +++ b/help3xsl/README.prism.js.txt @@ -1,3 +1,7 @@ +Latest download version + +PrismJS 1.20.0 + Using prism.js for Basic code highlight http://prismjs.com @@ -37,3 +41,4 @@ Add class 'language-visual-basic' and 'line-numbers' to as in http://schema.org/SoftwareSourceCode; itemprop="codeSampleType" content="snippet"> + diff --git a/help3xsl/default.css b/help3xsl/default.css index 0ae386088..dd647d14f 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -361,10 +361,7 @@ header { height: 60px; margin-right: 10px; } -[aria-hidden='true'], -[data-a11y-toggle]:not([aria-controls]) { - display: none; -} + #langs-nav:not([aria-hidden='true']), #modules-nav:not([aria-hidden='true']) { z-index: 100; /* line them up horizontally */ @@ -739,7 +736,7 @@ li.disabled a { } } @media screen and (min-width: 960px) { -#langs-nav { +#langs-nav, #modules-nav { display: none; } #langs-nav a { diff --git a/help3xsl/prism.css b/help3xsl/prism.css index 6e31d4d8f..8bd96d9cc 100644 --- a/help3xsl/prism.css +++ b/help3xsl/prism.css @@ -1,4 +1,4 @@ -/* PrismJS 1.15.0 +/* PrismJS 1.20.0 https://prismjs.com/download.html#themes=prism-coy=markup+css+clike+javascript+python+visual-basic=line-numbers+normalize-whitespace */ /** * prism.js Coy theme for JavaScript, CoffeeScript, CSS and HTML @@ -11,6 +11,7 @@ pre[class*="language-"] { color: black; background: none; font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace; + font-size: 1em; text-align: left; white-space: pre; word-spacing: normal; @@ -179,7 +180,7 @@ pre[class*="language-"]:after { cursor: help; } -.namespace { +.token.namespace { opacity: .7; } @@ -255,7 +256,6 @@ pre[class*="language-"].line-numbers > code { } .line-numbers-rows > span { - pointer-events: none; display: block; counter-increment: linenumber; } diff --git a/help3xsl/prism.js b/help3xsl/prism.js index c085b09b0..108011888 100644 --- a/help3xsl/prism.js +++ b/help3xsl/prism.js @@ -1,4 +1,4 @@ -/* PrismJS 1.15.0 +/* PrismJS 1.20.0 https://prismjs.com/download.html#themes=prism-coy=markup+css+clike+javascript+python+visual-basic=line-numbers+normalize-whitespace */ var _self = (typeof window !== 'undefined') ? window // if in browser @@ -14,21 +14,22 @@ var _self = (typeof window !== 'undefined') * @author Lea Verou http://lea.verou.me */ -var Prism = (function(){ +var Prism = (function (_self){ // Private helper vars var lang = /\blang(?:uage)?-([\w-]+)\b/i; var uniqueId = 0; -var _ = _self.Prism = { + +var _ = { manual: _self.Prism && _self.Prism.manual, disableWorkerMessageHandler: _self.Prism && _self.Prism.disableWorkerMessageHandler, util: { - encode: function (tokens) { + encode: function encode(tokens) { if (tokens instanceof Token) { - return new Token(tokens.type, _.util.encode(tokens.content), tokens.alias); - } else if (_.util.type(tokens) === 'Array') { - return tokens.map(_.util.encode); + return new Token(tokens.type, encode(tokens.content), tokens.alias); + } else if (Array.isArray(tokens)) { + return tokens.map(encode); } else { return tokens.replace(/&/g, '').replace(/http://localhost/components/prism-core.js:119:5) + //at Global code (http://localhost/components/prism-core.js:606:1) + + var src = (/at [^(\r\n]*\((.*):.+:.+\)$/i.exec(err.stack) || [])[1]; + if (src) { + var scripts = document.getElementsByTagName('script'); +
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |3 +++ 1 file changed, 3 insertions(+) New commits: commit 3dbc5d6b39165002e1de2f3ba6d99d6d7d9a5dd4 Author: Olivier Hallot AuthorDate: Tue May 26 15:23:30 2020 -0300 Commit: Olivier Hallot CommitDate: Tue May 26 20:39:33 2020 +0200 tdf#126813 Fix scrolling of targeted references Change-Id: Ic7ce644cc0a5053905e980952ad31767fa87125c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/94885 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 574b6a963..0ae386088 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -879,6 +879,9 @@ li.disabled a { "leftside main main main" ". footer footer footer" } +html { +scroll-padding-top: 64px; +} } @media screen and (min-width: 1440px) { body { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css | 10 -- 1 file changed, 10 deletions(-) New commits: commit 695cea8d8ed485a8c32f9ccb67e2a182159a6734 Author: Olivier Hallot AuthorDate: Tue May 26 12:55:21 2020 -0300 Commit: Olivier Hallot CommitDate: Tue May 26 19:45:07 2020 +0200 Remove unused CSS class Change-Id: I9db4df3062c411570a77686ec2b4fe3124f71539 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/94879 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 11c544094..574b6a963 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -329,16 +329,6 @@ h6 { .switch, .switchinline {} -.tintro { -color: white; -background-color: green; -font-family: Arial; -font-weight: bold; -font-size: 2rem; -border: 1px solid black; -padding-bottom: 6px; -margin-bottom: 6px; -} .embedded {} #TopLeftHeader { grid-area: header; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ede87672c15c3b15ff59a8393d4746c6915d82b7 Author: Adolfo Jayme Barrientos AuthorDate: Fri May 15 04:05:43 2020 -0500 Commit: Adolfo Jayme Barrientos CommitDate: Fri May 15 04:06:37 2020 -0500 CSS: Change selection color It doesn’t play nice anymore since 4d6b5e5f74c50cc440a46fada8fa89ad2f946749 Change-Id: Ib897702ad32915164e277e092103c295bba41366 diff --git a/help3xsl/default.css b/help3xsl/default.css index b3fd81d7d..11c544094 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -91,7 +91,7 @@ body { line-height: normal; } ::selection { -background: #BFFFB7; +background: #A0F3FF; } a { text-decoration: none; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl
help3xsl/default.css | 32 +++- help3xsl/online_transform.xsl |2 +- 2 files changed, 24 insertions(+), 10 deletions(-) New commits: commit 52eb45cd79ed75eb37b46c579860cee4e6180138 Author: Ilmari Lauhakangas AuthorDate: Fri May 1 18:15:37 2020 +0300 Commit: Olivier Hallot CommitDate: Fri May 1 20:21:01 2020 +0200 Help CSS: allow title in header to be wider Added a column and let the title section to grow into it. Also removed the hardcoded size from the Xapian search input. Change-Id: Id391264a17556a35d54b705621deb9bdecc16af2 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/93278 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index ceb591253..b3fd81d7d 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -829,6 +829,17 @@ li.disabled a { box-shadow: 0 2px 8px 0 rgba(0,0,0,.05); padding: 10px 50px 40px 50px; } +.xapian-omega-search { +width: 100%; +} +.xapian-omega-search form { +display: flex; +justify-content: center; +} +.omega-autofocus { +max-width: 200px; +width: 100% +} } @media screen and (min-width: 1440px) { #Contents { @@ -847,6 +858,9 @@ li.disabled a { label[for=accordion-1]:after { content: ""; } +.omega-autofocus { +max-width: 400px; +} } /* Use @supports to sneak these rules past IE */ @supports (grid-area: auto) { @@ -868,22 +882,22 @@ li.disabled a { } body { display: grid; -grid-template-columns: 360px 80px 1fr; +grid-template-columns: 360px 100px 300px 1fr; grid-template-rows: minmax(1em, auto) minmax(1em, auto) 1fr minmax(1em, auto); -grid-template-areas: "header search donation" - "rightside main main" - "leftside main main" - ". footer footer" +grid-template-areas: "header header search donation" + "rightside main main main" + "leftside main main main" + ". footer footer footer" } } @media screen and (min-width: 1440px) { body { display: grid; -grid-template-columns: 360px 450px 450px 1fr; +grid-template-columns: 360px 100px 400px 400px 1fr; grid-template-rows: 1fr minmax(1em, auto) minmax(1em, auto); -grid-template-areas: "header search search donation" - "leftside main main rightside" - ". footer footer ." +grid-template-areas: "header header search search donation" + "leftside main main main rightside" + ". footer footer footer ." } .donation { max-width: 300px; diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index c3bdfba18..573967c19 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -220,7 +220,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/help2.js
help3xsl/default.css |2 -- help3xsl/help2.js| 27 +++ 2 files changed, 27 insertions(+), 2 deletions(-) New commits: commit 4d6b5e5f74c50cc440a46fada8fa89ad2f946749 Author: Olivier Hallot AuthorDate: Tue Apr 28 15:51:38 2020 -0300 Commit: Olivier Hallot CommitDate: Wed Apr 29 14:29:05 2020 +0200 Apply module brand color to Help page Change page header and headings to module colors Module colors from branding wiki page https://wiki.documentfoundation.org/Marketing/Branding#Colors Based on ideas of Beatriz Fonseca (@beatorizu) betri...@gmail.com Change-Id: Ia855872185a9c5ff6bcf3c351cc78e57e5a7901c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/93100 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index f9a1edd4a..ceb591253 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -210,7 +210,6 @@ table, th, td { margin-top: 0px; } .tableheadcell { -background: #148603; color: white; vertical-align:top; } @@ -349,7 +348,6 @@ h6 { } header { color: #fff; -background-color: #18A303; height: 64px; padding: 8px 8px 8px 16px; } diff --git a/help3xsl/help2.js b/help3xsl/help2.js index 8c2b60d72..9eb35c003 100644 --- a/help3xsl/help2.js +++ b/help3xsl/help2.js @@ -66,6 +66,32 @@ function setSystemSpan(spanZ) { } } +// paint headers and headings with appl color + +function moduleColor (module) { +switch (module){ +case "WRITER" : {color="#0369A3"; break;} +case "CALC" : {color="#43C330"; break;} +case "CHART" : {color="darkcyan"; break;} +case "DRAW" : {color="#A33E03"; break;} +case "IMPRESS": {color="#C99C00"; break;} +case "BASE" : {color="#8E03A3"; break;} +case "BASIC" : {color="black"; break;} +case "MATH" : {color="darkslategray"; break;} +case "SHARED" : {color="gray"; break;} +default : {color="#18A303"; break;} +} +document.getElementById("TopLeftHeader").style.background = color; +document.getElementById("SearchFrame").style.background = color; +document.getElementById("DonationFrame").style.background = color; +var cols = document.getElementsByClassName('tableheadcell'); +for(i = 0; i < cols.length; i++) {cols[i].style.backgroundColor = color;}; +for (j of [1,2,3,4,5,6]) { +var hh = document.getElementsByTagName("H" + j); +for(i = 0; i < hh.length; i++) {hh[i].style.color = color;} +} +} + // Find spans that need the switch treatment and give it to them var spans = document.querySelectorAll("[class^=switch]"); var n = spans.length; @@ -205,6 +231,7 @@ if (document.body.getElementsByTagName('meta')) { var module = getParameterByName("DbPAR"); var helpID = getParameterByName("HID"); fixURL(module,system); +moduleColor(module); function debugInfo(dbg) { if (dbg == null) return; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 996909e80712157f57b650fec7b529320398dd4f Author: Adolfo Jayme Barrientos AuthorDate: Thu Mar 12 13:09:19 2020 -0600 Commit: Adolfo Jayme Barrientos CommitDate: Thu Mar 12 13:09:19 2020 -0600 Helponline: Make that image shadow look not tacky Change-Id: I7e0b370ad883e787a8c7b7970d8d96653e577f8e diff --git a/help3xsl/default.css b/help3xsl/default.css index 69f93543b..f9a1edd4a 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -316,14 +316,14 @@ h6 { border:none; } .screenshot, .genericimage { -border-collapse: collapse; +border: .5px solid rgba(0,0,0,.1); +border-radius: 3px; margin-left: auto; margin-right: auto; margin-top: 2em; margin-bottom: 2em; -border-style:none; display:block; -box-shadow: 10px 10px 5px grey; +box-shadow: rgba(0,0,0,0.08) 0 1px 5px 0; } .iconimage {} ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl help3xsl/xap_templ_query.xsl
help3xsl/default.css | 12 ++-- help3xsl/online_transform.xsl |4 ++-- help3xsl/xap_templ_query.xsl |4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) New commits: commit d0bf3b122de80bce6edddcb309bf7ed3a176e9cd Author: Olivier Hallot AuthorDate: Fri Feb 21 10:28:57 2020 -0300 Commit: Olivier Hallot CommitDate: Sat Feb 22 13:12:58 2020 +0100 Refactor XSLTs and CSS (2) class -> id Change-Id: I62c1af5a0203bb66fdd291dbf55633cbb3731353 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/89207 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 9e548dd46..69f93543b 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -573,7 +573,7 @@ li.disabled a { background-color: #FCFCFC; box-shadow: 0 2px 8px 0 rgba(0,0,0,.05); } -.donation-frame { +#DonationFrame { background: #18A303; position: sticky; top: 0px; @@ -603,7 +603,7 @@ li.disabled a { font-size:1.2rem; text-align: center; } -.search-frame { +#SearchFrame { background: #18A303; top: 0px; position: sticky; @@ -804,10 +804,10 @@ li.disabled a { .rightside { grid-area: rightside; } -.donation-frame { +#DonationFrame { grid-area: donation; } -.search-frame { +#SearchFrame { grid-area: search; } footer { @@ -853,13 +853,13 @@ li.disabled a { /* Use @supports to sneak these rules past IE */ @supports (grid-area: auto) { @media screen and (min-width: 960px) { -.search-frame { +#SearchFrame { grid-area: search; display: flex; justify-content: space-between; align-items: center; } -.donation-frame { +#DonationFrame { grid-area: donation; display: flex; justify-content: space-between; diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 5f06749dc..c3bdfba18 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -215,7 +215,7 @@ - + @@ -227,7 +227,7 @@ - + https://www.libreoffice.org/donate/?pk_campaign=help; target ="_blank"> diff --git a/help3xsl/xap_templ_query.xsl b/help3xsl/xap_templ_query.xsl index 719d8b909..a6648d70c 100644 --- a/help3xsl/xap_templ_query.xsl +++ b/help3xsl/xap_templ_query.xsl @@ -137,12 +137,12 @@ document.write("]]> + https://www.libreoffice.org/donate/?pk_campaign=help; target
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl help3xsl/xap_templ_query.xsl
help3xsl/default.css |2 +- help3xsl/online_transform.xsl |2 +- help3xsl/xap_templ_query.xsl |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit f48d72b4a80d8d6f21f2b335dc94e0500bbbcf60 Author: Olivier Hallot AuthorDate: Fri Feb 21 10:20:38 2020 -0300 Commit: Olivier Hallot CommitDate: Sat Feb 22 13:12:28 2020 +0100 Refactor XSLTs and CSS more meanigful names Change-Id: Ib786d2814adaed336f495992711eb89f99d85d39 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/89206 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index a0d8fccee..9e548dd46 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -341,7 +341,7 @@ h6 { margin-bottom: 6px; } .embedded {} -.header-extrawurst { +#TopLeftHeader { grid-area: header; position: sticky; top: 0px; diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 9daccd542..5f06749dc 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -164,7 +164,7 @@ - + diff --git a/help3xsl/xap_templ_query.xsl b/help3xsl/xap_templ_query.xsl index 014dfd198..719d8b909 100644 --- a/help3xsl/xap_templ_query.xsl +++ b/help3xsl/xap_templ_query.xsl @@ -107,7 +107,7 @@ document.write("]]> +
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css | 20 1 file changed, 20 deletions(-) New commits: commit 197930c8b95d59a9ac099b58672fa66e6d87bca4 Author: Olivier Hallot AuthorDate: Thu Feb 20 20:49:05 2020 -0300 Commit: Olivier Hallot CommitDate: Fri Feb 21 12:40:58 2020 +0100 Remove very old unused CSS Change-Id: I8af3443fb8db832ac2fc9a88dfb6fd779d3475ed Reviewed-on: https://gerrit.libreoffice.org/c/help/+/89163 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index fe70e4262..a0d8fccee 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -278,10 +278,6 @@ h6 { .wide { width: 100%; } -.topalign { -vertical-align: top; -border: 1px; -} .bug { color: red; } @@ -301,17 +297,6 @@ h6 { margin-bottom: 15px; } -.infopage { -color: green; -font-size: 1.33rem; -font-weight: bold; -} -.topmenu { -font-size: 1rem; -font-weight: bold; -padding: 1px; -border: solid 1px #148603; -} #DisplayArea { background-color: #FCFCFC; overflow: auto; @@ -423,11 +408,6 @@ footer { footer p { font-size: 0.98rem; } -.gsc-control-cse { -border-color: transparent !important; -background-color: transparent !important; -padding: 3px 0 0 0 !important; -} .contents-treeview input[type=checkbox], aside input[type=checkbox] { /* from .visuallyhidden class of html5-boilerplate */ border: 0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/help.js
help3xsl/default.css |1 + help3xsl/help.js |6 ++ 2 files changed, 3 insertions(+), 4 deletions(-) New commits: commit 35281f4c9178f373609a61f0a44e268b179c5749 Author: Mike Kaganski AuthorDate: Thu Jan 30 09:32:18 2020 +0100 Commit: Olivier Hallot CommitDate: Thu Jan 30 11:21:57 2020 +0100 tdf#127566: don't change divcopyable border width in onclick handler Instead, define border width in respective CSS, to make it consistent in both clicked and non-clicked states, and avoid "jumping" on click. Change-Id: Ic8ab8d0fd586059e21de6aa866fef95226774acf Reviewed-on: https://gerrit.libreoffice.org/c/help/+/87718 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index eeaa160d1..fe70e4262 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -296,6 +296,7 @@ h6 { .pycode, .bascode { +border: solid 5px transparent; margin-top: 15px; margin-bottom: 15px; } diff --git a/help3xsl/help.js b/help3xsl/help.js index 75541e674..48767222e 100644 --- a/help3xsl/help.js +++ b/help3xsl/help.js @@ -106,19 +106,17 @@ for (var i = 0, len = itemcopyable.length; i < len; i++) { (function() { var item = itemcopyable[i]; -function changeBorder(item, color, colorToChangeBackTo) { +function changeBorder(item, color) { var saveBorder = item.style.border; -item.style.border = "solid 5px"; item.style.borderColor = color; setTimeout(function() { item.style.border = saveBorder; -item.style.borderColor = colorToChangeBackTo; }, 150); } item.onclick = function() { document.execCommand("copy"); -changeBorder(item, "#18A303", "transparent"); +changeBorder(item, "#18A303"); }; item.addEventListener("copy", function(event) { event.preventDefault(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |2 ++ 1 file changed, 2 insertions(+) New commits: commit fdc5abfc53a4f76c534ad7f1782f18e44abdc28b Author: Olivier Hallot AuthorDate: Thu Oct 24 08:11:06 2019 -0300 Commit: Olivier Hallot CommitDate: Thu Oct 24 13:22:03 2019 +0200 Give some space around images Change-Id: Ic7251bfa74c9ee1ac8b55edf8f6bed9791d42903 Reviewed-on: https://gerrit.libreoffice.org/81442 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 988d3cf8d..eeaa160d1 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -333,6 +333,8 @@ h6 { border-collapse: collapse; margin-left: auto; margin-right: auto; +margin-top: 2em; +margin-bottom: 2em; border-style:none; display:block; box-shadow: 10px 10px 5px grey; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |4 1 file changed, 4 insertions(+) New commits: commit 404ff19a22ea45cc7b84e5a6874beca8949ca165 Author: Olivier Hallot AuthorDate: Fri Oct 11 14:56:19 2019 -0300 Commit: Olivier Hallot CommitDate: Fri Oct 11 20:06:25 2019 +0200 Fix top row of page grid Change-Id: I9ae465ac9d00df5561157e0872217a1e8a09e159 Reviewed-on: https://gerrit.libreoffice.org/80678 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index a68fc0067..1710f1e52 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -582,6 +582,8 @@ li.disabled a { } .donation-frame { background: #18A303; +position: sticky; +top: 0px; } .donation{ background: #0379BC; @@ -610,6 +612,8 @@ li.disabled a { } .search-frame { background: #18A303; +top: 0px; +position: sticky; } .xapian-omega-search { margin: auto; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl
help3xsl/default.css | 70 +++--- help3xsl/online_transform.xsl | 10 +++--- 2 files changed, 38 insertions(+), 42 deletions(-) New commits: commit 2e077c0f9f724a3fe258c8e92aa3f67b7ab75446 Author: Olivier Hallot AuthorDate: Thu Oct 10 09:20:18 2019 -0300 Commit: Olivier Hallot CommitDate: Fri Oct 11 13:01:44 2019 +0200 Fix xapian search bar in Help online (WIP) Change-Id: Ibe178ff79a27b8a21fcbaf2465c66da0786a28fd WIP: need adjusts for mobile. Reviewed-on: https://gerrit.libreoffice.org/80605 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index f71cb6885..a68fc0067 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -347,11 +347,11 @@ h6 { grid-area: header; position: sticky; top: 0px; -background-color: #18A303; z-index: 1000; } header { color: #fff; +background-color: #18A303; height: 64px; padding: 8px 8px 8px 16px; } @@ -461,6 +461,10 @@ aside input[type=checkbox]:checked ~ .contents-treeview { } .index a { font-size: 16px; +display: block; +} +.index .hidden { +display: none; } #Bookmarks { padding: 0 20px; @@ -544,12 +548,6 @@ aside input[type=checkbox]:checked ~ .contents-treeview { .pagination a { text-decoration: none; } -.index a { -display: block; -} -.index .hidden { -display: none; -} li.active { background-color: #0379BC; } @@ -582,12 +580,15 @@ li.disabled a { background-color: #FCFCFC; box-shadow: 0 2px 8px 0 rgba(0,0,0,.05); } -.donation { +.donation-frame { +background: #18A303; +} +.donation{ background: #0379BC; background-image: linear-gradient(to bottom, #3498db, #2980b9); border-radius: 8px; padding: 5px 10px 5px 10px; -margin: 20px auto 0 auto; +margin: auto; max-width: 200px; color: #ff; text-decoration: none; @@ -607,15 +608,11 @@ li.disabled a { font-size:1.2rem; text-align: center; } -/*.xapian-omega-search { -max-width: 300px; -margin: 40px auto 0 auto; -}*/ +.search-frame { +background: #18A303; +} .xapian-omega-search { -margin: 0; -/*position: absolute;*/ -top: 19px; -left: 360px; +margin: auto; } .modules { border-bottom: 2px solid #f3f3f3; @@ -809,16 +806,11 @@ li.disabled a { .rightside { grid-area: rightside; } -.xapian-donation { -grid-area: google; -position: sticky; -top: 0px; -background-color: #FCFCFC; -box-shadow: none; -clear: left; +.donation-frame { +grid-area: donation; } -.donation { -max-width: 400px; +.search-frame { +grid-area: search; } footer { grid-area: footer; @@ -863,27 +855,26 @@ li.disabled a { /* Use @supports to sneak these rules past IE */ @supports (grid-area: auto) { @media screen and (min-width: 960px) { -.xapian-donation { +.search-frame { +grid-area: search; display: flex; justify-content: space-between; align-items: center; -background-color: #18A303; -border-top: none; -} -.xapian-omega-search { -margin: 0; } -.donation { -margin: 0 auto; +.donation-frame { +grid-area: donation; +display: flex; +justify-content: space-between; +align-items: center; } footer { border-top: 2px solid #148603; } body { display: grid; -grid-template-columns: 320px 80px 1fr; +grid-template-columns: 360px 80px 1fr; grid-template-rows: minmax(1em, auto) minmax(1em, auto) 1fr minmax(1em, auto); -grid-template-areas: "header header google" +grid-template-areas: "header search donation" "rightside main main" "leftside main main" ". footer footer" @@ -892,12 +883,15 @@ li.disabled a { @media screen and (min-width: 1440px) { body { display: grid; -grid-template-columns: 320px 450px 450px 1fr; +grid-template-columns: 360px 450px 450px 1fr; grid-template-rows: 1fr minmax(1em, auto) minmax(1em, auto); -grid-template-areas: "header header google google" +grid-template-areas: "header search search donation" "leftside main main rightside" ". footer footer ." } +.donation { +max-width: 300px; +} .rightside { width: auto; border-right: none; diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) New commits: commit 085cd2e40ab7fac8fdea2fbd05b7768f79c83477 Author: Ilmari Lauhakangas AuthorDate: Sat May 18 15:07:16 2019 +0300 Commit: Olivier Hallot CommitDate: Sat May 18 16:53:19 2019 +0200 Hide our nav checkbox inputs only visually Some screenreaders do not read elements with opacity: 0 Change-Id: Ifc4c97a58c87e7d6b9533e15dc0db60aa70bfb97 Reviewed-on: https://gerrit.libreoffice.org/72519 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 482f3ed6d..50a67b752 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -416,8 +416,16 @@ footer p { padding: 3px 0 0 0 !important; } .contents-treeview input[type=checkbox], aside input[type=checkbox] { +/* from .visuallyhidden class of html5-boilerplate */ +border: 0; +clip: rect(0 0 0 0); +height: 1px; +margin: -1px; +overflow: hidden; +padding: 0; position: absolute; -opacity: 0; +width: 1px; +white-space: nowrap; } label[for=accordion-1] { color: #148603; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/help.js help3xsl/online_transform.xsl
help3xsl/default.css |4 +++- help3xsl/help.js | 35 +++ help3xsl/online_transform.xsl | 20 3 files changed, 54 insertions(+), 5 deletions(-) New commits: commit 3c494b6e6db198099f4641aaef3f608842d53faa Author: Olivier Hallot AuthorDate: Thu Apr 25 11:34:05 2019 -0300 Commit: Olivier Hallot CommitDate: Fri Apr 26 20:46:16 2019 +0200 tdf#122548 copy bascode and pycode to clipboard This will allow easy testing of coding examples. Change-Id: I30fc53642b1579744591f2de0c84a615d1755352 Reviewed-on: https://gerrit.libreoffice.org/71385 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 91b0a9adc..bf1358ee1 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -294,8 +294,9 @@ h6 { text-align: left; } +.pycode, .bascode { -margin-top:15px; +margin-top: 15px; margin-bottom: 15px; } @@ -620,6 +621,7 @@ li.disabled a { float: left; display: none; } + .calc-icon, .chart-icon, .writer-icon, diff --git a/help3xsl/help.js b/help3xsl/help.js index 7789c17ae..59dd378c7 100644 --- a/help3xsl/help.js +++ b/help3xsl/help.js @@ -79,6 +79,41 @@ function debounce(fn, wait) { }; } search.addEventListener('keyup', debounce(filter, 100)); + +// copy pycode and bascode to clipboard on mouse click +// Show border when copy is done +divcopyable(document.getElementsByClassName("bascode")); +divcopyable(document.getElementsByClassName("pycode")); + +function divcopyable(itemcopyable){ +for (var i = 0, len = itemcopyable.length; i < len; i++) { +(function() { +var item = itemcopyable[i]; + +function changeBorder(item, color, colorToChangeBackTo) { +var saveBorder = item.style.border; +item.style.border = "solid 5px"; +item.style.borderColor = color; + +setTimeout(function() { +item.style.border = saveBorder; +item.style.borderColor = colorToChangeBackTo; +}, 150); +} +item.onclick = function() { +document.execCommand("copy"); +changeBorder(item, "#18A303", "transparent"); +}; +item.addEventListener("copy", function(event) { +event.preventDefault(); +if (event.clipboardData) { +event.clipboardData.setData("text/plain", item.textContent); +} +}); +}()); +} +} + // copy useful content to clipboard on mouse click var copyable = document.getElementsByClassName("input"); for (var i = 0, len = copyable.length; i < len; i++) { diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 630aa8a93..95d19bc56 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -892,17 +892,29 @@ -http://schema.org/SoftwareSourceCode; itemprop="codeSampleType" content="snippet"> +http://schema.org/SoftwareSourceCode; itemprop="codeSampleType" content="snippet"> + + + -http://schema.org/SoftwareSourceCode; itemprop="codeSampleType" content="snippet"> +http://schema.org/SoftwareSourceCode; itemprop="codeSampleType" content="snippet"> + + + -http://schema.org/SoftwareSourceCode; itemprop="codeSampleType" content="snippet"> +http://schema.org/SoftwareSourceCode; itemprop="codeSampleType" content="snippet"> + + + -http://schema.org/SoftwareSourceCode; itemprop="codeSampleType" content="snippet"> +http://schema.org/SoftwareSourceCode; itemprop="codeSampleType" content="snippet"> + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/help2.js help3xsl/help.js help3xsl/index2.html help3xsl/online_transform.xsl help3xsl/paginathing.js help3xsl/polyfills.js Package_html_st
Package_html_static.mk|1 help3xsl/default.css |3 - help3xsl/help.js |2 help3xsl/help2.js | 23 --- help3xsl/index2.html | 100 +- help3xsl/online_transform.xsl | 21 +++ help3xsl/paginathing.js | 25 help3xsl/polyfills.js | 122 ++ 8 files changed, 203 insertions(+), 94 deletions(-) New commits: commit ca2a6bf2c3c59d106f1c6ad432eab21f696c23fc Author: Ilmari Lauhakangas AuthorDate: Fri Mar 22 12:06:44 2019 +0200 Commit: Olivier Hallot CommitDate: Wed Mar 27 09:42:01 2019 +0100 tdf#124245 Polyfills and fixes for IE11 The polyfills can be removed after we drop IE11 support. Other IE11 fixes: Change from document.URL to window.location.pathname because otherwise we get local Windows paths with backward slashes. Use clear: left; for google-donation element so it doesn't float on top of other elements. Don't use defer to load fuzzysort.js and prism.js. Change-Id: I6c0143eab555c8b1fbdbde8e749a24baed2f69c8 Reviewed-on: https://gerrit.libreoffice.org/69549 Tested-by: Jenkins Reviewed-by: himajin10 Reviewed-by: Olivier Hallot diff --git a/Package_html_static.mk b/Package_html_static.mk index a53929878..d1e1b 100644 --- a/Package_html_static.mk +++ b/Package_html_static.mk @@ -23,6 +23,7 @@ $(eval $(call gb_Package_add_files,helpcontent2_html_static,$(LIBO_SHARE_HELP_FO help2.js \ normalize.css \ paginathing.js \ + polyfills.js \ prism.js \ prism.css \ )) diff --git a/help3xsl/default.css b/help3xsl/default.css index 391403e72..91b0a9adc 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -349,7 +349,7 @@ h6 { background-color: #18A303; z-index: 1000; } -header { +header { color: #fff; height: 64px; padding: 8px 8px 8px 16px; @@ -793,6 +793,7 @@ li.disabled a { top: 0px; background-color: #FCFCFC; box-shadow: none; +clear: left; } .donation { max-width: 400px; diff --git a/help3xsl/help.js b/help3xsl/help.js index e806eeed4..7789c17ae 100644 --- a/help3xsl/help.js +++ b/help3xsl/help.js @@ -8,7 +8,7 @@ */ // Pagination and fuzzy search -var url = document.URL; +var url = window.location.pathname; var moduleRegex = new RegExp('text\\/(\\w+)\\/'); var regexArray = moduleRegex.exec(url); var currentModule = null; diff --git a/help3xsl/help2.js b/help3xsl/help2.js index 0003b72d8..f62105dc6 100644 --- a/help3xsl/help2.js +++ b/help3xsl/help2.js @@ -82,13 +82,14 @@ for (z = 0; z < n; z++) { /* add = and = to the links in DisplayArea div */ /* skip for object files */ function fixURL(module, system) { -var itemlink = document.getElementById("DisplayArea").getElementsByTagName("a"); +if ((DisplayArea = document.getElementById("DisplayArea")) === null) return; +var itemlink = DisplayArea.getElementsByTagName("a"); var pSystem = (system === null) ? getSystem() : system; var pAppl = (module === null) ? "WRITER" : module; var n = itemlink.length; for (var i = 0; i < n; i++) { -if (itemlink[i].getAttribute("class") != "objectfiles"){ -setURLParam(itemlink[i], pSystem, pAppl); +if (itemlink[i].getAttribute("class") != "objectfiles") { +setURLParam(itemlink[i], pSystem, pAppl); } } } @@ -203,12 +204,16 @@ if (document.body.getElementsByTagName('meta')) { var module = getParameterByName("DbPAR"); var helpID = getParameterByName("HID"); fixURL(module,system); -var dbg = getParameterByName("Debug"); -if (dbg == null) { dbg=0; } -document.getElementById("DEBUG").style.display = (dbg == 0) ? "none":"block"; -document.getElementById("bm_module").innerHTML ="Module is: "+module; -document.getElementById("bm_system").innerHTML ="System is: "+system; -document.getElementById("bm_HID").innerHTML ="HID is: "+helpID; + +function debugInfo(dbg) { +if (dbg == null) return; +document.getElementById("DEBUG").style.display = "block"; +document.getElementById("bm_module").innerHTML = "Module is: "+module; +document.getElementById("bm_system").innerHTML = "System is: "+system; +document.getElementById("bm_HID").innerHTML = "HID is: "+helpID; +} + +debugInfo(getParameterByName("Debug")); // Mobile devices need the modules and langs on page load if (Math.max(document.documentElement.clientWidth, window.innerWidth || 0) < 960) { diff --git a/help3xsl/index2.html b/help3xsl/index2.html index 0321b7a39..3f761885f 100644 --- a/help3xsl/index2.html +++ b/help3xsl/index2.html @@ -10,61 +10,65 @@ - + + -var url = window.location.href; -var n = url.indexOf('index.html?'); -if (n != -1) { -// the URL came from LibreOffice help (F1) -var
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) New commits: commit 34aca15b8c5711b2fce9c072364e04e3d11bcfc8 Author: Ilmari Lauhakangas AuthorDate: Thu Mar 14 19:33:47 2019 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Fri Mar 15 00:34:21 2019 +0100 Header and donation CSS tweaks Change-Id: I20e5610c08db700e12baffa9b62dcf8dfd0c4328 Reviewed-on: https://gerrit.libreoffice.org/69278 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot Tested-by: Jenkins diff --git a/help3xsl/default.css b/help3xsl/default.css index 5c68d4118..391403e72 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -346,9 +346,10 @@ h6 { grid-area: header; position: sticky; top: 0px; -} -header { background-color: #18A303; +z-index: 1000; +} +header { color: #fff; height: 64px; padding: 8px 8px 8px 16px; @@ -793,6 +794,9 @@ li.disabled a { background-color: #FCFCFC; box-shadow: none; } +.donation { +max-width: 400px; +} footer { grid-area: footer; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/help2.js help3xsl/online_transform.xsl
help3xsl/default.css |6 +++ help3xsl/help2.js | 42 +- help3xsl/online_transform.xsl | 67 -- 3 files changed, 60 insertions(+), 55 deletions(-) New commits: commit 54e3236790baca8a55d0bea3b1dd3e8de5ec5dd5 Author: Ilmari Lauhakangas AuthorDate: Sun Mar 10 10:57:34 2019 +0200 Commit: Olivier Hallot CommitDate: Sun Mar 10 19:22:22 2019 +0100 Show module & lang navigation on mobile Module & languages menus were not shown on screen widths < 960. Changed module & languages menu background to span the whole width, when on mobile. An arrow function was used in help2.js, which means it was broken on IE. Moved all src .js files to head and used defer for all. Moved inline Piwik & system info JS into help2.js and added a test for onlineness targeting the first meta element in the body. Change-Id: Ic1a928b53ce9029f9f655117977cd511b7e3246d Reviewed-on: https://gerrit.libreoffice.org/69005 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 75798d2db..5c68d4118 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -600,12 +600,16 @@ li.disabled a { } .modules { border-bottom: 2px solid #f3f3f3; +background-color: #26; } .modules label:after, .lang label:after { font-size: 30px; color: #fff; content:"⌄"; } +.lang { +background-color: #26; +} .lang label, .modules label { display: none; } @@ -796,6 +800,7 @@ li.disabled a { position: absolute; top: 0; left: 200px; +background-color: transparent; } .modules { width: 120px; @@ -803,6 +808,7 @@ li.disabled a { top: 0; left: 80px; border: none; +background-color: transparent; } #DisplayArea { box-shadow: 0 2px 8px 0 rgba(0,0,0,.05); diff --git a/help3xsl/help2.js b/help3xsl/help2.js index 505dcaf8e..5a48c394f 100644 --- a/help3xsl/help2.js +++ b/help3xsl/help2.js @@ -75,7 +75,7 @@ function fixURL(module, system) { for (var i = 0; i < n; i++) { if (itemlink[i].getAttribute("class") != "objectfiles"){ setURLParam(itemlink[i], pSystem, pAppl); -}; +} } } //Set the params inside URL @@ -159,11 +159,49 @@ function setupLanguages(target, page) { var langNav = document.getElementById('langs-nav'); if (!langNav.classList.contains('loaded')) { var html = ''; -languagesSet.forEach(lang => { +languagesSet.forEach(function(lang) { html += '' + ((lang in languageNames)? languageNames[lang]: lang) + ''; }); langNav.innerHTML = html; langNav.classList.add('loaded'); } } + +// Test, if we are online +if (document.body.getElementsByTagName('meta')[0].getAttribute('itemprop') === 'version') { +var _paq = _paq || []; +/* tracker methods like "setCustomDimension" should be called before "trackPageView" */ +_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(); +} + +var module = getParameterByName("DbPAR"); +var helpID = getParameterByName("HID"); +fixURL(module,system); +var dbg = getParameterByName("Debug"); +if (dbg == null) { dbg=0; } +document.getElementById("DEBUG").style.display = (dbg == 0) ? "none":"block"; +document.getElementById("bm_module").innerHTML ="Module is: "+module; +document.getElementById("bm_system").innerHTML ="System is: "+system; +document.getElementById("bm_HID").innerHTML ="HID is: "+helpID; + +// Mobile devices need the modules and langs on page load +if (Math.max(document.documentElement.clientWidth, window.innerWidth || 0) < 960) { +var e = new Event('change'); +var modules = document.getElementById('modules'); +var langs = document.getElementById('langs'); +modules.dispatchEvent(e); +langs.dispatchEvent(e); +} /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 02a669a56..33a9537d3 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -145,21 +145,24 @@ - - - - - - - - - - + + + + + + +
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl source/text
help3xsl/default.css| 106 ++-- help3xsl/online_transform.xsl | 72 +++-- source/text/shared/help/browserhelp.xhp |2 3 files changed, 115 insertions(+), 65 deletions(-) New commits: commit eb2972e06b1ac3210f1de1a6e9ade2d049aaf976 Author: Ilmari Lauhakangas AuthorDate: Fri Mar 8 00:11:39 2019 +0200 Commit: Olivier Hallot CommitDate: Fri Mar 8 11:48:40 2019 +0100 Donation button and sticky header for Help Task: https://redmine.documentfoundation.org/issues/2815 Header was made sticky on non-mobile by using position: sticky. This was the only way to make it work with the grid without carving magic numbers into stone. IE11 ignores it, but so what? Donation text was made shorter. The Google search and the donation button were wrapped in a container to make it easy to haul them all over the place. Lots of tweaks were made to the grid areas and the styles of the bottom elements to make everything fit nicely in the new markup order. The result was tested on IE11 to make sure it degrades gracefully. The Displayarea element had a fixed width (my old mistake), which made the min-width: 960px layout look very uncool. Change-Id: I131a1e82290bc3381c938acb4dc9dbc408fb2ba7 Reviewed-on: https://gerrit.libreoffice.org/68890 Tested-by: Jenkins Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 61d839401..75798d2db 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -293,14 +293,7 @@ h6 { color: red; text-align: left; } -.donation { -padding: 0 0 10px 0; -margin-bottom: 1em; -border-bottom: 1px dashed rgba(0,0,0,0.1); -} -.donation p{ -font-size:1.2rem; -} + .bascode { margin-top:15px; margin-bottom: 15px; @@ -320,7 +313,7 @@ h6 { #DisplayArea { background-color: #FCFCFC; overflow: auto; -padding: 10px; +padding: 10px 10px 40px 10px; grid-area: main; } #DisplayArea > p { @@ -351,6 +344,8 @@ h6 { .embedded {} .header-extrawurst { grid-area: header; +position: sticky; +top: 0px; } header { background-color: #18A303; @@ -402,9 +397,9 @@ header { white-space: nowrap; } footer { -border-top: 2px solid #148603; -padding: 15px 10px 0 10px; -margin: 40px 0; +padding: 40px 10px 40px 10px; +background-color: #FCFCFC; +box-shadow: 0 2px 8px 0 rgba(0,0,0,.05); } footer p { font-size: 0.98rem; @@ -569,9 +564,39 @@ li.disabled a { #search-bar::placeholder { font-style: italic; } +.google-donation { +border-top: 2px solid #148603; +background-color: #FCFCFC; +box-shadow: 0 2px 8px 0 rgba(0,0,0,.05); +} +.donation { +background: #0379BC; +background-image: linear-gradient(to bottom, #3498db, #2980b9); +border-radius: 8px; +padding: 5px 10px 5px 10px; +margin: 20px auto 0 auto; +max-width: 200px; +color: #ff; +text-decoration: none; +} +.donation a { +color: white; +} +.donation a:hover { +color: white; +text-decoration: none; +} +.donation:hover{ +background: #0379BC; +background-image: linear-gradient(to bottom, #3cb0fd, #3498db); +} +.donation p { +font-size:1.2rem; +text-align: center; +} .google-search { max-width: 300px; -margin: 0 auto; +margin: 40px auto 0 auto; } .modules { border-bottom: 2px solid #f3f3f3; @@ -757,11 +782,15 @@ li.disabled a { .rightside { grid-area: rightside; } -.google-search { -margin: 0; -position: absolute; -top: 19px; -left: 860px; +.google-donation { +grid-area: google; +position: sticky; +top: 0px; +background-color: #FCFCFC; +box-shadow: none; +} +footer { +grid-area: footer; } .lang { position: absolute; @@ -776,10 +805,8 @@ li.disabled a { border: none; } #DisplayArea { -background-color: #FCFCFC; box-shadow: 0 2px 8px 0 rgba(0,0,0,.05); -padding: 10px 50px; -width: 800px; +padding: 10px 50px 40px 50px; } } @media screen and (min-width: 1440px) { @@ -800,24 +827,43 @@ li.disabled a { content: ""; } } +/* Use @supports to sneak these rules past IE */ @supports (grid-area: auto) { @media screen and (min-width: 960px) { +.google-donation { +display: flex; +justify-content: space-between; +align-items: center; +background-color: #18A303; +border-top: none; +} +.google-search { +margin: 0; +} +.donation { +margin: 0 auto; +} +footer { +border-top: 2px solid #148603; +} body { display: grid; -
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css | 78 +++ 1 file changed, 12 insertions(+), 66 deletions(-) New commits: commit 4f35fbbb2924961cc29a2bb7966deb36e7b865ba Author: Adolfo Jayme Barrientos AuthorDate: Mon Mar 4 15:46:10 2019 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Mon Mar 4 15:46:21 2019 +0100 Revert "Improve donation link in Help online" This reverts commit bd26e706b30dccecdeba24ba8b697ddf2fc7a615. Change-Id: Id45b4ef2bacae444be070a03fbc0e10a4992f85c Reviewed-on: https://gerrit.libreoffice.org/68699 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/help3xsl/default.css b/help3xsl/default.css index f475d83ef..61d839401 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -293,11 +293,13 @@ h6 { color: red; text-align: left; } - +.donation { +padding: 0 0 10px 0; +margin-bottom: 1em; +border-bottom: 1px dashed rgba(0,0,0,0.1); +} .donation p{ font-size:1.2rem; -padding: 3px 0 0 0 !important; -text-align: center; } .bascode { margin-top:15px; @@ -567,35 +569,6 @@ li.disabled a { #search-bar::placeholder { font-style: italic; } -.donation { -margin-bottom: 1em; -background: #0379BC; -background-image: -webkit-linear-gradient(top, #3498db, #2980b9); -background-image: -moz-linear-gradient(top, #3498db, #2980b9); -background-image: -ms-linear-gradient(top, #3498db, #2980b9); -background-image: -o-linear-gradient(top, #3498db, #2980b9); -background-image: linear-gradient(to bottom, #3498db, #2980b9); --webkit-border-radius: 8; --moz-border-radius: 8; -border-radius: 8px; -padding: 5px 10px 5px 10px; -margin: 0 auto; -max-width: 300px; -color: #ff; -text-decoration: none; -} -.donation a { -color: white; -} -.donation:hover{ -background: #0379BC; -background-image: -webkit-linear-gradient(top, #3cb0fd, #3498db); -background-image: -moz-linear-gradient(top, #3cb0fd, #3498db); -background-image: -ms-linear-gradient(top, #3cb0fd, #3498db); -background-image: -o-linear-gradient(top, #3cb0fd, #3498db); -background-image: linear-gradient(to bottom, #3cb0fd, #3498db); -text-decoration: none; -} .google-search { max-width: 300px; margin: 0 auto; @@ -734,14 +707,6 @@ li.disabled a { } } @media screen and (min-width: 960px) { -.header-extrawurst { -position: fixed; -width: 100%; -top: 0px; -} -body { -padding-top: 60px; -} .lang nav { display: none; } @@ -792,6 +757,12 @@ li.disabled a { .rightside { grid-area: rightside; } +.google-search { +margin: 0; +position: absolute; +top: 19px; +left: 860px; +} .lang { position: absolute; top: 0; @@ -804,39 +775,14 @@ li.disabled a { left: 80px; border: none; } -.donation { -position: fixed; -top: 10px; -left: 400px; -} #DisplayArea { background-color: #FCFCFC; box-shadow: 0 2px 8px 0 rgba(0,0,0,.05); padding: 10px 50px; +width: 800px; } } @media screen and (min-width: 1440px) { -.header-extrawurst { -position: fixed; -width: 100%; -top: 0px; -} -body { -padding-top: 60px; -} -.google-search { -margin: 0; -position: fixed; -top: 19px; -left: 860px; -border-radius: 8px; -} -.donation { -position: fixed; -max-width: 300px; -top: 10px; -left: 400px; -} #Contents { color: #333; z-index: 6; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css | 78 +++ 1 file changed, 66 insertions(+), 12 deletions(-) New commits: commit bd26e706b30dccecdeba24ba8b697ddf2fc7a615 Author: Olivier Hallot AuthorDate: Sun Mar 3 14:05:43 2019 -0300 Commit: Olivier Hallot CommitDate: Mon Mar 4 15:41:52 2019 +0100 Improve donation link in Help online redmine#2815 Addressed responsiveness: for screen width < 960px the button goes to the bottom of the screen and the header is not fixed anymore. Artists are invited to improve button rendering. Button max width is 300px, the en-US text and the translated text should fit in 2 lines of 300px each. Text is centered. Change-Id: I51860be2ad998e85f247118e44b21af3e2efa060 Reviewed-on: https://gerrit.libreoffice.org/68644 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 61d839401..f475d83ef 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -293,13 +293,11 @@ h6 { color: red; text-align: left; } -.donation { -padding: 0 0 10px 0; -margin-bottom: 1em; -border-bottom: 1px dashed rgba(0,0,0,0.1); -} + .donation p{ font-size:1.2rem; +padding: 3px 0 0 0 !important; +text-align: center; } .bascode { margin-top:15px; @@ -569,6 +567,35 @@ li.disabled a { #search-bar::placeholder { font-style: italic; } +.donation { +margin-bottom: 1em; +background: #0379BC; +background-image: -webkit-linear-gradient(top, #3498db, #2980b9); +background-image: -moz-linear-gradient(top, #3498db, #2980b9); +background-image: -ms-linear-gradient(top, #3498db, #2980b9); +background-image: -o-linear-gradient(top, #3498db, #2980b9); +background-image: linear-gradient(to bottom, #3498db, #2980b9); +-webkit-border-radius: 8; +-moz-border-radius: 8; +border-radius: 8px; +padding: 5px 10px 5px 10px; +margin: 0 auto; +max-width: 300px; +color: #ff; +text-decoration: none; +} +.donation a { +color: white; +} +.donation:hover{ +background: #0379BC; +background-image: -webkit-linear-gradient(top, #3cb0fd, #3498db); +background-image: -moz-linear-gradient(top, #3cb0fd, #3498db); +background-image: -ms-linear-gradient(top, #3cb0fd, #3498db); +background-image: -o-linear-gradient(top, #3cb0fd, #3498db); +background-image: linear-gradient(to bottom, #3cb0fd, #3498db); +text-decoration: none; +} .google-search { max-width: 300px; margin: 0 auto; @@ -707,6 +734,14 @@ li.disabled a { } } @media screen and (min-width: 960px) { +.header-extrawurst { +position: fixed; +width: 100%; +top: 0px; +} +body { +padding-top: 60px; +} .lang nav { display: none; } @@ -757,12 +792,6 @@ li.disabled a { .rightside { grid-area: rightside; } -.google-search { -margin: 0; -position: absolute; -top: 19px; -left: 860px; -} .lang { position: absolute; top: 0; @@ -775,14 +804,39 @@ li.disabled a { left: 80px; border: none; } +.donation { +position: fixed; +top: 10px; +left: 400px; +} #DisplayArea { background-color: #FCFCFC; box-shadow: 0 2px 8px 0 rgba(0,0,0,.05); padding: 10px 50px; -width: 800px; } } @media screen and (min-width: 1440px) { +.header-extrawurst { +position: fixed; +width: 100%; +top: 0px; +} +body { +padding-top: 60px; +} +.google-search { +margin: 0; +position: fixed; +top: 19px; +left: 860px; +border-radius: 8px; +} +.donation { +position: fixed; +max-width: 300px; +top: 10px; +left: 400px; +} #Contents { color: #333; z-index: 6; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css | 43 --- 1 file changed, 24 insertions(+), 19 deletions(-) New commits: commit ec242a0c85d7cfe5b5bad62566875ccb8bb14a7f Author: Adolfo Jayme Barrientos AuthorDate: Thu Feb 21 06:48:09 2019 -0600 Commit: Adolfo Jayme Barrientos CommitDate: Thu Feb 21 06:48:09 2019 -0600 More CSS tweaks… • Ever-so-slightly brightened link color • Made most tables centered; I think they look much better • Removed some pointless spacing • Made all dropdown options consistently align to the left • Finally found out why pagination had extra 40px to its left and it’s a shame the normalizer doesn’t account for it • Correctly made disabled pagination links unsensitive • Gave styling to the search bar for consistent appearance in Gecko- and Blink-based browsers Change-Id: Idcb488160aa97ec0c4adb5202aed7f194dfac7c9 diff --git a/help3xsl/default.css b/help3xsl/default.css index 53e8af107..61d839401 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -95,11 +95,11 @@ body { } a { text-decoration: none; -color: #0369AE; +color: #0379BC; } a:hover { text-decoration: underline; -color: #1C99E0; +color: #0499EE; } pre, .code, @@ -191,9 +191,11 @@ pre, } table { -box-shadow: rgba(0,0,0,0.1) 0px 1px 3px 0px; +background: #FEFEFE; +box-shadow: rgba(0,0,0,0.08) 0 1px 5px 0; border-collapse: collapse; -background: #fefefe; +margin-left: auto; +margin-right: auto; } table, th, td { border-top: 0; @@ -232,8 +234,7 @@ h1 { font-size: 1.83rem; font-weight: 300; border-bottom: 2px solid #148603; -margin-bottom: 20px; -padding-bottom: 6px; +margin-bottom: 1.67rem; } h1 a { text-decoration: none; @@ -252,11 +253,6 @@ h6 { .relatedtopics { font-weight: normal; } -.relatedbody { -margin-top: 2px; -margin-bottom: 2px; -margin-left: 5px; -} .howtoget { background: #EBE7E9; border-left: 4px solid #4E4B55; @@ -392,7 +388,6 @@ header { overflow-y: hidden; /* make it smooth on iOS */ -webkit-overflow-scrolling: touch; -text-align: center; } .lang nav a, .modules nav a { color: #fff; @@ -530,9 +525,9 @@ aside input[type=checkbox]:checked ~ .contents-treeview { font-weight: bold; color: #148603; } -.pagination { -border-bottom: 1px dashed rgba(0,0,0,0.1); -padding-bottom: 1em; +.pagination-container { +text-align: center; +margin-left: -40px; /* The normalizer fails to account for this */ } .pagination li { display: inline-block; @@ -548,18 +543,28 @@ aside input[type=checkbox]:checked ~ .contents-treeview { display: none; } li.active { -background-color: #0369A3; +background-color: #0379BC; } li.active a { color: #fff; } li.disabled a { -color: #90C0E6; +opacity: 0.4; +pointer-events: none; } #search-bar { +border: 1px solid #CCC; +box-shadow: inset 0 1px 1px rgba(0,0,0,0.1); +box-sizing: border-box; +line-height: 1.5em; margin-top: 10px; +outline: none; +padding: 0 .25em; +transition: all 0.30s ease-in-out; width: 100%; -caret-color: #148603; +} +#search-bar:focus { +border: 1px solid #0EA5FB; } #search-bar::placeholder { font-style: italic; @@ -681,7 +686,7 @@ li.disabled a { } .contents-current { background: rgba(0,0,0,0.05); -border-left: 2px solid #0369a3; +border-left: 2px solid #0379BC; font-weight: 600; margin-left: -12px; padding-left: 10px; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css | 35 +-- 1 file changed, 17 insertions(+), 18 deletions(-) New commits: commit 00c5a418955574905aed5137c43ce2219b50e6f9 Author: Adolfo Jayme Barrientos AuthorDate: Thu Feb 7 18:00:41 2019 -0600 Commit: Adolfo Jayme Barrientos CommitDate: Thu Feb 7 18:03:45 2019 -0600 Minor color and padding tweaks; some styling for TOC Just to fix the most egregious issues in content paragraphs. Some day I will actually have the energy to systematize everything into a cohesive set of spacing and padding values. Change-Id: I6d5d36e96d9c9a133d61b233413ebd17d8189d33 diff --git a/help3xsl/default.css b/help3xsl/default.css index 2594c5de6..53e8af107 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -226,12 +226,13 @@ p, ol, td { font-size: 1.17rem; -margin: 2px 2px 2px 2px; +margin: 2px 0 2px 0; } h1 { font-size: 1.83rem; font-weight: 300; border-bottom: 2px solid #148603; +margin-bottom: 20px; padding-bottom: 6px; } h1 a { @@ -248,9 +249,6 @@ h5, h6 { font-size: 1.17rem; } -.avis { -/*background-color: #EE;*/ -} .relatedtopics { font-weight: normal; } @@ -274,9 +272,10 @@ h6 { box-shadow: 0 2px 2px -2px rgba(0,0,0,0.2); display: inline-block; font-weight: bold; -padding: 0.3em; +padding: 0.1em 0.3em; } .howtogetbody { +padding: 0 0.3em; } .samplefilesection{ } @@ -459,7 +458,6 @@ aside input[type=checkbox]:checked ~ .contents-treeview { } .index a { font-size: 16px; -margin-bottom: 5px; } #Bookmarks { padding: 0 20px; @@ -533,11 +531,12 @@ aside input[type=checkbox]:checked ~ .contents-treeview { color: #148603; } .pagination { -padding: 0; +border-bottom: 1px dashed rgba(0,0,0,0.1); +padding-bottom: 1em; } .pagination li { display: inline-block; -padding: 4px; +padding: 0 5px; } .pagination a { text-decoration: none; @@ -639,9 +638,12 @@ li.disabled a { } .contents-treeview a, .index a { text-decoration: none; +line-height: 1.4; } .contents-treeview a:hover, .index a:hover { -text-decoration: underline; +border-left: 2px solid rgba(0,0,0,0.05); +margin-left: -12px; +padding-left: 10px; } .contents-treeview input + label + ul { margin: 0 0 0 22px; @@ -664,8 +666,7 @@ li.disabled a { .contents-treeview label, .contents-treeview a, .contents-treeview label::before { -height: 16px; -line-height: 16px; +display: block; vertical-align: middle; } .contents-treeview label:before { @@ -679,12 +680,11 @@ li.disabled a { content: "⊟"; } .contents-current { -background-color: #0369A3; -color: #FFF; -padding-right: 1px; -} -.contents-current:hover { -color: #FFF; +background: rgba(0,0,0,0.05); +border-left: 2px solid #0369a3; +font-weight: 600; +margin-left: -12px; +padding-left: 10px; } /* webkit adjacent element selector bugfix */ @@ -743,7 +743,6 @@ li.disabled a { font-size: 19px; } aside { -background-color: #F4F7F7; float: left; width: 320px; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl
help3xsl/default.css | 18 +- help3xsl/online_transform.xsl |6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) New commits: commit 622324ec76e54ea1de99d6cea3debc2389049f58 Author: Adolfo Jayme Barrientos AuthorDate: Mon Jan 28 16:25:10 2019 -0600 Commit: Adolfo Jayme Barrientos CommitDate: Mon Jan 28 16:25:10 2019 -0600 tdf#121571 Solve cognitive dissonance with note icons and colors More often than not, the alarmist colors given to note boxes didn’t match their content. Change-Id: I88d7a8e2d07ffba661c218887fd54638506d21c8 diff --git a/help3xsl/default.css b/help3xsl/default.css index 9b7028af4..2594c5de6 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -86,7 +86,7 @@ h6, pointer-events: auto; } body { -background-color: #F4F7F7; +background-color: #F7F8F7; margin: 0; line-height: normal; } @@ -159,16 +159,16 @@ pre, margin-top: 15px; } .note { -border-left: 4px solid #FFDE09; -background-color: #FFF4D0; +border-left: 4px solid #61897C; +background-color: #D9E7E2; } .tip { -border-left: 4px solid #38618C; -background-color: #DAE2EA; +border-left: 4px solid #4866AD; +background-color: #CDD5E8; } .warning { -border-left: 4px solid #FF5964; -background-color: #FFE0E2; +border-left: 4px solid #D5B177; +background-color: #F9EEDC; } .noteicon, .notetext { padding:0.3em; @@ -260,8 +260,8 @@ h6 { margin-left: 5px; } .howtoget { -background: #CCF4C6; -border-left: 4px solid #148603; +background: #EBE7E9; +border-left: 4px solid #4E4B55; border-radius: 0 4px 4px 0; box-shadow: 0 2px 2px -2px rgba(0,0,0,0.2); padding: 0.3em; diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index f52edfa01..02a166c63 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -94,9 +94,9 @@ - - - + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl
help3xsl/default.css | 15 +-- help3xsl/online_transform.xsl |6 ++ 2 files changed, 3 insertions(+), 18 deletions(-) New commits: commit a8ab16150bf04fd812dde07bdd7d0bbd9b52f48e Author: Adolfo Jayme Barrientos AuthorDate: Mon Jan 28 15:31:15 2019 -0600 Commit: Adolfo Jayme Barrientos CommitDate: Mon Jan 28 15:31:15 2019 -0600 Drop this pitiful, bothersome, gimmicky animation Change-Id: If533f8565e38e02d503cc1ab59f65e2445f1369b diff --git a/help3xsl/default.css b/help3xsl/default.css index 0870b7a1b..9b7028af4 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -170,14 +170,7 @@ pre, border-left: 4px solid #FF5964; background-color: #FFE0E2; } -.noteicon { -padding:0.3em; -transition: transform .2s; /* Animation */ -} -.noteicon:hover { -transform: scale(2.0); /* (200% zoom - Note: if the zoom is too large, it will go outside of the viewport) */ -} -.notetext { +.noteicon, .notetext { padding:0.3em; } @@ -196,12 +189,6 @@ pre, .iconcell { padding:0.3em; } -.imageicon { -transition: transform .2s; /* Animation */ -} -.imageicon:hover{ -transform: scale(2.0); /* (200% zoom - Note: if the zoom is too large, it will go outside of the viewport) */ -} table { box-shadow: rgba(0,0,0,0.1) 0px 1px 3px 0px; diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 2bd356a8c..f52edfa01 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -1197,10 +1197,8 @@ - - - - + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl source/text
help3xsl/default.css| 10 ++ help3xsl/online_transform.xsl | 19 + source/text/smath/01/03090700.xhp |8 +- source/text/smath/01/03090901.xhp |2 source/text/smath/01/03090902.xhp |2 source/text/smath/01/03090903.xhp |2 source/text/smath/01/03090904.xhp |2 source/text/smath/01/03090905.xhp |2 source/text/smath/01/03090906.xhp |2 source/text/smath/01/03090907.xhp |2 source/text/smath/01/03090908.xhp |2 source/text/smath/01/03090909.xhp |2 source/text/smath/01/03090910.xhp |2 source/text/smath/01/03091100.xhp | 108 +--- source/text/smath/01/03091200.xhp | 16 ++-- source/text/smath/guide/align.xhp |4 - source/text/smath/guide/attributes.xhp |4 - source/text/smath/guide/brackets.xhp|4 - source/text/smath/guide/comment.xhp |4 - source/text/smath/guide/limits.xhp |8 +- source/text/smath/guide/parentheses.xhp |6 - source/text/smath/guide/text.xhp|4 - 22 files changed, 110 insertions(+), 105 deletions(-) New commits: commit e6095165acb81b895d5671a4414faf7885a622ff Author: Olivier Hallot AuthorDate: Wed Dec 26 12:54:58 2018 -0200 Commit: Olivier Hallot CommitDate: Wed Dec 26 22:15:20 2018 +0100 Review code in help page and mute l10n when OK + Added "smathcode" role to render smath code paragraphs + let smath code samples be copied to clipboard. Change-Id: I580c162d0c77f51d0de817ca143a845abf56eca9 Reviewed-on: https://gerrit.libreoffice.org/65621 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 6cb76ce38..0870b7a1b 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -39,14 +39,15 @@ h5, h6, .listitem, .listitemintable, -.tablecontent, -.input { +.tablecontent { font-family: -apple-system, system-ui, "Segoe UI", Roboto, Ubuntu, Cantarell, "Noto Sans", "DejaVu Sans", "Lucida Grande", "Helvetica Neue", Helvetica, Arial, sans-serif, FreeSerif, NanumGothic, "Noto Sans Tibetan", Taprom; } .input { +background-color: rgba(0,0,0,0.04); transition-property: background-color; transition-duration: 150ms; border-bottom: 1px dashed rgba(0,0,0,0.1); +font-family: Menlo, Consolas, "DejaVu Sans Mono", "Nimbus Mono L", "Lucida Sans Typewriter", "Courier New", Courier, Monaco, monospace; } [data-tooltip]{ position:relative; @@ -115,6 +116,11 @@ pre, padding: 1px 3px; font-family: Menlo, Consolas, "DejaVu Sans Mono", "Nimbus Mono L", "Lucida Sans Typewriter", "Courier New", Courier, Monaco, monospace; } +.smathcode { +border-radius: 2px; +padding: 1px 3px; +font-family: Menlo, Consolas, "DejaVu Sans Mono", "Nimbus Mono L", "Lucida Sans Typewriter", "Courier New", Courier, Monaco, monospace; +} .acronym { font-weight: bold; } diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index ad285480d..5fa01a773 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -538,7 +538,7 @@ - + @@ -552,6 +552,10 @@ + + + + @@ -579,7 +583,7 @@ - + @@ -589,6 +593,17 @@ + + + + + + + + + + + diff --git a/source/text/smath/01/03090700.xhp b/source/text/smath/01/03090700.xhp index e3afbb91f..b62ebb875 100644 --- a/source/text/smath/01/03090700.xhp +++ b/source/text/smath/01/03090700.xhp @@ -288,10 +288,10 @@ To align using the "matrix" command -matrix{ -alignr sin^2 x + cos^2 x#{}={}#alignl 1 ## -alignr cos^2 x #{}={} #alignl 1 - sin^2 x -} +matrix{ +alignr sin^2 x + cos^2 x#{}={}#alignl 1 ## +alignr cos^2 x #{}={} #alignl 1 - sin^2 x +} Aligning to the left If a line or an expression begins with text, it is aligned on the left by default. You can change this with any of the align commands. An example is stack{a+b-c*d#alignr "text"}, where "text" appears aligned to the right. Note that text must always be surrounded by quotation marks. The standard centralized formulas can be aligned to the left without using the Format - Align menu. To do this, place an empty character string, that is, the inverted commas which surround any text "", before the section of formula that you want to align. For example, typing "" a+b newline "" c+d results in both equations being left-aligned instead of centered. diff --git a/source/text/smath/01/03090901.xhp b/source/text/smath/01/03090901.xhp index 1d5125461..f127bf28f 100644 ---
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl help3xsl/prism.css help3xsl/prism.js help3xsl/README.prism.js.txt Package_html_static.mk
Package_html_static.mk|2 help3xsl/README.prism.js.txt | 39 + help3xsl/default.css | 31 - help3xsl/online_transform.xsl | 14 help3xsl/prism.css| 270 + help3xsl/prism.js | 1190 ++ 6 files changed, 1508 insertions(+), 38 deletions(-) New commits: commit 635750a0cda2e9f6f906e10e33a087b579a74ba8 Author: Olivier Hallot AuthorDate: Thu Nov 29 11:09:15 2018 -0200 Commit: Olivier Hallot CommitDate: Thu Nov 29 21:41:54 2018 +0100 tdf#115663 Syntax highlight in BASIC code examples Use prism.js to highlight BASIC code in help pages See README.prism.js.txt for details added normalize-whitespaces plugin to remove extra 1st line cleaned some useless css class Change-Id: I6dde4d217a29f485199ced462b896ee1b500fba0 Reviewed-on: https://gerrit.libreoffice.org/64252 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/Package_html_static.mk b/Package_html_static.mk index 59941b020..a53929878 100644 --- a/Package_html_static.mk +++ b/Package_html_static.mk @@ -23,6 +23,8 @@ $(eval $(call gb_Package_add_files,helpcontent2_html_static,$(LIBO_SHARE_HELP_FO help2.js \ normalize.css \ paginathing.js \ + prism.js \ +prism.css \ )) # vim: set noet sw=4 ts=4: diff --git a/help3xsl/README.prism.js.txt b/help3xsl/README.prism.js.txt new file mode 100644 index 0..581a1fe71 --- /dev/null +++ b/help3xsl/README.prism.js.txt @@ -0,0 +1,39 @@ +Using prism.js for Basic code highlight + +http://prismjs.com + +License MIT (see prism.js) + +Download page http://prismjs.com/download + +Theme: Coy + +Languages to download: Visual Basic + Python + defaults pre-sets + +Plugins: line numbers, + +normalize-whitespace: configure after https://prismjs.com/plugins/normalize-whitespace/ + +Prism.plugins.NormalizeWhitespace = new NormalizeWhitespace({ +'remove-trailing': true, +'remove-indent': true, +'left-trim': true, +'right-trim': true, +/*'break-lines': 80, +'indent': 2,*/ +'remove-initial-line-feed': true, +/*'tabs-to-spaces': 4, +'spaces-to-tabs': 4*/ +}); + + +Usage: + +Add prism.js and prism.css to html page, + +Add class 'language-visual-basic' and 'line-numbers' to as in + + +http://schema.org/SoftwareSourceCode; itemprop="codeSampleType" content="snippet"> + + diff --git a/help3xsl/default.css b/help3xsl/default.css index 285d1e900..6cb76ce38 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -314,37 +314,10 @@ h6 { font-size:1.2rem; } .bascode { -background-color: #fafafa; -margin-left: 30px; -margin-right: 30px; +margin-top:15px; +margin-bottom: 15px; } -.bascodepar { -font-family: monospace; -} - -/* Basic code syntax highlight */ -.identifier, -.unknown { -color: green; -} -.keyword { -color: blue; -} -.comment { -color: gray; -} -.number, -.string { -color: red; -} -.operator, -.parameter { -color: black; -} -.hotlink { -color: blue; -} .infopage { color: green; font-size: 1.33rem; diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 59eb5120a..e5671e22f 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -152,11 +152,13 @@ + + http://schema.org/TechArticle;> @@ -552,7 +554,7 @@ - + @@ -925,7 +927,6 @@ - @@ -942,15 +943,10 @@ -http://schema.org/SoftwareSourceCode; itemprop="codeSampleType" content="snippet"> +http://schema.org/SoftwareSourceCode; itemprop="codeSampleType" content="snippet"> -http://schema.org/SoftwareSourceCode; itemprop="codeSampleType" content="snippet"> - - - - - +http://schema.org/SoftwareSourceCode; itemprop="codeSampleType" content="snippet"> diff --git a/help3xsl/prism.css b/help3xsl/prism.css new file mode 100644 index 0..6e31d4d8f --- /dev/null +++ b/help3xsl/prism.css @@ -0,0 +1,270 @@ +/* PrismJS 1.15.0 +https://prismjs.com/download.html#themes=prism-coy=markup+css+clike+javascript+python+visual-basic=line-numbers+normalize-whitespace */ +/** + * prism.js Coy theme for JavaScript, CoffeeScript, CSS and HTML + * Based on https://github.com/tshedor/workshop-wp-theme (Example: http://workshop.kansan.com/category/sessions/basics or http://workshop.timshedor.com/category/sessions/basics); + * @author Tim Shedor + */ + +code[class*="language-"], +pre[class*="language-"] { + color: black; + background: none; + font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace; + text-align: left; + white-space: pre; + word-spacing: normal; + word-break: normal; + word-wrap: normal; + line-height: 1.5; + + -moz-tab-size: 4; +
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl helpers/xmlhelp.dtd
help3xsl/default.css | 17 +- help3xsl/online_transform.xsl | 59 ++ helpers/xmlhelp.dtd | 65 -- 3 files changed, 130 insertions(+), 11 deletions(-) New commits: commit 49baef5df55850a72b9385f7ec2b9eb98486e48a Author: Olivier Hallot AuthorDate: Fri Nov 16 10:00:39 2018 -0200 Commit: Olivier Hallot CommitDate: Wed Nov 28 10:53:51 2018 +0100 tdf#121797 XHP extensions (Help part) WIP. This is the Help part. Extend the XML parser to include new incantations of the tag, namely to , and Extension to the tag: , , , and * removed test files Change-Id: I2a473ee8772606f5e84bb02e651bccc6749598f4 Reviewed-on: https://gerrit.libreoffice.org/63954 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index e6a59ad8b..285d1e900 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -124,10 +124,23 @@ pre, border-top: 1px solid black; } .emph, -.menuitem, -.keycode { +.menuitem { font-weight: bold; } +.keycode { +/*font-weight: bold;*/ +font-family: Menlo, Consolas, "DejaVu Sans Mono", "Nimbus Mono L", "Lucida Sans Typewriter", "Courier New", Courier, Monaco, monospace; +} +.widget{ +padding: 1px 10px; +background: #f0f0f0; +background: linear-gradient(to bottom,#f0f0f0,#fcfcfc); +border-radius: 3px; +color: #303030; +border: 1px solid #a0a0a0; +border-bottom-width: 2px; +white-space: nowrap; +} /* div's for warning, tip and note */ .note, .tip, diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 95892bdd4..59eb5120a 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -800,6 +800,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/helpers/xmlhelp.dtd b/helpers/xmlhelp.dtd index d6564f5f4..20dbe802d 100644 --- a/helpers/xmlhelp.dtd +++ b/helpers/xmlhelp.dtd @@ -21,6 +21,9 @@ Version 03-Feb-2006 Version 06-Jun-2017 Made xml-lang optional (#IMPLIED) + +Version Nov 2018 + Added extensions: H1, .. H6, menuitem, keycode, literal input, widget, note, tip, warning --> @@ -38,7 +41,7 @@ Version 06-Jun-2017 - + - + - + @@ -76,9 +79,9 @@ Version 06-Jun-2017 date CDATA #REQUIRED > - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + @@ -228,10 +265,20 @@ Version 06-Jun-2017 status (DRAFT | FINAL | PUBLISH | STALLED | DEPRECATED) #IMPLIED > - + + + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) New commits: commit ad162dec44f8dc15cfa7405cba597b76cba8b3bd Author: Adolfo Jayme Barrientos AuthorDate: Thu Nov 22 11:54:01 2018 -0600 Commit: Adolfo Jayme Barrientos CommitDate: Thu Nov 22 11:54:01 2018 -0600 tdf#119415 Widen search box and style placeholder Change-Id: I0f60cfea338e695e778d16a208153597ec6d19ca diff --git a/help3xsl/default.css b/help3xsl/default.css index 6fee23221..e6a59ad8b 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -580,6 +580,11 @@ li.disabled a { } #search-bar { margin-top: 10px; +width: 100%; +caret-color: #148603; +} +#search-bar::placeholder { +font-style: italic; } .google-search { max-width: 300px; @@ -793,9 +798,6 @@ li.disabled a { padding: 10px 50px; width: 800px; } -#search-bar { -max-width: 290px; -} } @media screen and (min-width: 1440px) { #Contents { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 94177b1022a9a4f49743ab4d97169ff42315eea5 Author: Adolfo Jayme Barrientos AuthorDate: Sat Sep 15 08:55:12 2018 -0500 Commit: Adolfo Jayme Barrientos CommitDate: Sat Sep 15 08:55:12 2018 -0500 Helponline: H2 too similar to H3 A teeny-tiny upward nudge. Change-Id: I9491c5a849316907f0770ab29752cbc385cef107 diff --git a/help3xsl/default.css b/help3xsl/default.css index d2fd2fa2c..a67a03628 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -232,7 +232,7 @@ h1 a { text-decoration: none; } h2 { -font-size: 1.5rem; +font-size: 1.55rem; } h3 { font-size: 1.33rem; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl
help3xsl/default.css | 10 ++ help3xsl/online_transform.xsl |7 ++- 2 files changed, 16 insertions(+), 1 deletion(-) New commits: commit 0d03a98c88e64fb3303ecc80879e76f327d6bf4f Author: Olivier Hallot AuthorDate: Wed Sep 5 16:38:15 2018 -0300 Commit: Olivier Hallot CommitDate: Thu Sep 6 17:05:28 2018 +0200 Show how beautiful are our icons On hovering icons, enlarge them. Next step: change icons to SVG (tdf#117551) Change-Id: Ib43e3b54ed27352a8ca785c57dce9314adc00e4d Reviewed-on: https://gerrit.libreoffice.org/60053 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 98b8e0561..d2fd2fa2c 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -153,6 +153,10 @@ pre, } .noteicon { padding:0.3em; +transition: transform .2s; /* Animation */ +} +.noteicon:hover { +transform: scale(2.0); /* (200% zoom - Note: if the zoom is too large, it will go outside of the viewport) */ } .notetext { padding:0.3em; @@ -173,6 +177,12 @@ pre, .iconcell { padding:0.3em; } +.imageicon { +transition: transform .2s; /* Animation */ +} +.imageicon:hover{ +transform: scale(2.0); /* (200% zoom - Note: if the zoom is too large, it will go outside of the viewport) */ +} table { box-shadow: rgba(0,0,0,0.1) 0px 1px 3px 0px; diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index a22c384eb..67ea70220 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -1088,7 +1088,12 @@ - + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) New commits: commit c48b19bcf937b5b5689b08254208c935057b58e8 Author: Adolfo Jayme Barrientos AuthorDate: Thu Aug 23 12:26:28 2018 -0500 Commit: Adolfo Jayme Barrientos CommitDate: Thu Aug 23 12:26:28 2018 -0500 Better placement of background color definitions & a new shadow Change-Id: I8ad99f278cd1e4d96ae873627f2dfa2a5b827761 diff --git a/help3xsl/default.css b/help3xsl/default.css index 0f1967ceb..98b8e0561 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -85,7 +85,7 @@ h6, pointer-events: auto; } body { -background-color: #FCFCFC; +background-color: #F4F7F7; margin: 0; line-height: normal; } @@ -334,10 +334,10 @@ h6 { border: solid 1px #148603; } #DisplayArea { +background-color: #FCFCFC; overflow: auto; padding: 10px; grid-area: main; -margin-bottom: 50px; } #DisplayArea > p { margin-bottom: 10px; @@ -420,9 +420,8 @@ header { } footer { border-top: 2px solid #148603; -background: linear-gradient(to bottom, rgba(0,0,0,0.025) 0%,rgba(0,0,0,0) 100%); padding: 15px 10px 0 10px; -margin: 25px 0 0 0; +margin: 40px 0; } footer p { font-size: 0.98rem; @@ -754,7 +753,6 @@ li.disabled a { } aside { background-color: #F4F7F7; -border-right: 1px solid rgba(0,0,0,0.04); float: left; width: 320px; } @@ -783,6 +781,8 @@ li.disabled a { border: none; } #DisplayArea { +background-color: #FCFCFC; +box-shadow: 0 2px 8px 0 rgba(0,0,0,.05); padding: 10px 50px; width: 800px; } @@ -830,7 +830,6 @@ li.disabled a { .rightside { width: auto; border-right: none; -border-left: 1px solid rgba(0,0,0,0.04); } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit df4a017dbfecdb9ad1f8395ad8ad9c422a2e13e0 Author: Olivier Hallot AuthorDate: Wed Aug 22 18:08:04 2018 -0300 Commit: Adolfo Jayme Barrientos CommitDate: Thu Aug 23 05:35:20 2018 +0200 Add some space between warning/note/tip boxes Change-Id: I37b9bf85cbe2b3e101c5ba4c71391692b2a65425 Reviewed-on: https://gerrit.libreoffice.org/59473 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/help3xsl/default.css b/help3xsl/default.css index 88c24facf..0f1967ceb 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -137,6 +137,7 @@ pre, border-radius: 0 4px 4px 0; box-shadow: 0 2px 2px -2px rgba(0,0,0,0.2); padding: 0.2em; +margin-top: 15px; } .note { border-left: 4px solid #FFDE09; @@ -755,7 +756,7 @@ li.disabled a { background-color: #F4F7F7; border-right: 1px solid rgba(0,0,0,0.04); float: left; -width: 320px; +width: 320px; } .leftside { grid-area: leftside; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0901f95273cc31db84d31a11cb22187f73cad128 Author: Olivier Hallot AuthorDate: Sun Jul 22 08:10:59 2018 -0300 Commit: Olivier Hallot CommitDate: Sun Jul 22 13:15:51 2018 +0200 Restore 'GLOBAL' label in Index GLOBAL is the external nam of the SHARED bookmarks. Change-Id: If4a877cc26dddb3fa99e5369ef63c7333aa53ffe Reviewed-on: https://gerrit.libreoffice.org/57815 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 092ed89ef..88c24facf 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -536,7 +536,7 @@ aside input[type=checkbox]:checked ~ .contents-treeview { font-weight: bold; color: #148603; } -#GLOBAL::before { +#SHARED::before { content: "GLOBAL"; display: block; font-size: 22px; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1ee609da2c58c8628535602348d2a51dd7ac9f14 Author: Adolfo Jayme Barrientos Date: Tue Jul 10 05:41:44 2018 -0500 Also add that here… Change-Id: Ia31ace1a2f844dbd707839a44ec131f424513924 diff --git a/help3xsl/default.css b/help3xsl/default.css index 40a2414a5..092ed89ef 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -454,7 +454,7 @@ aside input[type=checkbox]:checked ~ .contents-treeview { color: #333; z-index: 6; display: block; -padding: 0 0 0 20px; +margin: 0 20px 0 20px; } .index-label { font-size: 22px; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 01319d64fae5989f35d10038d19d3371efb69d73 Author: Adolfo Jayme Barrientos Date: Tue Jul 10 05:31:25 2018 -0500 Helponline: Fix alignment of TOC in sidebar It was too close to the window border in Edge, Chrome and Firefox Nightly. Change-Id: I29a7b17c6abc240baa1f75cba879942810ebee07 diff --git a/help3xsl/default.css b/help3xsl/default.css index 2104d01d4..40a2414a5 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -794,7 +794,7 @@ li.disabled a { color: #333; z-index: 6; display: block; -padding: 0 0 0 20px; +margin: 0 20px 0 20px; } label[for=accordion-1] { background-color: transparent; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl
help3xsl/default.css | 55 +- help3xsl/online_transform.xsl |4 ++- 2 files changed, 41 insertions(+), 18 deletions(-) New commits: commit 581213f4b1f0589367529434af22c41ddc4c1a29 Author: Ilmari Lauhakangas Date: Sat Jul 7 15:09:33 2018 +0300 tdf#118430 Three column layout with 1440px width Contents will now stay collapsed until 1440px width, when it will move to the right side of the screen. Removed useless and harmful float:left from .index-label. Change-Id: I504e8c4be3a5e777dc7bafbd6a6105b163e4a5f3 Reviewed-on: https://gerrit.libreoffice.org/57129 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 03eaf34ca..2104d01d4 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -457,7 +457,6 @@ aside input[type=checkbox]:checked ~ .contents-treeview { padding: 0 0 0 20px; } .index-label { -float: left; font-size: 22px; color: #148603; padding-left: 20px; @@ -756,8 +755,13 @@ li.disabled a { background-color: #F4F7F7; border-right: 1px solid rgba(0,0,0,0.04); float: left; -width: 320px; -grid-area: sidebar; +width: 320px; +} +.leftside { +grid-area: leftside; +} +.rightside { +grid-area: rightside; } .google-search { margin: 0; @@ -777,28 +781,30 @@ li.disabled a { left: 80px; border: none; } -label[for=accordion-1] { -background-color: transparent; -text-decoration: none; -} - label[for=accordion-1]:hover { -background-color: transparent; -} - label[for=accordion-1]:after { -content: ""; -} #DisplayArea { padding: 10px 50px; width: 800px; } +#search-bar { +max-width: 290px; +} +} +@media screen and (min-width: 1440px) { #Contents { color: #333; z-index: 6; display: block; padding: 0 0 0 20px; } -#search-bar { -max-width: 290px; +label[for=accordion-1] { +background-color: transparent; +text-decoration: none; +} + label[for=accordion-1]:hover { +background-color: transparent; +} + label[for=accordion-1]:after { +content: ""; } } @supports (grid-area: auto) { @@ -806,9 +812,24 @@ li.disabled a { body { display: grid; grid-template-columns: 320px 1fr; -grid-template-rows: 1fr minmax(1em, auto); +grid-template-rows: minmax(1em, auto) minmax(1em, auto) 1fr; grid-template-areas: "header header" - "sidebar main" + "rightside main" + "leftside main" +} +} +@media screen and (min-width: 1440px) { +body { +display: grid; +grid-template-columns: 320px 900px 1fr; +grid-template-rows: 1fr minmax(1em, auto); +grid-template-areas: "header header header" + "leftside main rightside" +} +.rightside { +width: auto; +border-right: none; +border-left: 1px solid rgba(0,0,0,0.04); } } } diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 8bfd5d31b..889982fda 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -200,10 +200,12 @@ - + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css | 48 1 file changed, 24 insertions(+), 24 deletions(-) New commits: commit 139bd7c195abf3c1d73ed06c33f64fafeb5244be Author: Adolfo Jayme Barrientos Date: Mon Jul 2 16:46:43 2018 -0500 Helponline: Improve a few colors some more Change-Id: I3d9db610057119cdb08b1f31152700ed18d6ea16 diff --git a/help3xsl/default.css b/help3xsl/default.css index b27e96622..03eaf34ca 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -41,7 +41,7 @@ h6, .listitemintable, .tablecontent, .input { -font-family: -apple-system, system-ui, "Segoe UI", Roboto, Ubuntu, Oxygen, "Oxygen Sans", Cantarell, "Noto Sans", "Lucida Grande", "Helvetica Neue", Helvetica, Arial, sans-serif, FreeSerif, NanumGothic, "Noto Sans Tibetan", Taprom; +font-family: -apple-system, system-ui, "Segoe UI", Roboto, Ubuntu, Cantarell, "Noto Sans", "DejaVu Sans", "Lucida Grande", "Helvetica Neue", Helvetica, Arial, sans-serif, FreeSerif, NanumGothic, "Noto Sans Tibetan", Taprom; } .input { transition-property: background-color; @@ -140,7 +140,7 @@ pre, } .note { border-left: 4px solid #FFDE09; -background-color: #FFFADE; +background-color: #FFF4D0; } .tip { border-left: 4px solid #38618C; @@ -191,7 +191,7 @@ table, th, td { margin-top: 0px; } .tableheadcell { -background: #4F8A10; +background: #148603; color: white; vertical-align:top; } @@ -203,7 +203,7 @@ h4, h5, h6 { margin-bottom: 0.67rem; -color: #4F8A10; +color: #148603; } p, ol, @@ -214,7 +214,7 @@ td { h1 { font-size: 1.83rem; font-weight: 300; -border-bottom: 2px solid #4F8A10; +border-bottom: 2px solid #148603; padding-bottom: 6px; } h1 a { @@ -244,7 +244,7 @@ h6 { } .howtoget { background: #CCF4C6; -border-left: 4px solid #4F8A10; +border-left: 4px solid #148603; border-radius: 0 4px 4px 0; box-shadow: 0 2px 2px -2px rgba(0,0,0,0.2); padding: 0.3em; @@ -330,7 +330,7 @@ h6 { font-size: 1rem; font-weight: bold; padding: 1px; -border: solid 1px #4F8A10; +border: solid 1px #148603; } #DisplayArea { overflow: auto; @@ -407,7 +407,7 @@ header { } .lang nav a, .modules nav a { color: #fff; -background-color: #31363A; +background-color: #26; display: block; line-height: 1.5; padding: 3px 6px; @@ -418,7 +418,7 @@ header { white-space: nowrap; } footer { -border-top: 2px solid #4F8A10; +border-top: 2px solid #148603; background: linear-gradient(to bottom, rgba(0,0,0,0.025) 0%,rgba(0,0,0,0) 100%); padding: 15px 10px 0 10px; margin: 25px 0 0 0; @@ -437,7 +437,7 @@ footer p { opacity: 0; } label[for=accordion-1] { -color: #4F8A10; +color: #148603; display: block; padding: 10px 0 10px 20px; font-size: 22px; @@ -459,7 +459,7 @@ aside input[type=checkbox]:checked ~ .contents-treeview { .index-label { float: left; font-size: 22px; -color: #4F8A10; +color: #148603; padding-left: 20px; margin: 20px 0 0 0; } @@ -479,70 +479,70 @@ aside input[type=checkbox]:checked ~ .contents-treeview { #Bookmarks p { font-size: 22px; font-weight: bold; -color: #4F8A10; +color: #148603; } #WRITER::before { content: "WRITER"; display: block; font-size: 22px; font-weight: bold; -color: #4F8A10; +color: #148603; } #CALC::before { content: "CALC"; display: block; font-size: 22px; font-weight: bold; -color: #4F8A10; +color: #148603; } #IMPRESS::before { content: "IMPRESS"; display: block; font-size: 22px; font-weight: bold; -color: #4F8A10; +color: #148603; } #DRAW::before { content: "DRAW"; display: block; font-size: 22px; font-weight: bold; -color: #4F8A10; +color: #148603; } #BASE::before { content: "BASE"; display: block; font-size: 22px; font-weight: bold; -color: #4F8A10; +color: #148603; } #MATH::before { content: "MATH"; display: block; font-size: 22px; font-weight: bold; -color: #4F8A10; +color: #148603; } #CHART::before { content: "CHART"; display: block; font-size: 22px; font-weight: bold; -color: #4F8A10; +color: #148603; } #BASIC::before { content: "BASIC"; display: block; font-size: 22px; font-weight: bold; -color: #4F8A10; +color: #148603; } #GLOBAL::before { content: "GLOBAL"; display: block; font-size: 22px; font-weight: bold; -color: #4F8A10; +color: #148603; } .pagination { padding: 0; @@ -680,7 +680,7 @@ li.disabled a { } .contents-treeview label:before { content: "⊞"; -color: #4F8A10; +color: #148603; width: 16px; margin: 0 5px 0 0; display: inline-block; @@ -740,7 +740,7 @@ li.disabled a { top:
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css | 72 --- 1 file changed, 35 insertions(+), 37 deletions(-) New commits: commit 5bc297bf12e0d0010047559d8f8d058f1e848adf Author: Adolfo Jayme Barrientos Date: Mon Jun 18 09:13:04 2018 -0500 Helponline: New .howtoget, small tweaks to other boxes, tiny changes to colors Change-Id: I3d7d396482df4143b09776230c571c0c69ab0b5a Reviewed-on: https://gerrit.libreoffice.org/56040 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/help3xsl/default.css b/help3xsl/default.css index 09c818bdd..b27e96622 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -46,7 +46,7 @@ h6, .input { transition-property: background-color; transition-duration: 150ms; -border-bottom: 1px dashed #E8E8E8; +border-bottom: 1px dashed rgba(0,0,0,0.1); } [data-tooltip]{ position:relative; @@ -90,10 +90,7 @@ body { line-height: normal; } ::selection { -background: #CCF4C6; -} -::-moz-selection { /* moz#509958 */ -background: #CCF4C6; +background: #BFFFB7; } a { text-decoration: none; @@ -112,8 +109,7 @@ pre, .literalintable, .path, .pathintable { -background-color: rgba(0, 0, 0, 0.03); -border: 1px solid rgba(0,0,0,0.04); +background-color: rgba(0,0,0,0.04); border-radius: 2px; display: inline; padding: 1px 3px; @@ -138,12 +134,12 @@ pre, .warning { display:flex; align-items: center; -padding:0.3em; -border-bottom: 1px solid rgba(0,0,0,0.05); border-radius: 0 4px 4px 0; +box-shadow: 0 2px 2px -2px rgba(0,0,0,0.2); +padding: 0.2em; } .note { -border-left: 4px solid #FFE74C; +border-left: 4px solid #FFDE09; background-color: #FFFADE; } .tip { @@ -195,7 +191,7 @@ table, th, td { margin-top: 0px; } .tableheadcell { -background: #18A303; +background: #4F8A10; color: white; vertical-align:top; } @@ -207,7 +203,7 @@ h4, h5, h6 { margin-bottom: 0.67rem; -color: #18A303; +color: #4F8A10; } p, ol, @@ -218,7 +214,7 @@ td { h1 { font-size: 1.83rem; font-weight: 300; -border-bottom: 2px solid #18A303; +border-bottom: 2px solid #4F8A10; padding-bottom: 6px; } h1 a { @@ -248,19 +244,22 @@ h6 { } .howtoget { background: #CCF4C6; +border-left: 4px solid #4F8A10; +border-radius: 0 4px 4px 0; +box-shadow: 0 2px 2px -2px rgba(0,0,0,0.2); padding: 0.3em; display: flex; flex-direction: column; -border: 1px #99 solid; } .howtogetheader { +background: #FFF; +border-radius: 2px; +box-shadow: 0 2px 2px -2px rgba(0,0,0,0.2); +display: inline-block; font-weight: bold; -border: 1px solid #99; -background: #FF; padding: 0.3em; } .howtogetbody { -margin: 0px; } .samplefilesection{ } @@ -285,7 +284,7 @@ h6 { .donation { padding: 0 0 10px 0; margin-bottom: 1em; -border-bottom: 1px dashed #E8E8E8; +border-bottom: 1px dashed rgba(0,0,0,0.1); } .donation p{ font-size:1.2rem; @@ -295,7 +294,7 @@ h6 { margin-left: 30px; margin-right: 30px; } -.bascodepar{ +.bascodepar { font-family: monospace; } @@ -331,7 +330,7 @@ h6 { font-size: 1rem; font-weight: bold; padding: 1px; -border: solid 1px #18A303; +border: solid 1px #4F8A10; } #DisplayArea { overflow: auto; @@ -419,14 +418,13 @@ header { white-space: nowrap; } footer { -color: #333; -border-top: 2px solid #18A303; +border-top: 2px solid #4F8A10; background: linear-gradient(to bottom, rgba(0,0,0,0.025) 0%,rgba(0,0,0,0) 100%); padding: 15px 10px 0 10px; margin: 25px 0 0 0; } footer p { -font-size: 1rem; +font-size: 0.98rem; } .gsc-control-cse { border-color: transparent !important; @@ -439,7 +437,7 @@ footer p { opacity: 0; } label[for=accordion-1] { -color: #18A303; +color: #4F8A10; display: block; padding: 10px 0 10px 20px; font-size: 22px; @@ -461,7 +459,7 @@ aside input[type=checkbox]:checked ~ .contents-treeview { .index-label { float: left; font-size: 22px; -color: #18A303; +color: #4F8A10; padding-left: 20px; margin: 20px 0 0 0; } @@ -481,70 +479,70 @@ aside input[type=checkbox]:checked ~ .contents-treeview { #Bookmarks p { font-size: 22px; font-weight: bold; -color: #18A303; +color: #4F8A10; } #WRITER::before { content: "WRITER"; display: block; font-size: 22px; font-weight: bold; -color: #18A303; +color: #4F8A10; } #CALC::before { content: "CALC"; display: block; font-size: 22px; font-weight: bold; -color: #18A303; +color: #4F8A10; } #IMPRESS::before { content: "IMPRESS"; display: block; font-size: 22px; font-weight: bold; -color: #18A303; +color: #4F8A10; } #DRAW::before { content: "DRAW"; display: block;
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl
help3xsl/default.css |4 help3xsl/online_transform.xsl |2 +- 2 files changed, 5 insertions(+), 1 deletion(-) New commits: commit 2fdf0556202b43940ee003e7d1e6d452c3d11ab7 Author: Olivier Hallot Date: Thu Jun 14 18:52:12 2018 -0300 Fix rendering for paragraphs Change-Id: I4c76bac48f3be30dc3bcd358df427843a5f97a7a Reviewed-on: https://gerrit.libreoffice.org/55837 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index bfaa63268..09c818bdd 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -295,6 +295,10 @@ h6 { margin-left: 30px; margin-right: 30px; } +.bascodepar{ +font-family: monospace; +} + /* Basic code syntax highlight */ .identifier, diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 031476757..ccfa94ae5 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -871,7 +871,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b1a2195960ea7885d5049cf7e36bf0c5f1944f8e Author: Ilmari Lauhakangas Date: Thu Jun 14 15:08:39 2018 +0200 Add back fonts for complex scripts Change-Id: Ibe468e41fd016871ee30909dd6a9515e7d10b22a Reviewed-on: https://gerrit.libreoffice.org/55801 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index f3ab2a877..bfaa63268 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -41,7 +41,7 @@ h6, .listitemintable, .tablecontent, .input { -font-family: -apple-system, system-ui, "Segoe UI", Roboto, Ubuntu, Oxygen, "Oxygen Sans", Cantarell, "Noto Sans", "Lucida Grande", "Helvetica Neue", Helvetica, Arial, sans-serif; +font-family: -apple-system, system-ui, "Segoe UI", Roboto, Ubuntu, Oxygen, "Oxygen Sans", Cantarell, "Noto Sans", "Lucida Grande", "Helvetica Neue", Helvetica, Arial, sans-serif, FreeSerif, NanumGothic, "Noto Sans Tibetan", Taprom; } .input { transition-property: background-color; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 279e341d56686a5e381fbc53faec3395e4cd451a Author: Adolfo Jayme Barrientos Date: Tue Jun 12 18:38:48 2018 -0500 Helponline: Allow for system typeface to be used Change-Id: Ic3868b0bcdbb978f450666b4f98e53587b5e7f85 Reviewed-on: https://gerrit.libreoffice.org/55728 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index e5009046a..f3ab2a877 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -41,7 +41,7 @@ h6, .listitemintable, .tablecontent, .input { -font-family: "Segoe UI", Ubuntu, Cantarell, "Noto Sans", "DejaVu Sans", "Lucida Sans Unicode", "Liberation Sans", Arimo, "Helvetica Neue", HelveticaNeue, Helvetica, Tahoma, sans-serif, FreeSerif, NanumGothic, "Noto Sans Tibetan", Taprom; +font-family: -apple-system, system-ui, "Segoe UI", Roboto, Ubuntu, Oxygen, "Oxygen Sans", Cantarell, "Noto Sans", "Lucida Grande", "Helvetica Neue", Helvetica, Arial, sans-serif; } .input { transition-property: background-color; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 1b112c0bedae14d3c242d8662d16230acf8c333e Author: Adolfo Jayme Barrientos Date: Mon Jun 4 16:18:59 2018 -0500 tdf#94121 Give code paragraphs a different background, again The old wikihelp had this, but this time it won’t look as tawdry. Change-Id: I709b94c512cb15d6c1b5ef5b76b9e1bb13b6f09b Reviewed-on: https://gerrit.libreoffice.org/55301 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index a4aa1f3a5..e5009046a 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -112,8 +112,12 @@ pre, .literalintable, .path, .pathintable { +background-color: rgba(0, 0, 0, 0.03); +border: 1px solid rgba(0,0,0,0.04); +border-radius: 2px; +display: inline; +padding: 1px 3px; font-family: Menlo, Consolas, "DejaVu Sans Mono", "Nimbus Mono L", "Lucida Sans Typewriter", "Courier New", Courier, Monaco, monospace; -margin: 0.08rem 0; } .acronym { font-weight: bold; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css | 17 ++--- 1 file changed, 14 insertions(+), 3 deletions(-) New commits: commit 94e09fd49d6b8803b481bde0693c5deb534d82d0 Author: Adolfo Jayme Barrientos Date: Sat Jun 2 21:29:22 2018 -0500 Colored boxes for .note, .tip and .warning Change-Id: I067100546ac669fa34e59cf9401796a4d166718f Reviewed-on: https://gerrit.libreoffice.org/55239 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 67b8c261e..a4aa1f3a5 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -135,9 +135,20 @@ pre, display:flex; align-items: center; padding:0.3em; -box-shadow: rgba(0,0,0,0.1) 0px 1px 3px 0px; -border-bottom: 1px solid #E8E8E8; -background: #fefefe; +border-bottom: 1px solid rgba(0,0,0,0.05); +border-radius: 0 4px 4px 0; +} +.note { +border-left: 4px solid #FFE74C; +background-color: #FFFADE; +} +.tip { +border-left: 4px solid #38618C; +background-color: #DAE2EA; +} +.warning { +border-left: 4px solid #FF5964; +background-color: #FFE0E2; } .noteicon { padding:0.3em; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5f14059e0d87ac3552b02436405b129c1c3257e1 Author: Adolfo Jayme BarrientosDate: Sat May 12 02:30:33 2018 -0500 Helponline: Only add extra margin for main body text Change-Id: Ia6413bbe4e16ee39dbd01ba48fa307514f517fbe diff --git a/help3xsl/default.css b/help3xsl/default.css index c988eaa7a..67b8c261e 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -320,7 +320,7 @@ h6 { grid-area: main; margin-bottom: 50px; } -#DisplayArea p { +#DisplayArea > p { margin-bottom: 10px; } .mediabutton { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css | 22 ++ 1 file changed, 18 insertions(+), 4 deletions(-) New commits: commit 49076d176daea11abbb789a84c8a9e32f2ee9144 Author: Adolfo Jayme BarrientosDate: Wed May 9 19:37:47 2018 -0500 Helponline: Give links a different color It was the same color as headings, which was confusing. Also, remove the underline until hovering, which improves readability, particularly with Chinese, Japanese and Korean. And add a custom selection color because… why not? Change-Id: I3d120c7fd6cbe27d74f0c7c40b72e23cddaa0296 diff --git a/help3xsl/default.css b/help3xsl/default.css index b352360e1..c988eaa7a 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -89,8 +89,19 @@ body { margin: 0; line-height: normal; } +::selection { +background: #CCF4C6; +} +::-moz-selection { /* moz#509958 */ +background: #CCF4C6; +} a { -color: #18A303; +text-decoration: none; +color: #0369AE; +} +a:hover { +text-decoration: underline; +color: #1C99E0; } pre, .code, @@ -536,13 +547,13 @@ aside input[type=checkbox]:checked ~ .contents-treeview { display: none; } li.active { -background-color: #18A303; +background-color: #0369A3; } li.active a { color: #fff; } li.disabled a { -color: #bedcba; +color: #90C0E6; } #search-bar { margin-top: 10px; @@ -661,10 +672,13 @@ li.disabled a { content: "⊟"; } .contents-current { -background-color: #18A303; +background-color: #0369A3; color: #FFF; padding-right: 1px; } +.contents-current:hover { +color: #FFF; +} /* webkit adjacent element selector bugfix */ @media screen and (-webkit-min-device-pixel-ratio: 0) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl source/text
help3xsl/default.css |2 ++ help3xsl/online_transform.xsl | 36 +++- source/text/shared/00/0004.xhp |4 +--- 3 files changed, 34 insertions(+), 8 deletions(-) New commits: commit bc322f3bc59d3d05b61cc229eba17f86d157c8f8 Author: Olivier HallotDate: Mon May 7 16:59:37 2018 -0300 Refactor test for online case wrt objects Also refactor the section "Open file with example". Wrap in a div with class. Change-Id: I14b1b7ca6ca788383824db3db4db4014b295976e Reviewed-on: https://gerrit.libreoffice.org/53946 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index d17f5b2c1..b352360e1 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -236,6 +236,8 @@ h6 { .howtogetbody { margin: 0px; } +.samplefilesection{ +} .wide { width: 100%; } diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 5ab53c8d7..b8b73361d 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -568,8 +568,16 @@ - - + + + + + + + + + + @@ -1142,6 +1150,8 @@ + + @@ -1154,11 +1164,9 @@ - - @@ -1171,22 +1179,40 @@ + + + + + + + + - + + + + + + + + + + + diff --git a/source/text/shared/00/0004.xhp b/source/text/shared/00/0004.xhp index b151e9c35..1b3353af4 100644 --- a/source/text/shared/00/0004.xhp +++ b/source/text/shared/00/0004.xhp @@ -38,9 +38,7 @@ Related Topics - -Open file with example: - +Open file with example: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |1 + 1 file changed, 1 insertion(+) New commits: commit e1bc9445a23c41a19ff529f3ed014eaace091d5e Author: Adolfo Jayme BarrientosDate: Wed May 2 15:47:00 2018 -0500 Helponline: Provide a visual indicator for people to notice inputs Otherwise, it’s impossible to know you can click one and have its text copied into your clipboard. Change-Id: I9243229c0e507f35b35768ec71473117c2c34a8d diff --git a/help3xsl/default.css b/help3xsl/default.css index d56ecae71..b0a0834e6 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -46,6 +46,7 @@ h6, .input { transition-property: background-color; transition-duration: 150ms; +border-bottom: 1px dashed #E8E8E8; } [data-tooltip]{ position:relative; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 133eb760436feb2c70d8079b5be1bcb560a261e2 Author: Ilmari LauhakangasDate: Wed Apr 25 19:08:54 2018 +0100 We use px for font sizes in navigation Change-Id: I91de80116d82c8bc6bdc34436a98ebdd629ebb0c Reviewed-on: https://gerrit.libreoffice.org/53461 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 3f30cda39..0fb0b9670 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -372,7 +372,7 @@ label[for=accordion-1] { color: #18A303; display: block; padding: 10px 0 10px 20px; -font-size: 1.4em; +font-size: 22px; line-height: .6; } label[for=accordion-1]:after { @@ -390,7 +390,7 @@ aside input[type=checkbox]:checked ~ .contents-treeview { } .index-label { float: left; -font-size: 1.4em; +font-size: 22px; color: #18A303; padding-left: 20px; margin: 20px 0 0 0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl
help3xsl/default.css |5 + help3xsl/online_transform.xsl | 22 -- 2 files changed, 25 insertions(+), 2 deletions(-) New commits: commit f10b89e1d34ab5faca7c4121dc9d1389617d1ba5 Author: Olivier HallotDate: Thu Apr 19 19:26:46 2018 -0300 New Help: Improve table head rendering Add class to parent of Change-Id: Ifb9caf4d4ac3ab5e4c750b5bd96260e2dcb298e1 Reviewed-on: https://gerrit.libreoffice.org/53179 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos Reviewed-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 8d6d3df2d..c37684477 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -123,6 +123,11 @@ pre, background: #CCF4C6; text-align: center; } +.tableheadcell { +background: #CCF4C6; +vertical-align:top; +} + .howtogetheader { font-weight: bold; border: 1px solid #99; diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 34838a517..e6d6838b7 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -777,9 +777,27 @@ - + + + + + + + + + + - + + + + + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) New commits: commit 9c769f9b79e171a6500b4150ace3896266db9e17 Author: Adolfo Jayme BarrientosDate: Sun Apr 8 05:26:56 2018 -0500 Helponline: Rely on color, not thick borders, to separate content from UI Those thick borders were fugly. Give a slightly darker appearance to the sidebar and make its border fainter. Remove the pure-white background in body to make it easier on the eyes. Kill the alarming yellow (what was I thinking?). Change-Id: If236126da91df535a0bddbfbf4804c8ee655c4e1 diff --git a/help3xsl/default.css b/help3xsl/default.css index 427a374b3..391c4d213 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -84,6 +84,7 @@ h6, pointer-events: auto; } body { +background-color: #FDFDFD; margin: 0; line-height: normal; } @@ -145,7 +146,7 @@ td { h1 { font-size: 1.83rem; font-weight: 300; -border-bottom: 3px solid #18A303; +border-bottom: 2px solid #18A303; padding-bottom: 6px; } h1 a { @@ -201,8 +202,8 @@ h6 { .donation { padding: 5px 0px 0px 10px; margin-bottom: 1em; -background-color: #ffeeba; -border: 1px solid #FFDC42; +background-color: #F5FFDC; +border: 1px solid #E1FDA6; border-radius: 3px; } .donation p{ @@ -664,7 +665,8 @@ li.disabled a { font-size: 19px; } aside { -border-right: 5px solid #19A303; +background-color: #F5F5F5; +border-right: 1px solid #E8E8E8; float: left; width: 320px; grid-area: sidebar; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) New commits: commit 4740109668b5d2bbf67caef82fb38364abbc38bb Author: Adolfo Jayme BarrientosDate: Fri Mar 23 14:10:22 2018 -0600 Helponline: Prettify donation prompt Change-Id: Iedf3d560c2a8d1feabadcf3ce1be40f1b5e01989 diff --git a/help3xsl/default.css b/help3xsl/default.css index 1ae99162b..427a374b3 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -198,8 +198,12 @@ h6 { color: red; text-align: left; } -.donation{ -padding:0px 0px 10px 0px; +.donation { +padding: 5px 0px 0px 10px; +margin-bottom: 1em; +background-color: #ffeeba; +border: 1px solid #FFDC42; +border-radius: 3px; } .donation p{ font-size:1.2rem; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/normalize.css
help3xsl/default.css |5 + help3xsl/normalize.css | 161 +++-- 2 files changed, 27 insertions(+), 139 deletions(-) New commits: commit 1f58d6b4eb8d2e43f4abfca42196550912140a43 Author: Ilmari LauhakangasDate: Wed Feb 28 17:27:01 2018 +0200 Add spacing between paragraphs, update normalize.css Change-Id: I85df8d29fa78377d684adb4435087cc9f586dbe3 Reviewed-on: https://gerrit.libreoffice.org/50516 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index e797cd68c..bf5bac86f 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -41,7 +41,7 @@ h6, .listitemintable, .tablecontent, .input { -font-family: "Segoe UI", Ubuntu, Cantarell, "Noto Sans", "DejaVu Sans", "Lucida Sans Unicode", "Helvetica Neue", Helvetica, Tahoma, sans-serif; +font-family: "Segoe UI", Ubuntu, Cantarell, "Noto Sans", "DejaVu Sans", "Lucida Sans Unicode", "Liberation Sans", Arimo, "Helvetica Neue", HelveticaNeue, Helvetica, Tahoma, sans-serif, FreeSerif, NanumGothic, "Noto Sans Tibetan", Taprom; } .input { transition-property: background-color; @@ -249,6 +249,9 @@ h6 { grid-area: main; margin-bottom: 50px; } +#DisplayArea p { +margin-bottom: 10px; +} .mediabutton { background-color: cyan; } diff --git a/help3xsl/normalize.css b/help3xsl/normalize.css index 7dddf7617..47b010e47 100644 --- a/help3xsl/normalize.css +++ b/help3xsl/normalize.css @@ -1,26 +1,15 @@ -/* - * 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/. - * - * This file incorporates work covered by the following license notice: - */ -/*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */ +/*! normalize.css v8.0.0 | MIT License | github.com/necolas/normalize.css */ /* Document == */ /** * 1. Correct the line height in all browsers. - * 2. Prevent adjustments of font size after orientation changes in - *IE on Windows Phone and in iOS. + * 2. Prevent adjustments of font size after orientation changes in iOS. */ html { line-height: 1.15; /* 1 */ - -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ } @@ -28,7 +17,7 @@ html { == */ /** - * Remove the margin in all browsers (opinionated). + * Remove the margin in all browsers. */ body { @@ -36,19 +25,6 @@ body { } /** - * Add the correct display in IE 9-. - */ - -article, -aside, -footer, -header, -nav, -section { - display: block; -} - -/** * Correct the font size and margin on `h1` elements within `section` and * `article` contexts in Chrome, Firefox, and Safari. */ @@ -62,25 +38,6 @@ h1 { == */ /** - * Add the correct display in IE 9-. - * 1. Add the correct display in IE. - */ - -figcaption, -figure, -main { /* 1 */ - display: block; -} - -/** - * Add the correct margin in IE 8. - */ - -figure { - margin: 1em 40px; -} - -/** * 1. Add the correct box sizing in Firefox. * 2. Show the overflow in Edge and IE. */ @@ -105,17 +62,15 @@ pre { == */ /** - * 1. Remove the gray background on active links in IE 10. - * 2. Remove gaps in links underline in iOS 8+ and Safari 8+. + * Remove the gray background on active links in IE 10. */ a { - background-color: transparent; /* 1 */ - -webkit-text-decoration-skip: objects; /* 2 */ + background-color: transparent; } /** - * 1. Remove the bottom border in Chrome 57- and Firefox 39-. + * 1. Remove the bottom border in Chrome 57- * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. */ @@ -126,15 +81,6 @@ abbr[title] { } /** - * Prevent the duplicate application of `bolder` by the next rule in Safari 6. - */ - -b, -strong { - font-weight: inherit; -} - -/** * Add the correct font weight in Chrome, Edge, and Safari. */ @@ -156,23 +102,6 @@ samp { } /** - * Add the correct font style in Android 4.3-. - */ - -dfn { - font-style: italic; -} - -/** - * Add the correct background and color in IE 9-. - */ - -mark { - background-color: #ff0; - color: #000; -} - -/** * Add the correct font size in all browsers. */ @@ -205,44 +134,18 @@ sup { == */ /** - * Add the correct display in IE 9-. - */ - -audio, -video { - display: inline-block; -} - -/** - * Add the
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/help.js
help3xsl/default.css |8 + help3xsl/help.js | 216 --- 2 files changed, 108 insertions(+), 116 deletions(-) New commits: commit 863b926ed16b372800f75e8ac467afbf3443f61e Author: Ilmari LauhakangasDate: Fri Feb 9 13:42:21 2018 +0200 Tweaked contents expansion Stopped excluding main items. Highlighted current item. Harmonised the help.js indentation. Change-Id: I6b8f22940d077d008662a387071a5d5db04409f7 Reviewed-on: https://gerrit.libreoffice.org/49488 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index dc2a19972..e797cd68c 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -579,9 +579,6 @@ li.disabled a { line-height: 16px; vertical-align: middle; } -.contents-treeview label { -background-position: 18px 0; -} .contents-treeview label:before { content: "⊞"; color: #18A303; @@ -592,6 +589,11 @@ li.disabled a { .contents-treeview input:checked + label::before { content: "⊟"; } +.contents-current { +background-color: #18A303; +color: #FFF; +padding-right: 1px; +} /* webkit adjacent element selector bugfix */ @media screen and (-webkit-min-device-pixel-ratio: 0) { diff --git a/help3xsl/help.js b/help3xsl/help.js index 53d9cda4c..9329f2d0f 100644 --- a/help3xsl/help.js +++ b/help3xsl/help.js @@ -6,179 +6,172 @@ * 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/. */ - // Used to set Application in caseinline=APP -function setModule(module){ -if (module === null){module="WRITER";} +function setModule(module) { +if (module === null) { +module = "WRITER"; +} var itemspan = document.getElementsByTagName("span"); var n = itemspan.length; -for (var i = 0; i < n; i++){ -if (itemspan[i].getAttribute("value") == module){ +for (var i = 0; i < n; i++) { +if (itemspan[i].getAttribute("value") == module) { itemspan[i].removeAttribute("hidden"); } } } - // Used to set system in caseinline=SYSTEM -function setSystem(system){ +function setSystem(system) { var itemspan = document.getElementsByTagName("span"); -if (system=== null){system="WIN";} +if (system === null) { +system = "WIN"; +} var n = itemspan.length; -for (var i = 0; i < n; i++){ -if (itemspan[i].getAttribute("value") == system){ +for (var i = 0; i < n; i++) { +if (itemspan[i].getAttribute("value") == system) { itemspan[i].removeAttribute("hidden"); } } } /* add = and = to the links in DisplayArea div */ -function fixURL(module, system){ +function fixURL(module, system) { var itemlink = document.getElementById("DisplayArea").getElementsByTagName("a"); -var pSystem = (system=== null) ? "WIN" : system; -var pAppl = (module=== null) ? "WRITER" : module; +var pSystem = (system === null) ? "WIN" : system; +var pAppl = (module === null) ? "WRITER" : module; var n = itemlink.length; - -for (var i = 0; i
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl
help3xsl/default.css |6 ++ help3xsl/online_transform.xsl |7 ++- 2 files changed, 12 insertions(+), 1 deletion(-) New commits: commit 875dbb65c79bd52049c270197aaa71cc243821fb Author: Olivier HallotDate: Tue Jan 30 17:49:59 2018 -0200 New Help: Add donation link for online version Change-Id: I340362a70ecc115565c7fd7cb2be1a5d0fbb5599 Reviewed-on: https://gerrit.libreoffice.org/48929 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 00187b4fd..debcf99aa 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -155,6 +155,12 @@ h6 { color: red; text-align: left; } +.donation{ +padding:0px 0px 10px 0px; +} +.donation p{ +font-size:1.2rem; +} .bascode { background-color: #fafafa; margin-left: 30px; diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index c8cf7660c..8b215f218 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -148,7 +148,7 @@ -https://helponline.libreoffice.org/;> + @@ -283,6 +283,11 @@ gcse:search/gcse:search + + +If this page has been helpful, https://www.libreoffice.org/donate/?pk_campaign=help; target ="_blank">you can support us! + + http://www.libreoffice.org/imprint; target="_blank">Impressum (Legal Info) | http://www.libreoffice.org/privacy; target="_blank">Privacy Policy | http://www.documentfoundation.org/statutes.pdf; target="_blank">Statutes (non-binding English translation) - http://www.documentfoundation.org/satzung.pdf; target="_blank">Satzung (binding German version) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the http://www.libreoffice.org/download/license/; target="_blank">Mozilla Public License v2.0. “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 http://wiki.documentfoundation.org/TradeMark_Policy; target ="_blank">trademark policy. LibreOffice was based on OpenOffice.org. Help content debug info: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit ff44bbe7087cf87977103627f55a8b1b5c9ffb89 Author: Ilmari LauhakangasDate: Mon Jan 15 16:29:20 2018 +0200 tdf#114907 Expand and collapse symbols for Contents Unicode like it's 1993. Change-Id: I625dc220341db788dd578c210ef2f368bec58199 Reviewed-on: https://gerrit.libreoffice.org/47902 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 0236011dc..9efce4d33 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -485,15 +485,14 @@ aside input[type=checkbox]:checked ~ .contents-treeview { background-position: 18px 0; } .contents-treeview label:before { -content: ""; +content: "⊞"; color: #18A303; width: 16px; margin: 0 5px 0 0; -background-position: 0 -32px; display: inline-block; } .contents-treeview input:checked + label::before { -background-position: 0 -16px; +content: "⊟"; } /* webkit adjacent element selector bugfix */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/help.js help3xsl/localized.xsl help3xsl/online_transform.xsl
help3xsl/default.css | 396 ++ help3xsl/help.js | 16 - help3xsl/localized.xsl| 10 + help3xsl/online_transform.xsl | 207 +++-- 4 files changed, 254 insertions(+), 375 deletions(-) New commits: commit 382ba1bc41a04d2f7b444e4c4ca9460b66147717 Author: Ilmari LauhakangasDate: Thu Jan 4 22:45:57 2018 +0200 Switched to a sidebar layout. Art direction by Andreas Kainz Markup and JS got simpler, layout got more robust. Change-Id: Ia74489038e7d11b632ea2b6ca6efe0d90dfe5181 Reviewed-on: https://gerrit.libreoffice.org/47441 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 268b1ac4d..0236011dc 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -22,6 +22,11 @@ + WESTERN LANGUAGES + + +We use px as the unit for navigation elements and fonts because we do +not want them to scale with browser-set font size. +We use rem as the unit for article and footer contents because they +do not break anything related to layout by scaling. + */ body, @@ -42,6 +47,9 @@ body { margin: 0; line-height: normal; } +a { +color: #18A303; +} pre, .code, .codeintable, @@ -52,15 +60,14 @@ pre, .path, .pathintable { font-family: Menlo, Consolas, "DejaVu Sans Mono", "Nimbus Mono L", "Lucida Sans Typewriter", "Courier New", Courier, Monaco, monospace; -margin-top: 1pt; -margin-bottom: 1pt; +margin: 0.08rem 0; } .acronym { font-weight: bold; } .related { font-weight: bold; -margin-top: 20pt; +margin-top: 1.67rem; border-top: 1px solid black; } .emph, @@ -87,30 +94,30 @@ h3, h4, h5, h6 { -margin-bottom: 8pt; +margin-bottom: 0.67rem; color: #18A303; } p, td { -font-size: 14pt; +font-size: 1.17rem; margin: 2px 2px 2px 2px; } h1 { -font-size: 22pt; +font-size: 1.83rem; font-weight: 300; border-bottom: 3px solid #18A303; padding-bottom: 6px; } h2 { -font-size: 18pt; +font-size: 1.5rem; } h3 { -font-size: 16pt; +font-size: 1.33rem; } h4, h5, h6 { -font-size: 14pt; +font-size: 1.17rem; } .avis { /*background-color: #EE;*/ @@ -178,11 +185,11 @@ h6 { } .infopage { color: green; -font-size: 16pt; +font-size: 1.33rem; font-weight: bold; } .topmenu { -font-size: 12pt; +font-size: 1rem; font-weight: bold; padding: 1px; border: solid 1px #18A303; @@ -201,20 +208,22 @@ h6 { background-color: green; font-family: Arial; font-weight: bold; -font-size: 24pt; +font-size: 2rem; border: 1px solid black; padding-bottom: 6px; margin-bottom: 6px; } .embedded {} +.header-extrawurst { +grid-area: header; +} header { background-color: #18A303; color: #fff; -height: 4em; -padding: .5em .5em .5em 1em; -grid-area: header; +height: 64px; +padding: 8px 8px 8px 16px; } -.logo-menu-container { +.logo-container { display: flex; justify-content: space-between; } @@ -222,75 +231,19 @@ header { color: #fff; text-decoration: none; display: flex; -align-items: flex-end; } .logo p { -font-size: 1.5em; +font-size: 24px; } .logo .symbol { background-image: url(media/navigation/libo-symbol-white.svg); background-repeat: no-repeat; background-size: contain; -width: 3em; -height: 3.7em; -margin-right: .5em; -} -header nav { -margin-top: .7em; -padding: 0; -display: none; -border: 1px solid #333; -position: relative; -} -/* Create a style for the first level items */ - -header nav a, .mobile-lang a { -color: #333; -background-color: #EE; -display: block; -line-height: 1.5em; -padding: 0.2em 0.4em; -text-decoration: none; -font-weight: bold; -border-width: 0 1px 0 0; -border-style: solid; -border-color: #333; -font-size: 1.5em; -flex-shrink: 0; -z-index: 100; -white-space: nowrap; -} - -header nav a:last-child, .mobile-lang a:last-child { -border-right-width: 0; +width: 52px; +height: 60px; +margin-right: 10px; } - -header label { -cursor: pointer; -font-size: 1.2em; -position: relative; -top: 2em; -float: right; -display: none; -} -header input[type="checkbox"]:checked ~ nav { -background: #f1f1f1; -color: #333; -z-index: 100; -display: none; -/* allow for scrolling */ - -overflow-x: auto; -/* make it smooth on iOS */ - --webkit-overflow-scrolling: touch; -clear: both; -text-align: center; -} -.mobile-lang { -background: #f1f1f1; -color:
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/help.js help3xsl/localized.xsl help3xsl/online_transform.xsl
help3xsl/default.css | 135 ++-- help3xsl/help.js | 16 - help3xsl/localized.xsl| 41 help3xsl/online_transform.xsl | 349 +- 4 files changed, 304 insertions(+), 237 deletions(-) New commits: commit 50b850013374e0f711b5cded92739934d758bf1f Author: Ilmari LauhakangasDate: Thu Dec 28 16:05:43 2017 +0200 tdf#114709, tdf#112758, tdf#112757 Lots of changes and tweaks. Header and footer now span 100% width even on desktop. Font sizes were increased and content area made narrower. We now have two separate language menus so the menu is always visible on mobile. Google search moved out of the accordion panel. Accordion panel colours made darker. On desktop, expanded accordion panels overlap content. Change-Id: I976a67b1ca0cb2d21f0569da8d1fefd2b589d7d3 Reviewed-on: https://gerrit.libreoffice.org/47139 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index f4ee3273f..268b1ac4d 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -92,7 +92,7 @@ h6 { } p, td { -font-size: 11pt; +font-size: 14pt; margin: 2px 2px 2px 2px; } h1 { @@ -102,15 +102,15 @@ h1 { padding-bottom: 6px; } h2 { -font-size: 14pt; +font-size: 18pt; } h3 { -font-size: 12pt; +font-size: 16pt; } h4, h5, h6 { -font-size: 11pt; +font-size: 14pt; } .avis { /*background-color: #EE;*/ @@ -191,6 +191,7 @@ h6 { overflow: auto; padding: 10px; grid-area: main; +margin-bottom: 50px; } .mediabutton { background-color: cyan; @@ -211,21 +212,20 @@ header { color: #fff; height: 4em; padding: .5em .5em .5em 1em; -flex-wrap: wrap; -justify-content: space-between; grid-area: header; } +.logo-menu-container { +display: flex; +justify-content: space-between; +} .logo { -flex-shrink: 0; color: #fff; text-decoration: none; -float: left; -width: 190px; +display: flex; +align-items: flex-end; } .logo p { font-size: 1.5em; -width: 130px; -float: left; } .logo .symbol { background-image: url(media/navigation/libo-symbol-white.svg); @@ -233,20 +233,19 @@ header { background-size: contain; width: 3em; height: 3.7em; -float: left; margin-right: .5em; } header nav { margin-top: .7em; padding: 0; display: none; -border: 1px solid; +border: 1px solid #333; position: relative; } /* Create a style for the first level items */ -header nav a { -color: #33; +header nav a, .mobile-lang a { +color: #333; background-color: #EE; display: block; line-height: 1.5em; @@ -255,14 +254,14 @@ header nav a { font-weight: bold; border-width: 0 1px 0 0; border-style: solid; -border-color: #33; +border-color: #333; font-size: 1.5em; flex-shrink: 0; z-index: 100; white-space: nowrap; } -header nav a:last-child { +header nav a:last-child, .mobile-lang a:last-child { border-right-width: 0; } @@ -272,21 +271,34 @@ header label { position: relative; top: 2em; float: right; +display: none; } header input[type="checkbox"]:checked ~ nav { background: #f1f1f1; -color: #444; +color: #333; z-index: 100; -/* line them up horizontally */ +display: none; +/* allow for scrolling */ + +overflow-x: auto; +/* make it smooth on iOS */ +-webkit-overflow-scrolling: touch; +clear: both; +text-align: center; +} +.mobile-lang { +background: #f1f1f1; +color: #333; +border: 1px solid #333; +z-index: 100; +/* line them up horizontally */ display: flex; flex-direction: row; /* allow for scrolling */ - overflow-x: auto; overflow-y: hidden; /* make it smooth on iOS */ - -webkit-overflow-scrolling: touch; clear: both; text-align: center; @@ -298,6 +310,9 @@ footer { text-align: center; grid-area: footer; } +footer .headerfooter-center { +margin-top: 20px; +} footer a { color: #c2f6ba; } @@ -343,9 +358,17 @@ footer a { list-style-type: none; grid-area: accordion; } +.acc-panel { +z-index: 10; +} .acc-panel > div { display: none; } +.gsc-control-cse { +border-color: transparent !important; +background-color: transparent !important; +padding: 3px 0 0 0 !important; +} header input[type=checkbox], .contents-treeview input[type=checkbox] { position: absolute; @@ -355,7 +378,7 @@ header input[type=checkbox], display: none; } .acc-panel > label { -color: #666; +color: #333; cursor: pointer; display: block; font-size: 1em; @@ -364,32 +387,27 @@ header
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl
help3xsl/default.css | 32 ++ help3xsl/online_transform.xsl | 134 +- 2 files changed, 88 insertions(+), 78 deletions(-) New commits: commit 54d40a66cc5bdf829be02c0f5a0f6feb48ccb901 Author: Ilmari LauhakangasDate: Thu Oct 12 19:58:06 2017 +0200 Tweak the language menu Simplified the markup and tweaked the look a bit. Change-Id: Ifc296a82b17215e7bcfbfc17432aacddb922664b Reviewed-on: https://gerrit.libreoffice.org/43345 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index d686169b1..4feb3ae04 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -231,14 +231,16 @@ header { float: left; margin-right: .5em; } -header ul { +header nav { margin-top: .7em; padding: 0; display: none; +border: 1px solid; +position: relative; } /* Create a style for the first level items */ -header > ul > li > a { +header nav a { color: #33; background-color: #EE; display: block; @@ -246,17 +248,19 @@ header > ul > li > a { padding: 0.2em 0.4em; text-decoration: none; font-weight: bold; -border: 1px solid; +border-width: 0 1px 0 0; +border-style: solid; border-color: #33; font-size: 1.5em; -} -header ul li { -/* make sure the width is honored */ - flex-shrink: 0; -list-style-type: none; z-index: 100; +white-space: nowrap; +} + +header nav a:last-child { +border-right-width: 0; } + header label { cursor: pointer; font-size: 1.2em; @@ -264,7 +268,7 @@ header label { top: 2em; float: right; } -header input[type="checkbox"]:checked ~ ul { +header input[type="checkbox"]:checked ~ nav { background: #f1f1f1; color: #444; z-index: 100; @@ -275,6 +279,7 @@ header input[type="checkbox"]:checked ~ ul { /* allow for scrolling */ overflow-x: auto; +overflow-y: hidden; /* make it smooth on iOS */ -webkit-overflow-scrolling: touch; @@ -559,12 +564,17 @@ header input[type=checkbox], max-width: 1024px; margin: auto; } -header > ul > li > a { +header nav a { font-size: 1em; +white-space: normal; +border-width: 0 0 1px 0; +} +header nav a:last-child { +border-bottom-width: 0; } /* change the language menu direction to stacked */ -header input[type="checkbox"]:checked ~ ul { +header input[type="checkbox"]:checked ~ nav { flex-direction: column; max-width: 7.5em; float: right; diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index f3ddebee4..1d036fdb7 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -144,73 +144,73 @@ â¼ - -English (USA) -á ááá -اÙعربÙØ© -Asturianu -ÐÑлгаÑÑки -বাà¦à¦²à¦¾ -বাà¦à¦²à¦¾ -à½à½¼à½à¼à½¡à½²à½ / Bod skad -Bosanski -Català -Català -Valencia -Äesky -Dansk -Deutsch - à½à½¼à½à¼à½ -Îλληνικά -English (GB) -English (ZA) -Esperanto -Español -Eesti -Euskara -Suomi -Français -Galego -àªà«àªàª°àª¾àª¤à« -×¢×ר×ת -हिनà¥à¤¦à¥ -Hrvatski -Magyar -Bahasa Indonesia -Ãslenska -Italiano -æ¥æ¬èª -á¥áá áá£áá -áá¶áá¶ááááá -íêµì´ -ລາວ -Lietuvių -LatvieÅ¡u -ÐакедонÑки -Norsk (bokmÃ¥l / riksmÃ¥l) -नà¥à¤ªà¤¾à¤²à¥ -Nederlands -Norsk (nynorsk) -Oromoo -Polski -Português -Português do Brasil -RomânÄ -Ð ÑÑÑкий -à·à·à¶à·à¶½ -Sidámo 'Afó -SlovenÄina -SlovenÅ¡Äina -Shqip -Svenska -தமிழ௠-Тоҷикӣ -Türkçe -ئÛÙغÛرÚÛ -УкÑаÑнÑÑка -Tiếng Viá»t -ä¸æ (ç®ä½å) -
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 208b4ffb21e49ad906280ce3663852d5a1b83994 Author: Adolfo Jayme BarrientosDate: Fri Oct 6 20:09:34 2017 -0500 tdf#112754 Enlarge H1, make its fonts thinner & increase margin-bottom Change-Id: Ie683cdd429626bfcb1e2ebc0ad8ae88ec1fe50be diff --git a/help3xsl/default.css b/help3xsl/default.css index cc8fafb27..d686169b1 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -87,7 +87,7 @@ h3, h4, h5, h6 { -margin-bottom: 5pt; +margin-bottom: 8pt; color: #18A303; } p, @@ -96,10 +96,10 @@ td { margin: 2px 2px 2px 2px; } h1 { -font-size: 18pt; -border-bottom: 5px solid #18A303; +font-size: 22pt; +font-weight: 300; +border-bottom: 3px solid #18A303; padding-bottom: 6px; -margin-bottom: 6px; } h2 { font-size: 14pt; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css
help3xsl/default.css |1 + 1 file changed, 1 insertion(+) New commits: commit aaf3eadc2accd171b57f13d013f9adf526651171 Author: Adolfo Jayme BarrientosDate: Wed Sep 20 15:12:47 2017 -0500 Helponline: Override the ânormalizerâ rule messing with line height Otherwise, the body text looks cramped. Change-Id: I4bf6a8b714a243c5de333f46c4249e1c51060f50 Reviewed-on: https://gerrit.libreoffice.org/4 Reviewed-by: Ilmari Lauhakangas Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 6fcfc3297..cc8fafb27 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -40,6 +40,7 @@ h6, } body { margin: 0; +line-height: normal; } pre, .code, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/get_bookmark.xsl help3xsl/get_tree.xsl help3xsl/xhp2html.sh
help3xsl/default.css |5 help3xsl/get_bookmark.xsl | 50 -- help3xsl/get_tree.xsl |2 - help3xsl/xhp2html.sh |2 - 4 files changed, 34 insertions(+), 25 deletions(-) New commits: commit 4d6f86d203814a211eae9dfacd4baf195ca4ff1d Author: Olivier HallotDate: Sat Jul 29 10:59:28 2017 -0300 tdf#97745 housekeeping Fix links in bookmarks.js Better font size for Index and Contents Fix CSS file Change-Id: I42966be1d88b12393b6dd95adb2719baf76a025c Reviewed-on: https://gerrit.libreoffice.org/40549 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 3a83d55d4..6fcfc3297 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -389,8 +389,12 @@ header input[type=checkbox], top: 2px; left: 2px; } +#Index ul { +padding-left:15px; +} #Index ul li { list-style-type: none; +font-size: 11pt; } #Index p { font-size: 16pt; @@ -478,6 +482,7 @@ header input[type=checkbox], padding: 0; margin: 0; list-style: none; +font-size: 11pt; } .contents-treeview { /*font: normal 11px "Segoe UI", Arial, Sans-serif;*/ diff --git a/help3xsl/get_bookmark.xsl b/help3xsl/get_bookmark.xsl index 1a153c89e..d0fd8f19a 100644 --- a/help3xsl/get_bookmark.xsl +++ b/help3xsl/get_bookmark.xsl @@ -55,22 +55,37 @@ xsltproc get_bookmark.xsl - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -92,17 +107,6 @@ xsltproc get_bookmark.xsl - - - - - - - - - - - diff --git a/help3xsl/get_tree.xsl b/help3xsl/get_tree.xsl index c80ba1b95..4f959ad5a 100644 --- a/help3xsl/get_tree.xsl +++ b/help3xsl/get_tree.xsl @@ -8,7 +8,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> diff --git a/help3xsl/xhp2html.sh b/help3xsl/xhp2html.sh index d4e172c0b..eb2696a6e 100755 --- a/help3xsl/xhp2html.sh +++ b/help3xsl/xhp2html.sh @@ -89,7 +89,7 @@ echo 'copy global service files' cp index.html $here'/html/' cp help.js $here'/html/'$productversion'/' cp jquery-3.1.1.min.js $here'/html/'$productversion'/' -cp normalize.js $here'/html/'$productversion'/' +cp normalize.css $here'/html/'$productversion'/' cp default.css $here'/html/'$productversion'/' cp -rap ../source/media $here'/html/'$productversion'/' ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/normalize.css help3xsl/online_transform.xsl help3xsl/xhp2html.sh
help3xsl/default.css | 17 - help3xsl/normalize.css| 456 ++ help3xsl/online_transform.xsl |4 help3xsl/xhp2html.sh |2 4 files changed, 464 insertions(+), 15 deletions(-) New commits: commit a0efca32e5ebee152776ac81f8e4f59892faead0 Author: BuovjagaDate: Tue Jul 25 15:42:08 2017 -0300 tdf#97745 Fix width on wide screens Change-Id: I91a84a0d3460ab7ccacd1ec1f14ef7b97db3b767 Signed-off-by: Olivier Hallot Reviewed-on: https://gerrit.libreoffice.org/40427 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 19d4ff53d..3a83d55d4 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -434,10 +434,12 @@ header input[type=checkbox], float: left; } .calc, +.chart, .writer, .impress, .draw, .math, +.basic, .base { width: 21.5px; height: 26px; @@ -465,19 +467,9 @@ header input[type=checkbox], } .chart { background-image: url(media/navigation/libo-chart.svg); -width: 25.14px; -height: 25.4px; -position: relative; -top: -6.5px; -margin-right: 5px; } .basic { background-image: url(media/navigation/libo-basic.svg); -width: 25.4px; -height: 25.4px; -position: relative; -top: -8.7px; -margin-right: 5px; } /* tree view */ @@ -558,7 +550,7 @@ header input[type=checkbox], } @media screen and (min-width: 960px) { body { -max-width: 1280px; +max-width: 1024px; margin: auto; } header > ul > li > a { @@ -575,6 +567,7 @@ header input[type=checkbox], } .accordion { display: flex; +width: 960px; } .acc-panel { flex-basis: 320px; @@ -602,4 +595,4 @@ header input[type=checkbox], "footer footer"; } } -} \ No newline at end of file +} diff --git a/help3xsl/normalize.css b/help3xsl/normalize.css new file mode 100644 index 0..7dddf7617 --- /dev/null +++ b/help3xsl/normalize.css @@ -0,0 +1,456 @@ +/* + * 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/. + * + * This file incorporates work covered by the following license notice: + */ +/*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */ + +/* Document + == */ + +/** + * 1. Correct the line height in all browsers. + * 2. Prevent adjustments of font size after orientation changes in + *IE on Windows Phone and in iOS. + */ + +html { + line-height: 1.15; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/* Sections + == */ + +/** + * Remove the margin in all browsers (opinionated). + */ + +body { + margin: 0; +} + +/** + * Add the correct display in IE 9-. + */ + +article, +aside, +footer, +header, +nav, +section { + display: block; +} + +/** + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/* Grouping content + == */ + +/** + * Add the correct display in IE 9-. + * 1. Add the correct display in IE. + */ + +figcaption, +figure, +main { /* 1 */ + display: block; +} + +/** + * Add the correct margin in IE 8. + */ + +figure { + margin: 1em 40px; +} + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + +hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +pre { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/* Text-level semantics + == */ + +/** + * 1. Remove the gray background on active links in IE 10. + * 2. Remove gaps in links underline in iOS 8+ and Safari 8+. + */ + +a { + background-color: transparent; /* 1 */ + -webkit-text-decoration-skip: objects; /* 2 */ +} + +/** + * 1. Remove the bottom border in Chrome 57- and Firefox 39-. + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ + +abbr[title] { + border-bottom: none; /* 1 */ + text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ +} + +/** + * Prevent the duplicate
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl
help3xsl/default.css | 564 +++--- help3xsl/online_transform.xsl | 81 +++--- 2 files changed, 300 insertions(+), 345 deletions(-) New commits: commit d91a31ef72b13ae5aa135ef468771254bd31bf1a Author: BuovjagaDate: Tue Jul 25 11:38:36 2017 -0300 tdf#97745 Enhance help page layout * Horizontal (stackable) navigation * Work in progress Change-Id: I16a9816b2465e995dd63e36fda0f0d89ea6053e4 Signed-off-by: Olivier Hallot Reviewed-on: https://gerrit.libreoffice.org/40421 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 8ec98944f..19d4ff53d 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -15,7 +15,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - /* + + LIBREOFFICE HELP IN BROWSER + @@ -25,168 +24,182 @@ */ -body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable { - font-family: "Segoe UI", Ubuntu, Cantarell, "Noto Sans", "DejaVu Sans", "Lucida Sans Unicode", "Helvetica Neue", Helvetica, Tahoma, sans-serif; +body, +p, +h1, +h2, +h3, +h4, +h5, +h6, +.listitem, +.listitemintable, +.tablecontent, +.tablecontentintable { +font-family: "Segoe UI", Ubuntu, Cantarell, "Noto Sans", "DejaVu Sans", "Lucida Sans Unicode", "Helvetica Neue", Helvetica, Tahoma, sans-serif; } - body { margin: 0; } - -pre, .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable { - font-family: Menlo, Consolas, "DejaVu Sans Mono", "Nimbus Mono L", "Lucida Sans Typewriter", "Courier New", Courier, Monaco, monospace; - margin-top: 1pt; - margin-bottom: 1pt; +pre, +.code, +.codeintable, +.example, +.exampleintable, +.literal, +.literalintable, +.path, +.pathintable { +font-family: Menlo, Consolas, "DejaVu Sans Mono", "Nimbus Mono L", "Lucida Sans Typewriter", "Courier New", Courier, Monaco, monospace; +margin-top: 1pt; +margin-bottom: 1pt; } - .acronym { - font-weight: bold; +font-weight: bold; } - .related { - font-weight: bold; - margin-top: 20pt; - border-top: 1px solid black; +font-weight: bold; +margin-top: 20pt; +border-top: 1px solid black; } - -.emph, .menuitem, .keycode { - font-weight: bold; +.emph, +.menuitem, +.keycode { +font-weight: bold; } - -.tablehead, .tableheadintable { - font-weight: bold; - margin-top: 0px; - background: #CCF4C6; - text-align: center; +.tablehead, +.tableheadintable { +font-weight: bold; +margin-top: 0px; +background: #CCF4C6; +text-align: center; } - .howtogetheader { - font-weight: bold; - border: 1px solid #99; - background: #FF; - padding: 3px; -} - -h1, h2, h3, h4, h5, h6 { - margin-bottom: 5pt; - color: #18A303; -} - -p, td { - font-size: 11pt; - margin: 2px 2px 2px 2px; +font-weight: bold; +border: 1px solid #99; +background: #FF; +padding: 3px; +} +h1, +h2, +h3, +h4, +h5, +h6 { +margin-bottom: 5pt; +color: #18A303; +} +p, +td { +font-size: 11pt; +margin: 2px 2px 2px 2px; } - h1 { - font-size: 18pt; - border-bottom: 5px solid #18A303; - padding-bottom: 6px; - margin-bottom: 6px; +font-size: 18pt; +border-bottom: 5px solid #18A303; +padding-bottom: 6px; +margin-bottom: 6px; } - h2 { - font-size: 14pt; +font-size: 14pt; } - h3 { - font-size: 12pt; +font-size: 12pt; } - -h4, h5, h6 { - font-size: 11pt; +h4, +h5, +h6 { +font-size: 11pt; } - .avis { -/*background-color: #EE;*/ +/*background-color: #EE;*/ } - .relatedtopics { - font-weight: normal; +font-weight: normal; } - .relatedbody { - margin-top: 2px; - margin-bottom: 2px; - margin-left: 5px; +margin-top: 2px; +margin-bottom: 2px; +margin-left: 5px; } - .howtoget { - background: #CCF4C6; +background: #CCF4C6; } - .howtogetbody { - background: #CCF4C6; - margin: 0px; +background: #CCF4C6; +margin: 0px; } - .wide { - width: 100%; +width: 100%; } - .topalign { - vertical-align: top; - border: 1px; +vertical-align: top; +border: 1px; } - .bug { - color: red; +color: red; } - .debug { - border: 1px solid black; - padding: 3px; - display: show; - background-color:#222; - color:red; - text-align:left; +border: 1px solid black; +padding: 3px; +display: show; +background-color: #222; +color: red; +text-align: left; } - /* Basic code syntax highlight */ -.identifier, .unknown { - color: green; -} +.identifier, +.unknown { +color: green; +} .keyword { - color:
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl source/media
help3xsl/default.css | 732 +++--- help3xsl/online_transform.xsl | 299 -- source/media/navigation/favicon.ico |binary source/media/navigation/libo-base.svg |1 source/media/navigation/libo-basic.svg|1 source/media/navigation/libo-calc.svg |1 source/media/navigation/libo-chart.svg|1 source/media/navigation/libo-draw.svg |1 source/media/navigation/libo-impress.svg |1 source/media/navigation/libo-math.svg |1 source/media/navigation/libo-symbol-white.svg |1 source/media/navigation/libo-writer.svg |1 12 files changed, 573 insertions(+), 467 deletions(-) New commits: commit 7f87a5f65fe80d0262a96b43ee14edae33a09948 Author: BuovjagaDate: Sat Jul 22 14:08:09 2017 -0300 tdf#97745 Use system browser to display help pages Some improvements (WIP) * Use CSS grids * Better language selector * Better svg icons * reorder some scripts, clean code * favicon * fix index Change-Id: Idd55f41724cc3972c8b461ede5f1e975716c5290 Signed-off-by: Olivier Hallot Reviewed-on: https://gerrit.libreoffice.org/40316 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index d0ac1d303..8ec98944f 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -25,204 +25,12 @@ */ -/* Document Structure */ -html{ -background: #FF; -} -body { -padding: 0px; -background: #fff; -color: #333; -margin: 0 auto; -max-width: 900px; -} - -/* Document Header */ - -header { -background: #00a500; -padding: .5em 2em; -color: #fff; -line-height: 1; -} - -header h1{ -margin-bottom: 0; -color:white; -} - -header nav{ -float: right; -/*display:inline-block;*/ -} - -header nav select{ -font-size: .8em; -} - - -header nav div{ -font-size: .8em; -} - -header nav div a { -font-weight: 300; -padding: .3em .5em -} -header nav a{ -color: #fff; -display: inline-block; -padding: .3em .8em -} - -header nav a:hover, header nav a:focus{ -color: rgba(255,255,255,.6) -} - - -[role=main]{ -padding:1.5em 3em; -} - -/* Document Article */ - -article{ -padding: 1em 0; -} - -/* Document Footer */ - -footer{ -background: #00a500; -color: #fff; -padding: .1em 3em; -text-align: center; -} - -footer a{ -color:#c2f6ba; +body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable { + font-family: "Segoe UI", Ubuntu, Cantarell, "Noto Sans", "DejaVu Sans", "Lucida Sans Unicode", "Helvetica Neue", Helvetica, Tahoma, sans-serif; } -/* tree view */ - -.contents-treeview ul, -.contents-treeview li -{ -padding: 0; +body { margin: 0; -list-style: none; -} - -.contents-treeview input -{ -position: absolute; -opacity: 0; -} - -.contents-treeview -{ --moz-user-select: none; --webkit-user-select: none; -user-select: none; -} - -.contents-treeview a -{ -text-decoration: none; -} - -.contents-treeview a:hover -{ -text-decoration: underline; -} - -.contents-treeview input + label + ul -{ -margin: 0 0 0 22px; -} - -.contents-treeview input ~ ul -{ -display: none; -} - -.contents-treeview label, -.contents-treeview label::before -{ -cursor: pointer; -} - -.contents-treeview input:disabled + label -{ -cursor: default; -opacity: .6; -} - -.contents-treeview input:checked:not(:disabled) ~ ul -{ -display: block; -} - -.contents-treeview label, -.contents-treeview label::before -{ -background: url("media/icon-themes/res/folderop.png") no-repeat; -} - -.contents-treeview label, -.contents-treeview a, -.contents-treeview label::before -{ -display: inline-block; -height: 16px; -line-height: 16px; -vertical-align: middle; -} - -.contents-treeview label -{ -background-position: 18px 0; -} - -.contents-treeview label::before -{ -content: ""; -width: 16px; -margin: 0 22px 0 0; -vertical-align: middle; -background-position: 0 -32px; -} - -.contents-treeview input:checked + label::before -{ -background-position: 0 -16px; -} - -/* webkit adjacent element selector bugfix */ -@media screen and (-webkit-min-device-pixel-ratio:0) -{ -.contents-treeview -{ --webkit-animation: webkit-adjacent-element-selector-bugfix infinite 1s; -} - -@-webkit-keyframes webkit-adjacent-element-selector-bugfix -{ -from -{ -padding: 0; -} -to -{ -padding: 0; -} -} -} - - -/* default from old LibreOffice help system */ -body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable { -
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/get_bookmark.xsl help3xsl/get_tree.xsl help3xsl/online_transform.xsl help3xsl/xhp2html.sh
help3xsl/default.css | 15 ++ help3xsl/get_bookmark.xsl | 17 +-- help3xsl/get_tree.xsl | 61 -- help3xsl/online_transform.xsl |3 -- help3xsl/xhp2html.sh |6 ++-- 5 files changed, 47 insertions(+), 55 deletions(-) New commits: commit e9e6c25c54de48394ca994073aa837de529dc89e Author: Olivier HallotDate: Mon Jul 17 11:28:49 2017 -0300 tdf#97745 Help-in-browser (x) refactor contents Tree files now loaded as javascript More fixes Change-Id: Ifa353e717eec63e2369fbeabab7463f4ccd72392 Reviewed-on: https://gerrit.libreoffice.org/40069 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 7cbfba3f1..d0ac1d303 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -25,7 +25,7 @@ */ -/* Structure */ +/* Document Structure */ html{ background: #FF; } @@ -37,6 +37,8 @@ body { max-width: 900px; } +/* Document Header */ + header { background: #00a500; padding: .5em 2em; @@ -81,9 +83,15 @@ header nav a:hover, header nav a:focus{ [role=main]{ padding:1.5em 3em; } + +/* Document Article */ + article{ padding: 1em 0; } + +/* Document Footer */ + footer{ background: #00a500; color: #fff; @@ -113,7 +121,6 @@ footer a{ .contents-treeview { -/*font: normal 11px "Segoe UI", Arial, Sans-serif;*/ -moz-user-select: none; -webkit-user-select: none; user-select: none; @@ -121,7 +128,6 @@ footer a{ .contents-treeview a { -/* color: #00f; */ text-decoration: none; } @@ -283,7 +289,6 @@ h4, h5, h6 { } .avis { -/*background-color: #EE;*/ } .relatedtopics { @@ -373,7 +378,7 @@ a:active{ top:1px; } -/* Tabs */ +/* Document Tabs */ .js-on #tabs article { diff --git a/help3xsl/get_bookmark.xsl b/help3xsl/get_bookmark.xsl index 80dfa2c02..1a153c89e 100644 --- a/help3xsl/get_bookmark.xsl +++ b/help3xsl/get_bookmark.xsl @@ -57,16 +57,15 @@ xsltproc get_bookmark.xsl - - - - - - - + + + + + + - - + + diff --git a/help3xsl/get_tree.xsl b/help3xsl/get_tree.xsl index 0dd417798..c80ba1b95 100644 --- a/help3xsl/get_tree.xsl +++ b/help3xsl/get_tree.xsl @@ -13,14 +13,11 @@ Usage: xsltproc get_tree.xsl --> http://www.w3.org/1999/XSL/Transform;> - - - - + - - - - - - - - - - + + - - - - - - + + - + + - - + + + + + + + + + + + + + + + @@ -77,7 +76,7 @@ xsltproc get_tree.xsl -#39; + @@ -89,18 +88,6 @@ xsltproc get_tree.xsl - - - - - - - - - - - - @@ -154,8 +141,8 @@ xsltproc get_tree.xsl - + diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 9ce04e29d..4d630a59c 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -332,10 +332,10 @@ fixURL(module,system); document.getElementById("bm_module").innerHTML ="Module is: "+module; document.getElementById("bm_system").innerHTML ="System is: "+system; -$("#Contents").load(']]> + var myTabs = new tabs(document.getElementById("tabs"), "article", "h2").responsive("myTabs", { @@ -343,7 +343,6 @@ next: "Next" }); - diff --git a/help3xsl/xhp2html.sh b/help3xsl/xhp2html.sh index be8f3d439..8c402d733 100755 --- a/help3xsl/xhp2html.sh +++ b/help3xsl/xhp2html.sh @@ -42,9 +42,10 @@ ALL_TREE='sbasic.tree scalc.tree schart.tree shared.tree simpress.tree smat xhpFiles=$here/l10n/$productversion/$3/text -treeFileHTML=$outDirHTML/contents.html +treeFileHTML=$outDirHTML/contents.js rm -f $treeFileHTML touch $treeFileHTML +echo 'document.getElementById("Contents").innerHTML='$'\047''\'>$treeFileHTML xsltparm='--stringparam lang '$3' --stringparam productversion '$4 for tree in $ALL_TREE @@ -57,10 +58,11 @@ treeTemp2=`mktemp` xsltproc $xsltparm -o $treeTemp2 get_tree.xsl
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/get_tree.xsl help3xsl/online_transform.xsl help3xsl/xhp2html.sh
help3xsl/default.css | 119 + help3xsl/get_tree.xsl | 163 ++ help3xsl/online_transform.xsl | 198 -- help3xsl/xhp2html.sh | 77 +++- 4 files changed, 432 insertions(+), 125 deletions(-) New commits: commit 7d9270f4d45603665daaa51f31914eadbbd6b353 Author: Olivier HallotDate: Sun Jul 16 09:27:44 2017 -0300 Help-in-browser (ix) Add contents treeview Add Contents tree transforming *.tree files Reposition tag for UTF-8 Fork bash script for faster processing Change-Id: I6c74aa1e855b7f4bb152e2c632f6ab7d683e5462 Reviewed-on: https://gerrit.libreoffice.org/40007 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 1fe3b9bb1..7cbfba3f1 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -95,7 +95,126 @@ footer a{ color:#c2f6ba; } +/* tree view */ +.contents-treeview ul, +.contents-treeview li +{ +padding: 0; +margin: 0; +list-style: none; +} + +.contents-treeview input +{ +position: absolute; +opacity: 0; +} + +.contents-treeview +{ +/*font: normal 11px "Segoe UI", Arial, Sans-serif;*/ +-moz-user-select: none; +-webkit-user-select: none; +user-select: none; +} + +.contents-treeview a +{ +/* color: #00f; */ +text-decoration: none; +} + +.contents-treeview a:hover +{ +text-decoration: underline; +} + +.contents-treeview input + label + ul +{ +margin: 0 0 0 22px; +} + +.contents-treeview input ~ ul +{ +display: none; +} + +.contents-treeview label, +.contents-treeview label::before +{ +cursor: pointer; +} + +.contents-treeview input:disabled + label +{ +cursor: default; +opacity: .6; +} + +.contents-treeview input:checked:not(:disabled) ~ ul +{ +display: block; +} + +.contents-treeview label, +.contents-treeview label::before +{ +background: url("media/icon-themes/res/folderop.png") no-repeat; +} + +.contents-treeview label, +.contents-treeview a, +.contents-treeview label::before +{ +display: inline-block; +height: 16px; +line-height: 16px; +vertical-align: middle; +} + +.contents-treeview label +{ +background-position: 18px 0; +} + +.contents-treeview label::before +{ +content: ""; +width: 16px; +margin: 0 22px 0 0; +vertical-align: middle; +background-position: 0 -32px; +} + +.contents-treeview input:checked + label::before +{ +background-position: 0 -16px; +} + +/* webkit adjacent element selector bugfix */ +@media screen and (-webkit-min-device-pixel-ratio:0) +{ +.contents-treeview +{ +-webkit-animation: webkit-adjacent-element-selector-bugfix infinite 1s; +} + +@-webkit-keyframes webkit-adjacent-element-selector-bugfix +{ +from +{ +padding: 0; +} +to +{ +padding: 0; +} +} +} + + +/* default from old LibreOffice help system */ body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable { font-family: "Segoe UI", Ubuntu, Cantarell, "Noto Sans", "DejaVu Sans", "Lucida Sans Unicode", "Helvetica Neue", Helvetica, Tahoma, sans-serif; } diff --git a/help3xsl/get_tree.xsl b/help3xsl/get_tree.xsl new file mode 100644 index 0..0dd417798 --- /dev/null +++ b/help3xsl/get_tree.xsl @@ -0,0 +1,163 @@ + + + + +http://www.w3.org/1999/XSL/Transform;> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#39; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index bf4b72f21..9ce04e29d 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/help.js help3xsl/index.html help3xsl/online_transform.xsl help3xsl/tabs.css help3xsl/tabs.js help3xsl/xhp2html.sh
help3xsl/default.css | 305 ++ help3xsl/help.js | 21 -- help3xsl/index.html |7 help3xsl/online_transform.xsl | 303 ++--- help3xsl/tabs.css | 134 -- help3xsl/tabs.js | 53 +++ help3xsl/xhp2html.sh | 98 + 7 files changed, 489 insertions(+), 432 deletions(-) New commits: commit 551a5fdaba7c7b86b41daafd4574e7b1649c11d5 Author: Olivier HallotDate: Tue Jul 11 10:25:45 2017 -0300 Help-in-browser (vii) more improvements see it in http://helponline.libreoffice.org Added mos keywords from schema.org New, responsive page design Change-Id: I9df963c1a962c0fbb5c2926d8066b31cd20d485b Reviewed-on: https://gerrit.libreoffice.org/39822 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index ddb701334..1fe3b9bb1 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -25,6 +25,77 @@ */ +/* Structure */ +html{ +background: #FF; +} +body { +padding: 0px; +background: #fff; +color: #333; +margin: 0 auto; +max-width: 900px; +} + +header { +background: #00a500; +padding: .5em 2em; +color: #fff; +line-height: 1; +} + +header h1{ +margin-bottom: 0; +color:white; +} + +header nav{ +float: right; +/*display:inline-block;*/ +} + +header nav select{ +font-size: .8em; +} + + +header nav div{ +font-size: .8em; +} + +header nav div a { +font-weight: 300; +padding: .3em .5em +} +header nav a{ +color: #fff; +display: inline-block; +padding: .3em .8em +} + +header nav a:hover, header nav a:focus{ +color: rgba(255,255,255,.6) +} + + +[role=main]{ +padding:1.5em 3em; +} +article{ +padding: 1em 0; +} +footer{ +background: #00a500; +color: #fff; +padding: .1em 3em; +text-align: center; +} + +footer a{ +color:#c2f6ba; +} + + body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable { font-family: "Segoe UI", Ubuntu, Cantarell, "Noto Sans", "DejaVu Sans", "Lucida Sans Unicode", "Helvetica Neue", Helvetica, Tahoma, sans-serif; } @@ -133,6 +204,8 @@ h4, h5, h6 { border: 1px solid black; padding: 3px; display: show; + background-color:black; + text-align: left; } /* Basic code syntax highlight */ @@ -173,36 +246,85 @@ h4, h5, h6 { border: solid 1px #18A303; } +a:hover, a:focus{ +color: #000; +} +a:active{ +position: relative; +top:1px; +} + +/* Tabs */ + +.js-on #tabs article +{ +display:none +} + +#tabs, #tabs nav a.active{ +background: #f8f8f8; +color: #111; +} + +#tabs nav +{ +position: relative; +overflow: hidden; +display: table; +background: #bbb; +} + +#tabs nav a +{ +width:200px; +display:table-cell; +padding:1em; +text-align:center; +color: #333; +} + +#tabs nav a:hover,#tabs nav a:focus +{ +background:#eee +} + +#tabs article +{ +padding:2em; +} + +.js-on #tabs article.active +{ +display:block; +} +#tabs #mobiles{ +display:none; +border-radius: 0; +} +#tabs #mobiles a, #tabs #mobiles a:first-child, #tabs #mobiles a:last-child{ +width:300px; +border-radius: 0; +} + #DisplayArea { - position: fixed; - bottom: 1px; - right: 1px; - left: 30%; - top: 79px; - overflow: auto; - border: solid 1px; - padding: 10px; } -#BottomLeft { - position: fixed; - bottom: 1px; - left: 1px; +#Index { overflow: auto; - right: 70%; - top: 79px; - border-top: solid 1px; - border-left: solid 1px; - border-bottom: solid 1px; - padding: 10px; +} + +#Index ul{ list-style-type: none; } +#SearchBox{ +background-color:#c2f6ba; +border-color:green; +border:solid 1px; + +} + #TopRight { - position: fixed; - right: 1px; - top: 1px; - left: 70%; } #TopLeft { @@ -218,12 +340,6 @@ h4, h5, h6 { right:30% } -#TopSystem { -top: 35px; -left: 600px; -position: fixed; -} - .mediabutton { background-color: cyan; } @@ -241,92 +357,49 @@ position: fixed; .embedded { } -// Top menu navidation -#TopLeft nav { -background-color: #333; -margin: 0; -overflow: hidden; -} -#TopLeft nav ul{ -margin: 0; -padding: 0; -} -#TopLeft nav ul li { -/* This allow us to arrange list items in a row, without using float */ -display: inline-block; -list-style-type: none; -} - -/* Create a style for the first level items */ -#TopLeft nav > ul > li > a { -color: #FF; -background-color:#18A303; -display: block; -line-height: 1.5em; -padding: 0.5em 0.5em; -text-decoration: none; -font-weight: bold; -border:1px solid; -border-color:#33; -font-size: 11pt; -} - -// Top menu languages -#TopLang nav { -background-color: #333; -
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/get_bookmark.sh help3xsl/help.js help3xsl/index.html
help3xsl/default.css |2 +- help3xsl/get_bookmark.sh | 13 ++--- help3xsl/help.js | 35 +++ help3xsl/index.html | 34 +- 4 files changed, 55 insertions(+), 29 deletions(-) New commits: commit 2f35a021df0677851b7f05522ca5b97b3992aca9 Author: Fabio BiocchettiDate: Mon Oct 24 19:16:27 2016 +0200 Fix comments in script and JavaScript refactor. Comments correction in shell script Introduced js debouncer for search bar xml-stylesheet tag removed Introduced parameter passing through pages Links in XHP pages now work with js Minor adjustments Change-Id: Ibf5f7a74c3249fa6f1ff4d3037fe821797e88d1d Reviewed-on: https://gerrit.libreoffice.org/30231 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index 7065f0f..8863bbe 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -137,7 +137,7 @@ position: fixed; bottom: 5px; left: 5px; overflow:auto; -width: 30%; +width: 29%; height: 90%; } diff --git a/help3xsl/get_bookmark.sh b/help3xsl/get_bookmark.sh index b8e7ee6..a64ee24 100755 --- a/help3xsl/get_bookmark.sh +++ b/help3xsl/get_bookmark.sh @@ -1,11 +1,10 @@ #/bin/bash -#*-- -#* 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/. -#* + +# 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/. stub1='' stub2='' diff --git a/help3xsl/help.js b/help3xsl/help.js index fb77cbc..839c895 100644 --- a/help3xsl/help.js +++ b/help3xsl/help.js @@ -15,21 +15,33 @@ if (response == 1){return xhttp.responseXML;} return xhttp.responseText; } +function getParameterByName(name, url) { +if (!url) { + url = window.location.href; +} +name = name.replace(/[\[\]]/g, "\\$&"); +var regex = new RegExp("[?&]" + name + "(=([^
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/help.js help3xsl/index.html help3xsl/jquery-3.1.1.min.js help3xsl/online_transform.xsl
help3xsl/default.css | 60 +-- help3xsl/help.js | 80 ++ help3xsl/index.html | 43 ++ help3xsl/jquery-3.1.1.min.js |4 ++ help3xsl/online_transform.xsl |2 - 5 files changed, 161 insertions(+), 28 deletions(-) New commits: commit f6f7781565812712d41180f312289ad65c46ff78 Author: Fabio BioccettiDate: Fri Oct 21 12:35:55 2016 -0200 tdf#97745 Help pages in browser (WIP) Work in progress: Search index Javascript xhp server patch2: rename jj.js to help.js updated index.html accordingly Change-Id: Idece5ea25b0906b3fbdfd1f401e8dcfdfa4bd947 Reviewed-on: https://gerrit.libreoffice.org/30143 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/help3xsl/default.css b/help3xsl/default.css index e4ba6d5..7065f0f 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -109,15 +109,67 @@ h4, h5, h6 .hotlink { color:blue;} -.infopage -{ color:green; +.infopage { +color:green; font-size:16pt; font-weight:bold; } + .topmenu{ -color:yellow; -background-color:cyan; +color: green; +background-color: white; font-size:16pt; font-weight:bold; } +.indexlink{font-size: 10pt; margin-top: 2px; margin-bottom: 2px;} + +#DisplayArea{ +position: fixed; +bottom: 5px; +right: 5px; +overflow:auto; +width: 70%; +height: 90%; +} + +#BottomLeft { +position: fixed; +bottom: 5px; +left: 5px; +overflow:auto; +width: 30%; +height: 90%; +} + +#TopRight { +position: fixed; +top: 5px; +right: 5px; +} + +#TopLeft { +position: fixed; +top: 5px; +left: 5px; +} + +#centerdiv { +position: fixed; +top: 25%; +left:25%; +} + +.tintro { + color: white; +background-color: green; +font-family: Arial; +font-weight: bold; +font-size: 24pt; +border: 1px solid black; +padding-bottom: 6px; +margin-bottom: 6px; +} +.embedded { +background-color:yellow; +} diff --git a/help3xsl/help.js b/help3xsl/help.js new file mode 100644 index 000..fb77cbc --- /dev/null +++ b/help3xsl/help.js @@ -0,0 +1,80 @@ +function loadXMLDoc(filename, response) +{ +if (window.ActiveXObject) + { + xhttp = new ActiveXObject("Msxml2.XMLHTTP"); + } +else + { + xhttp = new XMLHttpRequest(); + } +xhttp.open("GET", filename, false); +try {xhttp.responseType = "msxml-document"} catch(err) {} // Helping IE11 +xhttp.send(""); +if (response == 1){return xhttp.responseXML;} +return xhttp.responseText; +} + + +function displayResult(file, moduleName, language, system) +{ +var xml = loadXMLDoc(file, 1); +var xsl = loadXMLDoc('/online_transform.xsl', 1); +var xsltProcessor; +var resultDocument; +var bookmarkHTML; +var urlVars = getUrlVars(file); + var module = urlVars["DbPAR"]; + var language = urlVars["Language"]; + var system = urlVars["System"]; + var usedb = urlVars["UseDB"]; + document.getElementById("DisplayArea").innerHTML= null; + document.getElementById("BottomLeft").innerHTML= null; +// code for IE +if (window.ActiveXObject || xhttp.responseType == "msxml-document") + { + ex = xml.transformNode(xsl); + document.getElementById("DisplayArea").innerHTML = ex; + } +// code for Chrome, Firefox, Opera, etc. +else if (document.implementation && document.implementation.createDocument) + { +xsltProcessor = new XSLTProcessor(); + +if (module){xsltProcessor.setParameter(null, "appl", module);} +if (language){xsltProcessor.setParameter(null, "Language", language);} +if (system){xsltProcessor.setParameter(null, "System", system);} + +$(document).on('click', '#BottomLeft a', function(e) { + e.preventDefault(); + var xml = loadXMLDoc($(this).attr('href'), 1); + var resultDocument = xsltProcessor.transformToFragment(xml, document); + $("#DisplayArea").html($(resultDocument).find('#DisplayArea').html()); + return false; +}); + +xsltProcessor.importStylesheet(xsl); +resultDocument = xsltProcessor.transformToFragment(xml, document); +$("#DisplayArea").html($(resultDocument).find('#DisplayArea').html()); +// Handle bookmar panel +$("#BottomLeft").load('/bookmark_'+moduleName+'.html'); + } +} + +$(document).ready(function() { + $('#search-bar').keyup(function() { +$("#BottomLeft ul li" ).show(); +if($(this).val()) { + $("#BottomLeft ul a:not(:contains('" + $(this).val() + "'))" ).parent().hide(); +} + }); +}); + +//http://papermashup.com/read-url-get-variables-withjavascript/ + +function getUrlVars(file) { +var vars = {}; +var parts = file.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m,key,value) {vars[key] = value;}); +//var parts = window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m,key,value) {vars[key] = value;}); +return vars; +} diff --git a/help3xsl/index.html b/help3xsl/index.html index