[Libreoffice-commits] online.git: loleaflet/css loleaflet/images
loleaflet/css/menubar.css| 18 ++
loleaflet/images/lc_menu_chevron.svg | 31 +++
2 files changed, 45 insertions(+), 4 deletions(-)
New commits:
commit fb6157b65fe96e4966f9d47f6d43660bfbff2d94
Author: Pedro Pinto Silva
AuthorDate: Wed Sep 23 12:25:50 2020 +0200
Commit: Pedro Silva
CommitDate: Wed Sep 23 14:24:06 2020 +0200
Top Menu: improve resolution of menu marks by
using svg instead of unicode content
Change-Id: I66629ef6cfade8c24701bace3f172e28fd5243ae
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103241
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/menubar.css b/loleaflet/css/menubar.css
index df58c5fcc..b630141ba 100644
--- a/loleaflet/css/menubar.css
+++ b/loleaflet/css/menubar.css
@@ -146,7 +146,13 @@
.lo-menu ul a span.sub-arrow {
right: 0;
margin-right: 5px;
- background: transparent; /* we want them to be transparent always
whether mobile or desktop */
+ background: transparent url('images/lc_menu_chevron.svg') no-repeat
center right; /* we want them to be transparent always whether mobile or
desktop */
+ color: transparent;
+ /*transform: rotate(180deg);*/
+}
+.lo-menu ul a:hover > span.sub-arrow {
+ -webkit-filter: brightness(100);
+ filter: brightness(100);
}
.lo-menu ul > li {
border-left: 0;
@@ -245,13 +251,17 @@
/* The smartmenus plugin doesn't seem to have support for icons, so implement
our own pseudo-elements */
.lo-menu-item-checked::before {
position: absolute;
- content: '\2713';
- left: 5px;
- top: 5px;
+ content: ' ';
+ left: 2px;
+ background: url('images/lc_listitem-selected.svg') no-repeat left -2px;
+ width: 20px;
+ height: 20px;
}
.lo-menu-item-checked:hover::before {
color: #fff;
+ -webkit-filter: brightness(100);
+ filter: brightness(100);
}
.writer-icon-img {
diff --git a/loleaflet/images/lc_menu_chevron.svg
b/loleaflet/images/lc_menu_chevron.svg
new file mode 100644
index 0..ad7ae2be7
--- /dev/null
+++ b/loleaflet/images/lc_menu_chevron.svg
@@ -0,0 +1,31 @@
+
+http://purl.org/dc/elements/1.1/;
+ xmlns:cc="http://creativecommons.org/ns#;
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#;
+ xmlns:svg="http://www.w3.org/2000/svg;
+ xmlns="http://www.w3.org/2000/svg;
+ height="9"
+ width="9"
+ id="svg4"
+ version="1.1"
+ viewBox="0 0 9 9">
+
+
+
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage; />
+
+
+
+
+
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/leaflet.css |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit f85c0c6a11b1389873635b763dbc9f86057d7068
Author: Pedro Pinto Silva
AuthorDate: Tue Sep 22 16:02:40 2020 +0200
Commit: Pedro Silva
CommitDate: Tue Sep 22 16:48:41 2020 +0200
Ruler: Make sure numbers are always vertically centered
Change-Id: I7ab64cc001e3a65b3fa52f7f77843cfe0eb6e2df
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103173
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css
index 573815780..2f6596fee 100644
--- a/loleaflet/css/leaflet.css
+++ b/loleaflet/css/leaflet.css
@@ -817,6 +817,8 @@ input.clipboard {
.loleaflet-ruler-breakcontainer {
height: 100%;
position: absolute;
+ display: flex;
+ align-items: center;
}
.loleaflet-ruler-tabstopcontainer {
@@ -878,7 +880,7 @@ input.clipboard {
}
.loleaflet-ruler-maj {
- height: 35%;
+ height: auto;
display: inline-block;
border-width: 0px .5px;
border-style: solid;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/menubar.css| 18 +-
loleaflet/src/control/Control.Notebookbar.js |2 ++
loleaflet/src/control/Control.Toolbar.js |2 ++
3 files changed, 17 insertions(+), 5 deletions(-)
New commits:
commit f11ce477fbb935632d6434aa1ec1306728a993ca
Author: Pedro Pinto Silva
AuthorDate: Fri Sep 18 14:23:54 2020 +0200
Commit: Pedro Silva
CommitDate: Fri Sep 18 15:16:25 2020 +0200
Readonly: fix styles and multiple document headers on notebookbar and
classic
- Avoid having multiple document-header elements when on notebookbar
- Add classes to the main-nav element when in presence of Readonly
Change-Id: I82cb816fcfa28d790202c96484a7e8c99f3875f6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103004
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/menubar.css b/loleaflet/css/menubar.css
index ff761d84a..df58c5fcc 100644
--- a/loleaflet/css/menubar.css
+++ b/loleaflet/css/menubar.css
@@ -19,7 +19,10 @@
background: #ff;
margin-right: 5px;
}
-
+/*avoid multiple document-headers in readonly mode*/
+.main-nav.hasnotebookbar.readonly > #main-menu #document-header {
+ display: none;
+}
.document-logo {
position: relative;
width: 22px;
@@ -46,10 +49,12 @@
right: 0px;
}
-.main-nav.hasnotebookbar #document-titlebar {
+.main-nav.hasnotebookbar:not(.readonly) #document-titlebar {
top: -10px;
}
-
+.main-nav.readonly #document-titlebar {
+ top: 1px;
+}
.main-nav {
height: 32px; /* on mouseover menubar items, border emerges */
width: auto;
@@ -57,8 +62,11 @@
margin: 3px;
white-space: nowrap;
}
-
-.main-nav.hasnotebookbar{
+.main-nav.readonly {
+ top: -1px; /*update .main-nav.readonly #document-titlebar*/
+ position: relative;
+}
+.main-nav.hasnotebookbar:not(.readonly) {
background: var(--gray-bg-color);
margin-top: 0px;
}
diff --git a/loleaflet/src/control/Control.Notebookbar.js
b/loleaflet/src/control/Control.Notebookbar.js
index cb7d9a173..d07c36808 100644
--- a/loleaflet/src/control/Control.Notebookbar.js
+++ b/loleaflet/src/control/Control.Notebookbar.js
@@ -45,6 +45,7 @@ L.Control.Notebookbar = L.Control.extend({
if (e.perm === 'edit') {
this._showNotebookbar = true;
this.showTabs();
+ $('.main-nav').removeClass('readonly');
}
},
@@ -60,6 +61,7 @@ L.Control.Notebookbar = L.Control.extend({
hideTabs: function() {
$('.ui-tabs.notebookbar').hide();
$('.notebookbar-shortcuts-bar').hide();
+ $('.main-nav').addClass('readonly');
},
collapse: function() {
diff --git a/loleaflet/src/control/Control.Toolbar.js
b/loleaflet/src/control/Control.Toolbar.js
index d073afa4d..7fa110194 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -975,7 +975,9 @@ function onUpdatePermission(e) {
if (!keepDisabled || alwaysEnable) {
toolbar.enable(items[idx].id);
}
+ $('.main-nav').removeClass('readonly');
} else if (!alwaysEnable) {
+ $('.main-nav').addClass('readonly');
toolbar.disable(items[idx].id);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/device-mobile.css | 10 +-
loleaflet/css/mobilewizard.css| 40 +---
loleaflet/src/control/Control.Menubar.js |4 +-
loleaflet/src/control/Control.MobileWizard.js | 42 ++
loleaflet/src/control/Control.PartsPreview.js |8
loleaflet/src/control/Parts.js| 33 +---
loleaflet/src/layer/tile/ImpressTileLayer.js | 17 ++
7 files changed, 88 insertions(+), 66 deletions(-)
New commits:
commit 596d70187c61199063495e23ebda132a7d06ae2b
Author: gokaysatir
AuthorDate: Sat Sep 12 16:52:20 2020 +0300
Commit: Andras Timar
CommitDate: Wed Sep 16 14:19:20 2020 +0200
loleaflet: Hide portrait view previews on layout view.
Header code is updated to avoid creating/deleting it every time.
Some CSS adjustments to increase maintainability. Example: There were 2
scroll bars in mobile-wizard. Scrolling was not smooth. And some other
improvements.
On layout view, 2 separate slide-sorter containers were visible. One of
them is hidden now.
Change-Id: Ic4201b176812f6ca00402777423feced7ee8284c
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102521
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index eb012192b..e5b441137 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -749,21 +749,15 @@ td[id^='tb_spreadsheet-toolbar_item']:focus
table.w2ui-button div.w2ui-icon, td[
#mobile-wizard-header.landscape {
display: none;
}
-#mobile-wizard-content.with-slide-sorter-above.landscape {
- top: 48px !important;
-}
#mobile-wizard-header.portrait {
display: block;
}
-#mobile-wizard-content.with-slide-sorter-above.portrait {
- top: 111px !important;
-}
/* Related to mobile-wizard based menubar */
-#mobile-wizard.menuwizard.landscape
#mobile-wizard-content.with-slide-sorter-above.landscape {
+#mobile-wizard.menuwizard.landscape #mobile-wizard-content.landscape {
overflow-y: auto !important;
}
-#mobile-wizard.menuwizard.portrait
#mobile-wizard-content.with-slide-sorter-above.portrait {
+#mobile-wizard.menuwizard.portrait #mobile-wizard-content.portrait {
overflow-y: hidden !important;
}
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 0f2d23145..42d34f356 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -190,10 +190,12 @@ p.mobile-wizard.ui-combobox-text.selected {
#mobile-wizard-content {
overflow-y: scroll;
overflow-x: hidden;
- position: absolute;
- top: 111px;
- bottom: 0px;
+ position: static;
width: 100%;
+ height: calc(100% - 48px);
+}
+#mobile-wizard.portrait > #mobile-wizard-header:not([style*='none']) ~
#mobile-wizard-content {
+ height: calc(100% - 121px);
}
#mobile-wizard.funcwizard div#mobile-wizard-content.hideHelpBG {
background: none !important;
@@ -201,19 +203,13 @@ p.mobile-wizard.ui-combobox-text.selected {
#mobile-wizard.funcwizard div#mobile-wizard-content.showHelpBG {
background: url('images/lc_helpindex_secondary.svg') no-repeat right
16px bottom 88px / 124px !important;
}
-#mobile-wizard-content:not(.with-slide-sorter-above), .menuwizard
#mobile-wizard-content.with-slide-sorter-above{
- top: 48px !important;
-}
-#mobile-wizard-content.with-slide-sorter-above {
- top: 128px !important;
- overflow-x: hidden;
-}
+
#ParaPropertyPanel > .ui-content{
display: flex;
flex-wrap: wrap !important;
justify-content: space-around;
}
-.with-slide-sorter-above > .ui-tabs-content > div[title='Layouts']{
+.ui-tabs-content > div[title='Layouts']{
justify-content: center;
-ms-box-orient: horizontal !important;
display: -webkit-box;
@@ -226,6 +222,7 @@ p.mobile-wizard.ui-combobox-text.selected {
align-items: center !important;
-webkit-flex-wrap: wrap !important;
flex-wrap: wrap !important;
+ margin-top: 25px;
}
#rotationlabel, #cellbackgroundlabel, #NumberFormatCurrency > .unolabel,
#NumberFormatPercent > .unolabel, #NumberFormatDecimal > .unolabel{
display: none;
@@ -265,7 +262,7 @@ p.mobile-wizard.ui-combobox-text.selected {
z-index: 1000;
background-color: white;
box-shadow: 0px -2px 4px 1px #0030;
- overflow-y: scroll;
+ overflow-y: hidden;
}
#mobile-wizard-content *{
@@ -280,6 +277,7 @@ p.mobile-wizard.ui-combobox-text.selected {
color: #636363;
border-bottom: 1px solid #dd !important;
position: sticky;
+ z-index: 2;
}
.ui-content.mobile-wizard {
@@ -455,6 +453,24 @@ p.mobile-wizard.ui-combobox-text.selected {
padding: 0px;
}
+#mobile-wizard-tabs {
+ position: sticky;
+ top: 0;
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/mobilewizard.css |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e3bace4a4467325ebc4b2e42c37dfb38687b2692
Author: Pedro Pinto Silva
AuthorDate: Tue Sep 15 12:57:19 2020 +0200
Commit: Pedro Silva
CommitDate: Tue Sep 15 14:21:18 2020 +0200
Mobile wizard: SetObjectToForeground label shouldn't be visible
Change-Id: I193731a3fc9d6a5eef958a2d28f83a054b16
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102731
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 992e8afca..0f2d23145 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -659,7 +659,7 @@ a.leaflet-control-zoom-in {
border-radius: 100px;
background-color: #696969;
}
-#mobile-wizard #SendToBack > span, #mobile-wizard #ObjectBackOne > span,
#mobile-wizard #ObjectForwardOne > span, #mobile-wizard #BringToFront > span,
#mobile-wizard #SetObjectToBackground > span, #mobile-wizard
#SetObjectToForeground > #mobile-wizard span, #mobile-wizard #FlipVertical >
span, #mobile-wizard #FlipHorizontal > span, #mobile-wizard #Bold > span,
#mobile-wizard #Italic > span, #mobile-wizard #Underline > span, #mobile-wizard
#Strikeout > span, #mobile-wizard #StyleApply > span, #mobile-wizard
#StyleUpdateByExample > span, #mobile-wizard #StyleNewByExample > span,
#mobile-wizard #Shadowed > span, #mobile-wizard #Grow > span, #mobile-wizard
#Shrink > span, #mobile-wizard #Color > span, #mobile-wizard #Spacing > span,
#mobile-wizard #SuperScript > span, #mobile-wizard #SubScript > span,
#mobile-wizard #AlignLeft > span, #mobile-wizard #AlignRight > span,
#mobile-wizard #AlignHorizontalCenter > span, #mobile-wizard #AlignBlock >
span, #mobile-wizard #ParaLeftToRight > spa
n, #mobile-wizard #ParaRightToLeft > span, #mobile-wizard #AlignTop > span,
#mobile-wizard #AlignVCenter > span, #mobile-wizard #AlignBottom > span,
#mobile-wizard #IncrementIndent > span, #mobile-wizard #DecrementIndent > span,
#mobile-wizard #LeftPara > span, #mobile-wizard #RightPara > span,
#mobile-wizard #CenterPara > span, #mobile-wizard #JustifyPara > span,
#mobile-wizard #DefaultBullet > span, #mobile-wizard #DefaultNumbering > span,
#mobile-wizard #ParaspaceIncrease > span, #mobile-wizard #ParaspaceDecrease >
span, #mobile-wizard #LineSpacing > span, #mobile-wizard #HangingIndent > span,
#mobile-wizard #CellVertTop > span, #mobile-wizard #CellVertCenter > span,
#mobile-wizard #CellVertBottom > span, #mobile-wizard div[id*='Table'] > span,
#mobile-wizard div[id*='Row'] > span, #mobile-wizard div[id*='Column'] > span,
#mobile-wizard div[id*='Cell'] > span, #mobile-wizard div[id^='Outline'] >
span, #mobile-wizard #nolines > img{
+#mobile-wizard #SendToBack > span, #mobile-wizard #ObjectBackOne > span,
#mobile-wizard #ObjectForwardOne > span, #mobile-wizard #BringToFront > span,
#mobile-wizard #SetObjectToBackground > span, #mobile-wizard
#SetObjectToForeground > #mobile-wizard span, #mobile-wizard #FlipVertical >
span, #mobile-wizard #FlipHorizontal > span, #mobile-wizard #Bold > span,
#mobile-wizard #Italic > span, #mobile-wizard #Underline > span, #mobile-wizard
#Strikeout > span, #mobile-wizard #StyleApply > span, #mobile-wizard
#StyleUpdateByExample > span, #mobile-wizard #StyleNewByExample > span,
#mobile-wizard #Shadowed > span, #mobile-wizard #Grow > span, #mobile-wizard
#Shrink > span, #mobile-wizard #Color > span, #mobile-wizard #Spacing > span,
#mobile-wizard #SuperScript > span, #mobile-wizard #SubScript > span,
#mobile-wizard #AlignLeft > span, #mobile-wizard #AlignRight > span,
#mobile-wizard #AlignHorizontalCenter > span, #mobile-wizard #AlignBlock >
span, #mobile-wizard #ParaLeftToRight > spa
n, #mobile-wizard #ParaRightToLeft > span, #mobile-wizard #AlignTop > span,
#mobile-wizard #AlignVCenter > span, #mobile-wizard #AlignBottom > span,
#mobile-wizard #IncrementIndent > span, #mobile-wizard #DecrementIndent > span,
#mobile-wizard #LeftPara > span, #mobile-wizard #RightPara > span,
#mobile-wizard #CenterPara > span, #mobile-wizard #JustifyPara > span,
#mobile-wizard #DefaultBullet > span, #mobile-wizard #DefaultNumbering > span,
#mobile-wizard #ParaspaceIncrease > span, #mobile-wizard #ParaspaceDecrease >
span, #mobile-wizard #LineSpacing > span, #mobile-wizard #HangingIndent > span,
#mobile-wizard #CellVertTop > span, #mobile-wizard #CellVertCenter > span,
#mobile-wizard #CellVertBottom > span, #mobile-wizard div[id*='Table'] > span,
#mobile-wizard div[id*='Row'] > span, #mobile-wizard div[id*='Column'] > span,
#mobile-wizard div[id*='Cell'] > span, #mobile-wizard div[id^='Outline'] >
span, #mobile-wizard #nolines > img, #mobile-wizard #SetObjectToForeground >
span {
display: none !important;
}
#mobile-wizard #SendToBack, #mobile-wizard #ObjectBackOne, #mobile-wizard
#ObjectForwardOne,
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/toolbar.css |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 04e4cab105a7f9295cd0280276d4d4a230e92ad4
Author: Andras Timar
AuthorDate: Fri Sep 11 20:55:18 2020 +0200
Commit: Andras Timar
CommitDate: Fri Sep 11 22:04:07 2020 +0200
lc_starshapes.signet.svg is the correct icon for the signet shape
Change-Id: I599a0408fe6eb4fd26a45ce0d80cee89c1edfdc5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102496
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index d3a9f733b..343ebd8d6 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -525,7 +525,7 @@ button.leaflet-control-search-next
.w2ui-icon.starshapes_concave-star6 { background:
url('images/lc_starshapes.concave-star6.svg') no-repeat center !important; }
.w2ui-icon.starshapes_vertical-scroll { background:
url('images/lc_starshapes.vertical-scroll.svg') no-repeat center !important; }
.w2ui-icon.starshapes_horizontal-scroll { background:
url('images/lc_starshapes.horizontal-scroll.svg') no-repeat center !important; }
-.w2ui-icon.starshapes_signet { background: url('images/lc_signature.svg')
no-repeat center !important; }
+.w2ui-icon.starshapes_signet { background:
url('images/lc_starshapes.signet.svg' ) no-repeat center !important; }
.w2ui-icon.starshapes_doorplate { background:
url('images/lc_starshapes.doorplate.svg') no-repeat center !important; }
.w2ui-icon.calloutshapes_rectangular-callout { background:
url('images/lc_calloutshapes.rectangular-callout.svg') no-repeat center
!important; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images
loleaflet/css/loleaflet.css |2 +-
loleaflet/images/cursors/fill.png |binary
2 files changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d42e41ce04a80a798053260c229ec159e20307ef
Author: Pedro Pinto Silva
AuthorDate: Thu Sep 10 15:05:17 2020 +0200
Commit: Pedro Silva
CommitDate: Thu Sep 10 16:52:02 2020 +0200
leaflet: cursor: bucket-cursor: fix inconsistencies
use similar asset as the icon that triggers it:
- so we have a paintbrush icon that triggers also a paintbrush cursor
(instead of a bucket)
- and adjust position accordingly
Change-Id: I2fa84f0a961e5a98de6fe8fc34c14ccac63344d0
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102382
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 10e382c60..22199cd4e 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -75,7 +75,7 @@
}
.bucket-cursor {
- cursor: url('images/cursors/fill.png') 14 29, auto !important;/*setting
coordinates to align the tip of the bucket icon */
+ cursor: url('images/cursors/fill.png') 4 9, auto !important;/*setting
coordinates to align the tip of the bucket icon */
}
.loleaflet-scrollbar-show {
opacity: 1 !important;
diff --git a/loleaflet/images/cursors/fill.png
b/loleaflet/images/cursors/fill.png
index 220641b9b..473474999 100644
Binary files a/loleaflet/images/cursors/fill.png and
b/loleaflet/images/cursors/fill.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/jquery-ui-lightness.css |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3d6c81476e1b66a42c74a7144018c1226c443cc4
Author: Pedro Pinto Silva
AuthorDate: Thu Sep 10 13:03:17 2020 +0200
Commit: Pedro Silva
CommitDate: Thu Sep 10 16:52:19 2020 +0200
Fix jquery-ui-tooltips' border and shadow color (notation for IE)
- border color was too bright and was causing some undesired results
around tooltips (in between fill and shadow)
- Change box-shadow color notation from rgba to rgb
Change-Id: Ibca0910675f0836a3f4fa02e00d599c59683e0cc
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102375
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/jquery-ui-lightness.css
b/loleaflet/css/jquery-ui-lightness.css
index 71099ca41..7cd43e869 100644
--- a/loleaflet/css/jquery-ui-lightness.css
+++ b/loleaflet/css/jquery-ui-lightness.css
@@ -890,7 +890,7 @@ button.ui-button::-moz-focus-inner {
font-size: 1em;
}
.ui-widget.ui-widget-content {
- border: 1px solid #cc;
+ border: 1px solid #232323;
}
.ui-widget-content {
border: 1px solid #dd;
@@ -1317,6 +1317,6 @@ a.ui-button:active,
filter: Alpha(Opacity=50); /* support: IE8 */
}
.ui-widget-shadow {
- -webkit-box-shadow: 0px 0px 4px 2px rgba(0,0,0,0.15);
- box-shadow: 0px 0px 4px 2px rgba(0,0,0,0.15);
+ -webkit-box-shadow: 0px 0px 4px 2px rgb(217, 217, 217);
+ box-shadow: 0px 0px 4px 2px rgb(217, 217, 217);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/.stylelintrc.json
loleaflet/.stylelintrc.json | 18 +++-
loleaflet/css/device-desktop.css |4 +--
loleaflet/css/device-mobile.css | 24 +++---
loleaflet/css/device-tablet.css |2 -
loleaflet/css/leaflet-spinner.css |2 -
loleaflet/css/leaflet.css | 12 +--
loleaflet/css/loleaflet.css |8 +++
loleaflet/css/menubar.css |2 -
loleaflet/css/mobilewizard.css| 41 +-
loleaflet/css/notebookbar.css |4 +--
loleaflet/css/spreadsheet.css |1
loleaflet/css/toolbar-mobile.css |4 +--
loleaflet/css/toolbar.css | 13 +---
loleaflet/css/vex.css |2 -
14 files changed, 74 insertions(+), 63 deletions(-)
New commits:
commit bef32043d6dafb1bc7c0d2c2e301e26939645f68
Author: Pedro Pinto Silva
AuthorDate: Wed Sep 9 11:02:15 2020 +0200
Commit: Pedro Silva
CommitDate: Wed Sep 9 11:48:31 2020 +0200
CSS lint: add more rules and fix problems
- Fix duplicated properties (ignore cases where it's needed
for browser compatibility);
- Fix space inconsistencies before !
- Fix space inconsistencies after colon
- Fix space inconsistencies after and before combinator (>, +, ~)
- Invalid calc
- Many rules added to json, namely no-extra-semicolons
Change-Id: I78af6bc546aeb1d7d7090e2ef278c895f0393a07
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102289
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/.stylelintrc.json b/loleaflet/.stylelintrc.json
index 83b2927a4..e2580d898 100644
--- a/loleaflet/.stylelintrc.json
+++ b/loleaflet/.stylelintrc.json
@@ -2,12 +2,28 @@
"rules": {
"indentation": "tab",
"string-quotes": "single",
+ "no-extra-semicolons": true,
"no-duplicate-selectors": true,
"selector-combinator-space-after": "always",
+ "selector-combinator-space-before": "always",
"selector-attribute-quotes": "always",
"selector-attribute-brackets-space-inside": "never",
"function-url-quotes": ["always", {
"except": ["empty"]
- }]
+ }],
+ "font-family-no-duplicate-names": true,
+ "declaration-block-no-duplicate-properties": [true, {
+ "ignore":
["consecutive-duplicates-with-different-values"]
+ }],
+ "function-calc-no-invalid": true,
+ "function-linear-gradient-no-nonstandard-direction": true,
+ "selector-pseudo-class-no-unknown": true,
+ "selector-pseudo-element-no-unknown": true,
+ "media-feature-name-no-unknown": true,
+ "comment-no-empty": true,
+ "no-invalid-double-slash-comments": true,
+ "shorthand-property-no-redundant-values": true,
+ "declaration-bang-space-before": "always",
+ "declaration-colon-space-after": "always"
}
}
diff --git a/loleaflet/css/device-desktop.css b/loleaflet/css/device-desktop.css
index 9a451a700..18d071e35 100644
--- a/loleaflet/css/device-desktop.css
+++ b/loleaflet/css/device-desktop.css
@@ -6,9 +6,9 @@
background-position-y: top;
width: 20px;
background-repeat: no-repeat;
- margin-left:1px !important;
+ margin-left: 1px !important;
transform: translateY(-12px);
}
#tb_formulabar_item_formula .inputbar_selection_handles
.leaflet-selection-marker-start{
- margin-left:-20px !important;
+ margin-left: -20px !important;
}
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index 935bf088f..eb012192b 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -63,7 +63,7 @@ input#follow-checkbox:checked ~ .checkmark {
}
#userlist_table + hr { display: none;}
div#w2ui-overlay-actionbar.w2ui-overlay{
- margin-left:-7px;
+ margin-left: -7px;
}
/* Related to loleaflet.css */
@@ -199,7 +199,7 @@ div#w2ui-overlay-actionbar.w2ui-overlay{
}
.inputbar_multiline #tb_formulabar_item_formula > div,
.inputbar_multiline #tb_formulabar_item_address > div {
- margin-top:0px;
+ margin-top: 0px;
}
.inputbar_multiline #tb_formulabar_item_address{
border-right: solid 1px #004d !important;
@@ -287,10 +287,10 @@ div#w2ui-overlay-actionbar.w2ui-overlay{
/* Related to vex.css */
.vex-open .loleaflet-user-idle {
- background: rgba(0, 0, 0, 0)!important;
- font-size: xx-large!important;
- color: #fff!important;
- text-align: center!important;
+ background: rgba(0, 0, 0, 0) !important;
+ font-size: xx-large !important;
+ color: #fff !important;
+ text-align: center !important;
}
.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/device-mobile.css | 117 +---
loleaflet/css/device-tablet.css |2
loleaflet/css/jquery-ui-lightness.css |2
loleaflet/css/jquery.mCustomScrollbar.css | 830 +++---
loleaflet/css/leaflet-spinner.css |4
loleaflet/css/leaflet.css | 423 +++
loleaflet/css/loleaflet.css | 67 +-
loleaflet/css/menubar.css | 304 +-
loleaflet/css/mobilewizard.css| 102 +--
loleaflet/css/notebookbar.css | 25
loleaflet/css/partsPreviewControl.css | 18
loleaflet/css/scrollBar.css |3
loleaflet/css/searchControl.css |6
loleaflet/css/sidebar.css |2
loleaflet/css/spreadsheet.css | 46 -
loleaflet/css/toolbar.css | 514 +-
loleaflet/css/vex.css | 10
loleaflet/css/w2ui-1.5.rc1.css|2
18 files changed, 1212 insertions(+), 1265 deletions(-)
New commits:
commit 175ac6e740c38c13d04c1a1717890fcf1eca707b
Author: Pedro Pinto Silva
AuthorDate: Thu Sep 3 16:41:01 2020 +0200
Commit: Pedro Silva
CommitDate: Tue Sep 8 17:02:30 2020 +0200
CSS lint: Code refactoring
- Detected many duplicated selectors within the same file (squashed them)
- Detected inconsistency (sometimes spaces sometimes tabs). Tabify as in JS.
- Detected quotes' inconsistency (sometimes none, sometimes '', sometimes
""). Use '' as in JS
- Avoid touching on files from 3rd party sources (jquery, w2ui), ignore
files
Change-Id: Idd82945f29ac6c5c9f522e5d5df4a783a367654d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102009
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index 890c0d612..935bf088f 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -33,7 +33,7 @@ input#follow-checkbox {
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
- }
+}
.checkmark {
position: absolute;
top: 0;
@@ -42,11 +42,9 @@ input#follow-checkbox {
width: 25px;
}
.checkmark:after {
- content: "";
+ content: '';
position: absolute;
display: none;
-}
-.checkmark:after {
left: 9px;
top: 5px;
width: 5px;
@@ -56,7 +54,7 @@ input#follow-checkbox {
-webkit-transform: rotate(45deg);
-ms-transform: rotate(45deg);
transform: rotate(45deg);
- }
+}
input#follow-checkbox:checked ~ .checkmark:after {
display: block;
}
@@ -102,63 +100,64 @@ div#w2ui-overlay-actionbar.w2ui-overlay{
/* Related to menubar.css */
.document-logo {
-width: 35px;
-height: 38px;
+ width: 35px;
+ height: 38px;
}
#document-titlebar {
-display: none;
+ display: none;
}
.document-title {
-display: none;
+ display: none;
}
/* hide the menu in mobile view */
#main-menu-state:not(:checked) ~ #main-menu {
-display: none;
+ display: none;
}
.main-menu-btn {
-display: inline-block;
+ display: inline-block;
}
.main-nav {
-position: absolute;
-height: 0;
-width: 100%;
-top: 37px; /*set equal to toolbar up's height*/
-margin: 0;
--webkit-overflow-scrolling: touch;
-overflow: scroll;
-z-index: 1010;
-bottom: 34px !important;
-background-color: #0050;
+ position: absolute;
+ height: 0;
+ width: 100%;
+ top: 37px; /*set equal to toolbar up's height*/
+ margin: 0;
+ -webkit-overflow-scrolling: touch;
+ overflow: scroll;
+ z-index: 1010;
+ bottom: 34px !important;
+ background-color: #0050;
+ display: block !important; /* Show menubar even if folded */
}
#main-menu {
- position: relative;
- top: 0;
- width: 70%;
- float: right;
- background-color: white;
- height: 100%;
+ position: relative;
+ top: 0;
+ width: 70%;
+ float: right;
+ background-color: white;
+ height: 100%;
}
.writer-icon-img {
-background-size: 35px 35px;
+ background-size: 35px 35px;
}
.calc-icon-img {
-background-size: 35px 35px;
+ background-size: 35px 35px;
}
.impress-icon-img {
-background-size: 35px 35px;
+ background-size: 35px 35px;
}
#document-name-input {
-display: none;
+ display: none;
}
/* Related to scollBar.css */
@@ -224,24 +223,6 @@ div#w2ui-overlay-actionbar.w2ui-overlay{
top: 95px !important;
}
}
-#spreadsheet-toolbar {
- bottom: 0;
-}
-
-.spreadsheet-tabs-container {
- bottom: 0;
-}
-
-#spreadsheet-row-column-frame.readonly {
- top: 37px !important;
-}
-#document-container.spreadsheet-document.readonly {
- top: 57px
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/loleaflet.css |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 79d99156dc9a6851b50ef04e96a73894c8ffb19a
Author: Pedro Pinto Silva
AuthorDate: Tue Sep 8 13:38:14 2020 +0200
Commit: Pedro Silva
CommitDate: Tue Sep 8 14:34:46 2020 +0200
leaflet: cursor: bucket-cursor fix alignment
Change-Id: Iafe8dea3d379b6c1fe9241063bab4ab4b7c17e8e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102247
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index a85f43a6b..bbd5aca1f 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -75,7 +75,7 @@
}
.bucket-cursor {
- cursor: url('images/cursors/fill.png'), auto !important;
+ cursor: url('images/cursors/fill.png') 14 29, auto !important;/*setting
coordinates to align the tip of the bucket icon */
}
.loleaflet-scrollbar-show {
opacity: 1 !important;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/device-mobile.css |8 +---
loleaflet/css/impress.css |3 ++-
loleaflet/css/toolbar.css | 14 --
3 files changed, 15 insertions(+), 10 deletions(-)
New commits:
commit 80542f6cf9646c89de54b6c7240ab6edbd7ba0f3
Author: Pedro Pinto Silva
AuthorDate: Mon Sep 7 15:51:30 2020 +0200
Commit: Pedro Silva
CommitDate: Tue Sep 8 10:25:57 2020 +0200
Fix inconsistencies wrt slide-sorter between impress and draw
- Inconsistencies between impress and draw (slide-sorter)
- Fix missing slide-sorter divider
- Mobile: Fix white borders
- Read-only mode inconsistencies (slide-sorter)
- Mobile: landscape: divider is present at the left edge of the screen
(remove)
- #presentation-toolbar misaligned and lack bottom border
Change-Id: Ib45438e955f4e65b35bae67b5d0edbc510a4987c
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102182
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index 3329c79a0..890c0d612 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -674,7 +674,7 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button
div.w2ui-icon, td[id
}
#document-container.portrait.readonly.parts-preview-document {
- bottom: 65px;
+ bottom: 61px;
}
#document-container.portrait.parts-preview-document {
@@ -686,7 +686,9 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button
div.w2ui-icon, td[id
#document-container.portrait.parts-preview-document.keyboard {
bottom: 33px;
}
-
+#document-container.portrait.parts-preview-document #map {
+ box-shadow: none;
+}
#slide-sorter.portrait {
max-height: 60px;
}
@@ -726,7 +728,7 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button
div.w2ui-icon, td[id
#document-container.landscape.parts-preview-document {
top: 41px;
left: 66px !important;
- bottom: 33px;
+ bottom: 35px;
}
#document-container.landscape.readonly.parts-preview-document {
diff --git a/loleaflet/css/impress.css b/loleaflet/css/impress.css
index 13f3763f4..d9b0f296b 100644
--- a/loleaflet/css/impress.css
+++ b/loleaflet/css/impress.css
@@ -1,4 +1,5 @@
-.presentation-doctype #map{
+.presentation-doctype #map, .drawing-doctype #map{
+ border-collapse: separate; /*To use box-shadow in Internet Explorer 9
or later, you must set border-collapse */
box-shadow: rgb(223, 223, 223) 0px 0px inset, #b6b6b6 1px 0px 0px inset;
}
#presentation-controls-wrapper {
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 6494a7e19..8e21f95df 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -87,12 +87,14 @@ w2ui-toolbar {
}
#presentation-toolbar {
- background-color: #dfdfdf;
- text-align: center;
- position: absolute;
- z-index: 500;
- width: 98%;
- padding: 0px 0px 10px 0px;
+ background-color: #dfdfdf;
+ text-align: center;
+ position: absolute;
+ z-index: 500;
+ width: 98%;
+ padding-bottom: 0px;
+ margin-top: -1px;
+ border-bottom: 1px solid #bb;
}
/* For MS Edge 40, the select2 combo boxes need to have higher z-index than
#map
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/notebookbar.css |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 277bf7c7c768093372931b1a84dc0d9a3695d5a9
Author: Szymon Kłos
AuthorDate: Mon Sep 7 12:52:50 2020 +0200
Commit: Szymon Kłos
CommitDate: Mon Sep 7 13:58:21 2020 +0200
notebookar: make loading spinners less distractive
Change-Id: I44d0e11d5f828b221b31d496ac4994134fb7d955
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102165
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index a6121768e..6bc396b55 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -683,7 +683,7 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
.ui-drawing-area-loader
{
border: 5px solid #f3f3f3;
- border-top: 5px solid #3498db;
+ border-top: 5px solid #d6d6d6;
border-radius: 50%;
width: 20px;
height: 20px;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/README
loleaflet/README |3 ++-
loleaflet/css/toolbar.css |2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 8123e4e26f9f691802ccd34e976543d790ae30b9
Author: Pranam Lashkari
AuthorDate: Tue Aug 25 05:23:30 2020 +0530
Commit: Pedro Silva
CommitDate: Mon Sep 7 12:00:45 2020 +0200
leaflet: menu options gets hidden behinde the statusbar
problems:
the main menu obscures the submenu,
the file name box / pencil obscures the submenu,
the submenu is hidden behind the status bar.
Change-Id: I8c3d08c9291c76c5b487e248ccbaf58410e3b54c
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101302
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/README b/loleaflet/README
index bdbf1..8cdbcdc1f 100644
--- a/loleaflet/README
+++ b/loleaflet/README
@@ -379,7 +379,8 @@ Z-index values:
---
menu items
---
-1000 main-menu(desktop-only), toolbar-down
+1000 main-menu(desktop-only)
+0 toolbar-down
1050 closebuttonwrapper (not being used currently)
---
on the top
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 5bb402afb..6494a7e19 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -16,7 +16,7 @@
padding: 0;
position: fixed;
bottom: 0;
- z-index: 1000;
+ z-index: 0;
border-top: 1px solid #bb;
}
#toolbar-down *{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/notebookbar.css |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit d83c6163fdafbdf9154b4ec4c6a29b1cb4805f94
Author: Pedro Pinto Silva
AuthorDate: Fri Sep 4 14:50:05 2020 +0200
Commit: Pedro Silva
CommitDate: Fri Sep 4 15:18:50 2020 +0200
Notebookbar: shortcutsbar: Fix hamburger menu entries hover state
fix the transparent background on hover state for the menu entries
introduced in https://gerrit.libreoffice.org/c/online/+/101833 by
making sure that the style is just applied to the top level anchor
Change-Id: I48d9d1cd22b618566d131c14d2cd2a345d21b85e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102047
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 233742b6c..a6121768e 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -105,10 +105,11 @@
.hasnotebookbar .notebookbar-shortcuts-bar #Menubar,
.hasnotebookbar .notebookbar-shortcuts-bar #Menubar li,
-.hasnotebookbar .notebookbar-shortcuts-bar #Menubar a {
- background-color: transparent;
+.hasnotebookbar .notebookbar-shortcuts-bar #Menubar > li > a {
+ background-color:transparent;
}
+
.hasnotebookbar .notebookbar-shortcuts-bar #Menubar > li > a {
cursor: pointer;
border: none;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/toolbar.css |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ddda854965fd47ed2ce6b3d51db3638aecc90773
Author: Pedro Pinto Silva
AuthorDate: Wed Sep 2 15:24:00 2020 +0200
Commit: Pedro Silva
CommitDate: Wed Sep 2 15:49:10 2020 +0200
Fix double semicolon added from
https://gerrit.libreoffice.org/c/online/+/67484
Change-Id: Iee19b722664ddb7c1ac6a0a85f1eb0052d6f37a0
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101931
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 986290d35..5bb402afb 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -35,7 +35,7 @@
content: '%';
}
#document-signing-bar {
- background-color: #ef324e;;
+ background-color: #ef324e;
}
#toolbar-search {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/notebookbar.css | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 424b914cec0b4279766b2f3054e8fa124d64bdf9
Author: Pedro Pinto Silva
AuthorDate: Tue Sep 1 11:59:12 2020 +0200
Commit: Pedro Silva
CommitDate: Tue Sep 1 12:48:13 2020 +0200
Notebookbar: shortcutsbar: hamburger menu + dialog
When a dialog is rendered the hamburger menu appears to have
a different color and thus, it stands out in the background.
Change-Id: I35766d083fc342f1d7bcbdca1ad9723057b70cd3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101833
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index eef4ebe1a..233742b6c 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -103,10 +103,15 @@
background: var(rgb(--green0-txt-primary-color));
}
+.hasnotebookbar .notebookbar-shortcuts-bar #Menubar,
+.hasnotebookbar .notebookbar-shortcuts-bar #Menubar li,
+.hasnotebookbar .notebookbar-shortcuts-bar #Menubar a {
+ background-color: transparent;
+}
+
.hasnotebookbar .notebookbar-shortcuts-bar #Menubar > li > a {
-cursor: pointer;
-border: none;
- background: var(--gray-bg-color);
+ cursor: pointer;
+ border: none;
height: 20px;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images
loleaflet/css/mobilewizard.css |1 +
loleaflet/images/lc_tableautofitmenu.svg |1 +
2 files changed, 2 insertions(+)
New commits:
commit a1b73c4001e007a33b3f1fb86ab9df15d3fb2e82
Author: Pedro Pinto Silva
AuthorDate: Thu Aug 27 15:49:06 2020 +0200
Commit: Pedro Silva
CommitDate: Mon Aug 31 12:40:28 2020 +0200
Mobile: Cell size icon missing, headers works
- Add lc_tableautofitmenu.svg
(used in the context menu when inside of a cell)
- Sometimes headers do not get properly set from JS:
missing "justify-content: space-between;" and so set it in the CSS side
Change-Id: If383b15fc5920f1074c6eb88dd45bd2667095d66
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101481
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index efb84291e..a83108951 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -316,6 +316,7 @@ p.mobile-wizard.ui-combobox-text.selected {
flex-direction: row;
align-items: center;
background-color: #fff;
+ justify-content: space-between;
}
.ui-header.mobile-wizard.disabled .ui-header-left * {
diff --git a/loleaflet/images/lc_tableautofitmenu.svg
b/loleaflet/images/lc_tableautofitmenu.svg
new file mode 100644
index 0..2b2b8590f
--- /dev/null
+++ b/loleaflet/images/lc_tableautofitmenu.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/device-mobile.css |3 ++-
loleaflet/src/control/Control.PartsPreview.js |3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 9c23e570421c881647c6035fa6ba00cd203f7ea5
Author: gokaysatir
AuthorDate: Fri Aug 28 15:58:46 2020 +0300
Commit: Andras Timar
CommitDate: Mon Aug 31 11:09:27 2020 +0200
loleaflet: Slides preview section improvements.
Change-Id: I4018cbc30d7b8b03f117bb229bf637706c70dc26
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101546
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index 38a7658f4..c12126a04 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -700,8 +700,9 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button
div.w2ui-icon, td[id
.preview-frame-portrait {
max-height: 60px;
max-width: 100%;
- display: table-cell;
+ display: inline-block;
padding-right: 1em;
+ margin: 0;
}
.preview-frame-portrait.preview-img-dropsite {
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index 718d65b50..ca5155d4d 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -62,6 +62,9 @@ L.Control.PartsPreview = L.Control.extend({
}
}
});
+
+ var scrollContainer =
$(this._partsPreviewCont).find('.mCSB_container').get(0);
+ scrollContainer.style.whiteSpace = 'nowrap';
},
_updateDisabled: function (e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/device-mobile.css |2 +-
loleaflet/css/mobilewizard.css |5 +++--
loleaflet/css/toolbar.css |8
3 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 8895a48d1f430260bc79ae1c65b447c7f70b1894
Author: gokaysatir
AuthorDate: Wed Aug 19 13:16:52 2020 +0300
Commit: Andras Timar
CommitDate: Thu Aug 27 20:48:21 2020 +0200
loleaflet: Insert shape window last row visibility.
Last row wasn't fully visible on Calculator mobile view.
Change-Id: Ia326fddc3510eabbca9b3d9b4bd90bf30f95f785
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100982
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index f78dd8fb8..38a7658f4 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -411,7 +411,7 @@
button.vex-dialog-button-secondary.vex-dialog-button.vex-last {
/* Related to toolbar.css */
.insertshape-grid {
box-sizing: content-box;
- position: absolute;
+ position: static;
padding: 2px 0px 2px 0px;
display: inline-block;
width: 100%;
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index ae530a7f3..efb84291e 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -194,7 +194,6 @@ p.mobile-wizard.ui-combobox-text.selected {
top: 111px;
bottom: 0px;
width: 100%;
- padding-bottom: 50px;
}
#mobile-wizard.funcwizard div#mobile-wizard-content.hideHelpBG {
background: none !important;
@@ -265,7 +264,8 @@ p.mobile-wizard.ui-combobox-text.selected {
bottom: 0px;
z-index: 1000;
background-color: white;
- box-shadow: 0px -2px 4px 1px #0030
+ box-shadow: 0px -2px 4px 1px #0030;
+ overflow-y: scroll;
}
#mobile-wizard-content *{
@@ -279,6 +279,7 @@ p.mobile-wizard.ui-combobox-text.selected {
height: 48px;
color: #636363;
border-bottom: 1px solid #dd !important;
+ position: sticky;
}
.ui-content.mobile-wizard {
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 3be4c97e6..986290d35 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -852,8 +852,7 @@ button.leaflet-control-search-next
}
.insertshape-grid .row:last-child {
- box-sizing: content-box;
- margin-bottom: 43px;
+ margin-bottom: 70px;
}
.insertshape-grid .col {
@@ -866,10 +865,11 @@ button.leaflet-control-search-next
.insertshape-grid .row-header {
height: 30px;
text-align: center;
- padding: 5px;
- padding-top: 10px;
+ padding: 7px;
clear: both;
background-color: rgba(128, 128, 128, 0.1);
+ position: static;
+ line-height: 30px;
}
.insertshape-grid .col:hover {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/notebookbar.css | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
New commits:
commit e382efb79ad28cb8b58ff42bfdcce728ed8cc29a
Author: Pedro Pinto Silva
AuthorDate: Wed Aug 26 16:07:26 2020 +0200
Commit: Pedro Silva
CommitDate: Wed Aug 26 16:41:33 2020 +0200
Notebookbar: Writer: fix Home misaligned icns
Change-Id: I8f8e249527664be910658e8550ff7e69f9746287
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101408
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index b820d8d3d..eef4ebe1a 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -220,7 +220,13 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
#table-Home-Section-Insert #table-GroupB20 #InsertTable.notebookbar {
width: 50px;
}
-
+#table-Home-Section-Insert #table-LineB9 #InsertGraphic.notebookbar{
+ width: auto;
+ margin-left: -2px;
+}
+#LineSpacing.notebookbar {
+ margin-left: -14px !important;
+}
#buttonbefore.notebookbar, #buttonafter.notebookbar,
#buttonoptimal.notebookbar, #buttonparallel.notebookbar,
#buttonnone.notebookbar, #buttonthrough.notebookbar, #bottom.notebookbar,
#top.notebookbar, #standard.notebookbar, #Bold.notebookbar,
#Italic.notebookbar, #Underline.notebookbar, #Strikeout.notebookbar{
margin: 0px !important;
padding: 0px !important;
@@ -348,7 +354,7 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
/* Writer */
/* Home tab */
-#table-HomeTab {
+#table-HomeTab {
margin-left: -16px;/*force alignment: clipboard elements*/
margin-top: -5px;
}
@@ -469,7 +475,8 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
#table-Reference-Section-Reference #InsertFootnote.notebookbar img,
#table-Reference-Section-Reference #InsertReferenceField.notebookbar img,
#InsertAuthoritiesEntry.notebookbar img,
-#UpdateAll.notebookbar img
+#UpdateAll.notebookbar img,
+#InsertReferenceField.notebookbar img
{
height: 32px !important;
width: 32px !important;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/toolbar.css |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 48bb33748b9fb115be7641a85676ca67a5783807
Author: Pedro Pinto Silva
AuthorDate: Wed Aug 26 14:27:04 2020 +0200
Commit: Pedro Silva
CommitDate: Wed Aug 26 15:31:05 2020 +0200
Mobile: Hamburger Menu: Add right padding to checkmarks
Change-Id: Ia4f5f95749661b2f0cb881d34b9c6c92ae682eed
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101404
Tested-by: Jenkins
Tested-by: Pedro Silva
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 7d51d6910..3be4c97e6 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -909,7 +909,7 @@ tr.useritem > td > img {
}
.menu-entry-checked {
- background: url(images/lc_listitem-selected.svg) no-repeat right;
+ background: url('images/lc_listitem-selected.svg') no-repeat 97% center;
}
.menu-entry-with-icon {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/notebookbar.css | 18 +++---
1 file changed, 15 insertions(+), 3 deletions(-)
New commits:
commit 27f75ae2d9825a74257806ba8e937c405b7acddc
Author: Szymon Kłos
AuthorDate: Wed Aug 26 12:42:48 2020 +0200
Commit: Szymon Kłos
CommitDate: Wed Aug 26 13:34:46 2020 +0200
notebookbar working css in IE
in IE/Edge:
- not working var()
- color with opacity must be used in rgba() format
- width: max-content not working, use nowrap
Change-Id: I771b2b8d58821144f5704d67126b5490a5f75c7a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101399
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 019bf95a2..b820d8d3d 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -31,15 +31,21 @@
box-shadow: 0 3px 0px 0px #fff, 0px -1px 8px -4px rgba(105, 105, 105,
0.4), -1px -15px 15px -4px rgb(77, 130, 184, 0.1);
}
.main-nav.hasnotebookbar.text-color-indicator .ui-tab.selected.notebookbar{
+ color: rgb(3, 105, 163);
color: var(rgb(--blue1-txt-primary-color));
+ text-shadow: 0px 0px 0.2px rgb(3, 105, 163);
text-shadow: 0px 0px 0.2px var(rgb(--blue1-txt-primary-color));
}
.main-nav.hasnotebookbar.spreadsheet-color-indicator
.ui-tab.selected.notebookbar{
+ color: rgb(16, 104, 2);
color: var(rgb(--green0-txt-primary-color));
+ text-shadow: 0px 0px 0.2px rgb(16, 104, 2);
text-shadow: 0px 0px 0.2px var(rgb(--green0-txt-primary-color));
}
.main-nav.hasnotebookbar.presentation-color-indicator
.ui-tab.selected.notebookbar{
+ color: rgb(163, 62, 3);
color: var(rgb(--orange1-txt-primary-color));
+ text-shadow: 0px 0px 0.2px rgb(163, 62, 3);
text-shadow: 0px 0px 0.2px var(rgb(--orange1-txt-primary-color));
}
.ui-tab.notebookbar:hover:not(.selected) {
@@ -81,16 +87,19 @@
.hasnotebookbar.text-color-indicator #shortcuts-menubar-icon,
.hasnotebookbar.text-color-indicator #shortcuts-menubar-icon:before,
.hasnotebookbar.text-color-indicator #shortcuts-menubar-icon:after {
+ background: rgb(3, 105, 163);
background: var(rgb(--blue1-txt-primary-color));
}
.hasnotebookbar.presentation-color-indicator #shortcuts-menubar-icon,
.hasnotebookbar.presentation-color-indicator #shortcuts-menubar-icon:before,
.hasnotebookbar.presentation-color-indicator #shortcuts-menubar-icon:after {
+ background: rgb(163, 62, 3);
background: var(rgb(--orange1-txt-primary-color));
}
.hasnotebookbar.spreadsheet-color-indicator #shortcuts-menubar-icon,
.hasnotebookbar.spreadsheet-color-indicator #shortcuts-menubar-icon:before,
.hasnotebookbar.spreadsheet-color-indicator #shortcuts-menubar-icon:after {
+ background: rgb(16, 104, 2);
background: var(rgb(--green0-txt-primary-color));
}
@@ -195,9 +204,9 @@
.hasnotebookbar .ui-content.unobutton.selected {
-webkit-filter: grayscale(0) brightness(90%) sepia(90%)
hue-rotate(-179deg) saturate(800%) contrast(0.7);
filter: grayscale(0) brightness(90%) sepia(90%) hue-rotate(-179deg)
saturate(800%) contrast(0.7);
- box-shadow: 0 0 0px 8px #e6e6e640;
+ box-shadow: 0 0 0px 8px rgba(230, 230, 230, 0.24);
border-radius: 0.1px;
- background-color: #e6e6e640;
+ background-color: rgba(230, 230, 230, 0.24);
}
div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookbar, #ObjectBackOne.notebookbar,
#ObjectForwardOne.notebookbar, #BringToFront.notebookbar,
#SetObjectToBackground.notebookbar, #SetObjectToForeground.notebookbar,
#FlipVertical.notebookbar, #FlipHorizontal.notebookbar, #Bold.notebookbar,
#Italic.notebookbar, #Underline.notebookbar, #Strikeout.notebookbar,
#StyleApply.notebookbar, #StyleUpdateByExample.notebookbar,
#StyleNewByExample.notebookbar, #Shadowed.notebookbar, #Grow.notebookbar,
#Shrink.notebookbar, #Spacing.notebookbar, #SuperScript.notebookbar,
#SubScript.notebookbar,#AlignLeft.notebookbar, #AlignRight.notebookbar,
#AlignHorizontalCenter.notebookbar, #AlignBlock.notebookbar,
#ParaRightToLeft.notebookbar, #ParaLeftToRight.notebookbar,
#AlignTop.notebookbar, #AlignVCenter.notebookbar, #AlignBottom.notebookbar,
#IncrementIndent.notebookbar, #DecrementIndent.notebookbar,
#LeftPara.notebookbar, #RightPara.notebookbar, #CenterPara.notebookbar, #Justif
yPara.notebookbar, #DefaultBullet.notebookbar, #DefaultNumbering.notebookbar,
#ParaspaceIncrease.notebookbar, #ParaspaceDecrease.notebookbar,
#LineSpacing.notebookbar, #HangingIndent.notebookbar, #CellVertTop.notebookbar,
#CellVertCenter.notebookbar, #CellVertBottom.notebookbar,
#DeleteTable.notebookbar, #MergeCells.notebookbar{
@@ -229,6 +238,7 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
.unotoolbutton.notebookbar .unolabel {
font-family:
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/device-mobile.css |3 +++
loleaflet/css/device-tablet.css |3 +++
2 files changed, 6 insertions(+)
New commits:
commit 1cbb8713363aee45c97c0cd057d039c6bcefa962
Author: Pedro Pinto Silva
AuthorDate: Wed Aug 26 09:50:43 2020 +0200
Commit: Andras Timar
CommitDate: Wed Aug 26 10:02:35 2020 +0200
Mobile: Fix misalignment due to vex sizing
- make sure avatar container is set to content-box instead of border-box
Change-Id: I342f01136bee99a0154527f34703b323cd62aeb5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101381
Tested-by: Andras Timar
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index 69c20c215..f78dd8fb8 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -312,6 +312,9 @@ div#w2ui-overlay-actionbar.w2ui-overlay{
.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input select,
.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input textarea,
.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="date"],
.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="datetime"],
.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input
input[type="datetime-local"], .vex.vex-theme-plain .vex-dialog-form
.vex-dialog-input input[type="email"], .vex.vex-theme-plain .vex-dialog-form
.vex-dialog-input input[type="month"], .vex.vex-theme-plain .vex-dialog-form
.vex-dialog-input input[type="number"], .vex.vex-theme-plain .vex-dialog-form
.vex-dialog-input input[type="password"], .vex.vex-theme-plain .vex-dialog-form
.vex-dialog-input input[type="search"], .vex.vex-theme-plain .vex-dialog-form
.vex-dialog-input input[type="tel"], .vex.vex-theme-plain .vex-dialog-form
.vex-dialog-input input[type="text"], .vex.vex-theme-plain .vex-dialog-form
.vex-dialog-input input[type="time"], .vex.vex
-theme-plain .vex-dialog-form .vex-dialog-input input[type="url"],
.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="week"]{
padding: 0 !important
}
+.vex-content .loleaflet-annotation-img {
+ box-sizing: content-box !important;
+}
.vex-dialog-input > textarea.loleaflet-annotation-textarea {
height: 198px;
border: 4px solid #f0f0f0 !important;
diff --git a/loleaflet/css/device-tablet.css b/loleaflet/css/device-tablet.css
index 8b7761b97..a31b49dc2 100644
--- a/loleaflet/css/device-tablet.css
+++ b/loleaflet/css/device-tablet.css
@@ -45,3 +45,6 @@
width: 0;
height: 0;
}
+.vex-content .loleaflet-annotation-img {
+ box-sizing: content-box !important;
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/notebookbar.css |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 7fba29f19026f0a990ccc1b1f680292bf9985efe
Author: Szymon Kłos
AuthorDate: Tue Aug 25 13:49:28 2020 +0200
Commit: Szymon Kłos
CommitDate: Wed Aug 26 09:19:22 2020 +0200
notebookbar: align home tab
Change-Id: I24c83af9e5136b17e06d78043e447c107e17f716
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101323
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 7d831bcdc..019bf95a2 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -247,9 +247,6 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
.unotoolbutton.notebookbar .unobutton.selected {
box-shadow: 0 0 0px 4px #e6e6e640 !important;
}
-#table-HomeTab {
- margin-left: -16px;/*force alignment: clipboard elements*/
-}
#table-HomeTab .unospan-uptoolbar:not(.disabled) {
border-top-left-radius: 12px;
border-bottom-left-radius: 12px;
@@ -339,6 +336,11 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
/* Writer */
/* Home tab */
+#table-HomeTab {
+ margin-left: -16px;/*force alignment: clipboard elements*/
+ margin-top: -5px;
+}
+
#clearFormatting.notebookbar div img {
width: 24px !important;
height: 24px !important;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/device-mobile.css |2 +-
loleaflet/src/control/Control.PartsPreview.js | 10 +++---
2 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit a5e77d71c25d64fd9d2458a9de90e64acc87a4a9
Author: gokaysatir
AuthorDate: Tue Aug 25 13:42:05 2020 +0300
Commit: Andras Timar
CommitDate: Tue Aug 25 22:08:35 2020 +0200
Loleaflet: Impress image previews are adjusted.
Change-Id: I0c333b58e823702678c4c292de2f58adabbdb3c1
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101319
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index 2efd9d6cf..69c20c215 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -696,7 +696,7 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button
div.w2ui-icon, td[id
.preview-frame-portrait {
max-height: 60px;
- max-width: initial;
+ max-width: 100%;
display: table-cell;
padding-right: 1em;
}
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index 7d4648f7d..718d65b50 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -12,8 +12,8 @@ L.Control.PartsPreview = L.Control.extend({
frameClass: '',
axis: '',
allowOrientation: true,
- maxWidth: !window.mode.isDesktop() ? 60 : 180,
- maxHeight: !window.mode.isDesktop() ? 60 : 180
+ maxWidth: window.mode.isDesktop() ? 180:
(window.mode.isTablet() ? 120: 60),
+ maxHeight: window.mode.isDesktop() ? 180:
(window.mode.isTablet() ? 120: 60)
},
partsFocused: false,
@@ -129,6 +129,7 @@ L.Control.PartsPreview = L.Control.extend({
this._previewTiles.push(this._createPreview(i, e.partNames[i], bottomBound));
}
L.DomUtil.addClass(this._previewTiles[selectedPart], 'preview-img-currentpart');
+ this._onScroll(); // Load previews.
this._previewInitialized = true;
}
else
@@ -314,11 +315,6 @@ L.Control.PartsPreview = L.Control.extend({
this._previewFrameHeight = imgHeight + 2 *
previewImgBorder;
}
}
-
- if (!window.mode.isDesktop() && imgSize) {
- L.DomUtil.setStyle(img, 'width', imgSize.width + 'px');
- L.DomUtil.setStyle(img, 'height', imgSize.height +
'px');
- }
},
_setPart: function (e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/html loleaflet/src
loleaflet/css/loleaflet.css|8 +--
loleaflet/css/menubar.css | 50 +++
loleaflet/css/mobilewizard.css |2
loleaflet/css/notebookbar.css | 18 +++
loleaflet/css/toolbar.css | 53 +++--
loleaflet/html/loleaflet.html.m4 |2
loleaflet/src/control/Control.DocumentNameInput.js |2
7 files changed, 94 insertions(+), 41 deletions(-)
New commits:
commit 1c4dcc1f587876b6c3880d3b0e8e7b593eeb26b6
Author: Pedro Pinto Silva
AuthorDate: Thu Aug 20 12:35:10 2020 +0200
Commit: Pedro Silva
CommitDate: Tue Aug 25 12:55:50 2020 +0200
Document Name Input: make it flexible (dynamic width) and
* convert var colors to rgb
* use the var colors for shadow + alpha (rgba)
* .document-title container: remove table display and add min width
Change-Id: Id4289af91562790edd23c83d4e70a16688e44fe3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101048
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 1b84d1091..28161c6c4 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -13,9 +13,9 @@
/*LibreOffice Colors:
https://wiki.documentfoundation.org/Marketing/Branding#Colors
--[to do]*/
- --blue1-txt-primary-color: #0369A3;
- --green0-txt-primary-color: #106802; /*green1 lacks contrast against
white*/
- --orange1-txt-primary-color: #A33E03;
+ --blue1-txt-primary-color: 3, 105, 163;
+ --green0-txt-primary-color: 16, 104, 2; /*green1 lacks contrast against
white*/
+ --orange1-txt-primary-color: 163, 62, 3;
--gray-light-txt--color: #696969;
--gray-bg-color: #EFEFEF;
@@ -631,4 +631,4 @@ body {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
-}
\ No newline at end of file
+}
diff --git a/loleaflet/css/menubar.css b/loleaflet/css/menubar.css
index 84e07849b..ad09ffa61 100644
--- a/loleaflet/css/menubar.css
+++ b/loleaflet/css/menubar.css
@@ -21,25 +21,33 @@
}
.document-logo {
- position: relative;
- width: 22px;
- height: 30px;
+ position: relative;
+ width: 22px;
+ height: 30px;
}
.document-title {
-display: table-cell;
-vertical-align: middle;
height: 30px;
+min-width: 84px;
white-space: nowrap;
+display: flex;
+align-items: center;
+justify-content: flex-start;
}
#document-titlebar {
position: relative;
-display: inline-block;
+display: inline-table; /*new*/
table-layout: fixed;
-border-spacing: 5px 0px;
+border-spacing: 5px 0;
max-height: 39px;
z-index: 1000;
+width: calc(100% - 890px);
+right: 0px;
+}
+
+.main-nav.hasnotebookbar #document-titlebar {
+ top: -10px;
}
.main-nav {
@@ -51,8 +59,8 @@
}
.main-nav.hasnotebookbar{
- background: var(--gray-bg-color);
- margin-top: 0px;
+ background: var(--gray-bg-color);
+ margin-top: 0px;
}
/* Customizations to sm-simple theme to make it look like LO menu, lo-menu
class */
@@ -241,24 +249,24 @@
}
.writer-icon-img {
- background-image: url('images/x-office-document.svg');
- background-size: 30px 30px;
- background-repeat: no-repeat;
- background-position: bottom;
+ background-image: url('images/x-office-document.svg');
+ background-size: 30px 30px;
+ background-repeat: no-repeat;
+ background-position: bottom;
}
.calc-icon-img {
- background-image: url('images/x-office-spreadsheet.svg');
- background-size: 30px 30px;
- background-repeat: no-repeat;
- background-position: bottom;
+ background-image: url('images/x-office-spreadsheet.svg');
+ background-size: 30px 30px;
+ background-repeat: no-repeat;
+ background-position: bottom;
}
.impress-icon-img {
- background-image: url('images/x-office-presentation.svg');
- background-size: 30px 30px;
- background-repeat: no-repeat;
- background-position: bottom;
+ background-image: url('images/x-office-presentation.svg');
+ background-size: 30px 30px;
+ background-repeat: no-repeat;
+ background-position: bottom;
}
#menu-last-mod a {
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 0cc9e768c..ae530a7f3 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -666,7 +666,7 @@ a.leaflet-control-zoom-in {
float:left;
}
#MergeCells > span{
- color: var(--blue1-txt-primary-color);
+ color: var(rgb(--blue1-txt-primary-color));
text-align: end;
vertical-align: bottom;
}
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 77dc94881..7d831bcdc 100644
---
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/leaflet.css|5 +
loleaflet/css/loleaflet.css |6 +++---
loleaflet/src/control/Control.Toolbar.js |6 ++
loleaflet/src/layer/marker/Cursor.js |4 +++-
4 files changed, 13 insertions(+), 8 deletions(-)
New commits:
commit cb5e5b3e505aa85e13d74fe7fc2eb263138c1306
Author: Pranam Lashkari
AuthorDate: Thu Jul 9 16:50:27 2020 +0530
Commit: Andras Timar
CommitDate: Thu Aug 20 09:55:19 2020 +0200
leaflet: changing cursor according to objects selected
text cursor only if cursor is visible
appropriate cursor for drag markers
move cursor for selected object
Change-Id: If750ac91fc870a0d730d4455c51bde0423c55e4a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98425
Tested-by: Andras Timar
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css
index 98f6aa71b..67899f262 100644
--- a/loleaflet/css/leaflet.css
+++ b/loleaflet/css/leaflet.css
@@ -185,10 +185,7 @@
/* cursors */
.leaflet-interactive {
- cursor: pointer;
- }
-.leaflet-container {
- cursor: text;
+ cursor: move;
}
.leaflet-crosshair,
.leaflet-crosshair .leaflet-interactive {
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 2c3703763..1b84d1091 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -69,14 +69,14 @@
z-index: 1000;
}
-#document-container.text-doctype > #map{
- cursor: text;
-}
.scroll-container .mCSB_scrollTools.mCSB_1_scrollbar {
position: absolute;
z-index: 1000;
}
+.bucket-cursor {
+ cursor: url('images/cursors/fill.png'), auto !important;
+}
.loleaflet-scrollbar-show {
opacity: 1 !important;
filter: "alpha(opacity=100)" !important;
diff --git a/loleaflet/src/control/Control.Toolbar.js
b/loleaflet/src/control/Control.Toolbar.js
index 8e4aaf6af..9a124cf88 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -838,6 +838,12 @@ function onCommandStateChanged(e) {
toolbar.disable('repair');
}
}
+ else if (commandName === '.uno:FormatPaintbrush') {
+ if (state === 'true')
+
$('.leaflet-pane.leaflet-map-pane').addClass('bucket-cursor');
+ else
+
$('.leaflet-pane.leaflet-map-pane').removeClass('bucket-cursor');
+ }
var id = unoCmdToToolbarId(commandName);
// id is set to '' by unoCmdToToolbarId() if the statechange message
should be ignored.
diff --git a/loleaflet/src/layer/marker/Cursor.js
b/loleaflet/src/layer/marker/Cursor.js
index c668c205f..71cd97a00 100644
--- a/loleaflet/src/layer/marker/Cursor.js
+++ b/loleaflet/src/layer/marker/Cursor.js
@@ -3,6 +3,7 @@
* L.Cursor blinking cursor.
*/
+ /* global $ */
L.Cursor = L.Layer.extend({
options: {
@@ -22,7 +23,7 @@ L.Cursor = L.Layer.extend({
if (!this._container) {
this._initLayout();
}
-
+ $('.leaflet-pane.leaflet-map-pane').css('cursor', 'text');
this._zoomAnimated = this._zoomAnimated &&
this.options.zoomAnimation;
if (this._zoomAnimated) {
L.DomUtil.addClass(this._container,
'leaflet-zoom-animated');
@@ -35,6 +36,7 @@ L.Cursor = L.Layer.extend({
onRemove: function () {
this._map.off('splitposchanged', this.update, this);
+ $('.leaflet-pane.leaflet-map-pane').css('cursor', '');
if (this._container) {
this.getPane().removeChild(this._container);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/loleaflet.css |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 745f4a5287b987649ccf80d618843ae0e843f5fd
Author: gokaysatir
AuthorDate: Tue Aug 11 19:09:45 2020 +0530
Commit: Andras Timar
CommitDate: Wed Aug 19 21:40:53 2020 +0200
leaflet: truncate long links in the popup
Change-Id: I82ab8d35e0c57aa82b130a89d0d4c7b3ba0b50e6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100547
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Aron Budea
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101020
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 5fbfe8c6b..2c3703763 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -625,4 +625,10 @@ body {
.word-wrap-for-vex-dialog {
overflow-wrap: break-word;
+}
+
+.hyperlink-popup .leaflet-popup-content {
+ white-space: nowrap;
+overflow: hidden;
+text-overflow: ellipsis;
}
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/toolbar.css | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
New commits:
commit 5de37de1c7e51443889979c06ad0bfbe1d3f5630
Author: gokaysatir
AuthorDate: Wed Aug 12 19:20:42 2020 +0300
Commit: Henry Castro
CommitDate: Sat Aug 15 00:01:06 2020 +0200
loleaflet mobile: Insert image: Make all items visible.
Change-Id: If479adf4a3b106676f9174669e3f7141bb23964d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100613
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 0f11a2b34..9b1b579af 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -792,21 +792,27 @@ button.leaflet-control-search-next
.insertshape-grid {
box-sizing: border-box;
background: rgba(255, 255, 255, 0.5);
- position: relative;
+ position: static;
padding: 2px;
- display: inline-block;
+ display: block;
min-width: 350px;
width: 100%;
- height: 100%;
+ height: auto;
}
.insertshape-grid .row {
- height: 30px;
+ height: auto;
+ position: static;
+ text-align: left;
+}
+
+.insertshape-grid .row:last-child {
+ box-sizing: content-box;
+ margin-bottom: 43px;
}
.insertshape-grid .col {
- height: 100%;
- float: left;
+ height: 30px;
padding: 2px;
width: 30px;
border: 1px solid transparent;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/device-mobile.css |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 14cc329613aed20ddada3c6698bac7f7c013f711
Author: Henry Castro
AuthorDate: Thu Aug 13 09:55:56 2020 -0400
Commit: Henry Castro
CommitDate: Fri Aug 14 02:04:22 2020 +0200
loleaflet: fix CSS style properties for landscape
orientation
Change-Id: I75e64d4f24405cb0c5a263d03d65a7b89ce7b528
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100681
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index 57486838e..2efd9d6cf 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -740,9 +740,9 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button
div.w2ui-icon, td[id
}
.preview-img-landscape {
- min-width: 40px;
- max-width: 40px;
- margin-left: 8px;
+ min-width: 20px;
+ max-width: 60px;
+ margin-left: 1px;
}
.preview-frame-landscape {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/loleaflet.css |4
loleaflet/src/control/Control.AlertDialog.js |1 +
2 files changed, 5 insertions(+)
New commits:
commit 091df95ac1e8615a65e116a338a4ae643910e030
Author: gokaysatir
AuthorDate: Mon Aug 10 11:10:30 2020 +0300
Commit: Jan Holesovsky
CommitDate: Tue Aug 11 16:13:56 2020 +0200
loleaflet: Wrap long words on hyperlink open dialog.
Change-Id: I944b2314c766f7e3f7f313a5afea3b022b637c05
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100416
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 6f5ad442c..5fbfe8c6b 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -622,3 +622,7 @@ body {
.drop-down-field-list-item:hover {
background: #0b87e7;
}
+
+.word-wrap-for-vex-dialog {
+ overflow-wrap: break-word;
+}
\ No newline at end of file
diff --git a/loleaflet/src/control/Control.AlertDialog.js
b/loleaflet/src/control/Control.AlertDialog.js
index c73d87d92..c7cff3b8b 100644
--- a/loleaflet/src/control/Control.AlertDialog.js
+++ b/loleaflet/src/control/Control.AlertDialog.js
@@ -83,6 +83,7 @@ L.Control.AlertDialog = L.Control.extend({
vex.dialog.open({
message: messageText,
showCloseButton: true,
+ contentClassName: 'word-wrap-for-vex-dialog',
buttons: buttonsList,
callback: function() {},
afterClose: function () {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/notebookbar.css | 19 ++-
loleaflet/src/control/Control.NotebookbarCalc.js|4 ++--
loleaflet/src/control/Control.NotebookbarImpress.js |8
loleaflet/src/control/Control.NotebookbarWriter.js |8
4 files changed, 12 insertions(+), 27 deletions(-)
New commits:
commit 93f3c3ae6203fd82359692d10a3b27db0408177b
Author: Szymon Kłos
AuthorDate: Fri Aug 7 09:47:52 2020 +0200
Commit: Andras Timar
CommitDate: Fri Aug 7 10:21:03 2020 +0200
notebookbar: don't change stacked items to inline
Change-Id: I6dfb54c7bb313e4fdfca6105dfbb9e573e993693
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100285
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index be9dc56ae..9d65c25b2 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -289,10 +289,7 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
text-align: center;
}
.unotoolbutton.notebookbar.has-label > *{ /*so they stay side by side*/
- display: inline-block;
-}
-.spreadsheet-color-indicator.hasnotebookbar + #toolbar-wrapper #table-Insert
.unotoolbutton.notebookbar.has-label > *{ /*except on calc insert, where we
want double line*/
- display: inline;
+ display: table-cell;
}
.unotoolbutton.notebookbar.has-label {
@@ -413,14 +410,6 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
margin-top: 15px;
}
-#table-Insert #InsertTable.notebookbar {
- width: 142px;
-}
-
-#table-Insert #BasicShapes.notebookbar{
- width: 170px;
-}
-
#table-Insert-Section-Pagebreak #InsertPagebreak.notebookbar img,
#table-Insert-Section-Table #InsertTable.notebookbar img,
#InsertObjectChart.notebookbar img,
@@ -678,12 +667,8 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
/* Insert Tab */
-.presentation-color-indicator + #toolbar-wrapper #table-Insert
#InsertTable.notebookbar {
- width: 108px;
-}
-
#table-Insert #HeaderAndFooter.notebookbar {
- width: 160px;
+ min-width: 160px;
}
#table-Insert-Section-DrawText #Text.notebookbar img,
diff --git a/loleaflet/src/control/Control.NotebookbarCalc.js
b/loleaflet/src/control/Control.NotebookbarCalc.js
index b05ea8650..de2a5f827 100644
--- a/loleaflet/src/control/Control.NotebookbarCalc.js
+++ b/loleaflet/src/control/Control.NotebookbarCalc.js
@@ -2208,14 +2208,14 @@ L.Control.NotebookbarCalc =
L.Control.NotebookbarWriter.extend({
'enabled': 'true',
'children': [
{
-
'type': 'bigtoolitem',
+
'type': 'toolitem',
'text': _UNO('.uno:BasicShapes'),
'command': '.uno:BasicShapes'
}
]
}
],
-
'vertical': 'false'
+
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/notebookbar.css | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
New commits:
commit a15bd4fcc6e403bea036e1deceb5b0ea56deb7d3
Author: Pedro Pinto Silva
AuthorDate: Thu Aug 6 17:27:06 2020 +0200
Commit: Pedro Silva
CommitDate: Thu Aug 6 17:59:53 2020 +0200
Notebookbar: force subitems of unotoolbuttons to be side by side instead of
stacked
there were some problems before, particullary with bigtoolitem types
Change-Id: Iee9816977d782221290e641527eb422291768e6a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100257
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 8f0ed9c35..be9dc56ae 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -288,6 +288,12 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
.unotoolbutton.notebookbar {
text-align: center;
}
+.unotoolbutton.notebookbar.has-label > *{ /*so they stay side by side*/
+ display: inline-block;
+}
+.spreadsheet-color-indicator.hasnotebookbar + #toolbar-wrapper #table-Insert
.unotoolbutton.notebookbar.has-label > *{ /*except on calc insert, where we
want double line*/
+ display: inline;
+}
.unotoolbutton.notebookbar.has-label {
text-align: center;
@@ -408,10 +414,10 @@ div[id*='Row'].notebookbar,
div[id*='Column'].notebookbar, #SendToBack.notebookb
}
#table-Insert #InsertTable.notebookbar {
- width: 130px;
+ width: 142px;
}
-#table-Insert #BasicShapes.notebookbar {
+#table-Insert #BasicShapes.notebookbar{
width: 170px;
}
@@ -673,7 +679,7 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
/* Insert Tab */
.presentation-color-indicator + #toolbar-wrapper #table-Insert
#InsertTable.notebookbar {
- width: 80px;
+ width: 108px;
}
#table-Insert #HeaderAndFooter.notebookbar {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/notebookbar.css |8
loleaflet/src/control/Control.NotebookbarImpress.js | 394 +++-
loleaflet/src/control/Control.NotebookbarWriter.js | 16
loleaflet/src/unocommands.js|2
4 files changed, 410 insertions(+), 10 deletions(-)
New commits:
commit fd8a1252709a765cb124ed6b5c3bdd33b9de110b
Author: Szymon Kłos
AuthorDate: Thu Aug 6 09:05:09 2020 +0200
Commit: Szymon Kłos
CommitDate: Thu Aug 6 09:51:28 2020 +0200
notebookbar: customize Insert tab in Impress
Change-Id: I079148922effbef618fb337f82c35bfefa3d89b3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100195
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index ef1aa46e1..aecffe463 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -664,6 +664,14 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
/* Insert Tab */
+.presentation-color-indicator + #toolbar-wrapper #table-Insert
#InsertTable.notebookbar {
+ width: 80px;
+}
+
+#table-Insert #HeaderAndFooter.notebookbar {
+ width: 160px;
+}
+
#table-Insert-Section-DrawText #Text.notebookbar img,
#table-Insert-Section-Slide #InsertPage.notebookbar img
{
diff --git a/loleaflet/src/control/Control.NotebookbarImpress.js
b/loleaflet/src/control/Control.NotebookbarImpress.js
index a0f13cb56..6c4eb3ea5 100644
--- a/loleaflet/src/control/Control.NotebookbarImpress.js
+++ b/loleaflet/src/control/Control.NotebookbarImpress.js
@@ -95,8 +95,8 @@ L.Control.NotebookbarImpress =
L.Control.NotebookbarWriter.extend({
},
{
'text': _('~Insert'),
- 'id': '3',
- 'name': 'InsertLabel'
+ 'id': '-4',
+ 'name': 'Insert'
},
{
'text': _('~Review'),
@@ -141,6 +141,10 @@ L.Control.NotebookbarImpress =
L.Control.NotebookbarWriter.extend({
case 'Format':
this.loadTab(this.getFormatTab());
break;
+
+ case 'Insert':
+ this.loadTab(this.getInsertTab());
+ break;
}
},
@@ -1977,6 +1981,392 @@ L.Control.NotebookbarImpress =
L.Control.NotebookbarWriter.extend({
}
]
};
+ },
+
+ getInsertTab: function() {
+ return {
+ 'id': '',
+ 'type': 'control',
+ 'text': '',
+ 'enabled': 'true',
+ 'children': [
+ {
+ 'id': '',
+ 'type': 'container',
+ 'text': '',
+ 'enabled': 'true',
+ 'children': [
+ {
+ 'id': 'NotebookBar',
+ 'type': 'grid',
+ 'text': '',
+ 'enabled': 'true',
+ 'children': [
+ {
+ 'id':
'box',
+ 'type':
'container',
+ 'text':
'',
+
'enabled': 'true',
+
'children': [
+
{
+
'id': 'ContextContainer',
+
'type': 'tabcontrol',
+
'text': '',
+
'enabled': 'true',
+
'children': [
+
{
+
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src scripts/unocommands.py
loleaflet/css/notebookbar.css | 25 -
loleaflet/src/control/Control.NotebookbarWriter.js | 461 -
loleaflet/src/layer/tile/TileLayer.js |1
loleaflet/src/unocommands.js | 11
scripts/unocommands.py | 20
5 files changed, 505 insertions(+), 13 deletions(-)
New commits:
commit 9dd57f8fe1355059156310af8eb0ac26b800c61e
Author: Szymon Kłos
AuthorDate: Wed Aug 5 15:54:28 2020 +0200
Commit: Szymon Kłos
CommitDate: Thu Aug 6 08:16:19 2020 +0200
notebookbar: customize Insert tab in Writer
Change-Id: I531854b4c7361fe5802a64016886feab5cda8979
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100177
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 70805ca81..ef1aa46e1 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -190,7 +190,9 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
}
/* avoid bug with arrow in new line when window is small */
-#LineSpacing.notebookbar, #InsertGraphic.notebookbar,
#BasicShapes.notebookbar, #InsertTable.notebookbar {
+#LineSpacing.notebookbar,
+#table-Home-Section-Insert #table-LineB9 #InsertGraphic.notebookbar,
+#table-Home-Section-Insert #table-GroupB20 #InsertTable.notebookbar {
width: 50px;
}
@@ -397,13 +399,20 @@ div[id*='Row'].notebookbar,
div[id*='Column'].notebookbar, #SendToBack.notebookb
/* Insert Tab */
#InsertReferenceField.notebookbar,
-#InsertSection.notebookbar,
-#table-Insert {
+#InsertSection.notebookbar {
margin-top: 5px;
}
-#table-shapes6 #BasicShapes.notebookbar {
- margin-top: 10px;
+#table-Insert {
+ margin-top: 15px;
+}
+
+#table-Insert #InsertTable.notebookbar {
+ width: 130px;
+}
+
+#table-Insert #BasicShapes.notebookbar {
+ width: 170px;
}
#table-Insert-Section-Pagebreak #InsertPagebreak.notebookbar img,
@@ -412,8 +421,6 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
#table-Insert-Section-Image #InsertGraphic.notebookbar img,
#HyperlinkDialog.notebookbar img,
#InsertFieldCtrl.notebookbar img,
-#DrawText.notebookbar img,
-#VerticalText.notebookbar img,
#BasicShapes.notebookbar img,
#table-Insert-Section-Symbol #CharmapControl.notebookbar img
{
@@ -464,8 +471,8 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
}
#InsertMultiIndex.notebookbar img,
-#InsertFootnote.notebookbar img,
-#InsertReferenceField.notebookbar img,
+#table-Reference-Section-Reference #InsertFootnote.notebookbar img,
+#table-Reference-Section-Reference #InsertReferenceField.notebookbar img,
#InsertAuthoritiesEntry.notebookbar img,
#UpdateAll.notebookbar img
{
diff --git a/loleaflet/src/control/Control.NotebookbarWriter.js
b/loleaflet/src/control/Control.NotebookbarWriter.js
index 4bd748a97..eb3002beb 100644
--- a/loleaflet/src/control/Control.NotebookbarWriter.js
+++ b/loleaflet/src/control/Control.NotebookbarWriter.js
@@ -21,8 +21,8 @@ L.Control.NotebookbarWriter = L.Control.Notebookbar.extend({
},
{
'text': _('~Insert'),
- 'id': '3',
- 'name': 'InsertLabel'
+ 'id': '-4',
+ 'name': 'Insert'
},
{
'text': _('~Layout'),
@@ -77,6 +77,10 @@ L.Control.NotebookbarWriter = L.Control.Notebookbar.extend({
case 'Format':
this.loadTab(this.getFormatTab());
break;
+
+ case 'Insert':
+ this.loadTab(this.getInsertTab());
+ break;
}
},
@@ -2076,6 +2080,459 @@ L.Control.NotebookbarWriter =
L.Control.Notebookbar.extend({
}
]
};
+ },
+
+ getInsertTab: function() {
+ return {
+ 'id': '',
+ 'type': 'control',
+ 'text': '',
+ 'enabled': 'true',
+ 'children': [
+ {
+ 'id': '',
+ 'type': 'container',
+ 'text': '',
+ 'enabled': 'true',
+ 'children': [
+ {
+ 'id': 'NotebookBar',
+ 'type': 'grid',
+
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/notebookbar.css | 17 +
loleaflet/images/lc_fontdialog.svg |1
loleaflet/images/lc_outlinebullet.svg |1
loleaflet/images/lc_paragraphdialog.svg |1
loleaflet/images/lc_transformdialog.svg |1
loleaflet/src/control/Control.JSDialogBuilder.js|2
loleaflet/src/control/Control.NotebookbarBuilder.js | 12 +
loleaflet/src/control/Control.NotebookbarImpress.js | 175
loleaflet/src/control/Control.NotebookbarWriter.js | 163 ++
9 files changed, 373 insertions(+)
New commits:
commit 936ea3eb1992f3abe87c0c1e7aad290ed2687f4e
Author: Szymon Kłos
AuthorDate: Wed Aug 5 11:15:51 2020 +0200
Commit: Szymon Kłos
CommitDate: Wed Aug 5 11:57:13 2020 +0200
notebookbar: Format tab for writer & impress
Change-Id: Id4365aff42af94d23b398736d00c6c9cde02e4ee
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100156
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 15924d608..70805ca81 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -283,6 +283,18 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
filter: grayscale(100%) brightness(100%);
}
+.unotoolbutton.notebookbar {
+ text-align: center;
+}
+
+.unotoolbutton.notebookbar.has-label {
+ text-align: center;
+}
+
+.unotoolbutton.notebookbar.has-label:not(.inline) img {
+ width: 32px !important;
+ height: 32px !important;
+}
/* unobuttons with inline labels */
@@ -473,6 +485,11 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
display: none;
}
+/* Format Tab */
+#table-Format-Section.notebookbar {
+ margin-top: 25px;
+}
+
/* Table Tab */
#table-Table-Container,
diff --git a/loleaflet/images/lc_fontdialog.svg
b/loleaflet/images/lc_fontdialog.svg
new file mode 100644
index 0..245d0ddc4
--- /dev/null
+++ b/loleaflet/images/lc_fontdialog.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/images/lc_outlinebullet.svg
b/loleaflet/images/lc_outlinebullet.svg
new file mode 100644
index 0..cb72428fd
--- /dev/null
+++ b/loleaflet/images/lc_outlinebullet.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/images/lc_paragraphdialog.svg
b/loleaflet/images/lc_paragraphdialog.svg
new file mode 100644
index 0..c6ceb2578
--- /dev/null
+++ b/loleaflet/images/lc_paragraphdialog.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/images/lc_transformdialog.svg
b/loleaflet/images/lc_transformdialog.svg
new file mode 100644
index 0..87f5bd3e2
--- /dev/null
+++ b/loleaflet/images/lc_transformdialog.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index d3b1fe202..5c7313370 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1654,9 +1654,11 @@ L.Control.JSDialogBuilder = L.Control.extend({
label.innerHTML = data.text;
controls['label'] = label;
+ $(div).addClass('has-label');
} else {
div.title = data.text;
$(div).tooltip();
+ $(div).addClass('no-label');
}
if (builder.options.useInLineLabelsForUnoButtons ===
true) {
diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js
b/loleaflet/src/control/Control.NotebookbarBuilder.js
index 2420109cb..40e3320cc 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -17,6 +17,7 @@ L.Control.NotebookbarBuilder =
L.Control.JSDialogBuilder.extend({
this._controlHandlers['listbox'] = this._comboboxControlHandler;
this._controlHandlers['tabcontrol'] =
this._overridenTabsControlHandler;
this._controlHandlers['menubartoolitem'] =
this._menubarToolItemHandler;
+ this._controlHandlers['bigtoolitem'] = this._bigtoolitemHandler;
this._controlHandlers['pushbutton'] = function() { return
false; };
this._controlHandlers['spinfield'] = function() { return false;
};
@@ -182,6 +183,17 @@ L.Control.NotebookbarBuilder =
L.Control.JSDialogBuilder.extend({
this._toolitemHandlers['vnd.sun.star.findbar:FocusToFindbar'] =
function() {};
},
+ _bigtoolitemHandler:
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/notebookbar.css | 10 ++
loleaflet/images/lc_combine.svg |1 +
loleaflet/images/lc_dismantle.svg |1 +
loleaflet/images/lc_distributeselection.svg |1 +
loleaflet/images/lc_forward.svg |1 +
loleaflet/images/lc_intersect.svg |1 +
loleaflet/images/lc_merge.svg |1 +
loleaflet/images/lc_substract.svg |1 +
loleaflet/src/control/Control.NotebookbarBuilder.js | 16
loleaflet/src/control/Control.NotebookbarImpress.js |6 ++
10 files changed, 39 insertions(+)
New commits:
commit 60a92ec348a6a85e966c01c664f4e422bd9fe893
Author: Szymon Kłos
AuthorDate: Tue Aug 4 12:47:57 2020 +0200
Commit: Szymon Kłos
CommitDate: Tue Aug 4 14:57:10 2020 +0200
notebookbar: Draw tab for Impress
Change-Id: I8332b8c71aa9af724592377de9f6fcd171e5014d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100080
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 22991e442..15924d608 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -680,6 +680,16 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
margin-top: 10px;
}
+/* Draw Tab */
+
+#table-DrawTab #table-box6 #XLineColor.notebookbar {
+ margin-left: -10px;
+}
+
+#table-DrawTab #table-Draw #table-GroupB102.notebookbar {
+ margin-left: -70px;
+}
+
/* other */
.ui-drawing-area-container
diff --git a/loleaflet/images/lc_combine.svg b/loleaflet/images/lc_combine.svg
new file mode 100644
index 0..716fb3b7c
--- /dev/null
+++ b/loleaflet/images/lc_combine.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/images/lc_dismantle.svg
b/loleaflet/images/lc_dismantle.svg
new file mode 100644
index 0..9aea821c0
--- /dev/null
+++ b/loleaflet/images/lc_dismantle.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/images/lc_distributeselection.svg
b/loleaflet/images/lc_distributeselection.svg
new file mode 100644
index 0..e581f95db
--- /dev/null
+++ b/loleaflet/images/lc_distributeselection.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/images/lc_forward.svg b/loleaflet/images/lc_forward.svg
new file mode 100644
index 0..c0f1b54ae
--- /dev/null
+++ b/loleaflet/images/lc_forward.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/images/lc_intersect.svg
b/loleaflet/images/lc_intersect.svg
new file mode 100644
index 0..4c9bd5e72
--- /dev/null
+++ b/loleaflet/images/lc_intersect.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/images/lc_merge.svg b/loleaflet/images/lc_merge.svg
new file mode 100644
index 0..d3f5df9f8
--- /dev/null
+++ b/loleaflet/images/lc_merge.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/images/lc_substract.svg
b/loleaflet/images/lc_substract.svg
new file mode 100644
index 0..067dac7de
--- /dev/null
+++ b/loleaflet/images/lc_substract.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js
b/loleaflet/src/control/Control.NotebookbarBuilder.js
index 7d88c0512..da036bf85 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -148,6 +148,22 @@ L.Control.NotebookbarBuilder =
L.Control.JSDialogBuilder.extend({
this._toolitemHandlers['.uno:FontworkCharacterSpacingFloater']
= function() {};
this._toolitemHandlers['.uno:Paste'] = function() {};
this._toolitemHandlers['.uno:DataDataPilotRun'] = function() {};
+ this._toolitemHandlers['.uno:AdvancedMode'] = function() {};
+ this._toolitemHandlers['.uno:Shear'] = function() {};
+ this._toolitemHandlers['.uno:CrookSlant'] = function() {};
+ this._toolitemHandlers['.uno:LineEndStyle'] = function() {};
+ this._toolitemHandlers['.uno:FillShadow'] = function() {};
+ this._toolitemHandlers['.uno:BezierConvert'] = function() {};
+ this._toolitemHandlers['.uno:BezierSymmetric'] = function() {};
+ this._toolitemHandlers['.uno:BezierClose'] = function() {};
+ this._toolitemHandlers['.uno:BezierEliminatePoints'] =
function() {};
+ this._toolitemHandlers['.uno:BezierMove'] = function() {};
+ this._toolitemHandlers['.uno:BezierCutLine'] = function() {};
+
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/notebookbar.css |6
loleaflet/src/control/Control.Menubar.js|2
loleaflet/src/control/Control.NotebookbarBuilder.js |9
loleaflet/src/control/Control.NotebookbarCalc.js| 280 +++-
4 files changed, 295 insertions(+), 2 deletions(-)
New commits:
commit 9719e6c4ef3f33b60a696adda2fda3574c5d856c
Author: Pedro Pinto Silva
AuthorDate: Mon Aug 3 12:24:27 2020 +0200
Commit: Pedro Silva
CommitDate: Tue Aug 4 14:01:11 2020 +0200
NotebookbarCalc: Add Layout and Data tabs,
Change-Id: I0dedbcf9c361969e1134406e2f782cf21aa585e4
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/7
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 07d494bed..22991e442 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -611,6 +611,12 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
width: 32px !important;
}
+/* Sheet Tab */
+
+#table-Sheet-Section.notebookbar {
+ margin-top: 10px;
+}
+
/* Impress */
/* Home Tab */
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 8838a3efd..f5e0818e5 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -409,7 +409,7 @@ L.Control.Menubar = L.Control.extend({
{type: 'separator'},
{name: _UNO('.uno:HyperlinkDialog'), id:
'inserthyperlink', type: 'action'},
{uno: '.uno:InsertSymbol'},
- {uno: '.uno:EditHeaderAndFooter'}
+ {uno: '.uno:EditHeaderAndFooter'} /*todo: add
to Control.Notebookbar.Calc.js (as Insert tab)*/
]},
{name: _UNO('.uno:FormatMenu', 'spreadsheet'), id:
'format', type: 'menu', menu: [
{uno: '.uno:ResetAttributes'},
diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js
b/loleaflet/src/control/Control.NotebookbarBuilder.js
index cd9fae8f1..7d88c0512 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -149,6 +149,15 @@ L.Control.NotebookbarBuilder =
L.Control.JSDialogBuilder.extend({
this._toolitemHandlers['.uno:Paste'] = function() {};
this._toolitemHandlers['.uno:DataDataPilotRun'] = function() {};
+ /*Calc: Data Tab*/
+ this._toolitemHandlers['.uno:DataProvider'] = function() {};
+ this._toolitemHandlers['.uno:ManageXMLSource'] = function() {};
+ this._toolitemHandlers['.uno:DataStreams'] = function() {};
+ this._toolitemHandlers['.uno:InsertExternalDataSource'] =
function() {};
+ this._toolitemHandlers['.uno:RecalcPivotTable'] = function() {};
+ this._toolitemHandlers['.uno:DataProviderRefresh'] = function()
{};
+ this._toolitemHandlers['.uno:Calculate'] = function() {};
+
this._toolitemHandlers['vnd.sun.star.findbar:FocusToFindbar'] =
function() {};
},
diff --git a/loleaflet/src/control/Control.NotebookbarCalc.js
b/loleaflet/src/control/Control.NotebookbarCalc.js
index b806bb4b8..e15a695f8 100644
--- a/loleaflet/src/control/Control.NotebookbarCalc.js
+++ b/loleaflet/src/control/Control.NotebookbarCalc.js
@@ -5,7 +5,7 @@
/* global _ _UNO */
L.Control.NotebookbarCalc = L.Control.NotebookbarWriter.extend({
-
+
getTabs: function() {
return [
{
@@ -24,6 +24,16 @@ L.Control.NotebookbarCalc =
L.Control.NotebookbarWriter.extend({
'id': '3',
'name': 'InsertLabel'
},
+ {
+ 'text': _('~Sheet'),
+ 'id': '-3',
+ 'name': 'Sheet'
+ },
+ {
+ 'text': _('~Data'),
+ 'id': '5',
+ 'name': 'DataLabel'
+ },
{
'text': _('~Review'),
'id': '6',
@@ -37,6 +47,23 @@ L.Control.NotebookbarCalc =
L.Control.NotebookbarWriter.extend({
];
},
+ selectedTab: function(tabName) {
+ switch (tabName) {
+ case 'File':
+ this.loadTab(this.getFileTab());
+ break;
+
+ case 'Help':
+ this.loadTab(this.getHelpTab());
+ break;
+
+ case 'Sheet':
+
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/notebookbar.css|4
loleaflet/src/control/Control.JSDialogBuilder.js | 13 +
loleaflet/src/layer/tile/TileLayer.js|1 +
loleaflet/src/map/Map.js |2 ++
4 files changed, 20 insertions(+)
New commits:
commit ad4f53aa4df4bc855dbfda105e001a440dbdbd78
Author: Szymon Kłos
AuthorDate: Fri Jul 31 13:06:46 2020 +0200
Commit: Szymon Kłos
CommitDate: Fri Jul 31 14:16:58 2020 +0200
notebookar: show tabs depending on context
If tab is marked with context, show it only in that context.
Exception: tab with 'default' is shown always
Change-Id: Id3ae82cc9188c0e5050d5e78629ce4dea98049c4
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99864
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 69fa813ac..07d494bed 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -20,6 +20,10 @@
padding-top: 7px;
}
+.ui-tab.hidden.notebookbar {
+ display: none;
+}
+
.ui-tab.selected.notebookbar {
border: none;
border-radius: 0px;
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 3a99fef0d..d3b1fe202 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -683,8 +683,21 @@ L.Control.JSDialogBuilder = L.Control.extend({
var tab = L.DomUtil.create('div', 'ui-tab ' +
builder.options.cssClass, tabsContainer);
tab.id = data.tabs[tabIdx].name;
tab.number = data.tabs[tabIdx].id - 1;
+
if (data.selected == data.tabs[tabIdx].id)
$(tab).addClass('selected');
+
+ var tabContext = data.tabs[tabIdx].context;
+ if (tabContext) {
+ var tabHasCurrentContext =
builder.map.context.context !== ''
+
&& tabContext.indexOf(builder.map.context.context) !== -1;
+ var tabHasDefultContext =
tabContext.indexOf('default') !== -1;
+
+ if (!tabHasCurrentContext &&
!tabHasDefultContext) {
+ $(tab).addClass('hidden');
+ }
+ }
+
tabs[tabIdx] = tab;
tabIds[tabIdx] = tab.id;
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 54e640ca9..e0f1b8d37 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -732,6 +732,7 @@ L.TileLayer = L.GridLayer.extend({
var message = textMsg.substring('context:'.length + 1);
message = message.split(' ');
if (message.length > 1) {
+ this._map.context = {context: message[1]};
this._map.fire('contextchange', {context:
message[1]});
}
}
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index bc5776aaa..ac6c6da9b 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -51,6 +51,8 @@ L.Map = L.Evented.extend({
// Control.LokDialog instance, is set in Control.UIManager.js
dialog: null,
+ context: {context: ''},
+
lastActiveTime: Date.now(),
initialize: function (id, options) { // (HTMLElement or String, Object)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/device-tablet.css | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit dd9a70e1b283a166dcbe10d6a3698a96658f2ce3
Author: Pedro Pinto Silva
AuthorDate: Thu Jul 30 17:20:12 2020 +0200
Commit: Pedro Silva
CommitDate: Thu Jul 30 17:43:47 2020 +0200
Notebookbar: tablet: make tabs scrollable
Change-Id: I19a4667a08df3b75e71dd71763dca3ceef9f689a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99807
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/device-tablet.css b/loleaflet/css/device-tablet.css
index 519300405..8b7761b97 100644
--- a/loleaflet/css/device-tablet.css
+++ b/loleaflet/css/device-tablet.css
@@ -35,3 +35,13 @@
.main-nav {
margin: 0;
}
+.hasnotebookbar{
+ min-width: 808px; /*set a minimum so the logo fits*/
+ overflow: auto hidden;
+ scrollbar-width: none;
+ -ms-overflow-style: none;
+}
+.hasnotebookbar::-webkit-scrollbar {
+ width: 0;
+ height: 0;
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/menubar.css | 43 -
loleaflet/css/notebookbar.css | 59 +
loleaflet/src/control/Control.Notebookbar.js|1
loleaflet/src/control/Control.NotebookbarBuilder.js | 88
loleaflet/src/control/Control.NotebookbarImpress.js |5 +
5 files changed, 152 insertions(+), 44 deletions(-)
New commits:
commit 1519c773fbacdd1189af27858ef0d2b2b2767e57
Author: Szymon Kłos
AuthorDate: Thu Jul 30 10:06:53 2020 +0200
Commit: Szymon Kłos
CommitDate: Thu Jul 30 13:56:17 2020 +0200
notebookbar: fill hamburger menu
Change-Id: I7812e241dd47b8481159342a526813b5061b5b70
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99768
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/menubar.css b/loleaflet/css/menubar.css
index 22a505fcd..84e07849b 100644
--- a/loleaflet/css/menubar.css
+++ b/loleaflet/css/menubar.css
@@ -172,49 +172,6 @@
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
-/* Hamburger icon: from shortcutsbar (notebookbar) */
-.notebookbar-shortcuts-bar #Menubar {padding-right: 7px;}
-
-.hasnotebookbar.text-color-indicator #shortcuts-menubar-icon,
-.hasnotebookbar.text-color-indicator #shortcuts-menubar-icon:before,
-.hasnotebookbar.text-color-indicator #shortcuts-menubar-icon:after {
- background: var(--blue1-txt-primary-color);
-}
-.hasnotebookbar.presentation-color-indicator #shortcuts-menubar-icon,
-.hasnotebookbar.presentation-color-indicator #shortcuts-menubar-icon:before,
-.hasnotebookbar.presentation-color-indicator #shortcuts-menubar-icon:after {
- background: var(--orange1-txt-primary-color);
-}
-.hasnotebookbar.spreadsheet-color-indicator #shortcuts-menubar-icon,
-.hasnotebookbar.spreadsheet-color-indicator #shortcuts-menubar-icon:before,
-.hasnotebookbar.spreadsheet-color-indicator #shortcuts-menubar-icon:after {
- background: var(--green0-txt-primary-color);
-}
-
-.hasnotebookbar #shortcuts-menubar-icon,
-.hasnotebookbar #shortcuts-menubar-icon:before,
-.hasnotebookbar #shortcuts-menubar-icon:after {
- position: absolute;
- top: 52%;
- left: 0px;
- height: 1px;
- width: 13px;
- -webkit-transition: all 0.25s;
- transition: all 0.25s;
-}
-
-.hasnotebookbar #shortcuts-menubar-icon:before {
- content: '';
- top: -6px;
- left: 0;
-}
-
-.notebookbar-shortcuts-bar #shortcuts-menubar-icon:after {
- content: '';
- top: 6px;
- left: 0;
-}
-
/* Hamburger icon */
.main-menu-btn-icon,
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index c73a9a742..69fa813ac 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -73,6 +73,65 @@
margin-top: 3px;
}
+/* Hamburger icon: from shortcutsbar (notebookbar) */
+.hasnotebookbar.text-color-indicator #shortcuts-menubar-icon,
+.hasnotebookbar.text-color-indicator #shortcuts-menubar-icon:before,
+.hasnotebookbar.text-color-indicator #shortcuts-menubar-icon:after {
+ background: var(--blue1-txt-primary-color);
+}
+.hasnotebookbar.presentation-color-indicator #shortcuts-menubar-icon,
+.hasnotebookbar.presentation-color-indicator #shortcuts-menubar-icon:before,
+.hasnotebookbar.presentation-color-indicator #shortcuts-menubar-icon:after {
+ background: var(--orange1-txt-primary-color);
+}
+.hasnotebookbar.spreadsheet-color-indicator #shortcuts-menubar-icon,
+.hasnotebookbar.spreadsheet-color-indicator #shortcuts-menubar-icon:before,
+.hasnotebookbar.spreadsheet-color-indicator #shortcuts-menubar-icon:after {
+ background: var(--green0-txt-primary-color);
+}
+
+.hasnotebookbar .notebookbar-shortcuts-bar #Menubar > li > a {
+cursor: pointer;
+border: none;
+ background: var(--gray-bg-color);
+ height: 20px;
+}
+
+.hasnotebookbar #shortcuts-menubar-icon {
+position: absolute;
+ top: 52%;
+ left: 0px;
+ height: 1px;
+ width: 13px;
+ -webkit-transition: all 0.25s;
+transition: all 0.25s;
+
+margin-left: 8px;
+}
+
+.hasnotebookbar #shortcuts-menubar-icon:before,
+.hasnotebookbar #shortcuts-menubar-icon:after {
+ position: absolute;
+ top: 52%;
+ left: 0px;
+ height: 1px;
+ width: 13px;
+ -webkit-transition: all 0.25s;
+ transition: all 0.25s;
+}
+
+.hasnotebookbar #shortcuts-menubar-icon:before {
+ content: '';
+ top: -6px;
+ left: 0;
+}
+
+.hasnotebookbar #shortcuts-menubar-icon:after {
+ content: '';
+ top: 6px;
+ left: 0;
+}
+
/* options section */
.notebookbar-options-section {
display: inline;
diff --git a/loleaflet/src/control/Control.Notebookbar.js
b/loleaflet/src/control/Control.Notebookbar.js
index f9578c3af..cb1d43d0c 100644
--- a/loleaflet/src/control/Control.Notebookbar.js
+++ b/loleaflet/src/control/Control.Notebookbar.js
@@
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/notebookbar.css |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 0b4c10538108723740b6f48c253c3fab6c5e68c5
Author: Pedro Pinto Silva
AuthorDate: Thu Jul 30 12:33:14 2020 +0200
Commit: Pedro Silva
CommitDate: Thu Jul 30 13:44:59 2020 +0200
Notebookbar: Force hometab, clipboard alignment
Change-Id: I76d7cd3c5dd2b79a8e72039f8d6649cd3756ffb4
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99784
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 437c586ca..c73a9a742 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -166,6 +166,9 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
.unotoolbutton.notebookbar .unobutton.selected {
box-shadow: 0 0 0px 4px #e6e6e640 !important;
}
+#table-HomeTab {
+ margin-left: -16px;/*force alignment: clipboard elements*/
+}
#table-HomeTab .unospan-uptoolbar:not(.disabled) {
border-top-left-radius: 12px;
border-bottom-left-radius: 12px;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/notebookbar.css |5 +
1 file changed, 5 insertions(+)
New commits:
commit d621a65ccd1c4c19bf10f36aca6dfdbfa2a01ffd
Author: Pedro Pinto Silva
AuthorDate: Thu Jul 30 10:50:56 2020 +0200
Commit: Pedro Silva
CommitDate: Thu Jul 30 11:30:04 2020 +0200
Notebookbar: turn shortcuts-bar's container into a block with height
Change-Id: Id7720b36398bc95f127b592e28abb14eae17468c
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99767
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 7385916b4..437c586ca 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -57,6 +57,11 @@
z-index: 1;
}
+.notebookbar-shortcuts-bar > table {
+ display: block;
+ height: 33px;
+}
+
.notebookbar-shortcuts-bar .unotoolbutton.notebookbar {
margin-right: 10px;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/device-mobile.css | 10 +-
loleaflet/src/control/Control.PartsPreview.js | 112 +++---
2 files changed, 111 insertions(+), 11 deletions(-)
New commits:
commit 653ecb1698c19c230860e7c598f1b0a8e8e854cd
Author: Pranam Lashkari
AuthorDate: Fri Jul 10 17:05:43 2020 +0530
Commit: Henry Castro
CommitDate: Wed Jul 29 21:17:03 2020 +0200
tdf#133283 leaflet: fixed reordering of slide with drag and drop in touch
screens
Changed the gestures:
1st tap to select the slide
2nd tap will open the mobile wizard
long press and then drag and drop the slides
Change-Id: I44a874f69eed4586667f7fbe825d5da943565071
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97345
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Tested-by: Henry Castro
Reviewed-by: Henry Castro
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index d84beba63..57486838e 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -701,6 +701,12 @@ td[id^=tb_spreadsheet-toolbar_item]:focus
table.w2ui-button div.w2ui-icon, td[id
padding-right: 1em;
}
+.preview-frame-portrait.preview-img-dropsite {
+padding-right: 0px;
+ border-right: 20px solid #b6b6b6;
+ border-bottom: none;
+}
+
/* Slidesorter in landscape mode */
#presentation-controls-wrapper.landscape {
top: 41px;
@@ -746,8 +752,8 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button
div.w2ui-icon, td[id
}
/* Highlight where a slide can be dropped when reordering by drag-and-drop. */
-.preview-img-dropsite {
-border-bottom: 3px solid #b6b6b6;
+.preview-frame-landscape.preview-img-dropsite {
+border-bottom: 10px solid #b6b6b6;
}
/* Related to mobilewizard.cxx */
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index 77847fd55..da01e151d 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -118,6 +118,7 @@ L.Control.PartsPreview = L.Control.extend({
var frame = L.DomUtil.create('div', frameClass,
this._scrollContainer);
this._addDnDHandlers(frame);
frame.setAttribute('draggable', false);
+ frame.setAttribute('id', 'first-drop-site');
if (window.mode.isDesktop()) {
L.DomUtil.setStyle(frame, 'height',
'20px');
@@ -207,21 +208,31 @@ L.Control.PartsPreview = L.Control.extend({
img.fetched = false;
if (!window.mode.isDesktop()) {
(new Hammer(img, {recognizers: [[Hammer.Press]]}))
- .on('press', L.bind(function () {
+ .on('press', function (e) {
if (this._map.isPermissionEdit()) {
- setTimeout(function () {
-
w2ui['actionbar'].click('mobile_wizard');
- }, 0);
+ this._addDnDTouchHandlers(e);
}
- }, this));
+ }.bind(this));
}
L.DomEvent.on(img, 'click', function (e) {
L.DomEvent.stopPropagation(e);
L.DomEvent.stop(e);
- this._setPart(e);
- this._map.focus();
- this.partsFocused = true;
- document.activeElement.blur();
+ var part =
$(this._partsPreviewCont).find('.mCSB_container
.preview-frame').index(e.target.parentNode);
+ if (part !== null)
+ var partId = parseInt(part) - 1; // The first
part is just a drop-site for reordering.
+ if (!window.mode.isDesktop() && partId ===
this._map._docLayer._selectedPart) {
+ // if mobile or tab then second tap will open
the mobile wizard
+ if (this._map._permission === 'edit') {
+ setTimeout(function () {
+
w2ui['actionbar'].click('mobile_wizard');
+ }, 0);
+ }
+ } else {
+ this._setPart(e);
+ this._map.focus();
+ this.partsFocused = true;
+ document.activeElement.blur();
+ }
}, this);
this._layoutPreview(i, img, bottomBound);
@@ -538,6 +549,89 @@ L.Control.PartsPreview =
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/leaflet.css |3 +-
loleaflet/css/loleaflet.css | 10 +++
loleaflet/src/layer/marker/ProgressOverlay.js | 36 +++---
loleaflet/src/map/Map.js |8 -
4 files changed, 23 insertions(+), 34 deletions(-)
New commits:
commit 0f1b05bf8bd011578e50e21d1deb80b9d97c8f38
Author: Szymon Kłos
AuthorDate: Tue Jul 28 16:01:07 2020 +0200
Commit: Szymon Kłos
CommitDate: Wed Jul 29 11:27:50 2020 +0200
Center progressbar using css
Simplify progressbar code and center it using
css instead of JS code.
Change-Id: Ie5877dcbc0614b889f436cc598c7069fda135a3d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99600
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css
index 6507c634c..98f6aa71b 100644
--- a/loleaflet/css/leaflet.css
+++ b/loleaflet/css/leaflet.css
@@ -815,7 +815,8 @@ input.clipboard {
.leaflet-progress-label {
text-align: center;
- }
+ font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
+}
.leaflet-slideshow {
background: #FF;
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index c50080654..6f5ad442c 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -59,6 +59,16 @@
z-index: 10;
cursor: auto;
}
+
+.leaflet-progress-layer
+{
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ z-index: 1000;
+}
+
#document-container.text-doctype > #map{
cursor: text;
}
diff --git a/loleaflet/src/layer/marker/ProgressOverlay.js
b/loleaflet/src/layer/marker/ProgressOverlay.js
index 9931a1b26..4d609b869 100644
--- a/loleaflet/src/layer/marker/ProgressOverlay.js
+++ b/loleaflet/src/layer/marker/ProgressOverlay.js
@@ -10,8 +10,7 @@ L.ProgressOverlay = L.Layer.extend({
spinnerSpeed: 30
},
- initialize: function (latlng, size) {
- this._latlng = L.latLng(latlng);
+ initialize: function (size) {
this._size = size;
this._percent = 0;
this._initLayout();
@@ -19,18 +18,13 @@ L.ProgressOverlay = L.Layer.extend({
},
onAdd: function () {
- if (this._container) {
- this.getPane().appendChild(this._container);
- this.update();
- }
-
this._spinnerInterval =
L.LOUtil.startSpinner(this._spinnerCanvas, this.options.spinnerSpeed);
- this._map.on('moveend', this.update, this);
},
onRemove: function () {
if (this._container) {
- this.getPane().removeChild(this._container);
+
L.DomUtil.get('document-container').removeChild(this._container);
+ this._container = null;
}
if (this._spinnerInterval) {
@@ -38,18 +32,8 @@ L.ProgressOverlay = L.Layer.extend({
}
},
- update: function () {
- if (this._container && this._map) {
- var origin = new L.Point(0, 0);
- var paneOffset =
this._map.layerPointToContainerPoint(origin);
- var sizeOffset = this._size.divideBy(2, true);
- var position =
this._map.latLngToLayerPoint(this._latlng).round();
-
this._setPos(position.subtract(paneOffset).subtract(sizeOffset));
- }
- },
-
_initLayout: function () {
- this._container = L.DomUtil.create('div',
'leaflet-progress-layer');
+ this._container = L.DomUtil.create('div',
'leaflet-progress-layer', L.DomUtil.get('document-container'));
this._spinner = L.DomUtil.create('div',
'leaflet-progress-spinner', this._container);
this._spinnerCanvas = L.DomUtil.create('canvas',
'leaflet-progress-spinner-canvas', this._spinner);
@@ -72,10 +56,6 @@ L.ProgressOverlay = L.Layer.extend({
.disableScrollPropagation(this._container);
},
- _setPos: function (pos) {
- L.DomUtil.setPosition(this._container, pos);
- },
-
shutdownTimer: function() {
if (this.intervalTimer)
clearInterval(this.intervalTimer);
@@ -123,6 +103,10 @@ L.ProgressOverlay = L.Layer.extend({
if (map.hasLayer(this)) {
map.removeLayer(this);
}
+ if (this._container) {
+
L.DomUtil.get('document-container').removeChild(this._container);
+ this._container = null;
+ }
},
setLabel: function (label) {
@@ -147,6 +131,6 @@ L.ProgressOverlay =
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/mobilewizard.css |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit b54e4b4a94572a61c63d94ed840613f5333ce524
Author: Pedro Pinto Silva
AuthorDate: Tue Jul 28 16:15:14 2020 +0200
Commit: Pedro Silva
CommitDate: Wed Jul 29 09:10:54 2020 +0200
Vex dialogs: fix misaligned textareas
instroducs by a5016d547c6242f6f9b28748b5724b0bc10cdb67
Change-Id: Ibaa04c5feb2d71b4f592a55df96ee5224f155cab
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99634
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 127e12dfd..77706008d 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -853,7 +853,11 @@ input[type=checkbox][disabled] {
width: -webkit-fill-available !important;
}
-.ui-edit.mobile-wizard, textarea {
+.ui-edit.mobile-wizard {
+ /*
+ , textarea was also here assign but it was messing up with all
textareas (annotations on desktop and vex on mobile):
+ - added 93038: jsdialog: style dialogs;
a5016d547c6242f6f9b28748b5724b0bc10cdb67
+ */
width: -moz-available;
width: -webkit-fill-available;
margin: 10px 5% 10px 5% !important;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/menubar.css| 42 +++
loleaflet/src/control/Control.Notebookbar.js |6 +++
2 files changed, 48 insertions(+)
New commits:
commit c424141287c23eecf6fd0ead9c84269e108574a9
Author: Pedro Pinto Silva
AuthorDate: Tue Jul 28 10:30:29 2020 +0200
Commit: Pedro Silva
CommitDate: Tue Jul 28 14:58:38 2020 +0200
Notebookbar: Add Menubar icon
Change-Id: I49f3fda9d765f7934a80b8f71007adfc384fd3e2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99574
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/menubar.css b/loleaflet/css/menubar.css
index ea7a311c9..22a505fcd 100644
--- a/loleaflet/css/menubar.css
+++ b/loleaflet/css/menubar.css
@@ -172,6 +172,48 @@
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
+/* Hamburger icon: from shortcutsbar (notebookbar) */
+.notebookbar-shortcuts-bar #Menubar {padding-right: 7px;}
+
+.hasnotebookbar.text-color-indicator #shortcuts-menubar-icon,
+.hasnotebookbar.text-color-indicator #shortcuts-menubar-icon:before,
+.hasnotebookbar.text-color-indicator #shortcuts-menubar-icon:after {
+ background: var(--blue1-txt-primary-color);
+}
+.hasnotebookbar.presentation-color-indicator #shortcuts-menubar-icon,
+.hasnotebookbar.presentation-color-indicator #shortcuts-menubar-icon:before,
+.hasnotebookbar.presentation-color-indicator #shortcuts-menubar-icon:after {
+ background: var(--orange1-txt-primary-color);
+}
+.hasnotebookbar.spreadsheet-color-indicator #shortcuts-menubar-icon,
+.hasnotebookbar.spreadsheet-color-indicator #shortcuts-menubar-icon:before,
+.hasnotebookbar.spreadsheet-color-indicator #shortcuts-menubar-icon:after {
+ background: var(--green0-txt-primary-color);
+}
+
+.hasnotebookbar #shortcuts-menubar-icon,
+.hasnotebookbar #shortcuts-menubar-icon:before,
+.hasnotebookbar #shortcuts-menubar-icon:after {
+ position: absolute;
+ top: 52%;
+ left: 0px;
+ height: 1px;
+ width: 13px;
+ -webkit-transition: all 0.25s;
+ transition: all 0.25s;
+}
+
+.hasnotebookbar #shortcuts-menubar-icon:before {
+ content: '';
+ top: -6px;
+ left: 0;
+}
+
+.notebookbar-shortcuts-bar #shortcuts-menubar-icon:after {
+ content: '';
+ top: 6px;
+ left: 0;
+}
/* Hamburger icon */
diff --git a/loleaflet/src/control/Control.Notebookbar.js
b/loleaflet/src/control/Control.Notebookbar.js
index 41c6f55d9..f9578c3af 100644
--- a/loleaflet/src/control/Control.Notebookbar.js
+++ b/loleaflet/src/control/Control.Notebookbar.js
@@ -118,6 +118,11 @@ L.Control.Notebookbar = L.Control.extend({
'id': 'shortcutstoolbox',
'type': 'toolbox',
'children': [
+ {
+ 'type': 'toolitem',
+ 'text': _('Menu'),
+ 'command': '.uno:Menubar'
+ },
{
'type': 'toolitem',
'text': _('Save'),
@@ -143,6 +148,7 @@ L.Control.Notebookbar = L.Control.extend({
$('nav').prepend(shortcutsBar);
var builder = new L.control.notebookbarBuilder({mobileWizard:
this, map: this.map, cssClass: 'notebookbar'});
builder.build(shortcutsBar, this.getShortcutsBarData());
+ $('#Menubar').html('');
},
setCurrentScrollPosition: function() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/notebookbar.css |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c3c52b920b60343401509edcf2f6bd0a3a566dc4
Author: Szymon Kłos
AuthorDate: Tue Jul 28 11:18:16 2020 +0200
Commit: Szymon Kłos
CommitDate: Tue Jul 28 11:44:15 2020 +0200
notebookbar: don't move arrows to new line
for icons with dropdown arrow
Change-Id: Icaeb60e9c431337657a312575ba4c61b3588ec84
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99579
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index dbf9ccfb1..7385916b4 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -122,8 +122,8 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
}
/* avoid bug with arrow in new line when window is small */
-#LineSpacing.notebookbar {
- width: 40px;
+#LineSpacing.notebookbar, #InsertGraphic.notebookbar,
#BasicShapes.notebookbar, #InsertTable.notebookbar {
+ width: 50px;
}
#buttonbefore.notebookbar, #buttonafter.notebookbar,
#buttonoptimal.notebookbar, #buttonparallel.notebookbar,
#buttonnone.notebookbar, #buttonthrough.notebookbar, #bottom.notebookbar,
#top.notebookbar, #standard.notebookbar, #Bold.notebookbar,
#Italic.notebookbar, #Underline.notebookbar, #Strikeout.notebookbar{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/notebookbar.css |1 +
loleaflet/src/control/Control.LokDialog.js |2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 1be5550126f83d08cbc39f92647293130951dba5
Author: gokaysatir
AuthorDate: Mon Jul 27 18:25:10 2020 +0300
Commit: Henry Castro
CommitDate: Tue Jul 28 00:44:41 2020 +0200
loleaflet: lokDialog children are mispositioned bug.
Change-Id: I9f84d1860d541c56da033dff6e95dbc4d7e0f68b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99513
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 09626e911..dbf9ccfb1 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -96,6 +96,7 @@
#toolbar-wrapper.hasnotebookbar {
position: fixed;
+ z-index: 11;
}
/* unobuttons */
diff --git a/loleaflet/src/control/Control.LokDialog.js
b/loleaflet/src/control/Control.LokDialog.js
index f88e74e5e..d2aa02af7 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -1674,7 +1674,7 @@ L.Control.LokDialog = L.Control.extend({
else if (grandParentID.includes('calc-inputbar')) {
// This is the calculator input bar.
L.DomUtil.setStyle(floatingCanvas, 'left',
(containerLeft + left) + 'px');
- L.DomUtil.setStyle(floatingCanvas, 'top', (containerTop
+ top - 20) + 'px');
+ L.DomUtil.setStyle(floatingCanvas, 'top', (containerTop
+ 20) + 'px');
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/mobilewizard.css |6 +++---
loleaflet/css/notebookbar.css | 32
2 files changed, 27 insertions(+), 11 deletions(-)
New commits:
commit 65e3a8de12693a4e32b8d0250b1cacdf580ca50a
Author: Pedro Pinto Silva
AuthorDate: Mon Jul 27 13:16:25 2020 +0200
Commit: Pedro Silva
CommitDate: Mon Jul 27 16:25:02 2020 +0200
Notebookbar: Aesthetic fixes and make sure mobilewizard rules from mobile
do not affect desktop
* Some rules from mobile were affecting notebookbar layout (e.g.: writer:
tab table)
* Fix paddings in every .unolabel
* Adjust .unoarrow and add hover state
* Remove duplicated selectors (mobilewizard.css)
* Add rules (from mobilewizard.css) that are needed uin the notebookbar to
notebookbar.css with proper parent: .hasnotebookbar
Change-Id: I22282c53ede39d7952bde1ea9625b4d928aaaea0
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99477
Tested-by: Jenkins CollaboraOffice
Tested-by: Jenkins
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 7bd7cb36c..127e12dfd 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -646,17 +646,17 @@ a.leaflet-control-zoom-in {
vertical-align: top;
padding-left: 4%;
}
-#buttonnone + label, #buttonbefore + label, #buttonafter + label,
#buttonoptimal + label, #buttonparallel + label, #buttonnone + label,
#buttonthrough + label{
+#buttonnone + label, #buttonbefore + label, #buttonafter + label,
#buttonoptimal + label, #buttonparallel + label, #buttonthrough + label{
padding-left: 0;
}
#Color > img{
border-radius:100px;
background-color: #696969;
}
-#SendToBack > span, #ObjectBackOne > span, #ObjectForwardOne > span,
#BringToFront > span, #SetObjectToBackground > span, #SetObjectToForeground >
span, #FlipVertical > span, #FlipHorizontal > span, #Bold > span, #Italic >
span, #Underline > span, #Strikeout > span, #StyleApply > span,
#StyleUpdateByExample > span, #StyleNewByExample > span, #Shadowed > span,
#Grow > span, #Shrink > span, #Color > span, #Spacing > span, #SuperScript >
span, #SubScript > span, #AlignLeft > span, #AlignRight > span,
#AlignHorizontalCenter > span, #AlignBlock > span, #ParaLeftToRight > span,
#ParaRightToLeft > span, #AlignTop > span, #AlignVCenter > span, #AlignBottom >
span, #IncrementIndent > span, #DecrementIndent > span, #LeftPara > span,
#RightPara > span, #CenterPara > span, #JustifyPara > span, #DefaultBullet >
span, #DefaultNumbering > span, #ParaspaceIncrease > span, #ParaspaceDecrease >
span, #LineSpacing > span, #HangingIndent > span, #CellVertTop > span,
#CellVertCenter > span, #CellVertBot
tom > span, .mobile-wizard > div[id*='Table'] > span, div[id*='Row'] > span,
div[id*='Column'] > span, .mobile-wizard > div[id*='Cell'] > span,
div[id^=Outline] > span, #nolines > img{
+#mobile-wizard #SendToBack > span, #mobile-wizard #ObjectBackOne > span,
#mobile-wizard #ObjectForwardOne > span, #mobile-wizard #BringToFront > span,
#mobile-wizard #SetObjectToBackground > span, #mobile-wizard
#SetObjectToForeground > #mobile-wizard span, #mobile-wizard #FlipVertical >
span, #mobile-wizard #FlipHorizontal > span, #mobile-wizard #Bold > span,
#mobile-wizard #Italic > span, #mobile-wizard #Underline > span, #mobile-wizard
#Strikeout > span, #mobile-wizard #StyleApply > span, #mobile-wizard
#StyleUpdateByExample > span, #mobile-wizard #StyleNewByExample > span,
#mobile-wizard #Shadowed > span, #mobile-wizard #Grow > span, #mobile-wizard
#Shrink > span, #mobile-wizard #Color > span, #mobile-wizard #Spacing > span,
#mobile-wizard #SuperScript > span, #mobile-wizard #SubScript > span,
#mobile-wizard #AlignLeft > span, #mobile-wizard #AlignRight > span,
#mobile-wizard #AlignHorizontalCenter > span, #mobile-wizard #AlignBlock >
span, #mobile-wizard #ParaLeftToRight > spa
n, #mobile-wizard #ParaRightToLeft > span, #mobile-wizard #AlignTop > span,
#mobile-wizard #AlignVCenter > span, #mobile-wizard #AlignBottom > span,
#mobile-wizard #IncrementIndent > span, #mobile-wizard #DecrementIndent > span,
#mobile-wizard #LeftPara > span, #mobile-wizard #RightPara > span,
#mobile-wizard #CenterPara > span, #mobile-wizard #JustifyPara > span,
#mobile-wizard #DefaultBullet > span, #mobile-wizard #DefaultNumbering > span,
#mobile-wizard #ParaspaceIncrease > span, #mobile-wizard #ParaspaceDecrease >
span, #mobile-wizard #LineSpacing > span, #mobile-wizard #HangingIndent > span,
#mobile-wizard #CellVertTop > span, #mobile-wizard #CellVertCenter > span,
#mobile-wizard #CellVertBottom > span, #mobile-wizard div[id*='Table'] > span,
#mobile-wizard div[id*='Row'] > span, #mobile-wizard div[id*='Column'] > span,
#mobile-wizard div[id*='Cell'] > span, #mobile-wizard div[id^='Outline'] >
span, #mobile-wizard #nolines > img{
display: none !important;
}
-#SendToBack,
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/mobilewizard.css |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 24972fe9776a7fdb4acd5609a7d35b18311412bb
Author: Pranam Lashkari
AuthorDate: Mon Jul 27 12:16:26 2020 +0530
Commit: Aron Budea
CommitDate: Mon Jul 27 15:05:57 2020 +0200
leaflet: Notebookbar: resolved "Table" text on tab not visible, and button
layout is messed up
Change-Id: I27ac375e0960af06c429d6185e7e27361a298169
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99467
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Aron Budea
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 125a5313c..7bd7cb36c 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -653,10 +653,10 @@ a.leaflet-control-zoom-in {
border-radius:100px;
background-color: #696969;
}
-#SendToBack > span, #ObjectBackOne > span, #ObjectForwardOne > span,
#BringToFront > span, #SetObjectToBackground > span, #SetObjectToForeground >
span, #FlipVertical > span, #FlipHorizontal > span, #Bold > span, #Italic >
span, #Underline > span, #Strikeout > span, #StyleApply > span,
#StyleUpdateByExample > span, #StyleNewByExample > span, #Shadowed > span,
#Grow > span, #Shrink > span, #Color > span, #Spacing > span, #SuperScript >
span, #SubScript > span, #AlignLeft > span, #AlignRight > span,
#AlignHorizontalCenter > span, #AlignBlock > span, #ParaLeftToRight > span,
#ParaRightToLeft > span, #AlignTop > span, #AlignVCenter > span, #AlignBottom >
span, #IncrementIndent > span, #DecrementIndent > span, #LeftPara > span,
#RightPara > span, #CenterPara > span, #JustifyPara > span, #DefaultBullet >
span, #DefaultNumbering > span, #ParaspaceIncrease > span, #ParaspaceDecrease >
span, #LineSpacing > span, #HangingIndent > span, #CellVertTop > span,
#CellVertCenter > span, #CellVertBot
tom > span, div[id*='Table'] > span, div[id*='Row'] > span, div[id*='Column']
> span, div[id*='Cell'] > span, div[id^=Outline] > span, #nolines > img{
+#SendToBack > span, #ObjectBackOne > span, #ObjectForwardOne > span,
#BringToFront > span, #SetObjectToBackground > span, #SetObjectToForeground >
span, #FlipVertical > span, #FlipHorizontal > span, #Bold > span, #Italic >
span, #Underline > span, #Strikeout > span, #StyleApply > span,
#StyleUpdateByExample > span, #StyleNewByExample > span, #Shadowed > span,
#Grow > span, #Shrink > span, #Color > span, #Spacing > span, #SuperScript >
span, #SubScript > span, #AlignLeft > span, #AlignRight > span,
#AlignHorizontalCenter > span, #AlignBlock > span, #ParaLeftToRight > span,
#ParaRightToLeft > span, #AlignTop > span, #AlignVCenter > span, #AlignBottom >
span, #IncrementIndent > span, #DecrementIndent > span, #LeftPara > span,
#RightPara > span, #CenterPara > span, #JustifyPara > span, #DefaultBullet >
span, #DefaultNumbering > span, #ParaspaceIncrease > span, #ParaspaceDecrease >
span, #LineSpacing > span, #HangingIndent > span, #CellVertTop > span,
#CellVertCenter > span, #CellVertBot
tom > span, .mobile-wizard > div[id*='Table'] > span, div[id*='Row'] > span,
div[id*='Column'] > span, .mobile-wizard > div[id*='Cell'] > span,
div[id^=Outline] > span, #nolines > img{
display: none !important;
}
-#SendToBack, #ObjectBackOne, #ObjectForwardOne, #BringToFront,
#SetObjectToBackground, #SetObjectToForeground, #FlipVertical, #FlipHorizontal,
#Bold, #Italic, #Underline, #Strikeout, #StyleApply, #StyleUpdateByExample,
#StyleNewByExample, #Shadowed, #Grow, #Shrink, #Spacing, #SuperScript,
#SubScript,#AlignLeft, #AlignRight, #AlignHorizontalCenter, #AlignBlock,
#ParaRightToLeft, #ParaLeftToRight, #AlignTop, #AlignVCenter, #AlignBottom,
#IncrementIndent, #DecrementIndent, #LeftPara, #RightPara, #CenterPara,
#JustifyPara, #DefaultBullet, #DefaultNumbering, #ParaspaceIncrease,
#ParaspaceDecrease, #LineSpacing, #HangingIndent, #CellVertTop,
#CellVertCenter, #CellVertBottom, #ParaspaceIncrease, #ParaspaceDecrease,
div[id*='Row'], div[id*='Column'], #DeleteTable, #MergeCells, div[id^=Outline],
#EntireCell, #SelectTable, #EntireColumn, #EntireRow, #SplitCell, #SplitTable{
+#SendToBack, #ObjectBackOne, #ObjectForwardOne, #BringToFront,
#SetObjectToBackground, #SetObjectToForeground, #FlipVertical, #FlipHorizontal,
#Bold, #Italic, #Underline, #Strikeout, #StyleApply, #StyleUpdateByExample,
#StyleNewByExample, #Shadowed, #Grow, #Shrink, #Spacing, #SuperScript,
#SubScript,#AlignLeft, #AlignRight, #AlignHorizontalCenter, #AlignBlock,
#ParaRightToLeft, #ParaLeftToRight, #AlignTop, #AlignVCenter, #AlignBottom,
#IncrementIndent, #DecrementIndent, #LeftPara, #RightPara, #CenterPara,
#JustifyPara, #DefaultBullet, #DefaultNumbering, #ParaspaceIncrease,
#ParaspaceDecrease, #LineSpacing, #HangingIndent, #CellVertTop,
#CellVertCenter, #CellVertBottom, #ParaspaceIncrease, #ParaspaceDecrease,
div[id*='Row'], div[id*='Column'], #DeleteTable,
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/notebookbar.css |5 +
1 file changed, 5 insertions(+)
New commits:
commit de0aa9238eb2fcaf4f209b7d006e44990029080f
Author: Szymon Kłos
AuthorDate: Mon Jul 27 14:04:55 2020 +0200
Commit: Szymon Kłos
CommitDate: Mon Jul 27 14:34:49 2020 +0200
notebookbar: don't move arrow to new line for linespacing
When window was small arrow was moved to the next line
and notebookbar layouw was broken.
Change-Id: I7532a25b1a684aaaba70cfd28f9a3ee891f1d446
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99481
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 3cad6dbb6..906cbb76a 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -105,6 +105,11 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
margin: 0px 5px 0px 0px !important;
}
+/* avoid bug with arrow in new line when window is small */
+#LineSpacing.notebookbar {
+ width: 40px;
+}
+
#buttonbefore.notebookbar, #buttonafter.notebookbar,
#buttonoptimal.notebookbar, #buttonparallel.notebookbar,
#buttonnone.notebookbar, #buttonthrough.notebookbar, #bottom.notebookbar,
#top.notebookbar, #standard.notebookbar, #Bold.notebookbar,
#Italic.notebookbar, #Underline.notebookbar, #Strikeout.notebookbar{
margin: 0px !important;
padding: 0px !important;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/notebookbar.css | 12 +++-
loleaflet/src/control/Control.JSDialogBuilder.js|7 ++-
loleaflet/src/control/Control.NotebookbarBuilder.js | 15 ++-
3 files changed, 27 insertions(+), 7 deletions(-)
New commits:
commit c6b583091ecca80e1951f792c6bf4855dc87dd64
Author: Szymon Kłos
AuthorDate: Mon Jul 27 10:54:39 2020 +0200
Commit: Szymon Kłos
CommitDate: Mon Jul 27 11:15:42 2020 +0200
notebookbar: add dropdown arrows
Arrows added for uno buttons with dropdown menu
Change-Id: I273d97def7919e8884ff62b50dde269ac882f911
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99469
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index f2683637c..3cad6dbb6 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -126,6 +126,16 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
padding-left: 5px !important;
}
+.unotoolbutton.notebookbar .unoarrow {
+ margin-left: 5px;
+ border: solid #555;
+ border-width: 0 3px 3px 0;
+ display: inline-block;
+ padding: 3px;
+ transform: rotate(45deg);
+ -webkit-transform: rotate(45deg);
+}
+
.unotoolbutton.notebookbar .unobutton.selected {
box-shadow: 0 0 0px 4px #e6e6e640 !important;
}
@@ -221,7 +231,7 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
}
#ControlCodes.notebookbar {
- margin-left: 30px !important;
+ margin-left: 35px !important;
}
#fontnamecombobox.notebookbar ~ .select2 {
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 967e2bd7b..3a99fef0d 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1614,7 +1614,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
parentContainer);
},
- _unoToolButton: function(parentContainer, data, builder) {
+ _unoToolButton: function(parentContainer, data, builder, options) {
var button = null;
var controls = {};
@@ -1683,6 +1683,11 @@ L.Control.JSDialogBuilder = L.Control.extend({
controls['label'] = button;
}
+ if (options && options.hasDropdownArrow) {
+ var arrow = L.DomUtil.create('i', 'unoarrow', div);
+ controls['arrow'] = arrow;
+ }
+
$(div).click(function () {
if (!$(div).hasClass('disabled')) {
builder.refreshSidebar = true;
diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js
b/loleaflet/src/control/Control.NotebookbarBuilder.js
index 33f06ccf0..5dbd14d27 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -372,7 +372,8 @@ L.Control.NotebookbarBuilder =
L.Control.JSDialogBuilder.extend({
},
_insertTableControl: function(parentContainer, data, builder) {
- var control = builder._unoToolButton(parentContainer, data,
builder);
+ var options = {hasDropdownArrow: true};
+ var control = builder._unoToolButton(parentContainer, data,
builder, options);
$(control.container).unbind('click');
$(control.container).click(function () {
@@ -388,7 +389,8 @@ L.Control.NotebookbarBuilder =
L.Control.JSDialogBuilder.extend({
},
_shapesControl: function(parentContainer, data, builder) {
- var control = builder._unoToolButton(parentContainer, data,
builder);
+ var options = {hasDropdownArrow: true};
+ var control = builder._unoToolButton(parentContainer, data,
builder, options);
$(control.container).unbind('click');
$(control.container).click(function () {
@@ -404,7 +406,8 @@ L.Control.NotebookbarBuilder =
L.Control.JSDialogBuilder.extend({
},
_conditionalFormatControl: function(parentContainer, data, builder) {
- var control = builder._unoToolButton(parentContainer, data,
builder);
+ var options = {hasDropdownArrow: true};
+ var control = builder._unoToolButton(parentContainer, data,
builder, options);
$(control.container).unbind('click');
$(control.container).click(function () {
@@ -419,7 +422,8 @@ L.Control.NotebookbarBuilder =
L.Control.JSDialogBuilder.extend({
},
_insertGraphicControl: function(parentContainer, data, builder) {
- var control = builder._unoToolButton(parentContainer, data,
builder);
+ var options =
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/spreadsheet.css | 19 ---
loleaflet/src/control/Control.TopToolbar.js |7 +++
loleaflet/src/map/Map.js|4 ++--
3 files changed, 21 insertions(+), 9 deletions(-)
New commits:
commit 7a17f0aa528e12d751281fb8254c576e730919c9
Author: Dennis Francis
AuthorDate: Tue Jul 21 19:51:14 2020 +0530
Commit: Dennis Francis
CommitDate: Fri Jul 24 15:10:47 2020 +0200
calc-tablet-readonly: fix document-container/headers position
This change "hides" the toolbar and the formula bar in readonly mode for
tablets like the mobile(small-screen + touch) case, by positioning the
document-container and the header-container "over" the toolbar-wrapper
by using .tablet, and .tablet.readonly css style overrides.
Change-Id: I3a0d8468c2b2f5b62a238592ab64d85e1f8be62e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99356
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Dennis Francis
diff --git a/loleaflet/css/spreadsheet.css b/loleaflet/css/spreadsheet.css
index 3f4ebe5c9..c0c6b95e0 100644
--- a/loleaflet/css/spreadsheet.css
+++ b/loleaflet/css/spreadsheet.css
@@ -9,11 +9,8 @@
top: 56px;
}
-#document-container.spreadsheet-document.tablet {
- border-top: 1px solid #B6B6B6;
- top: 100px;
- left: 50px;
- bottom: 78px;
+#document-container.spreadsheet-document.tablet.readonly {
+ top: 52px;
}
.spreadsheet-tabs-container {
@@ -79,8 +76,8 @@
bottom: 0px;
}
-#spreadsheet-row-column-frame.tablet {
- top: 80px;
+#spreadsheet-row-column-frame.tablet.readonly {
+ top: 32px;
}
#spreadsheet-header-corner-container {
@@ -229,3 +226,11 @@
background-size: 100% 100%;
background-repeat: no-repeat;
}
+
+#toolbar-wrapper.spreadsheet.tablet {
+ z-index: auto;
+}
+
+#toolbar-wrapper.spreadsheet.tablet.readonly {
+ z-index: -1;
+}
diff --git a/loleaflet/src/control/Control.TopToolbar.js
b/loleaflet/src/control/Control.TopToolbar.js
index a0d665664..34450e934 100644
--- a/loleaflet/src/control/Control.TopToolbar.js
+++ b/loleaflet/src/control/Control.TopToolbar.js
@@ -280,6 +280,13 @@ L.Control.TopToolbar = L.Control.extend({
toolbarUp.remove('styles');
}
+ $('#toolbar-wrapper').addClass('spreadsheet');
+ if (window.mode.isTablet()) {
+
$(this.map.options.documentContainer).addClass('tablet');
+
$('#spreadsheet-row-column-frame').addClass('tablet');
+ $('#toolbar-wrapper').addClass('tablet');
+ }
+
break;
case 'text':
if (toolbarUp)
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 1ba421e99..819d3ea51 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -179,7 +179,7 @@ L.Map = L.Evented.extend({
if (e.perm === 'readonly') {
L.DomUtil.addClass(this._container.parentElement, 'readonly');
- if (window.mode.isDesktop()) {
+ if (window.mode.isDesktop() ||
window.mode.isTablet()) {
L.DomUtil.addClass(L.DomUtil.get('toolbar-wrapper'), 'readonly');
}
L.DomUtil.addClass(L.DomUtil.get('main-menu'),
'readonly');
@@ -187,7 +187,7 @@ L.Map = L.Evented.extend({
L.DomUtil.addClass(L.DomUtil.get('spreadsheet-row-column-frame'), 'readonly');
} else {
L.DomUtil.removeClass(this._container.parentElement, 'readonly');
- if (window.mode.isDesktop()) {
+ if (window.mode.isDesktop() ||
window.mode.isTablet()) {
L.DomUtil.removeClass(L.DomUtil.get('toolbar-wrapper'), 'readonly');
}
L.DomUtil.removeClass(L.DomUtil.get('main-menu'), 'readonly');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/mobilewizard.css |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e89b6bcf53ce542beb5b8041d95f99887b44d7f2
Author: Pranam Lashkari
AuthorDate: Thu Jul 23 14:20:32 2020 +0530
Commit: Tamás Zolnai
CommitDate: Fri Jul 24 12:35:00 2020 +0200
leaflet: fixed styling for table mobile wizard
Change-Id: I256f6d28b13c283b79408eabf2cae0b2381e8c72
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99276
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 6a35251d0..125a5313c 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -653,10 +653,10 @@ a.leaflet-control-zoom-in {
border-radius:100px;
background-color: #696969;
}
-#SendToBack > span, #ObjectBackOne > span, #ObjectForwardOne > span,
#BringToFront > span, #SetObjectToBackground > span, #SetObjectToForeground >
span, #FlipVertical > span, #FlipHorizontal > span, #Bold > span, #Italic >
span, #Underline > span, #Strikeout > span, #StyleApply > span,
#StyleUpdateByExample > span, #StyleNewByExample > span, #Shadowed > span,
#Grow > span, #Shrink > span, #Color > span, #Spacing > span, #SuperScript >
span, #SubScript > span, #AlignLeft > span, #AlignRight > span,
#AlignHorizontalCenter > span, #AlignBlock > span, #ParaLeftToRight > span,
#ParaRightToLeft > span, #AlignTop > span, #AlignVCenter > span, #AlignBottom >
span, #IncrementIndent > span, #DecrementIndent > span, #LeftPara > span,
#RightPara > span, #CenterPara > span, #JustifyPara > span, #DefaultBullet >
span, #DefaultNumbering > span, #ParaspaceIncrease > span, #ParaspaceDecrease >
span, #LineSpacing > span, #HangingIndent > span, #CellVertTop > span,
#CellVertCenter > span, #CellVertBot
tom > span, div[id*='Row'] > span, div[id*='Column'] > span, div[id^=Outline]
> span, #nolines > img{
+#SendToBack > span, #ObjectBackOne > span, #ObjectForwardOne > span,
#BringToFront > span, #SetObjectToBackground > span, #SetObjectToForeground >
span, #FlipVertical > span, #FlipHorizontal > span, #Bold > span, #Italic >
span, #Underline > span, #Strikeout > span, #StyleApply > span,
#StyleUpdateByExample > span, #StyleNewByExample > span, #Shadowed > span,
#Grow > span, #Shrink > span, #Color > span, #Spacing > span, #SuperScript >
span, #SubScript > span, #AlignLeft > span, #AlignRight > span,
#AlignHorizontalCenter > span, #AlignBlock > span, #ParaLeftToRight > span,
#ParaRightToLeft > span, #AlignTop > span, #AlignVCenter > span, #AlignBottom >
span, #IncrementIndent > span, #DecrementIndent > span, #LeftPara > span,
#RightPara > span, #CenterPara > span, #JustifyPara > span, #DefaultBullet >
span, #DefaultNumbering > span, #ParaspaceIncrease > span, #ParaspaceDecrease >
span, #LineSpacing > span, #HangingIndent > span, #CellVertTop > span,
#CellVertCenter > span, #CellVertBot
tom > span, div[id*='Table'] > span, div[id*='Row'] > span, div[id*='Column']
> span, div[id*='Cell'] > span, div[id^=Outline] > span, #nolines > img{
display: none !important;
}
-#SendToBack, #ObjectBackOne, #ObjectForwardOne, #BringToFront,
#SetObjectToBackground, #SetObjectToForeground, #FlipVertical, #FlipHorizontal,
#Bold, #Italic, #Underline, #Strikeout, #StyleApply, #StyleUpdateByExample,
#StyleNewByExample, #Shadowed, #Grow, #Shrink, #Spacing, #SuperScript,
#SubScript,#AlignLeft, #AlignRight, #AlignHorizontalCenter, #AlignBlock,
#ParaRightToLeft, #ParaLeftToRight, #AlignTop, #AlignVCenter, #AlignBottom,
#IncrementIndent, #DecrementIndent, #LeftPara, #RightPara, #CenterPara,
#JustifyPara, #DefaultBullet, #DefaultNumbering, #ParaspaceIncrease,
#ParaspaceDecrease, #LineSpacing, #HangingIndent, #CellVertTop,
#CellVertCenter, #CellVertBottom, #ParaspaceIncrease, #ParaspaceDecrease,
div[id*='Row'], div[id*='Column'], #DeleteTable, #MergeCells, div[id^=Outline]{
+#SendToBack, #ObjectBackOne, #ObjectForwardOne, #BringToFront,
#SetObjectToBackground, #SetObjectToForeground, #FlipVertical, #FlipHorizontal,
#Bold, #Italic, #Underline, #Strikeout, #StyleApply, #StyleUpdateByExample,
#StyleNewByExample, #Shadowed, #Grow, #Shrink, #Spacing, #SuperScript,
#SubScript,#AlignLeft, #AlignRight, #AlignHorizontalCenter, #AlignBlock,
#ParaRightToLeft, #ParaLeftToRight, #AlignTop, #AlignVCenter, #AlignBottom,
#IncrementIndent, #DecrementIndent, #LeftPara, #RightPara, #CenterPara,
#JustifyPara, #DefaultBullet, #DefaultNumbering, #ParaspaceIncrease,
#ParaspaceDecrease, #LineSpacing, #HangingIndent, #CellVertTop,
#CellVertCenter, #CellVertBottom, #ParaspaceIncrease, #ParaspaceDecrease,
div[id*='Row'], div[id*='Column'], #DeleteTable, #MergeCells, div[id^=Outline],
#EntireCell, #SelectTable, #EntireColumn, #EntireRow, #SplitCell, #SplitTable{
padding: 16px 28px 16px 4% !important;
margin: 0px !important;
float:left;
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/leaflet.css |4 ++--
loleaflet/css/loleaflet.css|5 +++--
loleaflet/css/menubar.css |4 ++--
loleaflet/css/mobilewizard.css |2 +-
loleaflet/css/notebookbar.css | 20 ++--
loleaflet/css/spreadsheet.css |2 +-
6 files changed, 27 insertions(+), 10 deletions(-)
New commits:
commit a8db0d749ff9898866957d53eaa849ca6a195257
Author: Pedro Pinto Silva
AuthorDate: Fri Jul 24 09:56:19 2020 +0200
Commit: Pedro Silva
CommitDate: Fri Jul 24 11:01:10 2020 +0200
Notebookbar: Fix tab shadow so it does bleed out when collapsed and
* increase distinction between disabled and enabled buttons,
* make the Selected buttons to use the same main blue color
* make the Selected buttons with text to change their text color as well
* Use --gray-bg-color across all files
Change-Id: I50b8ab86216211de37ef6c4d2b2c6baddc783ae7
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99349
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css
index f4bd5abf0..6507c634c 100644
--- a/loleaflet/css/leaflet.css
+++ b/loleaflet/css/leaflet.css
@@ -827,7 +827,7 @@ input.clipboard {
}
.loleaflet-ruler {
- background-color: #efefef;
+ background-color: var(--gray-bg-color);
height: 20px;
width: 100vw;
margin: 0px;
@@ -942,7 +942,7 @@ input.clipboard {
.loleaflet-ruler-margin {
height: 100%;
- background-color: #efefef;
+ background-color: var(--gray-bg-color);
}
.loleaflet-ruler-left {
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index c48eaca1b..c50080654 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -16,8 +16,9 @@
--blue1-txt-primary-color: #0369A3;
--green0-txt-primary-color: #106802; /*green1 lacks contrast against
white*/
--orange1-txt-primary-color: #A33E03;
-
+
--gray-light-txt--color: #696969;
+ --gray-bg-color: #EFEFEF;
}
#document-container {
border-top: 1px solid #B6B6B6;
@@ -323,7 +324,7 @@ body {
font-family: var(--loleaflet-font) !important;
font-size: 13px;
text-align: left;
- background-color: #efefef;
+ background-color: var(--gray-bg-color);
box-shadow: 0px 3px 6px rgba(0,0,0,0.2);
color: #222;
border: none;
diff --git a/loleaflet/css/menubar.css b/loleaflet/css/menubar.css
index 07ca96221..ea7a311c9 100644
--- a/loleaflet/css/menubar.css
+++ b/loleaflet/css/menubar.css
@@ -51,7 +51,7 @@
}
.main-nav.hasnotebookbar{
- background: #efefef;
+ background: var(--gray-bg-color);
margin-top: 0px;
}
@@ -144,7 +144,7 @@
overflow: hidden;
padding-top: 0;
padding-bottom: 0;
-background-color: #efefef;
+background-color: var(--gray-bg-color);
}
/* lo-menu customizations end */
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 549e7b40b..6a35251d0 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -662,7 +662,7 @@ a.leaflet-control-zoom-in {
float:left;
}
#MergeCells > span{
- color: #4d82b8;
+ color: var(--blue1-txt-primary-color);
text-align: end;
vertical-align: bottom;
}
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 410426a50..f2683637c 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -16,7 +16,7 @@
color: dimgray;
height: 24px;
padding: 0px 1em;
- background: #efefef;
+ background: var(--gray-bg-color);
padding-top: 7px;
}
@@ -24,7 +24,7 @@
border: none;
border-radius: 0px;
background: #fff;
- box-shadow: 0 6px 0px 0px white, 0px 0 8px -4px rgba(105, 105, 105,
0.4), -2px 0 15px -4px rgba(77, 130, 184, 0.1);
+ box-shadow: 0 3px 0px 0px #fff, 0px -1px 8px -4px rgba(105, 105, 105,
0.4), -1px -15px 15px -4px rgb(77, 130, 184, 0.1);
}
.main-nav.hasnotebookbar.text-color-indicator .ui-tab.selected.notebookbar{
color: var(--blue1-txt-primary-color);
@@ -165,6 +165,22 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
border: 1px solid silver;
}
+.unotoolbutton.notebookbar .unobutton.selected + .ui-content.unolabel {
+ color: var(--blue1-txt-primary-color) !important;
+}
+
+.unotoolbutton.notebookbar.disabled:not(.unospan-shortcutstoolbox),
.mobile-wizard-widebutton.disabled {
+ color: silver;
+ border-radius: 4px;
+ background: #c0c0c04a;
+}
+
+.unotoolbutton.notebookbar.disabled img, .mobile-wizard-widebutton.disabled
img {
+ -webkit-filter: grayscale(100%) brightness(100%);
+ filter: grayscale(100%) brightness(100%);
+}
+
+
/* unobuttons with inline labels */
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/notebookbar.css| 10 +++--
loleaflet/css/toolbar.css| 28 +--
loleaflet/src/control/Control.Notebookbar.js | 15 ++
3 files changed, 29 insertions(+), 24 deletions(-)
New commits:
commit b56d6a542396cc96b3d392144a217eff5618a4ab
Author: Pedro Pinto Silva
AuthorDate: Tue Jul 21 11:37:10 2020 +0200
Commit: Pedro Silva
CommitDate: Tue Jul 21 14:45:05 2020 +0200
Notebookbar: reposition sidebar icon
Since it's a trigger that it's not dependent on a specific tab content but
rather a top control that activates the sidebar I repositioned it up top. This
will also avoid problems in the future in the case we add a "collapse tab
content"
- Also optative close button got some improvements in position and size
Change-Id: I541a3683529e5744714394b64a57105a3407b13f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99126
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 42aea041f..5c4843424 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -65,12 +65,14 @@
width: 16px !important;
height: 16px !important;
margin-right: 0px;
- margin-bottom: 3px;
+ margin-top: 3px;
}
/* options section */
.notebookbar-options-section {
- margin-left: 10px;
+ display: inline;
+ position: fixed;
+ right: 0px;
}
/* root container */
@@ -91,6 +93,10 @@
height: 0;
}
+#toolbar-wrapper.hasnotebookbar {
+ position: fixed;
+}
+
/* unobuttons */
div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookbar, #ObjectBackOne.notebookbar,
#ObjectForwardOne.notebookbar, #BringToFront.notebookbar,
#SetObjectToBackground.notebookbar, #SetObjectToForeground.notebookbar,
#FlipVertical.notebookbar, #FlipHorizontal.notebookbar, #Bold.notebookbar,
#Italic.notebookbar, #Underline.notebookbar, #Strikeout.notebookbar,
#StyleApply.notebookbar, #StyleUpdateByExample.notebookbar,
#StyleNewByExample.notebookbar, #Shadowed.notebookbar, #Grow.notebookbar,
#Shrink.notebookbar, #Spacing.notebookbar, #SuperScript.notebookbar,
#SubScript.notebookbar,#AlignLeft.notebookbar, #AlignRight.notebookbar,
#AlignHorizontalCenter.notebookbar, #AlignBlock.notebookbar,
#ParaRightToLeft.notebookbar, #ParaLeftToRight.notebookbar,
#AlignTop.notebookbar, #AlignVCenter.notebookbar, #AlignBottom.notebookbar,
#IncrementIndent.notebookbar, #DecrementIndent.notebookbar,
#LeftPara.notebookbar, #RightPara.notebookbar, #CenterPara.notebookbar, #Justif
yPara.notebookbar, #DefaultBullet.notebookbar, #DefaultNumbering.notebookbar,
#ParaspaceIncrease.notebookbar, #ParaspaceDecrease.notebookbar,
#LineSpacing.notebookbar, #HangingIndent.notebookbar, #CellVertTop.notebookbar,
#CellVertCenter.notebookbar, #CellVertBottom.notebookbar,
#ParaspaceIncrease.notebookbar, #ParaspaceDecrease.notebookbar,
#DeleteTable.notebookbar, #MergeCells.notebookbar{
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 880f48053..0f11a2b34 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -216,23 +216,23 @@ td[id^=tb_editbar_item_sidebar]{
}
#closebuttonwrapper {
- position: fixed;
- z-index: 1050;
- right: 4px;
- top: 3px;
- width: 28px;
- height: 28px;
- background-color: white;
- display: none;
+ position: fixed;
+ z-index: 1050;
+ right: 4px;
+ top: 0px;
+ width: 32px;
+ height: 32px;
+ background-color: white;
+ display: none;
}
#closebutton {
- width: 18px;
- height: 18px;
- border: 1px solid;
- border-color: transparent;
- border-radius: 5px;
- margin: 5px;
+ width: 18px;
+ height: 18px;
+ border: 1px solid;
+ border-color: transparent;
+ border-radius: 5px;
+ margin: 8px;
}
#closebutton:hover {
diff --git a/loleaflet/src/control/Control.Notebookbar.js
b/loleaflet/src/control/Control.Notebookbar.js
index b1612cb06..b2c4ac54e 100644
--- a/loleaflet/src/control/Control.Notebookbar.js
+++ b/loleaflet/src/control/Control.Notebookbar.js
@@ -6,7 +6,6 @@
/* global $ _ _UNO */
L.Control.Notebookbar = L.Control.extend({
- _optionsSectionWidth: 50,
_currentScrollPosition: 0,
_showNotebookbar: false,
@@ -23,6 +22,7 @@ L.Control.Notebookbar = L.Control.extend({
this.map.on('notebookbar', this.onNotebookbar, this);
this.map.on('updatepermission', this.onUpdatePermission, this);
+ $('#toolbar-wrapper').addClass('hasnotebookbar');
$('.main-nav').addClass('hasnotebookbar');
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/notebookbar.css | 26 +-
1 file changed, 25 insertions(+), 1 deletion(-)
New commits:
commit d69682284b49e4bdae6ef216acc2c6dcbb9ad53b
Author: Pedro Pinto Silva
AuthorDate: Tue Jul 21 11:06:01 2020 +0200
Commit: Pedro Silva
CommitDate: Tue Jul 21 11:29:00 2020 +0200
Notebookbar: Home: make Paragraph style and its navigation arrows one
visual element
- decrease size of those arrows so they are not mistaken by main actions
that affect the document
Change-Id: Ief0b633187df84e8862501cf928c327fa2e44f5f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99125
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 88c889986..42aea041f 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -122,7 +122,27 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
.unotoolbutton.notebookbar .unobutton.selected {
box-shadow: 0 0 0px 4px #e6e6e640 !important;
}
-
+#table-HomeTab .unospan-uptoolbar:not(.disabled) {
+ border-top-left-radius: 12px;
+ border-bottom-left-radius: 12px;
+ background: linear-gradient(to left, #e6e6e600, #e6e6e652 30%);
+}
+#table-HomeTab .unospan-downtoolbar:not(.disabled) {
+ background: linear-gradient(to right, #e6e6e600, #e6e6e652 30%);
+ border-top-right-radius: 12px;
+ border-bottom-right-radius: 12px;
+}
+#table-HomeTab .unospan-uptoolbar:not(.disabled):hover{
+ box-shadow: -2px 0 2px 2px #e6e6e6b0;
+}
+#table-HomeTab .unospan-downtoolbar:not(.disabled):hover{
+ box-shadow: 2px 0 2px 2px #e6e6e6b0;
+}
+#table-HomeTab .unospan-uptoolbar img, #table-HomeTab .unospan-downtoolbar img
{
+ width: 18px !important;
+ height: 18px !important;
+ padding: 4px;
+}
.unotoolbutton.notebookbar:not(.disabled):hover, #clearFormatting.notebookbar
div img:hover {
box-shadow: 0 0 0px 4px #e6e6e6b0;
border-radius: 0.1px;
@@ -224,6 +244,10 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
cursor: pointer;
}
+#table-stylescontainer #style4 {
+ border-right: 1px dashed transparent;
+}
+
#table-stylescontainer #style1:hover,
#table-stylescontainer #style2:hover,
#table-stylescontainer #style3:hover,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/notebookbar.css|5 ++
loleaflet/images/lc_sidebar.svg |1
loleaflet/src/control/Control.Notebookbar.js | 55 ++-
3 files changed, 59 insertions(+), 2 deletions(-)
New commits:
commit 0d57bb2872326daf1f23b6998699f89a111baa50
Author: Szymon Kłos
AuthorDate: Tue Jul 21 09:30:04 2020 +0200
Commit: Szymon Kłos
CommitDate: Tue Jul 21 10:23:55 2020 +0200
notebookbar: add sidebar switch
Change-Id: Ib64f0d99d428896680eae8ce5ae9109563ec5b76
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99121
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index d46b2f1dd..88c889986 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -68,6 +68,11 @@
margin-bottom: 3px;
}
+/* options section */
+.notebookbar-options-section {
+ margin-left: 10px;
+}
+
/* root container */
.notebookbar-scroll-wrapper {
diff --git a/loleaflet/images/lc_sidebar.svg b/loleaflet/images/lc_sidebar.svg
new file mode 100644
index 0..75c2b7b52
--- /dev/null
+++ b/loleaflet/images/lc_sidebar.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/src/control/Control.Notebookbar.js
b/loleaflet/src/control/Control.Notebookbar.js
index 146888230..b1612cb06 100644
--- a/loleaflet/src/control/Control.Notebookbar.js
+++ b/loleaflet/src/control/Control.Notebookbar.js
@@ -3,9 +3,10 @@
* L.Control.Notebookbar
*/
-/* global $ _ */
+/* global $ _ _UNO */
L.Control.Notebookbar = L.Control.extend({
+ _optionsSectionWidth: 50,
_currentScrollPosition: 0,
_showNotebookbar: false,
@@ -79,6 +80,9 @@ L.Control.Notebookbar = L.Control.extend({
if (this._showNotebookbar === false)
this.hideTabs();
+ if (window.mode.isDesktop())
+ this.createOptionsSection();
+
this.scrollToLastPositionIfNeeded();
},
@@ -151,6 +155,8 @@ L.Control.Notebookbar = L.Control.extend({
$(left).css({'height': '80px'});
$(right).css({'height': '80px'});
+ if (window.mode.isDesktop())
+ $(right).css({'right': this._optionsSectionWidth +
'px'});
$(left).click(function () {
var scroll =
$('.notebookbar-scroll-wrapper').scrollLeft() - 300;
@@ -203,5 +209,50 @@ L.Control.Notebookbar = L.Control.extend({
}
}
}
- }
+ },
+
+ getOptionsSectionData: function() {
+ return [
+ {
+ 'id': 'optionscontainer',
+ 'type': 'container',
+ 'vertical': 'true',
+ 'children': [
+ {
+ 'id': 'optionstoolboxdown',
+ 'type': 'toolbox',
+ 'children': [
+ {
+ 'type':
'toolitem',
+ 'text':
_UNO('.uno:Sidebar', '', true),
+ 'command':
'.uno:Sidebar'
+ },
+ {
+ 'type':
'toolitem',
+ // dummy node
to avoid creating labels
+ }
+ ]
+ }
+ ]
+ }
+ ];
+ },
+
+ createOptionsSection: function() {
+ $('.notebookbar-options-td').remove();
+ var optionsTd = L.DomUtil.create('td',
'notebookbar-options-td');
+ $(optionsTd).css('width', this._optionsSectionWidth + 'px');
+
+ var optionsSection = L.DomUtil.create('div',
'notebookbar-options-section', optionsTd);
+ $('#toolbar-up').parent().append(optionsTd);
+
+ var builderOptions = {
+ mobileWizard: this,
+ map: this.map,
+ cssClass: 'notebookbar',
+ };
+
+ var builder = new L.control.notebookbarBuilder(builderOptions);
+ builder.build(optionsSection, this.getOptionsSectionData());
+ },
});
___
Libreoffice-commits mailing
[Libreoffice-commits] online.git: loleaflet/css loleaflet/docs loleaflet/images loleaflet/src
loleaflet/css/device-mobile.css |4
loleaflet/css/jquery-ui-lightness.css| 35 +---
loleaflet/css/loleaflet.css | 31 ++-
loleaflet/css/menubar.css|7 +
loleaflet/css/mobilewizard.css |2
loleaflet/css/notebookbar.css| 43 +++---
loleaflet/css/spreadsheet.css|8 -
loleaflet/css/toolbar.css| 17 ++-
loleaflet/docs/css/main.css |5 -
loleaflet/images/lc_keyboard-shortcuts.svg | 116 +++
loleaflet/images/lc_online-help.svg |1
loleaflet/images/lc_report-an-issue.svg |1
loleaflet/src/control/Control.Notebookbar.js | 11 ++
13 files changed, 235 insertions(+), 46 deletions(-)
New commits:
commit 515fee128b1146238b40f87ddb172b7aff9ad2f5
Author: Pedro Pinto Silva
AuthorDate: Tue Jul 14 14:09:06 2020 +0200
Commit: Pedro Silva
CommitDate: Mon Jul 20 09:35:25 2020 +0200
Notebookbar: styling
- Overall styling
- Fix tab’ alignment and paddings
- Fix tabs’ states
- Make use of text-shadow to emphasize instead of changing font-weight in
order to avoid changes in size
- Add document-type class in notebookbar (similar to what I did for menubar)
- Style jquery-ui tooltips
- Style .unolabel
- Start to use css --var for font and colors (still no changes in the code
per sea [like reducing the values etc] just start using it)
-- add comments
-- Use it depending on doc-type for notebookbar tab unolabel
- Add missing icons
- Fix extra border (toolbar-wrapper)
- Add document-header
Change-Id: I24552b118657d8ead47a74a6d189bd2448aac808
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98721
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index 2207215ac..d84beba63 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -324,7 +324,7 @@ div#w2ui-overlay-actionbar.w2ui-overlay{
}
.vex-dialog-message {
text-align: center;
- font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif !important;
+ font-family: var(--vex-font) !important;
font-size: 1em !important;
font-weight: 600 !important;
}
@@ -347,7 +347,7 @@ div#w2ui-overlay-actionbar.w2ui-overlay{
color: #000 !important;
}
.vex-dialog-input {
- font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif !important;
+ font-family: var(--vex-font) !important;
font-size: 0.8em;
}
.vex.vex-theme-plain .vex-content {
diff --git a/loleaflet/css/jquery-ui-lightness.css
b/loleaflet/css/jquery-ui-lightness.css
index 6b7ec6aaf..24085cf9d 100644
--- a/loleaflet/css/jquery-ui-lightness.css
+++ b/loleaflet/css/jquery-ui-lightness.css
@@ -871,19 +871,10 @@ button.ui-button::-moz-focus-inner {
padding: 1em 1.4em;
background: none;
}
-.ui-tooltip {
- padding: 8px;
- position: absolute;
- z-index: ;
- max-width: 300px;
-}
-body .ui-tooltip {
- border-width: 2px;
-}
/* Component containers
--*/
.ui-widget {
- font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif;
+ font-family: var(--jquery-ui-font);
font-size: 1.1em;
}
.ui-widget .ui-widget {
@@ -893,7 +884,7 @@ body .ui-tooltip {
.ui-widget select,
.ui-widget textarea,
.ui-widget button {
- font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif;
+ font-family: var(--jquery-ui-font);
font-size: 1em;
}
.ui-widget.ui-widget-content {
@@ -917,6 +908,24 @@ body .ui-tooltip {
color: #ff;
}
+/*Tooltips
+--*/
+.ui-tooltip {
+ padding: 7px 9px;
+ position: absolute;
+ z-index: ;
+ max-width: 300px;
+ background: #2a2a2a;
+}
+body .ui-tooltip {
+ border-width: 2px;
+}
+.ui-tooltip-content {
+ font-size: 0.8em;
+ color: #fff;
+ background: #2a2a2a;
+}
+
/* Interaction states
--*/
.ui-state-default,
@@ -1306,6 +1315,6 @@ a.ui-button:active,
filter: Alpha(Opacity=50); /* support: IE8 */
}
.ui-widget-shadow {
- -webkit-box-shadow: -5px -5px 5px #00;
- box-shadow: -5px -5px 5px #00;
+ -webkit-box-shadow: 0px 0px 4px 2px rgba(0,0,0,0.15);
+ box-shadow: 0px 0px 4px 2px rgba(0,0,0,0.15);
}
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 97c47ab97..c48eaca1b 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -1,3 +1,24 @@
+:root {
+ /*All used fonts (except w2ui)
+ --*/
+ --loleaflet-font: 'Segoe UI', Tahoma, Arial, Helvetica, sans-serif;
+ /*investigate what are the drawback in consisntly
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/loleaflet.css|4 ++--
loleaflet/css/spreadsheet.css |8 +++-
loleaflet/src/control/Control.LokDialog.js | 25 +
loleaflet/src/control/Control.Tabs.js |1 -
4 files changed, 6 insertions(+), 32 deletions(-)
New commits:
commit e0a27002f0cd309b84e9cc573ff2c95d7c10f54e
Author: gokaysatir
AuthorDate: Fri Jul 10 15:06:27 2020 +0300
Commit: Henry Castro
CommitDate: Thu Jul 16 00:19:50 2020 +0200
loleaflet: sidebar overlap issue.
Change-Id: Iff2184725c49c24900865d9865237e9747a050cb
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98555
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Tested-by: Henry Castro
Reviewed-by: Henry Castro
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 29ab4977c..97c47ab97 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -148,7 +148,7 @@ body {
position: absolute;
top: 77px;
right: 0px;
- bottom: 37px;
+ bottom: 72px;
border-top: 1px solid #b6b6b6;
border-left: 1px solid #b6b6b6;
overflow: hidden;
@@ -162,7 +162,7 @@ body {
width: auto;
height: 100%;
overflow-x: hidden;
- overflow-y: scroll;
+ overflow-y: auto;
z-index: 1200;
}
diff --git a/loleaflet/css/spreadsheet.css b/loleaflet/css/spreadsheet.css
index 651dfb97b..3090872fb 100644
--- a/loleaflet/css/spreadsheet.css
+++ b/loleaflet/css/spreadsheet.css
@@ -2,7 +2,7 @@
border-top: 1px solid #B6B6B6;
top: 137px;
left: 50px;
- bottom: 65px;
+ bottom: 75px;
}
#document-container.spreadsheet-document.readonly {
@@ -13,7 +13,7 @@
border-top: 1px solid #B6B6B6;
top: 100px;
left: 50px;
- bottom: 68px;
+ bottom: 78px;
}
.spreadsheet-tabs-container {
@@ -36,14 +36,12 @@
height: 100%;
overflow: auto;
padding-bottom: 20px; /* to hide the horizontal scrollbar */
- padding-right: 5px; /* to hide the vertical scrollbar */
-
margin-left: 6px;
}
.spreadsheet-tab {
margin: 0px;
- margin-top: 2px;
+ margin-top: 4px;
margin-right: 3px;
padding-left: 9px;
padding-right: 9px;
diff --git a/loleaflet/src/control/Control.LokDialog.js
b/loleaflet/src/control/Control.LokDialog.js
index 9fd9dc7ff..f88e74e5e 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -1595,7 +1595,7 @@ L.Control.LokDialog = L.Control.extend({
spreadsheetRowColumnFrame.style.right =
width.toString() + 'px';
this._resizeCalcInputBar(deckOffset);
- this._adjustTabsBar(width);
+
// If we didn't have the focus, don't steal it form the editor.
if ($('#' + this._currentDeck.strId + '-cursor').css('display')
=== 'none') {
if (this._map.editorHasFocus()) {
@@ -1623,29 +1623,6 @@ L.Control.LokDialog = L.Control.extend({
}
},
- _adjustTabsBar: function(deckNewWidth) {
-
- if (this._map.getDocType() !== 'spreadsheet') {
- return;
- }
-
- // This is called only if sidebar is made visible or hidden, so
no need of
- // special-casing for mobile where that never happens.
- // In the case of tablets, when sidebar is made visible/hidden
the below adjustments
- // will work correctly like in desktop-online (verified with
chrome-tablet emulator).
-
- var tabsContainer =
L.DomUtil.get('spreadsheet-tabs-container-id');
- if (!tabsContainer) {
- return;
- }
-
- var docWidth =
L.DomUtil.get('spreadsheet-toolbar').getBoundingClientRect().width;
- var tabsContainerLeft =
tabsContainer.getBoundingClientRect().left;
- var deckMargin = (deckNewWidth === 0) ? 0 : 10;
-
- tabsContainer.style.width = (docWidth - tabsContainerLeft -
deckNewWidth - deckMargin) + 'px';
- },
-
_onDialogChildClose: function(dialogId) {
$('#' + this._toStrId(dialogId) + '-floating').remove();
if (!this._isSidebar(dialogId) &&
!this.isCalcInputBar(dialogId)) {
diff --git a/loleaflet/src/control/Control.Tabs.js
b/loleaflet/src/control/Control.Tabs.js
index 7bb681364..06ccd043a 100644
--- a/loleaflet/src/control/Control.Tabs.js
+++ b/loleaflet/src/control/Control.Tabs.js
@@ -42,7 +42,6 @@ L.Control.Tabs = L.Control.extend({
var map = this._map;
var docContainer = map.options.documentContainer;
this._tabsCont =
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/selectionMarkers.css|6 --
loleaflet/src/layer/tile/TileLayer.js |2 --
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 7ac677244b5391f0a09a4d4ff7cc1f0bfa30
Author: gokaysatir
AuthorDate: Sat Jul 11 15:07:37 2020 +0300
Commit: Henry Castro
CommitDate: Wed Jul 15 22:50:14 2020 +0200
loleaflet: Writer, mobile: Selection handles are slightly off.
Change-Id: If81bb33f80f4f52733c3465567c4dc27abf5b8b5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98559
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/css/selectionMarkers.css
b/loleaflet/css/selectionMarkers.css
index f7acfabff..f35083819 100644
--- a/loleaflet/css/selectionMarkers.css
+++ b/loleaflet/css/selectionMarkers.css
@@ -1,6 +1,7 @@
.leaflet-selection-marker-start {
position: absolute;
- margin-left: -28px;
+ margin-left: -30px;
+ margin-top: -2px;
width: 30px;
height: 44px;
background-image: url('images/handle_start.svg');
@@ -8,7 +9,8 @@
.leaflet-selection-marker-end {
position: absolute;
- margin-left: -2px;
+ margin-left: 0;
+ margin-top: -2px;
width: 30px;
height: 44px;
background-image: url('images/handle_end.svg');
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 09eea8893..7a370575e 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -3188,7 +3188,6 @@ L.TileLayer = L.GridLayer.extend({
if (!startMarker.isDragged) {
var pos =
this._map.project(this._textSelectionStart.getSouthWest());
- pos = pos.subtract(new L.Point(0, 2));
pos = this._map.unproject(pos);
startMarker.setLatLng(pos);
this._map.addLayer(startMarker);
@@ -3196,7 +3195,6 @@ L.TileLayer = L.GridLayer.extend({
if (!endMarker.isDragged) {
pos =
this._map.project(this._textSelectionEnd.getSouthEast());
- pos = pos.subtract(new L.Point(0, 2));
pos = this._map.unproject(pos);
endMarker.setLatLng(pos);
this._map.addLayer(endMarker);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/toolbar.css |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit c1730cf7c1d3f84141f33e7ee516ab7a8cad05f6
Author: Pedro Pinto Silva
AuthorDate: Tue Jul 14 11:47:17 2020 +0200
Commit: Pedro Silva
CommitDate: Tue Jul 14 12:21:04 2020 +0200
Desktop: Document name input and pencil: remove unused styles
and make sure that no default browser properties gets in the way
Change-Id: I2f536c47f4e7db73e4cf77bec03d42b8ad73bd07
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98715
Tested-by: Jenkins
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index e4090800f..68528914e 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -156,6 +156,10 @@ w2ui-toolbar {
position: absolute;
right: 10px;
background: url('images/baseline-edit.svg') right center no-repeat,
radial-gradient(circle, #fff 20%, #fff0 100%);
+ top: 5px;
+ padding: 1px 0px;
+ margin: 0px;
+ border: none;
}
#document-title-pencil:not(.editable){
@@ -171,12 +175,11 @@ w2ui-toolbar {
#document-name-input.editable {
border: none;
box-shadow: 0 0 0.1px 1px #ebebeb, 0 0 2px 1px #f0f0f0;
- background-position: right;
- background-repeat: no-repeat;
padding-right: 24px;
max-width: 100%;
overflow: hidden;
text-overflow:ellipsis;
+ height: 18px;
}
#document-name-input.editable:focus {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/toolbar.css |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 6455178954a7cd312157f77be7d44ea8149ec304
Author: Pedro Pinto Silva
AuthorDate: Mon Jul 13 16:36:52 2020 +0200
Commit: Pedro Silva
CommitDate: Tue Jul 14 10:37:33 2020 +0200
Desktop: document-name-input: add ellipsis together with gradient to show
that the text overflows
Change-Id: Iec964d99a3582c78c83e9b6cb238ccb7cdc39b3c
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98669
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 1af0bbf91..e4090800f 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -175,6 +175,8 @@ w2ui-toolbar {
background-repeat: no-repeat;
padding-right: 24px;
max-width: 100%;
+ overflow: hidden;
+ text-overflow:ellipsis;
}
#document-name-input.editable:focus {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/mobilewizard.css |4
loleaflet/src/control/Control.JSDialogBuilder.js |4
2 files changed, 8 insertions(+)
New commits:
commit 1aed5ddaa440c0d687708bd0ba7819499dd247fc
Author: Szymon Kłos
AuthorDate: Fri Jul 10 15:22:00 2020 +0200
Commit: Szymon Kłos
CommitDate: Mon Jul 13 10:00:07 2020 +0200
mobile wizard: hide unsupported items in table panel
Change-Id: Ie8486a496cd30f48f600d7acc7960674f3864b7d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98527
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index d11ced002..5442e96c3 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -883,3 +883,7 @@ input[type=checkbox][disabled] {
margin: 10px 5% 10px 5% !important;
width: 90%;
}
+
+#TableEditPanel #misc_label.mobile-wizard {
+ display: none;
+}
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 38ac8710a..967e2bd7b 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -196,6 +196,10 @@ L.Control.JSDialogBuilder = L.Control.extend({
this._toolitemHandlers['.uno:ResetAttributes'] =
this._clearFormattingControl;
this._toolitemHandlers['.uno:SetDefault'] =
this._clearFormattingControl;
+ this._toolitemHandlers['.uno:InsertFormula'] = function () {};
+ this._toolitemHandlers['.uno:SetBorderStyle'] = function () {};
+ this._toolitemHandlers['.uno:TableCellBackgroundColor'] =
function () {};
+
this._currentDepth = 0;
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/toolbar.css |1 +
1 file changed, 1 insertion(+)
New commits:
commit e396ef0ba14d156e1d62af8c66f0ab8e3f4d971c
Author: Pedro Pinto Silva
AuthorDate: Fri Jul 10 15:41:03 2020 +0200
Commit: Pedro Silva
CommitDate: Mon Jul 13 08:55:54 2020 +0200
Remove default browser-specific outline
- happening on some browsers (black thick line)
Change-Id: I1f628f9b93caf3779564f0f4143a2cb599605699
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98529
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 11cbec629..1af0bbf91 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -182,6 +182,7 @@ w2ui-toolbar {
box-shadow: inset 0 0 2px 1px #f0f0f0, 0 0 0.1px 1px #bbb;
background-color: white;
background-image: none;
+ outline: none;
}
#document-name-input.editable:hover:not(:focus) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/toolbar.css|1 -
loleaflet/src/control/Control.Menubar.js |2 +-
loleaflet/src/control/Control.Toolbar.js |5 +++--
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 49bbd53f702acac714efedb570008b2faecf14c9
Author: Henry Castro
AuthorDate: Thu Jul 9 10:53:48 2020 -0400
Commit: Henry Castro
CommitDate: Fri Jul 10 15:51:51 2020 +0200
loleaflet: fix the show/hide close button
Explicit show/hide the close button if the page is loaded by
a WOPI Integrator.
Change-Id: I13d58bbbff03f283ed033a12a4489b610839748e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98443
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 297605e56..11cbec629 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -230,7 +230,6 @@ td[id^=tb_editbar_item_sidebar]{
}
.closebuttonimage {
- display: none;
background: url('images/closedoc.svg') no-repeat center
!important;
}
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index ead7ebd34..b83a78a55 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -1364,7 +1364,7 @@ L.Control.Menubar = L.Control.extend({
if (menuItem.type === 'action') {
if ((menuItem.id === 'rev-history' &&
!L.Params.revHistoryEnabled) ||
- (menuItem.id === 'closedocument' &&
!window.closebutton) ||
+ (menuItem.id === 'closedocument' &&
!L.Params.closeButtonEnabled) ||
(menuItem.id === 'latest-updates' &&
!window.enableWelcomeMessage)) {
return false;
}
diff --git a/loleaflet/src/control/Control.Toolbar.js
b/loleaflet/src/control/Control.Toolbar.js
index e8dce9bc3..de0447a39 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -1060,11 +1060,12 @@ function setupToolbar(e) {
map.on('commandresult', onCommandResult);
map.on('updateparts pagenumberchanged', onUpdateParts);
- if (!L.Params.closeButtonEnabled) {
+ if (map.options.wopi && L.Params.closeButtonEnabled) {
+ $('#closebuttonwrapper').show();
+ } else if (!L.Params.closeButtonEnabled) {
$('#closebuttonwrapper').hide();
} else if (L.Params.closeButtonEnabled && !window.mode.isMobile()) {
$('#closebuttonwrapper').show();
- $('.closebuttonimage').show();
}
$('#closebutton').click(function() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/notebookbar.css |6 ++
loleaflet/images/lc_aligncenter.svg |1 +
loleaflet/images/lc_aligndown.svg |1 +
loleaflet/images/lc_alignmiddle.svg |1 +
loleaflet/images/lc_alignup.svg |1 +
loleaflet/images/lc_entergroup.svg |1 +
loleaflet/images/lc_formatarea.svg |1 +
loleaflet/images/lc_formatline.svg |1 +
loleaflet/images/lc_leavegroup.svg |1 +
loleaflet/images/lc_objectalignleft.svg |1 +
loleaflet/images/lc_objectalignright.svg|1 +
loleaflet/src/control/Control.NotebookbarBuilder.js | 14 +-
loleaflet/src/control/Control.NotebookbarWriter.js |6 ++
13 files changed, 35 insertions(+), 1 deletion(-)
New commits:
commit 12d5e0aabc0237c5ba1fcdc151f17b8ab6db1a0a
Author: Szymon Kłos
AuthorDate: Fri Jul 10 10:36:58 2020 +0200
Commit: Szymon Kłos
CommitDate: Fri Jul 10 14:50:46 2020 +0200
notebookbar: enable Draw tab for writer
Change-Id: I32f91d35fbf2332e133db7194fd795b9471af7b1
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98487
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 60d851074..a7fcfc57f 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -376,6 +376,12 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
margin-top: 20px;
}
+/* Draw tab */
+#table-Draw #table-box16 #table-first16.notebookbar,
+#table-DrawTab #table-GroupB74 #table-SectionBottom48.notebookbar {
+ display: none;
+}
+
/* Calc */
/* Home tab */
diff --git a/loleaflet/images/lc_aligncenter.svg
b/loleaflet/images/lc_aligncenter.svg
new file mode 100644
index 0..f2e6308ee
--- /dev/null
+++ b/loleaflet/images/lc_aligncenter.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/images/lc_aligndown.svg
b/loleaflet/images/lc_aligndown.svg
new file mode 100644
index 0..59a972c8a
--- /dev/null
+++ b/loleaflet/images/lc_aligndown.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/images/lc_alignmiddle.svg
b/loleaflet/images/lc_alignmiddle.svg
new file mode 100644
index 0..6186f920d
--- /dev/null
+++ b/loleaflet/images/lc_alignmiddle.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/images/lc_alignup.svg b/loleaflet/images/lc_alignup.svg
new file mode 100644
index 0..2cbe84e1c
--- /dev/null
+++ b/loleaflet/images/lc_alignup.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/images/lc_entergroup.svg
b/loleaflet/images/lc_entergroup.svg
new file mode 100644
index 0..e05b5b696
--- /dev/null
+++ b/loleaflet/images/lc_entergroup.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/images/lc_formatarea.svg
b/loleaflet/images/lc_formatarea.svg
new file mode 100644
index 0..ebd7aac9d
--- /dev/null
+++ b/loleaflet/images/lc_formatarea.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/images/lc_formatline.svg
b/loleaflet/images/lc_formatline.svg
new file mode 100644
index 0..bf6ead04f
--- /dev/null
+++ b/loleaflet/images/lc_formatline.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/images/lc_leavegroup.svg
b/loleaflet/images/lc_leavegroup.svg
new file mode 100644
index 0..5bd9a2dfb
--- /dev/null
+++ b/loleaflet/images/lc_leavegroup.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/images/lc_objectalignleft.svg
b/loleaflet/images/lc_objectalignleft.svg
new file mode 100644
index 0..d51301c47
--- /dev/null
+++ b/loleaflet/images/lc_objectalignleft.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/images/lc_objectalignright.svg
b/loleaflet/images/lc_objectalignright.svg
new file mode 100644
index 0..cab9fb366
--- /dev/null
+++ b/loleaflet/images/lc_objectalignright.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js
b/loleaflet/src/control/Control.NotebookbarBuilder.js
index 36265b450..52e1454c8 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -82,7 +82,6 @@ L.Control.NotebookbarBuilder =
L.Control.JSDialogBuilder.extend({
this._toolitemHandlers['.uno:SelectObject'] = function() {};
this._toolitemHandlers['.uno:BibliographyComponent'] =
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/toolbar.css |5 ++---
loleaflet/src/control/Control.DocumentNameInput.js |3 +--
2 files changed, 3 insertions(+), 5 deletions(-)
New commits:
commit a84ff0ae46422c630b4a6e9587eda107ea1336fe
Author: Pedro Pinto Silva
AuthorDate: Thu Jun 25 16:10:49 2020 +0200
Commit: Pedro Silva
CommitDate: Fri Jul 10 09:58:30 2020 +0200
Desktop: document name: center icon (pencil) & loading time
* be sure to wait from either the menu or the doc to appear to show the
icon by adding the "editable" class on after onDocLayerInit and onWopiProps
* remove if (this.UserCanNotWriteRelative === false) as at that moment we
still have no clue of its status
Change-Id: Icaaa921452b09d747be4fffab90bf1c93283718e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97128
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 807e1054b..297605e56 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -152,11 +152,10 @@ w2ui-toolbar {
#document-title-pencil.editable {
visibility: visible;
width: 24px;
- height: 22px;
+ height: 18px;
position: absolute;
- left: 87%;
+ right: 10px;
background: url('images/baseline-edit.svg') right center no-repeat,
radial-gradient(circle, #fff 20%, #fff0 100%);
- border-top: solid 3px white;
}
#document-title-pencil:not(.editable){
diff --git a/loleaflet/src/control/Control.DocumentNameInput.js
b/loleaflet/src/control/Control.DocumentNameInput.js
index 3ad053094..7ccc5993d 100644
--- a/loleaflet/src/control/Control.DocumentNameInput.js
+++ b/loleaflet/src/control/Control.DocumentNameInput.js
@@ -11,6 +11,7 @@ L.Control.DocumentNameInput = L.Control.extend({
map.on('doclayerinit', this.onDocLayerInit, this);
map.on('wopiprops', this.onWopiProps, this);
+ $('#document-title-pencil').addClass('editable');
},
documentNameConfirm: function() {
@@ -100,12 +101,10 @@ L.Control.DocumentNameInput = L.Control.extend({
if (e.BaseFileName !== null)
// set the document name into the name field
$('#document-name-input').val(e.BreadcrumbDocName !==
undefined ? e.BreadcrumbDocName : e.BaseFileName);
-
if (e.UserCanNotWriteRelative === false) {
// Save As allowed
$('#document-name-input').prop('disabled', false);
$('#document-name-input').addClass('editable');
- $('#document-title-pencil').addClass('editable');
$('#document-name-input').off('keypress',
this.onDocumentNameKeyPress).on('keypress',
this.onDocumentNameKeyPress.bind(this));
$('#document-name-input').off('focus',
this.onDocumentNameFocus).on('focus', this.onDocumentNameFocus.bind(this));
$('#document-name-input').off('blur',
this.documentNameCancel).on('blur', this.documentNameCancel.bind(this));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/notebookbar.css |8
1 file changed, 8 insertions(+)
New commits:
commit c618fcba64f5ee2398afcd86383a123e3151065c
Author: Szymon Kłos
AuthorDate: Thu Jul 9 13:26:17 2020 +0200
Commit: Szymon Kłos
CommitDate: Thu Jul 9 14:28:57 2020 +0200
notebookbar: highlight styles on hover
Change-Id: I41a7715747cb22fe972547d4028c4c0e0899305e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98426
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 94cff1fee..60d851074 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -194,6 +194,14 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
cursor: pointer;
}
+#table-stylescontainer #style1:hover,
+#table-stylescontainer #style2:hover,
+#table-stylescontainer #style3:hover,
+#table-stylescontainer #style4:hover
+{
+ border: 1px solid lightgray;
+}
+
/* Insert Tab */
#InsertReferenceField.notebookbar,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/Makefile.am loleaflet/src
loleaflet/Makefile.am |1
loleaflet/css/leaflet.css | 19 +++
loleaflet/src/layer/tile/CanvasTileLayer.js | 30 +
loleaflet/src/layer/vector/SplitterLine.js | 158
4 files changed, 208 insertions(+)
New commits:
commit 3c3adc3f5d22171c9fa5ca18351ae9376c04f88a
Author: Dennis Francis
AuthorDate: Tue Jul 7 14:57:24 2020 +0530
Commit: Dennis Francis
CommitDate: Wed Jul 8 16:59:04 2020 +0200
add draggable splitters that controls the split-panes
Change-Id: I7d6f681fbacfd8b1a6699c52a8bd9d007f20b99d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98355
Tested-by: Jenkins CollaboraOffice
Tested-by: Jenkins
Reviewed-by: Dennis Francis
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 589a95448..dfc9d5984 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -231,6 +231,7 @@ LOLEAFLET_JS =\
src/geometry/PolyUtil.js \
src/layer/vector/Polygon.js \
src/layer/vector/Rectangle.js \
+ src/layer/vector/SplitterLine.js \
src/layer/vector/CircleMarker.js \
src/layer/vector/Circle.js \
src/layer/vector/SVG.js \
diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css
index 2ea1f74ea..f4bd5abf0 100644
--- a/loleaflet/css/leaflet.css
+++ b/loleaflet/css/leaflet.css
@@ -1001,3 +1001,22 @@ input.clipboard {
top: 0;
z-index: 9;
}
+
+.leaflet-pane-splitter {
+ cursor:grab;
+ stroke: #e0e0e0;
+ fill: #e0e0e0;
+ opacity: 1;
+ }
+
+.splitter-hidden {
+ opacity: 0.6;
+ stroke: #ee;
+ fill: #ee;
+ }
+
+path.leaflet-pane-splitter:hover {
+ opacity: 1 !important;
+ stroke: #cdcdcd;
+ fill: #cdcdcd;
+ }
diff --git a/loleaflet/src/layer/tile/CanvasTileLayer.js
b/loleaflet/src/layer/tile/CanvasTileLayer.js
index a9df21726..e086a08ad 100644
--- a/loleaflet/src/layer/tile/CanvasTileLayer.js
+++ b/loleaflet/src/layer/tile/CanvasTileLayer.js
@@ -1329,4 +1329,34 @@ L.CanvasTileLayer = L.TileLayer.extend({
this._map._socket.sendMessage('tileprocessed tile=' + tileID);
},
+ updateHorizPaneSplitter: function () {
+
+ var map = this._map;
+
+ if (!this._xSplitter) {
+ this._xSplitter = new L.SplitterLine(
+ map, { isHoriz: true });
+
+ map.addLayer(this._xSplitter);
+ }
+ else {
+ this._xSplitter.update();
+ }
+ },
+
+ updateVertPaneSplitter: function () {
+
+ var map = this._map;
+
+ if (!this._ySplitter) {
+ this._ySplitter = new L.SplitterLine(
+ map, { isHoriz: false });
+
+ map.addLayer(this._ySplitter);
+ }
+ else {
+ this._ySplitter.update();
+ }
+ },
+
});
diff --git a/loleaflet/src/layer/vector/SplitterLine.js
b/loleaflet/src/layer/vector/SplitterLine.js
new file mode 100644
index 0..a769a58e0
--- /dev/null
+++ b/loleaflet/src/layer/vector/SplitterLine.js
@@ -0,0 +1,158 @@
+/* -*- js-indent-level: 8 -*- */
+/*
+ * L.SplitterLine is a draggable L.Rectangle to be used as control for
split-panes.
+ */
+
+L.SplitterLine = L.Rectangle.extend({
+
+ options: {
+ color: '#e0e0e0',
+ fill: true,
+ weight: 1,
+ fillOpacity: 1,
+ opacity: 1,
+ interactive: true,
+ fixed: true,
+ draggable: true,
+ noClip: true,
+ isHoriz: true,
+ manualDrag: false,
+ },
+
+ initialize: function (map, options) {
+
+ this.options.isHoriz = options.isHoriz;
+ var latlngBounds = this._calculateLatLngBounds(map);
+ L.Rectangle.prototype.initialize.call(this, latlngBounds);
+ L.setOptions(this, options);
+ },
+
+ _calculateLatLngBounds: function (map) {
+ map = map || this._map;
+ this._splitPanesContext = this._splitPanesContext ||
map.getSplitPanesContext();
+ console.assert(this._splitPanesContext, 'no
_splitPanesContext!');
+
+ var size = map._docLayer.getMaxDocSize();
+ var isHoriz = this.options.isHoriz;
+ var splitPos = this._splitPanesContext.getSplitPos();
+
+ this._lastPos = isHoriz ? splitPos.x : splitPos.y;
+
+ var thickness = 4;
+
+ var xmin = isHoriz ? splitPos.x - thickness/2 : -size.x;
+ var xmax = isHoriz ? splitPos.x + thickness/2 : size.x;
+
+ var ymin = !isHoriz ? splitPos.y - thickness/2 : -size.y;
+ var ymax = !isHoriz ? splitPos.y +
[Libreoffice-commits] online.git: loleaflet/css loleaflet/Makefile.am loleaflet/src
loleaflet/Makefile.am |1
loleaflet/css/leaflet.css |8
loleaflet/src/layer/tile/CanvasTileLayer.js | 1332
3 files changed, 1341 insertions(+)
New commits:
commit 4b2ff56750ff11ae421572e4bceae273c540820f
Author: Dennis Francis
AuthorDate: Tue Jul 7 13:20:34 2020 +0530
Commit: Dennis Francis
CommitDate: Wed Jul 8 16:50:42 2020 +0200
introduce CanvasTileLayer with support for split-panes
which is derived from TileLayer but renders tiles on a canvas instead.
TODO: Generalize certain methods of TileLayer instead of a complete
re-implementation in CanvasTileLayer just because a few things need to
change.
Change-Id: I51001f83f8f663d194bc9c4b018fa9950c40f420
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98351
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Dennis Francis
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 49faf56f1..2b2dd22c8 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -201,6 +201,7 @@ LOLEAFLET_JS =\
src/layer/Layer.js \
src/layer/tile/GridLayer.js \
src/layer/tile/TileLayer.js \
+ src/layer/tile/CanvasTileLayer.js \
src/layer/SplitPanesContext.js \
src/layer/tile/TileLayer.TableOverlay.js \
src/layer/ObjectFocusDarkOverlay.js \
diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css
index ccf881de2..2ea1f74ea 100644
--- a/loleaflet/css/leaflet.css
+++ b/loleaflet/css/leaflet.css
@@ -7,6 +7,7 @@
.leaflet-tile-container,
.leaflet-map-pane svg,
.leaflet-map-pane canvas,
+.leaflet-canvas-container canvas
.leaflet-zoom-box,
.leaflet-image-layer,
.leaflet-layer {
@@ -993,3 +994,10 @@ input.clipboard {
top: 24px;
color: white;
}
+
+.leaflet-canvas-container {
+ position: absolute;
+ left: 0;
+ top: 0;
+ z-index: 9;
+ }
diff --git a/loleaflet/src/layer/tile/CanvasTileLayer.js
b/loleaflet/src/layer/tile/CanvasTileLayer.js
new file mode 100644
index 0..a9df21726
--- /dev/null
+++ b/loleaflet/src/layer/tile/CanvasTileLayer.js
@@ -0,0 +1,1332 @@
+/* -*- js-indent-level: 8 -*- */
+/*
+ * L.CanvasTileLayer is a L.TileLayer with canvas based rendering.
+ */
+
+L.TileCoordData = L.Class.extend({
+
+ initialize: function (left, top, zoom, part) {
+ this.x = left;
+ this.y = top;
+ this.z = zoom;
+ this.part = part;
+ },
+
+ getPos: function () {
+ return new L.Point(this.x, this.y);
+ },
+
+ key: function () {
+ return this.x + ':' + this.y + ':' + this.z + ':' + this.part;
+ },
+
+ toString: function () {
+ return '{ left : ' + this.x + ', top : ' + this.y +
+ ', z : ' + this.z + ', part : ' + this.part + ' }';
+ }
+});
+
+L.TileCoordData.parseKey = function (keyString) {
+
+ console.assert(typeof keyString === 'string', 'key should be a string');
+ var k = keyString.split(':');
+ console.assert(k.length >= 4, 'invalid key format');
+ return new L.TileCoordData(+k[0], +k[1], +k[2], +k[3]);
+};
+
+L.CanvasTilePainter = L.Class.extend({
+
+ options: {
+ debug: false,
+ },
+
+ initialize: function (layer, dpiScale, enableImageSmoothing) {
+ this._layer = layer;
+ this._canvas = this._layer._canvas;
+ this._splitPanesContext = this._layer.getSplitPanesContext();
+
+ if (dpiScale === 1 || dpiScale === 2) {
+ enableImageSmoothing = (enableImageSmoothing === true);
+ }
+ else {
+ enableImageSmoothing = (enableImageSmoothing ===
undefined || enableImageSmoothing);
+ }
+
+ this._dpiScale = dpiScale;
+
+ this._map = this._layer._map;
+ this._setupCanvas(enableImageSmoothing);
+
+ this._topLeft = undefined;
+ this._lastZoom = undefined;
+ this._lastPart = undefined;
+ this._splitPos = this._splitPanesContext ?
+ this._splitPanesContext.getSplitPos() : new L.Point(0,
0);
+
+ this._tileSizeCSSPx = undefined;
+ this._updatesRunning = false;
+ },
+
+ isUpdatesRunning: function () {
+ return this._updatesRunning;
+ },
+
+ startUpdates: function () {
+ if (this._updatesRunning === true) {
+ return false;
+ }
+
+ this._updatesRunning = true;
+ this._updateWithRAF();
+ return true;
+ },
+
+ stopUpdates: function () {
+ if (this._updatesRunning) {
+ L.Util.cancelAnimFrame(this._canvasRAF);
+
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/device-mobile.css |6 +++---
loleaflet/src/control/Control.PartsPreview.js | 15 ++-
2 files changed, 13 insertions(+), 8 deletions(-)
New commits:
commit e5188272c768e3cb4da8f87f93fd06a510d2f930
Author: Henry Castro
AuthorDate: Thu Jun 11 09:35:25 2020 -0400
Commit: Henry Castro
CommitDate: Tue Jul 7 17:29:32 2020 +0200
android: fix thumbnails images when portrait orientation is set
Change-Id: I70aee6b569f78795487cbff736130e0e7413e852
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96123
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index 24f26678a..2207215ac 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -584,14 +584,14 @@ td[id^=tb_spreadsheet-toolbar_item]:focus
table.w2ui-button div.w2ui-icon, td[id
/* Related to slidesorter */
/* Show slidesorter beyond 768px only */
#presentation-controls-wrapper {
- top: initial;
+ top: 41px;
left: initial;
bottom: 33px;
max-width: initial;
}
#presentation-controls-wrapper.readonly {
- top: initial;
+ top: 41px;
bottom: 0px;
}
@@ -691,7 +691,6 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button
div.w2ui-icon, td[id
.preview-img-portrait {
min-width: 37px;
max-width: 60px;
- max-height: 45px;
margin: 0px;
}
@@ -715,6 +714,7 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button
div.w2ui-icon, td[id
}
#document-container.landscape.parts-preview-document {
+ top: 41px;
left: 66px !important;
bottom: 33px;
}
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index e5f1676df..a922ada7a 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -12,8 +12,8 @@ L.Control.PartsPreview = L.Control.extend({
frameClass: '',
axis: '',
allowOrientation: true,
- maxWidth: (window.mode.isMobile() || window.mode.isTablet()) ?
60 : 180,
- maxHeight: (window.mode.isMobile() || window.mode.isTablet()) ?
60 : 180
+ maxWidth: !window.mode.isDesktop() ? 60 : 180,
+ maxHeight: !window.mode.isDesktop() ? 60 : 180
},
partsFocused: false,
@@ -118,7 +118,7 @@ L.Control.PartsPreview = L.Control.extend({
this._addDnDHandlers(frame);
frame.setAttribute('draggable', false);
- if (!window.mode.isMobile()) {
+ if (window.mode.isDesktop()) {
L.DomUtil.setStyle(frame, 'height',
'20px');
L.DomUtil.setStyle(frame, 'margin',
'0em');
}
@@ -204,7 +204,7 @@ L.Control.PartsPreview = L.Control.extend({
img.hash = hashCode;
img.src = L.Icon.Default.imagePath + '/preview_placeholder.png';
img.fetched = false;
- if (window.mode.isMobile() || window.mode.isTablet()) {
+ if (!window.mode.isDesktop()) {
(new Hammer(img, {recognizers: [[Hammer.Press]]}))
.on('press', L.bind(function () {
if (this._map._permission === 'edit') {
@@ -290,7 +290,7 @@ L.Control.PartsPreview = L.Control.extend({
var previewImgMinWidth =
Math.round(parseFloat(L.DomUtil.getStyle(img, 'min-width')));
var imgHeight = imgSize.height;
var imgWidth = imgSize.width;
- if (imgSize.width < previewImgMinWidth)
+ if (imgSize.width < previewImgMinWidth &&
window.mode.isDesktop())
imgHeight = Math.round(imgHeight *
previewImgMinWidth / imgSize.width);
var previewFrameBB =
img.parentElement.getBoundingClientRect();
if (this._direction === 'x') {
@@ -303,6 +303,11 @@ L.Control.PartsPreview = L.Control.extend({
this._previewFrameHeight = imgHeight + 2 *
previewImgBorder;
}
}
+
+ if (!window.mode.isDesktop() && imgSize) {
+ L.DomUtil.setStyle(img, 'width', imgSize.width + 'px');
+ L.DomUtil.setStyle(img, 'height', imgSize.height +
'px');
+ }
},
_setPart: function (e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/notebookbar.css | 10
loleaflet/src/control/Control.NotebookbarBuilder.js | 17
loleaflet/src/control/Control.NotebookbarCalc.js| 260 ++
loleaflet/src/control/Control.NotebookbarImpress.js | 313
loleaflet/src/control/Control.NotebookbarWriter.js | 490 +++-
5 files changed, 1086 insertions(+), 4 deletions(-)
New commits:
commit 7895ab9a293ad304017043fcd7597738441e18c1
Author: Szymon Kłos
AuthorDate: Mon Jul 6 09:42:30 2020 +0200
Commit: Szymon Kłos
CommitDate: Tue Jul 7 15:36:25 2020 +0200
notebookbar: add file & help tabs
Change-Id: Ie24b8ff6d541a95df61ff45a3a4ad1b26b08c596
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98254
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index dbadb..94cff1fee 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -358,6 +358,16 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
margin-top: 10px !important;
}
+/* Help tab */
+#table-Help-Section {
+ margin-top: 40px;
+}
+
+/* File tab */
+#table-File-Section {
+ margin-top: 20px;
+}
+
/* Calc */
/* Home tab */
diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js
b/loleaflet/src/control/Control.NotebookbarBuilder.js
index 27857a375..36265b450 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -16,6 +16,7 @@ L.Control.NotebookbarBuilder =
L.Control.JSDialogBuilder.extend({
this._controlHandlers['combobox'] =
this._comboboxControlHandler;
this._controlHandlers['listbox'] = this._comboboxControlHandler;
this._controlHandlers['tabcontrol'] =
this._overridenTabsControlHandler;
+ this._controlHandlers['menubartoolitem'] =
this._menubarToolItemHandler;
this._controlHandlers['pushbutton'] = function() { return
false; };
this._controlHandlers['spinfield'] = function() { return false;
};
@@ -240,6 +241,22 @@ L.Control.NotebookbarBuilder =
L.Control.JSDialogBuilder.extend({
return builder._tabsControlHandler(parentContainer, data,
builder);
},
+ _menubarToolItemHandler: function(parentContainer, data, builder) {
+ var originalInLineState =
builder.options.useInLineLabelsForUnoButtons;
+ builder.options.useInLineLabelsForUnoButtons = true;
+
+ data.command = data.id;
+ var control = builder._unoToolButton(parentContainer, data,
builder);
+
+ builder.options.useInLineLabelsForUnoButtons =
originalInLineState;
+
+ $(control.container).unbind('click');
+ $(control.container).click(function () {
+ console.log(builder.options.map);
+ L.control.menubar()._executeAction.bind({_map:
builder.options.map})(undefined, {id: data.id});
+ });
+ },
+
_colorControl: function(parentContainer, data, builder) {
var commandOverride = data.command === '.uno:Color' &&
builder.map.getDocType() === 'text';
if (commandOverride)
diff --git a/loleaflet/src/control/Control.NotebookbarCalc.js
b/loleaflet/src/control/Control.NotebookbarCalc.js
index b8709c2c2..b806bb4b8 100644
--- a/loleaflet/src/control/Control.NotebookbarCalc.js
+++ b/loleaflet/src/control/Control.NotebookbarCalc.js
@@ -3,11 +3,16 @@
* L.Control.NotebookbarCalc
*/
-/* global _ */
+/* global _ _UNO */
L.Control.NotebookbarCalc = L.Control.NotebookbarWriter.extend({
getTabs: function() {
return [
+ {
+ 'text': _('~File'),
+ 'id': '-1',
+ 'name': 'File',
+ },
{
'text': _('~Home'),
'id': '2',
@@ -23,10 +28,263 @@ L.Control.NotebookbarCalc =
L.Control.NotebookbarWriter.extend({
'text': _('~Review'),
'id': '6',
'name': 'ReviewLabel'
+ },
+ {
+ 'text': _('~Help'),
+ 'id': '-2',
+ 'name': 'Help',
}
];
},
+ getFileTab: function() {
+ var hasRevisionHistory = L.Params.revHistoryEnabled;
+ var hasPrint = !this._map['wopi'].HidePrintOption;
+ var hasSaveAs = !this._map['wopi'].UserCanNotWriteRelative;
+ var hasShare = this._map['wopi'].EnableShare;
+
+
+
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/spreadsheet.css |2 --
1 file changed, 2 deletions(-)
New commits:
commit 320550f5820fb2f2158978145be3644f46044fb0
Author: Dennis Francis
AuthorDate: Fri May 22 23:41:52 2020 +0530
Commit: Dennis Francis
CommitDate: Sun Jul 5 16:29:12 2020 +0200
row(col) header's canvas height(width) should not auto-adjust...
with the height(width) of the parent container, because if it does, the
header-canvas scales its contents to adjust to the new height(width) and
of course goes out of sync with the tiles.
This bug is visible when we do synchronous update of headers and if one
or both of the headers change size due to increase/decrease of
table-outline levels.
Change-Id: Ib65fd27f3598c7d58323d37c80ce2a147e594911
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98104
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Dennis Francis
diff --git a/loleaflet/css/spreadsheet.css b/loleaflet/css/spreadsheet.css
index 1934933b5..a24792192 100644
--- a/loleaflet/css/spreadsheet.css
+++ b/loleaflet/css/spreadsheet.css
@@ -135,7 +135,6 @@
.spreadsheet-header-columns {
display: inline-block;
white-space: nowrap;
- width: 100%;
height: 100%;
border-spacing: 0px !important;
position: relative;
@@ -178,7 +177,6 @@
.spreadsheet-header-rows {
width: 100%;
- height: 100%;
border-spacing: 0px !important;
position: relative;
margin: 0px;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/loleaflet.css |2 +-
loleaflet/src/control/Control.PresentationBar.js |3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 99944f8842e73a4207c230f895ac02ecba23cfd0
Author: Pranam Lashkari
AuthorDate: Thu Jul 2 17:59:11 2020 +0530
Commit: Andras Timar
CommitDate: Fri Jul 3 12:49:50 2020 +0200
leaflet: removed slide controls from draw
Change-Id: I5916d829b257729363125643cf3ba548f7e4e9db
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97759
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 2bcf9a3b5..29ab4977c 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -135,7 +135,7 @@ body {
}
#presentation-controls-wrapper.drawing {
- bottom: 40px; /* Hide the presentation toolbar (insert slide etc.) for
doctype = drawing */
+ bottom: 33px; /* Hide the presentation toolbar (insert slide etc.) for
doctype = drawing */
}
#presentation-controls-wrapper.readonly {
diff --git a/loleaflet/src/control/Control.PresentationBar.js
b/loleaflet/src/control/Control.PresentationBar.js
index eeb3cfac8..dd10369b0 100644
--- a/loleaflet/src/control/Control.PresentationBar.js
+++ b/loleaflet/src/control/Control.PresentationBar.js
@@ -10,6 +10,9 @@ L.Control.PresentationBar = L.Control.extend({
},
onAdd: function (map) {
+ if (this._map.getDocType() === 'drawing') {
+ return;
+ }
this.map = map;
this.create();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/loleaflet.css |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit ce2b95c99a4b8a21caa23276bf1de1184fb2bdd3
Author: Mike Kaganski
AuthorDate: Fri Jul 3 08:40:55 2020 +0200
Commit: Mike Kaganski
CommitDate: Fri Jul 3 09:00:49 2020 +0200
Make the button animate on release, too
Change-Id: I188ee6b9af97e3018c06bca684cacce6fee1774c
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97795
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Mike Kaganski
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 7e962a09e..2bcf9a3b5 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -193,6 +193,8 @@ body {
border-radius: 50%;
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0,
0.19);
z-index: 1001;
+ transform: scale(1);
+ transition: transform 0.5s;
}
#mobile-edit-button.impress {
@@ -206,14 +208,14 @@ body {
width: 24px;
height: 24px;
background: url('images/baseline-edit-24px.svg') no-repeat center
!important;
+ transform: rotate(0deg);
+ transition: transform 0.5s;
}
#mobile-edit-button:active{
transform: scale(1.2);
- transition: transform 0.5s;
}
#mobile-edit-button:active > #mobile-edit-button-image {
transform: rotate(45deg);
- transition: transform 0.5s;
}
.loleaflet-font {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/loleaflet.css |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3ce83a527bbee5d7d89491e6370619ef09893f0d
Author: Mike Kaganski
AuthorDate: Thu Jul 2 22:45:48 2020 +0200
Commit: Mike Kaganski
CommitDate: Thu Jul 2 23:11:10 2020 +0200
Use child combinator instead of separate :active pseudo-classes
This avoids the image not rotating when touching the edge of the button,
when the image is not active.
Ref.: https://developer.mozilla.org/en-US/docs/Web/CSS/Child_combinator
Change-Id: I4a6d966743d6d07106dd0666f840d8d73ccdc8cc
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97791
Tested-by: Jenkins CollaboraOffice
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index f1a870772..7e962a09e 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -211,7 +211,7 @@ body {
transform: scale(1.2);
transition: transform 0.5s;
}
-#mobile-edit-button-image:active {
+#mobile-edit-button:active > #mobile-edit-button-image {
transform: rotate(45deg);
transition: transform 0.5s;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/mobilewizard.css |1 +
1 file changed, 1 insertion(+)
New commits:
commit d8d3d1936aa33a0ea51f0b148fbc4e3c7c6a4cf2
Author: Szymon Kłos
AuthorDate: Thu Jul 2 08:58:06 2020 +0200
Commit: Szymon Kłos
CommitDate: Thu Jul 2 11:03:58 2020 +0200
mobilewizard: add bottom padding
Change-Id: Ie1ae026a580c483f1a0a9cdd8eaac8679dca
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97706
Tested-by: Jenkins CollaboraOffice
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 9cbad6825..00e915a6c 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -194,6 +194,7 @@ p.mobile-wizard.ui-combobox-text.selected {
top: 111px;
bottom: 0px;
width: 100%;
+ padding-bottom: 50px;
}
#mobile-wizard.funcwizard div#mobile-wizard-content.hideHelpBG {
background: none !important;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/mobilewizard.css | 10 +--
loleaflet/src/control/ColorPicker.js | 63 ++-
loleaflet/src/control/Control.JSDialogBuilder.js |2
3 files changed, 59 insertions(+), 16 deletions(-)
New commits:
commit c96e0d7d230eb1b038489c1632bb4c214d96e500
Author: Marco Cecchetti
AuthorDate: Mon Jun 29 11:32:15 2020 +0200
Commit: Andras Timar
CommitDate: Mon Jun 29 22:51:42 2020 +0200
leaflet: mobile: color picker has no automatic color control
Change-Id: I97b5e2b3e92c0c98a3835c71cd2d7d5d3b298ae4
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97393
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 0d9ef8a62..9cbad6825 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -67,7 +67,7 @@ span#main-menu-btn-icon {
border-radius: 100px;
}
-.no-color-selected {
+.no-color-selected, .auto-color-selected {
text-align: center;
font-size: 30pt;
line-height: 32px;
@@ -106,7 +106,7 @@ span#main-menu-btn-icon {
padding: 0 4%;
}
-.colors-container-no-color-row {
+.colors-container-no-color-row, .colors-container-auto-color-row{
display: flex;
justify-content: space-between;
height: 50px;
@@ -120,19 +120,19 @@ span#main-menu-btn-icon {
padding-bottom: 0px;
}
-.no-color-control-label {
+.no-color-control-label, .auto-color-control-label {
display:table-cell;
padding-left: 4px;
vertical-align: middle;
}
-.no-color-control-mark {
+.no-color-control-mark, .auto-color-control-mark {
color: #0b87e7 !important;
font-size: larger;
line-height: 0;
}
-.no-color-control-icon {
+.no-color-control-icon, .auto-color-control-icon {
display: table-cell;
height: 32px !important;
width: 32px !important;
diff --git a/loleaflet/src/control/ColorPicker.js
b/loleaflet/src/control/ColorPicker.js
index 153356f65..8428dc810 100644
--- a/loleaflet/src/control/ColorPicker.js
+++ b/loleaflet/src/control/ColorPicker.js
@@ -10,6 +10,7 @@ L.ColorPicker = L.Class.extend({
options: {
selectedColor: '#ff',
noColorControl: true,
+ autoColorControl: false,
selectionCallback: function () {}
},
@@ -55,10 +56,15 @@ L.ColorPicker = L.Class.extend({
initialize: function (selectedColorSample, options) {
L.setOptions(this, options);
+ if (this.options.noColorControl &&
this.options.autoColorControl) {
+ this.options.autoColorControl = false;
+ console.warn('L.ColorPicker: requested both no color
and auto color control');
+ }
this._id = L.ColorPicker.ID++;
this._basicColorSampleIdTag = L.ColorPicker.ID_TAG + this._id +
'-basic-color-';
this._tintSampleIdTag = L.ColorPicker.ID_TAG + this._id +
'-tint-';
this._noColorControlId = L.ColorPicker.ID_TAG + this._id +
'-no-color';
+ this._autoColorControlId = L.ColorPicker.ID_TAG + this._id +
'-auto-color';
this._createBasicColorSelectionMark();
this._selectedColorElement = selectedColorSample;
this._selectedColor = this.options.selectedColor;
@@ -105,26 +111,31 @@ L.ColorPicker = L.Class.extend({
_createControl: function () {
var children = [];
- if (this.options.noColorControl)
- children.push(this._createNoColorControl());
+ if (this.options.noColorControl ||
this.options.autoColorControl)
+ children.push(this._createPseudoColorControl());
children.push(this._createBasicColorSamples());
children.push(this._createTintSamples());
return {type: 'divcontainer', style: 'colors-container',
children: children};
},
- _createNoColorControl: function () {
+ _createPseudoColorControl: function () {
+ var noColorControl = this.options.noColorControl;
var icon = {
type: 'fixedtext',
text: '',
- style: 'no-color-control-icon'
+ style: noColorControl ? 'no-color-control-icon' :
'auto-color-control-icon'
};
- var label = {type: 'fixedtext', style:
'no-color-control-label', text: _('No color')};
+ var label =
+ noColorControl ? {type: 'fixedtext', style:
'no-color-control-label', text: _('No color')}
+ : {type: 'fixedtext',
style: 'auto-color-control-label', text: _('Automatic color')};
var
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images
dev/null|binary
loleaflet/css/loleaflet.css |2 +-
loleaflet/images/user.svg | 24
3 files changed, 25 insertions(+), 1 deletion(-)
New commits:
commit edaea8a3896ba37fab38ecb11644f98c14076f60
Author: Aron Budea
AuthorDate: Thu Jun 25 09:25:53 2020 +0200
Commit: Andras Timar
CommitDate: Mon Jun 29 16:55:48 2020 +0200
loleaflet: use correct extension for default user avatar
Regression from 8bfa1318b246d7c9df2b1d22d2e8094205a53acd
Change-Id: I8be2ea394fd35c418b33aed42555cfa37d7bc7c9
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97086
Tested-by: Jenkins CollaboraOffice
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index dccd4b4b5..f1a870772 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -383,7 +383,7 @@ body {
box-sizing: border-box;
width: 32px; /* Width of new image */
height: 32px; /* Height of new image */
- background: url(images/user.png) center 3px no-repeat;
+ background: url(images/user.svg) center 3px no-repeat;
}
.leaflet-container .leaflet-pane.leaflet-calc-background-pane {
diff --git a/loleaflet/images/user.png b/loleaflet/images/user.png
deleted file mode 100644
index 88d9050d0..0
Binary files a/loleaflet/images/user.png and /dev/null differ
diff --git a/loleaflet/images/user.svg b/loleaflet/images/user.svg
new file mode 100644
index 0..f91ec33da
--- /dev/null
+++ b/loleaflet/images/user.svg
@@ -0,0 +1,24 @@
+http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/notebookbar.css |4
loleaflet/src/control/Control.NotebookbarBuilder.js | 15 ++-
loleaflet/src/control/Control.NotebookbarCalc.js|2 +-
3 files changed, 19 insertions(+), 2 deletions(-)
New commits:
commit 7205cc301368e6deaf713390002328eb759e2466
Author: Szymon Kłos
AuthorDate: Tue Jun 23 07:49:18 2020 +0200
Commit: Szymon Kłos
CommitDate: Mon Jun 29 08:42:55 2020 +0200
notebookbar: number format field
Change-Id: Ie6047e917ecc7c78da5c9a45e6c253f451951555
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97231
Tested-by: Jenkins CollaboraOffice
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index ea8dfd0e7..12cb1af64 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -365,6 +365,10 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
display: none;
}
+#table-numbertype .select2.select2-container {
+ width: 170px !important;
+}
+
/* Insert Tab */
#table-InsertBox {
diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js
b/loleaflet/src/control/Control.NotebookbarBuilder.js
index 66c66adf7..306baaf3d 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -189,6 +189,11 @@ L.Control.NotebookbarBuilder =
L.Control.JSDialogBuilder.extend({
state = items.getItemValue('.uno:StyleApply');
$(combobox).val(state).trigger('change');
+ } else {
+ $(combobox).on('select2:select', function (e) {
+ var value = e.params.data.id + ';' +
e.params.data.text;
+ builder.callback('combobox', 'selected',
combobox, value, builder);
+ });
}
},
@@ -199,8 +204,16 @@ L.Control.NotebookbarBuilder =
L.Control.JSDialogBuilder.extend({
var select = L.DomUtil.createWithId('select', data.id,
parentContainer);
$(select).addClass(builder.options.cssClass);
+ var processedData = [];
+
+ data.entries.forEach(function (value, index) {
+ var selected = parseInt(data.selectedEntries[0]) ==
index;
+ processedData.push({id: index, text: value, selected:
selected});
+ });
+ console.log(processedData);
+
$(select).select2({
- data: data.entries.sort(function (a, b) {return
a.localeCompare(b);}),
+ data: processedData,
placeholder: _(builder._cleanText(data.text))
});
diff --git a/loleaflet/src/control/Control.NotebookbarCalc.js
b/loleaflet/src/control/Control.NotebookbarCalc.js
index 0a5df17cc..49f22a3ff 100644
--- a/loleaflet/src/control/Control.NotebookbarCalc.js
+++ b/loleaflet/src/control/Control.NotebookbarCalc.js
@@ -925,7 +925,7 @@ L.Control.NotebookbarCalc =
L.Control.NotebookbarWriter.extend({
'enabled': 'true',
'children': [
{
-
'id':
'',
+
'id':
'numbertype',
'type':
'listbox',
'text':
'',
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/loleaflet.css | 11 ++
loleaflet/src/layer/marker/Annotation.js | 32 +++
2 files changed, 43 insertions(+)
New commits:
commit 552462cecd225b5d12f40fea410686a2f3a40ba0
Author: Tomaž Vajngerl
AuthorDate: Fri Jun 26 09:04:35 2020 +0200
Commit: Tomaž Vajngerl
CommitDate: Sun Jun 28 08:51:15 2020 +0200
Add support to show annotation marker for draw/impress
Change-Id: Ibaeaed97de5b5a87f4a46c4da593a3ee861e2399
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97335
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 41e9459fc..dccd4b4b5 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -236,6 +236,17 @@ body {
margin-right: 10px;
}
+.annotation-marker {
+ margin-left: 0px;
+ margin-top: 0px;
+ width: 24px;
+ height: 24px;
+ background-image: url('images/note.svg');
+ background-size: 100% 100%;
+ background-repeat: no-repeat;
+ outline: none;
+}
+
.loleaflet-scrolled {
overflow: auto;
}
diff --git a/loleaflet/src/layer/marker/Annotation.js
b/loleaflet/src/layer/marker/Annotation.js
index 6224007f8..730396ab9 100644
--- a/loleaflet/src/layer/marker/Annotation.js
+++ b/loleaflet/src/layer/marker/Annotation.js
@@ -19,6 +19,7 @@ L.Annotation = L.Layer.extend({
this._latlng = L.latLng(latlng);
this._data = data;
this._skipCheckBounds = false;
+ this._annotationMarker = null;
},
onAdd: function (map) {
@@ -51,6 +52,7 @@ L.Annotation = L.Layer.extend({
this._updateContent();
this._updateLayout();
this._updatePosition();
+ this._updateAnnotationMarker();
},
setData: function (data) {
@@ -89,6 +91,9 @@ L.Annotation = L.Layer.extend({
if (this._data.textSelected && this._map.hasLayer &&
!this._map.hasLayer(this._data.textSelected)) {
this._map.addLayer(this._data.textSelected);
}
+ if (this._annotationMarker != null) {
+ this._map.addLayer(this._annotationMarker);
+ }
},
hide: function () {
@@ -99,6 +104,9 @@ L.Annotation = L.Layer.extend({
if (this._data.textSelected &&
this._map.hasLayer(this._data.textSelected)) {
this._map.removeLayer(this._data.textSelected);
}
+ if (this._annotationMarker != null) {
+ this._map.removeLayer(this._annotationMarker);
+ }
},
isVisible: function () {
@@ -441,6 +449,30 @@ L.Annotation = L.Layer.extend({
var authorImageHeight = Math.round(this.options.imgSize.y *
scaleFactor);
this._authorAvatarImg.setAttribute('width', authorImageWidth);
this._authorAvatarImg.setAttribute('height', authorImageHeight);
+ },
+
+ _updateAnnotationMarker: function () {
+ if (this._data == null)
+ return;
+
+ if (this._annotationMarker == null) {
+ this._annotationMarker = L.marker(new L.LatLng(0, 0), {
+ icon: L.divIcon({
+ className: 'annotation-marker',
+ iconSize: null
+ }),
+ draggable: true
+ });
+ this._map.addLayer(this._annotationMarker);
+ }
+ var stringTwips = this._data.rectangle.match(/\d+/g);
+ var topLeftTwips = new L.Point(parseInt(stringTwips[0]),
parseInt(stringTwips[1]));
+ var offset = new L.Point(parseInt(stringTwips[2]),
parseInt(stringTwips[3]));
+ var bottomRightTwips = topLeftTwips.add(offset);
+ var bounds = new L.LatLngBounds(
+ this._map._docLayer._twipsToLatLng(topLeftTwips,
this._map.getZoom()),
+ this._map._docLayer._twipsToLatLng(bottomRightTwips,
this._map.getZoom()));
+ this._annotationMarker.setLatLng(bounds.getSouthWest());
}
});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/notebookbar.css |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0a885514098f7f13c265c6d10b912dd8c34506c6 Author: Szymon Kłos AuthorDate: Tue Jun 23 06:38:51 2020 +0200 Commit: Szymon Kłos CommitDate: Thu Jun 25 14:34:16 2020 +0200 notebookbar: set correct height for calc Change-Id: I0872167aea1b09e771a3f4a57a4e2e708506d8a5 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97106 Tested-by: Jenkins CollaboraOffice Tested-by: Jenkins Reviewed-by: Szymon Kłos diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css index 71e2cc736..ea8dfd0e7 100644 --- a/loleaflet/css/notebookbar.css +++ b/loleaflet/css/notebookbar.css @@ -53,7 +53,7 @@ scrollbar-width: none; /* Firefox */ -ms-overflow-style: none; /* Internet Explorer 10+ */ - height: 105px; + height: 94px; margin-top: -20px; padding-top: 5px; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/loleaflet.css|5 -
loleaflet/src/control/Control.LokDialog.js |2 ++
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 862486f6d231178ce44a0f3902b2feb76866b5f9
Author: Pedro Pinto Silva
AuthorDate: Fri Jun 19 16:32:05 2020 +0200
Commit: Pedro Silva
CommitDate: Tue Jun 23 15:01:29 2020 +0200
Sidebar-panel has fixed width that is bigger than its contents, better fix
- Revert display:table from #sidebar-panel
- Set document-container position to right:0px when in presence of text or
presentation documents that has (missing) the sidebar closed
(sidebar-dock-wrapper display:none)
Change-Id: Id4416e9dfa0540dd774b83b41428f021f99f4f38
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96741
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 0773c624d..41e9459fc 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -7,6 +7,10 @@
right: 0px;
left: 0px;
}
+#document-container.sidebar-closed {
+ right: 0px !important;
+}
+
#document-container.tablet {
top: 36px;
@@ -152,7 +156,6 @@ body {
}
#sidebar-panel {
- display: table;
padding: 0px;
margin: 0px;
position: relative;
diff --git a/loleaflet/src/control/Control.LokDialog.js
b/loleaflet/src/control/Control.LokDialog.js
index dfddbdfc2..1b70b1cc0 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -1060,6 +1060,7 @@ L.Control.LokDialog = L.Control.extend({
this._sendPaintWindowRect(id);
} else {
this._createSidebar(id, strId, width, height);
+ $('#document-container').removeClass('sidebar-closed');
}
},
@@ -1365,6 +1366,7 @@ L.Control.LokDialog = L.Control.extend({
this._map.fire('editorgotfocus');
this._map.focus();
}
+ $('#document-container').addClass('sidebar-closed');
},
_onCalcInputBarClose: function(dialogId) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/notebookbar.css | 85
loleaflet/css/toolbar.css |2
loleaflet/src/control/Control.NotebookbarBuilder.js |3
3 files changed, 74 insertions(+), 16 deletions(-)
New commits:
commit 6168faa0b26d361f1637c5aeb712d5157ce8374a
Author: Szymon Kłos
AuthorDate: Tue Jun 16 14:40:57 2020 +0200
Commit: Szymon Kłos
CommitDate: Fri Jun 19 11:41:21 2020 +0200
notebookbar: update css
Change-Id: I836b1b343ff6e16fcc7631d6239d1fc81c8aa6dd
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96685
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index e9d084e6d..71e2cc736 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -54,7 +54,7 @@
-ms-overflow-style: none; /* Internet Explorer 10+ */
height: 105px;
- margin-top: -25px;
+ margin-top: -20px;
padding-top: 5px;
}
@@ -67,7 +67,7 @@
div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookbar, #ObjectBackOne.notebookbar,
#ObjectForwardOne.notebookbar, #BringToFront.notebookbar,
#SetObjectToBackground.notebookbar, #SetObjectToForeground.notebookbar,
#FlipVertical.notebookbar, #FlipHorizontal.notebookbar, #Bold.notebookbar,
#Italic.notebookbar, #Underline.notebookbar, #Strikeout.notebookbar,
#StyleApply.notebookbar, #StyleUpdateByExample.notebookbar,
#StyleNewByExample.notebookbar, #Shadowed.notebookbar, #Grow.notebookbar,
#Shrink.notebookbar, #Spacing.notebookbar, #SuperScript.notebookbar,
#SubScript.notebookbar,#AlignLeft.notebookbar, #AlignRight.notebookbar,
#AlignHorizontalCenter.notebookbar, #AlignBlock.notebookbar,
#ParaRightToLeft.notebookbar, #ParaLeftToRight.notebookbar,
#AlignTop.notebookbar, #AlignVCenter.notebookbar, #AlignBottom.notebookbar,
#IncrementIndent.notebookbar, #DecrementIndent.notebookbar,
#LeftPara.notebookbar, #RightPara.notebookbar, #CenterPara.notebookbar, #Justif
yPara.notebookbar, #DefaultBullet.notebookbar, #DefaultNumbering.notebookbar,
#ParaspaceIncrease.notebookbar, #ParaspaceDecrease.notebookbar,
#LineSpacing.notebookbar, #HangingIndent.notebookbar, #CellVertTop.notebookbar,
#CellVertCenter.notebookbar, #CellVertBottom.notebookbar,
#ParaspaceIncrease.notebookbar, #ParaspaceDecrease.notebookbar,
#DeleteTable.notebookbar, #MergeCells.notebookbar{
padding: 0px !important;
- margin: 0px !important;
+ margin: 0px 5px 0px 0px !important;
}
#buttonbefore.notebookbar, #buttonafter.notebookbar,
#buttonoptimal.notebookbar, #buttonparallel.notebookbar,
#buttonnone.notebookbar, #buttonthrough.notebookbar, #bottom.notebookbar,
#top.notebookbar, #standard.notebookbar, #Bold.notebookbar,
#Italic.notebookbar, #Underline.notebookbar, #Strikeout.notebookbar{
@@ -75,9 +75,18 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
padding: 0px !important;
}
+.unotoolbutton.notebookbar {
+ margin-right: 5px !important;
+}
+
.unotoolbutton.notebookbar .unobutton {
width: 24px !important;
height: 24px !important;
+ margin-right: 0px !important;
+}
+
+.unotoolbutton.notebookbar .unolabel {
+ padding-left: 5px !important;
}
.unotoolbutton.notebookbar .unobutton.selected {
@@ -124,13 +133,17 @@ div[id*='Row'].notebookbar,
div[id*='Column'].notebookbar, #SendToBack.notebookb
height: 24px !important;
}
+#table-fontsize .select2.select2-container {
+ width: 60px !important;
+}
+
#Paste.notebookbar img, #InsertAnnotation.notebookbar img,
#SearchDialog.notebookbar img {
height: 32px !important;
width: 32px !important;
}
#ControlCodes.notebookbar {
- padding-left: 30px !important;
+ margin-left: 30px !important;
}
#fontnamecombobox.notebookbar ~ .select2 {
@@ -145,17 +158,46 @@ div[id*='Row'].notebookbar,
div[id*='Column'].notebookbar, #SendToBack.notebookb
width: 170px !important;
}
-#table-StyleParagraphSection1.notebookbar, #table-GroupB15.notebookbar,
#table-GroupB11.notebookbar {
+#table-StyleParagraphSection1.notebookbar,
+#table-GroupB15.notebookbar,
+#table-GroupB11.notebookbar
+{
margin-top: -5px;
}
-#Copy.notebookbar, #clearFormatting.notebookbar, #table-Home-Section-Insert
#table-GroupB20.notebookbar {
+#Copy.notebookbar,
+#clearFormatting.notebookbar,
+#table-Home-Section-Insert #table-GroupB20.notebookbar {
margin-top: 10px;
}
+#table-GroupB94.notebookbar {
+ margin-top: -5px;
+}
+
+#table-GroupB19 #table-GroupB93.notebookbar {
+ margin-left: -60px;
+ margin-top: 5px;
+}
+
+#table-stylescontainer #style1,
+#table-stylescontainer #style2,
+#table-stylescontainer #style3,
+#table-stylescontainer #style4
+{
+ border: 1px dashed lightgray;
+ cursor: pointer;
+}
+
/* Insert Tab */
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/notebookbar.css| 35 +++
loleaflet/images/lc_down.svg |1
loleaflet/images/lc_up.svg |1
loleaflet/src/control/Control.JSDialogBuilder.js |8 -
4 files changed, 44 insertions(+), 1 deletion(-)
New commits:
commit e794414e94bc7af37259bcedaa14ae52304b1425
Author: Szymon Kłos
AuthorDate: Tue Jun 16 15:54:05 2020 +0200
Commit: Szymon Kłos
CommitDate: Fri Jun 19 11:37:43 2020 +0200
notebookbar: loading spinner for styles
Change-Id: If9c5094847d00e7148387cfd200166e20c1ed53f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96686
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 6f9675180..e9d084e6d 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -402,4 +402,39 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
#table-Table-Section-Layout #table-SectionBottom57.notebookbar
{
margin-top: 10px;
+}
+
+/* other */
+
+.ui-drawing-area-container
+{
+ position: relative;
+}
+
+.ui-drawing-area-loader
+{
+ border: 5px solid #f3f3f3;
+ border-top: 5px solid #3498db;
+ border-radius: 50%;
+ width: 20px;
+ height: 20px;
+ animation: spin 2s linear infinite;
+ margin-left: auto;
+ margin-right: auto;
+ position: relative;
+ top: 25%;
+}
+
+.ui-drawing-area-loader-container
+{
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+}
+
+@keyframes spin {
+ 0% { transform: rotate(0deg); }
+ 100% { transform: rotate(360deg); }
}
\ No newline at end of file
diff --git a/loleaflet/images/lc_down.svg b/loleaflet/images/lc_down.svg
new file mode 100644
index 0..f6c1ad057
--- /dev/null
+++ b/loleaflet/images/lc_down.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/images/lc_up.svg b/loleaflet/images/lc_up.svg
new file mode 100644
index 0..3e6b6f298
--- /dev/null
+++ b/loleaflet/images/lc_up.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 0c91dedc2..b3bd9cfcd 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1546,10 +1546,16 @@ L.Control.JSDialogBuilder = L.Control.extend({
_drawingAreaControl: function(parentContainer, data, builder) {
if (data.image) {
- var image = L.DomUtil.create('img',
builder.options.cssClass + ' ui-drawing-area', parentContainer);
+ var container = L.DomUtil.create('div',
builder.options.cssClass + ' ui-drawing-area-container', parentContainer);
+ var image = L.DomUtil.create('img',
builder.options.cssClass + ' ui-drawing-area', container);
image.src = data.image.replace('\\', '');
image.id = data.id;
+ if (data.loading && data.loading === 'true') {
+ var loaderContainer = L.DomUtil.create('div',
'ui-drawing-area-loader-container', container);
+ L.DomUtil.create('div',
'ui-drawing-area-loader', loaderContainer);
+ }
+
$(image).click(function () {
builder.callback('drawingarea', 'click', image,
null, builder);
});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/html loleaflet/src
loleaflet/css/toolbar.css | 19 ---
loleaflet/html/loleaflet.html.m4 |1 +
loleaflet/src/control/Control.DocumentNameInput.js | 11 ++-
3 files changed, 27 insertions(+), 4 deletions(-)
New commits:
commit 40110f2ba7a53621a0f6c360e7c3bd4803fd6eeb
Author: Pedro Pinto Silva
AuthorDate: Wed Jun 10 15:56:34 2020 +0200
Commit: Andras Timar
CommitDate: Thu Jun 11 12:54:38 2020 +0200
Desktop: Set max size for document name's width
Change-Id: Ic35990efd9e240ed29ae9da1e72dcd6b58a4e933
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96053
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 13eb379d5..20fb595a0 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -149,6 +149,19 @@ w2ui-toolbar {
#tb_formulabar_item_formula div table {
width: 100%;
}
+#document-title-pencil.editable {
+ visibility: visible;
+ width: 24px;
+ height: 22px;
+ position: absolute;
+ left: 87%;
+ background: url('images/baseline-edit.svg') right center no-repeat,
radial-gradient(circle, #fff 20%, #fff0 100%);
+ border-top: solid 3px white;
+}
+
+#document-title-pencil:not(.editable){
+ visibility: hidden;
+}
#document-name-input {
font-size: 16px;
@@ -159,25 +172,25 @@ w2ui-toolbar {
#document-name-input.editable {
border: none;
box-shadow: 0 0 0.1px 1px #ebebeb, 0 0 2px 1px #f0f0f0;
- background-image: url('images/baseline-edit.svg');
background-position: right;
background-repeat: no-repeat;
+ padding-right: 24px;
+ max-width: 100%;
}
#document-name-input.editable:focus {
border: none;
box-shadow: inset 0 0 2px 1px #f0f0f0, 0 0 0.1px 1px #bbb;
background-color: white;
+ background-image: none;
}
#document-name-input.editable:hover:not(:focus) {
border: none;
box-shadow: 0 0 0.1px 1px #d7d7d7, 0 0 3px 2px #f0f0f0;
background-color: white;
- background-image: url('images/baseline-edit.svg');
background-position: right;
background-repeat: no-repeat;
- padding-right: 2px;
}
#tb_editbar_item_fold table.w2ui-button {
margin: 0px 14px 0px 4px !important;
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index d3c3e21de..f84271e62 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -145,6 +145,7 @@ m4_ifelse(MOBILEAPP,[true],
+
diff --git a/loleaflet/src/control/Control.DocumentNameInput.js
b/loleaflet/src/control/Control.DocumentNameInput.js
index 090cc25f9..28db57f41 100644
--- a/loleaflet/src/control/Control.DocumentNameInput.js
+++ b/loleaflet/src/control/Control.DocumentNameInput.js
@@ -65,7 +65,13 @@ L.Control.DocumentNameInput = L.Control.extend({
},
onDocLayerInit: function() {
- $('#document-name-input').attr('size',
$('#document-name-input').val().length);
+ var value = $('#document-name-input').val();
+ if (value.length < 27) {
+ $('#document-name-input').attr('size', value.length);
+ }
+ else {
+ $('#document-name-input').attr('size', '25');
+ }
// FIXME: Android app would display a temporary filename, not
the actual filename
if (window.ThisIsTheAndroidApp) {
@@ -78,6 +84,7 @@ L.Control.DocumentNameInput = L.Control.extend({
// We can now set the document name in the menu bar
$('#document-name-input').prop('disabled', false);
$('#document-name-input').removeClass('editable');
+ $('#document-title-pencil').removeClass('editable');
$('#document-name-input').focus(function() {
$(this).blur(); });
// Call decodecodeURIComponent twice: Reverse both our
encoding and the encoding of
// the name in the file system.
@@ -99,12 +106,14 @@ L.Control.DocumentNameInput = L.Control.extend({
// Save As allowed
$('#document-name-input').prop('disabled', false);
$('#document-name-input').addClass('editable');
+ $('#document-title-pencil').addClass('editable');
$('#document-name-input').off('keypress',
this.onDocumentNameKeyPress).on('keypress',
this.onDocumentNameKeyPress.bind(this));
$('#document-name-input').off('focus',
this.onDocumentNameFocus).on('focus',
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/toolbar.css |5 +
loleaflet/src/control/Control.DocumentNameInput.js |2 ++
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 4ad75ca85dc8be2399f99e71fbbff685de0ffe80
Author: Pedro Pinto Silva
AuthorDate: Tue Jun 9 11:25:16 2020 +0200
Commit: Pedro Silva
CommitDate: Tue Jun 9 13:10:48 2020 +0200
Desktop: Set (on LayerInit) document name's size dynamically according to
its value
Change-Id: I5e15b50c4ecf51d8e713cfc0fe116b44294e1e45
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95904
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Tested-by: Pedro Silva
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 45b1531ec..13eb379d5 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -154,7 +154,6 @@ w2ui-toolbar {
font-size: 16px;
border: 1px solid transparent;
background-color: transparent;
- width: 200px;
}
#document-name-input.editable {
@@ -169,7 +168,6 @@ w2ui-toolbar {
border: none;
box-shadow: inset 0 0 2px 1px #f0f0f0, 0 0 0.1px 1px #bbb;
background-color: white;
- width: 200px;
}
#document-name-input.editable:hover:not(:focus) {
@@ -179,8 +177,7 @@ w2ui-toolbar {
background-image: url('images/baseline-edit.svg');
background-position: right;
background-repeat: no-repeat;
- padding-right: 20px;
- width: 181px;
+ padding-right: 2px;
}
#tb_editbar_item_fold table.w2ui-button {
margin: 0px 14px 0px 4px !important;
diff --git a/loleaflet/src/control/Control.DocumentNameInput.js
b/loleaflet/src/control/Control.DocumentNameInput.js
index e11d6bf95..13f83c4d2 100644
--- a/loleaflet/src/control/Control.DocumentNameInput.js
+++ b/loleaflet/src/control/Control.DocumentNameInput.js
@@ -59,6 +59,8 @@ L.Control.DocumentNameInput = L.Control.extend({
},
onDocLayerInit: function() {
+ $('#document-name-input').attr('size',
$('#document-name-input').val().length);
+
// FIXME: Android app would display a temporary filename, not
the actual filename
if (window.ThisIsTheAndroidApp) {
$('#document-name-input').hide();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/Makefile.am loleaflet/package.json
loleaflet/Makefile.am |8 loleaflet/css/jquery-ui-lightness.css | 1311 ++ loleaflet/images/jquery-ui-lightness/ui-bg_diagonals-thick_18_b81900_40x40.png |binary loleaflet/images/jquery-ui-lightness/ui-bg_diagonals-thick_20_66_40x40.png |binary loleaflet/images/jquery-ui-lightness/ui-bg_glass_100_f6f6f6_1x400.png |binary loleaflet/images/jquery-ui-lightness/ui-bg_glass_100_fdf5ce_1x400.png |binary loleaflet/images/jquery-ui-lightness/ui-bg_glass_65_ff_1x400.png |binary loleaflet/images/jquery-ui-lightness/ui-bg_gloss-wave_35_f6a828_500x100.png |binary loleaflet/images/jquery-ui-lightness/ui-bg_highlight-soft_100_ee_1x100.png |binary loleaflet/images/jquery-ui-lightness/ui-bg_highlight-soft_75_ffe45c_1x100.png |binary loleaflet/images/jquery-ui-lightness/ui-icons_22_256x240.png |binary loleaflet/images/jquery-ui-lightness/ui-icons_228ef1_256x240.png |binary loleaflet/images/jquery-ui-lightness/ui-icons_ef8c08_256x240.png |binary loleaflet/images/jquery-ui-lightness/ui-icons_ffd27a_256x240.png |binary loleaflet/images/jquery-ui-lightness/ui-icons_ff_256x240.png |binary loleaflet/package.json |2 16 files changed, 1316 insertions(+), 5 deletions(-) New commits: commit 6f6c0a32e5e5856b4e5136149ecac50b748d70d8 Author: gokaysatir AuthorDate: Tue Jun 2 12:46:39 2020 +0300 Commit: Andras Timar CommitDate: Thu Jun 4 12:55:07 2020 +0200 leaflet: update jquery-ui package with lightness them. Change-Id: I8273c2f7d8b46f63f582c11c2c0e81c303e04bcb Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95352 Tested-by: Jenkins CollaboraOffice Tested-by: Jenkins Reviewed-by: Andras Timar diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am index 3f68dcf12..329a96357 100644 --- a/loleaflet/Makefile.am +++ b/loleaflet/Makefile.am @@ -30,11 +30,11 @@ $(L10N_IOS_ALL_JS) : $(wildcard $(srcdir)/po/ui-*.po) $(shell find $(srcdir)/l10 done endif -JQUERY_LIGHTNESS_IMAGE_PATH = node_modules/jquery-ui/themes/ui-lightness/images +JQUERY_LIGHTNESS_IMAGE_PATH = $(srcdir)/images/jquery-ui-lightness JQUERY_LIGHTNESS_IMAGES = $(wildcard $(JQUERY_LIGHTNESS_IMAGE_PATH)/*.png) JQUERY_LIGHTNESS_DIST_IMAGES = $(patsubst $(JQUERY_LIGHTNESS_IMAGE_PATH)/%.png,$(DIST_FOLDER)/images/%.png,$(JQUERY_LIGHTNESS_IMAGES)) -JQUERY_MINIFIED_IMAGE_PATH = node_modules/jquery-ui/themes/base/minified/images +JQUERY_MINIFIED_IMAGE_PATH = node_modules/jquery-ui-dist/images JQUERY_MINIFIED_IMAGES = $(wildcard $(JQUERY_MINIFIED_IMAGE_PATH)/*.png) JQUERY_MINIFIED_DIST_IMAGES = $(patsubst $(JQUERY_MINIFIED_IMAGE_PATH)/%.png,$(DIST_FOLDER)/images/%.png,$(JQUERY_MINIFIED_IMAGES)) @@ -136,7 +136,7 @@ LOLEAFLET_CSS =\ $(srcdir)/css/jsdialogs.css \ $(srcdir)/css/notebookbar.css \ $(srcdir)/css/vex.css \ - $(builddir)/node_modules/jquery-ui/themes/ui-lightness/jquery-ui.css + $(srcdir)/css/jquery-ui-lightness.css LOLEAFLET_CSS_DST = $(foreach file,$(LOLEAFLET_CSS),$(DIST_FOLDER)/$(notdir $(file))) LOLEAFLET_CSS_M4 = $(strip $(foreach file,$(LOLEAFLET_CSS),$(notdir $(file @@ -148,7 +148,7 @@ NODE_MODULES_JS =\ node_modules/jquery/dist/jquery.js \ node_modules/jquery-mousewheel/jquery.mousewheel.js \ node_modules/jquery-contextmenu/dist/jquery.contextMenu.js \ - node_modules/jquery-ui/jquery-ui.js \ + node_modules/jquery-ui-dist/jquery-ui.js \ node_modules/smartmenus/dist/jquery.smartmenus.js LOLEAFLET_LIBS_JS =\ diff --git a/loleaflet/css/jquery-ui-lightness.css b/loleaflet/css/jquery-ui-lightness.css new file mode 100644 index 0..6b7ec6aaf --- /dev/null +++ b/loleaflet/css/jquery-ui-lightness.css @@ -0,0 +1,1311 @@ +/*! jQuery UI - v1.12.1 - 2016-09-14 +* http://jqueryui.com +* Includes: core.css, accordion.css, autocomplete.css, menu.css, button.css, controlgroup.css, checkboxradio.css, datepicker.css, dialog.css, draggable.css, resizable.css, progressbar.css, selectable.css, selectmenu.css, slider.css, sortable.css, spinner.css, tabs.css, tooltip.css, theme.css +* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS%2CTahoma%2CVerdana%2CArial%2Csans-serif=bold=1.1em=4px=f6a828=gloss_wave=35=e78f08=ff=ff=ee=highlight_soft=100=dd=33=22=f6f6f6=glass=100=cc=1c94c4=ef8c08=fdf5ce=glass=100=fbcb09=c77405=ef8c08=ff=glass=65=fbd850=eb8f00=ef8c08=ffe45c=highlight_soft=75=fed22f=363636 ight=228ef1=b81900=diagonals_thick=18=cd0a0a=ff=ffd27a=66=diagonals_thick=20=50=00=flat=10=20=5px=-5px=-5px=5px +* Copyright jQuery Foundation and other contributors; Licensed MIT */ + +/* Layout helpers
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/toolbar.css | 16 +---
1 file changed, 13 insertions(+), 3 deletions(-)
New commits:
commit 51534dfce23cb3203676c11724cfb9296b9ce029
Author: Pedro Pinto Silva
AuthorDate: Mon Jun 1 12:59:03 2020 +0200
Commit: Pedro Silva
CommitDate: Mon Jun 1 13:53:52 2020 +0200
Desktop: Improve document-name-input states and discoverability
- display element as an input field (some users didn't know they could
rename the document)
- use box-shadows instead of borders to increase the difference between
states and so the text does not jump
Change-Id: Id00bbcb3be27688603afdedeb25f14ba515bfe33
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95277
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Tested-by: Pedro Silva
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index cc80202e6..45b1531ec 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -157,14 +157,24 @@ w2ui-toolbar {
width: 200px;
}
+#document-name-input.editable {
+ border: none;
+ box-shadow: 0 0 0.1px 1px #ebebeb, 0 0 2px 1px #f0f0f0;
+ background-image: url('images/baseline-edit.svg');
+ background-position: right;
+ background-repeat: no-repeat;
+}
+
#document-name-input.editable:focus {
- border: 1px solid #bb;
+ border: none;
+ box-shadow: inset 0 0 2px 1px #f0f0f0, 0 0 0.1px 1px #bbb;
background-color: white;
width: 200px;
}
-#document-name-input.editable:hover {
- border: 1px solid #bb;
+#document-name-input.editable:hover:not(:focus) {
+ border: none;
+ box-shadow: 0 0 0.1px 1px #d7d7d7, 0 0 3px 2px #f0f0f0;
background-color: white;
background-image: url('images/baseline-edit.svg');
background-position: right;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/loleaflet.css |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 9535cd1e01b207c6ba725e3c366fc32f201b3312
Author: Pedro Pinto Silva
AuthorDate: Fri May 29 15:25:03 2020 +0200
Commit: Pedro Silva
CommitDate: Mon Jun 1 13:05:41 2020 +0200
Sidebar-panel has fixed width that is bigger than its contents
causing a white placeholder to appear sometimes after the side panel (when
it's open) and sometimes before (when it's closed)
Change-Id: I6247b2bbb90943c3520dc4f22ee07966bf03d1e3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95143
Tested-by: Jenkins CollaboraOffice
Tested-by: Jenkins
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 3ec71f0f1..0773c624d 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -152,10 +152,11 @@ body {
}
#sidebar-panel {
+ display: table;
padding: 0px;
margin: 0px;
position: relative;
- width: 100%;
+ width: auto;
height: 100%;
overflow-x: hidden;
overflow-y: scroll;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/menubar.css |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cc61195faa2839ce35be12b0a74240ff1fe2c6bb
Author: Pedro Pinto Silva
AuthorDate: Fri May 29 12:40:44 2020 +0200
Commit: Pedro Silva
CommitDate: Mon Jun 1 09:29:55 2020 +0200
Make sure document title bar is not above dialogs
by reducing the value introduced in
db32e4fc3800ffad83ea82e4835b0653d26d1bae and instead using the same z-index as
its neighbour elment (main-menu) so 1000
Change-Id: I92d893d1a092e16a1455a6d1941a98e73ec63d1a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95103
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/menubar.css b/loleaflet/css/menubar.css
index a9031469a..cab048379 100644
--- a/loleaflet/css/menubar.css
+++ b/loleaflet/css/menubar.css
@@ -39,7 +39,7 @@
table-layout: fixed;
border-spacing: 5px 0px;
max-height: 39px;
-z-index: 10;
+z-index: 1000;
}
.main-nav {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/Makefile.am
loleaflet/Makefile.am |1 +
loleaflet/css/jsdialogs.css | 41 +
2 files changed, 42 insertions(+)
New commits:
commit 37eccae0f0942c00f992300fa2f3c7ee5dfa36d8
Author: Szymon Kłos
AuthorDate: Fri May 22 15:48:57 2020 +0200
Commit: Szymon Kłos
CommitDate: Fri May 22 17:03:38 2020 +0200
jsdialog: style word count dialog
Change-Id: Ibffe28ddecbbcfcf01aac6e5a112c34134668633
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94692
Tested-by: Jenkins CollaboraOffice
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 11945badb..5d1ddf893 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -124,6 +124,7 @@ LOLEAFLET_CSS =\
$(builddir)/node_modules/smartmenus/dist/css/sm-simple/sm-simple.css \
$(srcdir)/css/menubar.css \
$(srcdir)/css/mobilewizard.css \
+ $(srcdir)/css/jsdialogs.css \
$(srcdir)/css/notebookbar.css \
$(srcdir)/css/vex.css \
$(builddir)/node_modules/jquery-ui/themes/ui-lightness/jquery-ui.css
diff --git a/loleaflet/css/jsdialogs.css b/loleaflet/css/jsdialogs.css
new file mode 100644
index 0..144de0db6
--- /dev/null
+++ b/loleaflet/css/jsdialogs.css
@@ -0,0 +1,41 @@
+
+/* Word count dialog */
+
+#label9, #documentlabel-mobile {
+ color: #636363 !important;
+}
+
+#documentlabel-mobile {
+ padding-top: 10px;
+}
+
+#wordslabel,
+#inclspaceslabel,
+#exclspaceslabel,
+#cjkcharsft,
+#wordslabel2,
+#inclspaceslabel2,
+#exclspaceslabel2,
+#cjkcharsft2
+{
+ float: left;
+ clear: left;
+ width: 70%;
+ color: #636363 !important;
+}
+
+#selectwords,
+#selectchars,
+#selectcharsnospaces,
+#selectcjkchars,
+#docwords,
+#docchars,
+#doccharsnospaces,
+#doccjkchars
+{
+ float: right;
+ clear: right;
+ width: 20%;
+ border-bottom: none;
+ color: #636363 !important;
+}
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/leaflet.css|8
loleaflet/images/indentation_marker_down.svg | 16 +---
loleaflet/images/indentation_marker_up.svg | 16 +---
loleaflet/src/control/Ruler.js | 17 -
4 files changed, 38 insertions(+), 19 deletions(-)
New commits:
commit 5299ec381ce9e7df049bc16609f15af11d1c36b3
Author: Tomaž Vajngerl
AuthorDate: Wed May 13 09:12:20 2020 +0200
Commit: Tomaž Vajngerl
CommitDate: Wed May 13 10:05:11 2020 +0200
make indent markers nicer, put update after _TSContainer change
Make markers look more like in LO - smaller, more slick.
Move the _updateParagraphIndentations after _TSContainer position
is recalculated as we depend on that.
Change-Id: I08034f6b5402a1532b6f74203a465164327f4593
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94095
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tomaž Vajngerl
diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css
index ec6a3d3de..ccf881de2 100644
--- a/loleaflet/css/leaflet.css
+++ b/loleaflet/css/leaflet.css
@@ -843,8 +843,8 @@ input.clipboard {
}
.loleaflet-ruler-indentation-marker-down {
- width: 17px;
- height: 11px;
+ width: 14px;
+ height: 10px;
background: url(images/indentation_marker_down.svg);
position: absolute;
left: 0;
@@ -854,8 +854,8 @@ input.clipboard {
}
.loleaflet-ruler-indentation-marker-up {
- width: 17px;
- height: 11px;
+ width: 14px;
+ height: 10px;
background: url(images/indentation_marker_up.svg);
position: absolute;
left: 0;
diff --git a/loleaflet/images/indentation_marker_down.svg
b/loleaflet/images/indentation_marker_down.svg
index 41e73bbeb..9dd7fa373 100644
--- a/loleaflet/images/indentation_marker_down.svg
+++ b/loleaflet/images/indentation_marker_down.svg
@@ -1,3 +1,13 @@
-http://www.w3.org/2000/svg;
xmlns:xlink="http://www.w3.org/1999/xlink; viewBox="0 0 140 110" >
-
-
\ No newline at end of file
+
+http://www.w3.org/2000/svg; xmlns:cc="http://creativecommons.org/ns#;
xmlns:dc="http://purl.org/dc/elements/1.1/;
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#;>
+
+
+
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"/>
+
+
+
+
+
+
diff --git a/loleaflet/images/indentation_marker_up.svg
b/loleaflet/images/indentation_marker_up.svg
index 88f90c049..2bb0a9baf 100644
--- a/loleaflet/images/indentation_marker_up.svg
+++ b/loleaflet/images/indentation_marker_up.svg
@@ -1,3 +1,13 @@
-http://www.w3.org/2000/svg;
xmlns:xlink="http://www.w3.org/1999/xlink; viewBox="0 0 140 110" >
-
-
\ No newline at end of file
+
+http://www.w3.org/2000/svg; xmlns:cc="http://creativecommons.org/ns#;
xmlns:dc="http://purl.org/dc/elements/1.1/;
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#;>
+
+
+
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"/>
+
+
+
+
+
+
diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js
index 98b65370e..a5537055e 100644
--- a/loleaflet/src/control/Ruler.js
+++ b/loleaflet/src/control/Ruler.js
@@ -220,9 +220,9 @@ L.Control.Ruler = L.Control.extend({
// Conversion to mm100.
if (this.options.indentUnit === 'inch') {
- this.options.firstLineIndent =
(this.options.firstLineIndent) * 2540;
- this.options.leftParagraphIndent =
(this.options.leftParagraphIndent) * 2540;
- this.options.rightParagraphIndent =
(this.options.rightParagraphIndent) * 2540;
+ this.options.firstLineIndent =
this.options.firstLineIndent * 2540;
+ this.options.leftParagraphIndent =
this.options.leftParagraphIndent * 2540;
+ this.options.rightParagraphIndent =
this.options.rightParagraphIndent * 2540;
}
this.options.firstLineIndent *= pxPerMm100;
@@ -235,10 +235,9 @@ L.Control.Ruler = L.Control.extend({
var pEndPosition =
this._rTSContainer.getBoundingClientRect().right -
this.options.rightParagraphIndent;
// We calculated the positions. Now we should move them to left
in order to make their sharp edge point to the right direction..
- var halfWidth =
(this._firstLineMarker.getBoundingClientRect().right -
this._firstLineMarker.getBoundingClientRect().left) * 0.5;
- this._firstLineMarker.style.left = (fLinePosition - halfWidth)
+ 'px';
- this._pStartMarker.style.left = (pStartPosition - halfWidth) +
'px';
- this._pEndMarker.style.left = (pEndPosition - halfWidth) + 'px';
+ this._firstLineMarker.style.left = (fLinePosition -
(this._firstLineMarker.getBoundingClientRect().width / 2.0)) + 'px';
+ this._pStartMarker.style.left = (pStartPosition -
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/leaflet.css| 33
loleaflet/images/indentation_marker_down.svg |3
loleaflet/images/indentation_marker_up.svg |3
loleaflet/src/control/Ruler.js | 217 ++-
4 files changed, 255 insertions(+), 1 deletion(-)
New commits:
commit 221d666822d8f010e629761456ff30ad8bb8fe24
Author: gokaysatir
AuthorDate: Fri May 1 13:18:23 2020 +0300
Commit: Tomaž Vajngerl
CommitDate: Tue May 12 13:28:08 2020 +0200
tdf#111535 Add First-line indent, paragraph indent, and tab spaces/Online
part.
Change-Id: I7b0b6e205aa9af40b8331044b99c44df0bd4cced
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93250
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tomaž Vajngerl
diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css
index f8f5eb95c..ec6a3d3de 100644
--- a/loleaflet/css/leaflet.css
+++ b/loleaflet/css/leaflet.css
@@ -842,6 +842,39 @@ input.clipboard {
position: absolute;
}
+.loleaflet-ruler-indentation-marker-down {
+ width: 17px;
+ height: 11px;
+ background: url(images/indentation_marker_down.svg);
+ position: absolute;
+ left: 0;
+ top: 0;
+ z-index: 12;
+ background-repeat: no-repeat;
+}
+
+.loleaflet-ruler-indentation-marker-up {
+ width: 17px;
+ height: 11px;
+ background: url(images/indentation_marker_up.svg);
+ position: absolute;
+ left: 0;
+ bottom: 0;
+ z-index: 12;
+ background-repeat: no-repeat;
+}
+
+.loleaflet-ruler-indentation-marker-center{
+ position: fixed;
+ display: none;
+ height: 100vh;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ border-right: 2px dotted grey;
+ z-index: 12;
+}
+
.loleaflet-ruler-marginwrapper {
height: 100%;
position: absolute;
diff --git a/loleaflet/images/indentation_marker_down.svg
b/loleaflet/images/indentation_marker_down.svg
new file mode 100644
index 0..41e73bbeb
--- /dev/null
+++ b/loleaflet/images/indentation_marker_down.svg
@@ -0,0 +1,3 @@
+http://www.w3.org/2000/svg;
xmlns:xlink="http://www.w3.org/1999/xlink; viewBox="0 0 140 110" >
+
+
\ No newline at end of file
diff --git a/loleaflet/images/indentation_marker_up.svg
b/loleaflet/images/indentation_marker_up.svg
new file mode 100644
index 0..88f90c049
--- /dev/null
+++ b/loleaflet/images/indentation_marker_up.svg
@@ -0,0 +1,3 @@
+http://www.w3.org/2000/svg;
xmlns:xlink="http://www.w3.org/1999/xlink; viewBox="0 0 140 110" >
+
+
\ No newline at end of file
diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js
index 3c849aaad..98b65370e 100644
--- a/loleaflet/src/control/Ruler.js
+++ b/loleaflet/src/control/Ruler.js
@@ -64,6 +64,89 @@ L.Control.Ruler = L.Control.extend({
}
},
+ _initiateIndentationMarkers: function() {
+ // First line indentation..
+ this._firstLineMarker = document.createElement('div');
+ this._firstLineMarker.id = 'lo-fline-marker';
+
this._firstLineMarker.classList.add('loleaflet-ruler-indentation-marker-down');
+ this._rFace.appendChild(this._firstLineMarker);
+
+ // Paragraph indentation..
+ this._pStartMarker = document.createElement('div');
+ this._pStartMarker.id = 'lo-pstart-marker';
+
this._pStartMarker.classList.add('loleaflet-ruler-indentation-marker-up');
+ this._rFace.appendChild(this._pStartMarker);
+
+ // Paragraph end..
+ this._pEndMarker = document.createElement('div');
+ this._pEndMarker.id = 'lo-pend-marker';
+
this._pEndMarker.classList.add('loleaflet-ruler-indentation-marker-up');
+ this._rFace.appendChild(this._pEndMarker);
+
+ // While one of the markers is being dragged, a vertical line
should be visible in order to indicate the new position of the marker..
+ this._markerVerticalLine = L.DomUtil.create('div',
'loleaflet-ruler-indentation-marker-center');
+ this._rFace.appendChild(this._markerVerticalLine);
+
+ var self = this;
+
+ // Now we have indentation markers. Next we should bind drag
initializers to them..
+ // We will use 3 hammers. 1 hammer is not usable for this case.
+ if (L.Browser.touch) {
+ // Hammer for first line indentation..
+ this._firstLineHammer = new
Hammer(this._firstLineMarker);
+ this._firstLineHammer.add(new Hammer.Pan({ threshold:
0, pointers: 0 }));
+ this._firstLineHammer.get('press').set({
+ time: 500
+ });
+ this._firstLineHammer.on('panstart', function (event) {
+
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/loleaflet.css |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit daf8f68418ee02abf529f57fc3169d7ea6e08b57
Author: Andras Timar
AuthorDate: Sun May 10 08:37:07 2020 +0200
Commit: Andras Timar
CommitDate: Sun May 10 08:37:07 2020 +0200
MSForms: white background of drop-down-field-list (not black :))
Change-Id: I633fff952f10d95ed120494dbb3f75dd4e9bbc2e
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 02d1ee1ba..b2f788141 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -558,7 +558,7 @@ body {
position: absolute;
border: 1px solid;
cursor: pointer;
- background: #00;
+ background: #ff;
}
.drop-down-field-list-item {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/loleaflet.css |1 +
1 file changed, 1 insertion(+)
New commits:
commit c16218061ede373158d802a68b4159c4a608e4d3
Author: Andras Timar
AuthorDate: Sun May 10 08:29:11 2020 +0200
Commit: Andras Timar
CommitDate: Sun May 10 08:29:21 2020 +0200
MSForms: white background of drop-down-field-list (it was transparent)
Change-Id: I315cdc29643d0fddb6704610cb4ed72c03ee3e8b
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 227658acb..02d1ee1ba 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -558,6 +558,7 @@ body {
position: absolute;
border: 1px solid;
cursor: pointer;
+ background: #00;
}
.drop-down-field-list-item {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/notebookbar.css| 18 +
loleaflet/src/control/Control.Notebookbar.js | 35 +++
2 files changed, 53 insertions(+)
New commits:
commit 0752bd238610fc00f7416df06ac94754d68b9536
Author: Szymon Kłos
AuthorDate: Fri May 8 11:05:17 2020 +0200
Commit: Szymon Kłos
CommitDate: Fri May 8 12:27:37 2020 +0200
notebookbar: add shortcuts toolbar
Change-Id: Ia6ddecaca2d6940b9d5bc52684527cb6e67b6a37
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93707
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index b5572ebe5..6f9675180 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -27,6 +27,24 @@
cursor: pointer;
}
+/* shortcuts bar */
+
+.notebookbar-shortcuts-bar {
+ display: inline-block;
+ position: relative;
+ z-index: 1;
+}
+
+.notebookbar-shortcuts-bar .unotoolbutton.notebookbar {
+ margin-right: 10px;
+}
+
+.notebookbar-shortcuts-bar .unotoolbutton.notebookbar .unobutton {
+ width: 16px !important;
+ height: 16px !important;
+ margin-right: 0px;
+}
+
/* root container */
.notebookbar-scroll-wrapper {
diff --git a/loleaflet/src/control/Control.Notebookbar.js
b/loleaflet/src/control/Control.Notebookbar.js
index f19d124f9..2be2c8443 100644
--- a/loleaflet/src/control/Control.Notebookbar.js
+++ b/loleaflet/src/control/Control.Notebookbar.js
@@ -33,6 +33,7 @@ L.Control.Notebookbar = L.Control.extend({
setTabs: function(tabs) {
$('nav').prepend(tabs);
+ this.createShortcutsBar();
},
selectedTab: function() {
@@ -44,6 +45,40 @@ L.Control.Notebookbar = L.Control.extend({
return [];
},
+ getShortcutsBarData: function() {
+ return [
+ {
+ 'id': 'shortcutstoolbox',
+ 'type': 'toolbox',
+ 'children': [
+ {
+ 'type': 'toolitem',
+ 'text': 'Save',
+ 'command': '.uno:Save'
+ },
+ {
+ 'type': 'toolitem',
+ 'text': 'Undo',
+ 'command': '.uno:Undo'
+ },
+ {
+ 'type': 'toolitem',
+ 'text': 'Redo',
+ 'command': '.uno:Redo'
+ }
+ ]
+ }
+ ];
+ },
+
+ createShortcutsBar: function() {
+ var shortcutsBar = L.DomUtil.create('div',
'notebookbar-shortcuts-bar');
+ $('nav').prepend(shortcutsBar);
+
+ var builder = new L.control.notebookbarBuilder({mobileWizard:
this, map: this.map, cssClass: 'notebookbar'});
+ builder.build(shortcutsBar, this.getShortcutsBarData());
+ },
+
// required, called by builder, not needed in this container
setCurrentScrollPosition: function() {},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
