core.git: Branch 'distro/collabora/co-24.04' - svx/uiconfig
svx/uiconfig/ui/sidebartextpanel.ui | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) New commits: commit a26c07e37ed2e5996a5f1e07a23fa4f7ddb96534 Author: Pedro Pinto Silva AuthorDate: Wed Jul 24 11:04:15 2024 +0200 Commit: Pedro Silva CommitDate: Fri Jul 26 13:21:05 2024 +0200 lok: Sidebar: Fix Shadowed btn not fitting properly in the grid Better to move it down where we have more space. Signed-off-by: Pedro Pinto Silva Change-Id: If5d898f1491ed933dad00a5635036d2ceaf7fa73 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170931 Reviewed-by: Szymon Kłos Tested-by: Jenkins CollaboraOffice diff --git a/svx/uiconfig/ui/sidebartextpanel.ui b/svx/uiconfig/ui/sidebartextpanel.ui index b53b9e2e36c8..478baefadb32 100644 --- a/svx/uiconfig/ui/sidebartextpanel.ui +++ b/svx/uiconfig/ui/sidebartextpanel.ui @@ -149,16 +149,6 @@ False - - -True -True - - -False -False - - 0 @@ -233,6 +223,16 @@ False + + + True + True + + + False + False + + False
core.git: Branch 'distro/collabora/co-24.04' - 11 commits - configure.ac cui/source cui/uiconfig framework/source icon-themes/colibre icon-themes/galaxy icon-themes/karasa_jaga include/default.rc inst
/create_tree.sh |8
sysui/productlist.mk|4
vcl/win/app/salinst.cxx |2
67 files changed, 8554 insertions(+), 371 deletions(-)
New commits:
commit 149ed9227194979f82edc95ca6474249bdef951f
Author: Pedro Pinto Silva
AuthorDate: Mon Apr 25 16:27:56 2022 +0200
Commit: Andras Timar
CommitDate: Mon Jan 15 11:46:10 2024 +0100
[cp] Update brand colors: progress bar and app icons
Signed-off-by: Pedro Pinto Silva
Change-Id: I0a183c30eee7a6280cb59fc1d03805600c1e977f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133469
Tested-by: Andras Timar
Reviewed-by: Andras Timar
diff --git a/instsetoo_native/CustomTarget_setup.mk
b/instsetoo_native/CustomTarget_setup.mk
index 55a12e16a12d..57b4a3399f5d 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -143,7 +143,7 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'HideEula=1' \
&& echo 'Logo=1' \
&& echo 'NativeProgress=false' \
- && echo 'ProgressBarColor=80,73,153' \
+ && echo 'ProgressBarColor=92,41,131' \
&& echo 'ProgressFrameColor=255,255,255' \
&& echo 'ProgressPosition=268,106' \
&& echo 'ProgressSize=212,4' \
commit b0eeca798cdab4862cf9deaa90f4078f4425f89f
Author: Andras Timar
AuthorDate: Mon Dec 5 00:55:03 2022 +0100
Commit: Andras Timar
CommitDate: Mon Jan 15 11:45:35 2024 +0100
[cp] resolution of osxdndinstall.png must be 72dpi
Change-Id: Ib0a020fcbd855c97fc2294287e517b9f440c552a
diff --git a/setup_native/source/packinfo/osxdndinstall.png
b/setup_native/source/packinfo/osxdndinstall.png
index 4998aa8ce9b2..eb5625392531 100644
Binary files a/setup_native/source/packinfo/osxdndinstall.png and
b/setup_native/source/packinfo/osxdndinstall.png differ
commit 21dda7e5017b2cf051b3d9709f50660be3ce706c
Author: Pedro Pinto Silva
AuthorDate: Fri Jul 1 15:33:22 2022 +0200
Commit: Andras Timar
CommitDate: Mon Jan 15 11:45:23 2024 +0100
[cp] Rename UI Variant from Standard Toolbar to Compact
To be more in-tune with COnline options
Signed-off-by: Pedro Pinto Silva
Change-Id: I38c4d1639dbf7d726fb8c3d784a298cd01a97201
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136743
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/cui/uiconfig/ui/toolbarmodedialog.ui
b/cui/uiconfig/ui/toolbarmodedialog.ui
index f3f00446d16f..66e548f2e483 100644
--- a/cui/uiconfig/ui/toolbarmodedialog.ui
+++ b/cui/uiconfig/ui/toolbarmodedialog.ui
@@ -108,7 +108,7 @@
3
-Standard Toolbar
+Compact
True
True
False
commit f93fa3fab14166d0569a21644d6573496c70f5b8
Author: Pedro Pinto Silva
AuthorDate: Wed Apr 27 12:36:44 2022 +0200
Commit: Andras Timar
CommitDate: Mon Jan 15 11:45:17 2024 +0100
[cp] Update brand colors: win installers
Signed-off-by: Pedro Pinto Silva
Change-Id: I4e6d3ba089ef8679c598535971f5417796a6adad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133501
Tested-by: Andras Timar
Reviewed-by: Andras Timar
diff --git
a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp
index 5f8be18fd7a0..19e748e2e547 100644
Binary files
a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp and
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp differ
diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp
index 0fc8f7fb6c72..23a79c2a822d 100644
Binary files
a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp and
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp differ
commit 2b25a8c93298e1002a436566b8e7c2a2b68bbb79
Author: Pedro Pinto Silva
AuthorDate: Wed Apr 27 11:22:32 2022 +0200
Commit: Andras Timar
CommitDate: Mon Jan 15 11:45:12 2024 +0100
[cp] Update brand colors: mac installer
Signed-off-by: Pedro Pinto Silva
Change-Id: Iaa5620207577ccc45418cc0137af12d4848e268d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133498
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/setup_native/source/packinfo/osxdndinstall.png
b/setup_native/source/packinfo/osxdndinstall.png
index eb90a85c6028..4998a
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/srchdlg.hxx |1 +
svx/source/dialog/srchdlg.cxx |7 +++
2 files changed, 8 insertions(+)
New commits:
commit 564af6b066b71aa48cca9bb843668a2fb47d999c
Author: Pedro Pinto Silva
AuthorDate: Wed Mar 22 10:07:43 2023 +0100
Commit: Caolán McNamara
CommitDate: Tue Oct 10 17:31:25 2023 +0200
jsdialog: hide help and close buttons for searchreplace dialog
Signed-off-by: Pedro Pinto Silva
Change-Id: I0f3bc2cd6839c74dff40431f8659d7f90b285d12
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149293
(cherry picked from commit c65142fd9fd9a43e1f27cb11f5b4048600b5a4c4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157720
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 9a75199ad818..f069af48c539 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -198,6 +198,7 @@ private:
std::unique_ptr m_xWordBtn;
std::unique_ptr m_xCloseBtn;
+std::unique_ptr m_xHelpBtn;
std::unique_ptr m_xIncludeDiacritics;
std::unique_ptr m_xIncludeKashida;
std::unique_ptr m_xOtherOptionsExpander;
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index dcb467b5475f..a17711bc46fb 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -301,6 +301,7 @@ SvxSearchDialog::SvxSearchDialog(weld::Window* pParent,
SfxChildWindow* pChildWi
, m_xSearchFormattedCB(m_xBuilder->weld_check_button("searchformatted"))
, m_xWordBtn(m_xBuilder->weld_check_button("wholewords"))
, m_xCloseBtn(m_xBuilder->weld_button("close"))
+, m_xHelpBtn(m_xBuilder->weld_button("help"))
, m_xIncludeDiacritics(m_xBuilder->weld_check_button("includediacritics"))
, m_xIncludeKashida(m_xBuilder->weld_check_button("includekashida"))
, m_xOtherOptionsExpander(m_xBuilder->weld_expander("OptionsExpander"))
@@ -327,6 +328,12 @@ SvxSearchDialog::SvxSearchDialog(weld::Window* pParent,
SfxChildWindow* pChildWi
, m_xAllSheetsCB(m_xBuilder->weld_check_button("allsheets"))
, m_xCalcStrFT(m_xBuilder->weld_label("entirecells"))
{
+if (comphelper::LibreOfficeKit::isActive())
+{
+m_xCloseBtn->hide();
+m_xHelpBtn->hide();
+}
+
m_aPresentIdle.SetTimeout(50);
m_aPresentIdle.SetInvokeHandler(LINK(this, SvxSearchDialog,
PresentTimeoutHdl_Impl));
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - include/svx svx/source
include/svx/srchdlg.hxx |1 +
svx/source/dialog/srchdlg.cxx |7 +++
2 files changed, 8 insertions(+)
New commits:
commit c65142fd9fd9a43e1f27cb11f5b4048600b5a4c4
Author: Pedro Pinto Silva
AuthorDate: Wed Mar 22 10:07:43 2023 +0100
Commit: Pedro Silva
CommitDate: Thu May 4 10:55:06 2023 +0200
jsdialog: hide help and close buttons for searchreplace dialog
Signed-off-by: Pedro Pinto Silva
Change-Id: I0f3bc2cd6839c74dff40431f8659d7f90b285d12
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149293
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 2b975e435083..d413fd0539a4 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -198,6 +198,7 @@ private:
std::unique_ptr m_xWordBtn;
std::unique_ptr m_xCloseBtn;
+std::unique_ptr m_xHelpBtn;
std::unique_ptr m_xIncludeDiacritics;
std::unique_ptr m_xIncludeKashida;
std::unique_ptr m_xOtherOptionsExpander;
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 69483c124770..ed9657fc9c67 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -301,6 +301,7 @@ SvxSearchDialog::SvxSearchDialog(weld::Window* pParent,
SfxChildWindow* pChildWi
, m_xSearchFormattedCB(m_xBuilder->weld_check_button("searchformatted"))
, m_xWordBtn(m_xBuilder->weld_check_button("wholewords"))
, m_xCloseBtn(m_xBuilder->weld_button("close"))
+, m_xHelpBtn(m_xBuilder->weld_button("help"))
, m_xIncludeDiacritics(m_xBuilder->weld_check_button("includediacritics"))
, m_xIncludeKashida(m_xBuilder->weld_check_button("includekashida"))
, m_xOtherOptionsExpander(m_xBuilder->weld_expander("OptionsExpander"))
@@ -327,6 +328,12 @@ SvxSearchDialog::SvxSearchDialog(weld::Window* pParent,
SfxChildWindow* pChildWi
, m_xAllSheetsCB(m_xBuilder->weld_check_button("allsheets"))
, m_xCalcStrFT(m_xBuilder->weld_label("entirecells"))
{
+if (comphelper::LibreOfficeKit::isActive())
+{
+m_xCloseBtn->hide();
+m_xHelpBtn->hide();
+}
+
m_aPresentIdle.SetTimeout(50);
m_aPresentIdle.SetInvokeHandler(LINK(this, SvxSearchDialog,
PresentTimeoutHdl_Impl));
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - instsetoo_native/CustomTarget_setup.mk
instsetoo_native/CustomTarget_setup.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ebd01ae80ad0135a8f3421f55d0f4c7e55f94843 Author: Pedro Pinto Silva AuthorDate: Mon Apr 25 16:27:56 2022 +0200 Commit: Andras Timar CommitDate: Sun Feb 12 17:56:12 2023 +0100 [cp] Update brand colors: progress bar and app icons Signed-off-by: Pedro Pinto Silva Change-Id: I0a183c30eee7a6280cb59fc1d03805600c1e977f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133469 Tested-by: Andras Timar Reviewed-by: Andras Timar diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 8c9204933170..84ec12fd17a2 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -143,7 +143,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'HideEula=1' \ && echo 'Logo=1' \ && echo 'NativeProgress=false' \ - && echo 'ProgressBarColor=80,73,153' \ + && echo 'ProgressBarColor=92,41,131' \ && echo 'ProgressFrameColor=255,255,255' \ && echo 'ProgressPosition=268,106' \ && echo 'ProgressSize=212,4' \
[Libreoffice-commits] core.git: icon-themes/colibre sd/uiconfig
icon-themes/colibre/cmd/sc_add.png |binary icon-themes/colibre/cmd/sc_list_remove.png |binary sd/uiconfig/simpress/ui/customanimationspanel.ui |4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 75c14600a559f1e8e5cce52ba66e30d4a22a281d Author: Pedro Pinto Silva AuthorDate: Mon Mar 14 15:36:32 2022 +0100 Commit: Pedro Silva CommitDate: Fri Aug 19 10:53:20 2022 +0200 Fix btn image size inconsistencies on CustomAnimationsPanel Animations btns (Add, Remove, Move Up, Move Down) - Images were being loaded from different locations - Images did not share the same size Signed-off-by: Pedro Pinto Silva Change-Id: I33c033d50c802b7f2c9506b2c5a7b82967af7db8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131551 Tested-by: Jenkins CollaboraOffice Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138487 Tested-by: Jenkins Tested-by: Andreas Kainz Reviewed-by: Andreas Kainz diff --git a/icon-themes/colibre/cmd/sc_add.png b/icon-themes/colibre/cmd/sc_add.png index 5d1b3b8e8146..7b0680d5c24e 100644 Binary files a/icon-themes/colibre/cmd/sc_add.png and b/icon-themes/colibre/cmd/sc_add.png differ diff --git a/icon-themes/colibre/cmd/sc_list_remove.png b/icon-themes/colibre/cmd/sc_list_remove.png new file mode 100644 index ..05a11237416f Binary files /dev/null and b/icon-themes/colibre/cmd/sc_list_remove.png differ diff --git a/sd/uiconfig/simpress/ui/customanimationspanel.ui b/sd/uiconfig/simpress/ui/customanimationspanel.ui index 848b40da9661..2d8bd06d6118 100644 --- a/sd/uiconfig/simpress/ui/customanimationspanel.ui +++ b/sd/uiconfig/simpress/ui/customanimationspanel.ui @@ -20,7 +20,7 @@ True False -svtools/res/list_add.png +cmd/sc_add.png True @@ -35,7 +35,7 @@ True False -extensions/res/buttonminus.png +cmd/sc_list_remove.png True
Pedro Silva license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license.
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - cui/uiconfig
cui/uiconfig/ui/toolbarmodedialog.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c1743dc6f610db557de1a4fd31ce8c0f090f4c52 Author: Pedro Pinto Silva AuthorDate: Fri Jul 1 15:33:22 2022 +0200 Commit: Andras Timar CommitDate: Mon Jul 4 16:55:52 2022 +0200 Rename UI Variant from Standard Toolbar to Compact To be more in-tune with COnline options Signed-off-by: Pedro Pinto Silva Change-Id: I38c4d1639dbf7d726fb8c3d784a298cd01a97201 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136743 Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar diff --git a/cui/uiconfig/ui/toolbarmodedialog.ui b/cui/uiconfig/ui/toolbarmodedialog.ui index d401f75edf73..58b399680760 100644 --- a/cui/uiconfig/ui/toolbarmodedialog.ui +++ b/cui/uiconfig/ui/toolbarmodedialog.ui @@ -108,7 +108,7 @@ 3 -Standard Toolbar +Compact True True False
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - 2 commits - sc/uiconfig
sc/uiconfig/scalc/ui/textimportcsv.ui |2 +-
sc/uiconfig/scalc/ui/textimportoptions.ui |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a23172e88c3f82d590bba31894c0935067ee7c13
Author: Pedro Pinto Silva
AuthorDate: Fri Jul 1 10:16:19 2022 +0200
Commit: Xisco Fauli
CommitDate: Fri Jul 1 15:07:59 2022 +0200
tdf#138748 Correct group label in HTML import dialog
Use "Locale" as a label instead of "Language" for locale
options
Signed-off-by: Pedro Pinto Silva
Change-Id: Ic7edd5108a59cf1be1062b3709cb80a84606fe82
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136725
Reviewed-by: Mike Kaganski
Tested-by: Jenkins
(cherry picked from commit 05b80bc0cc082dd571bebbbc2de97e8de7499e86)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136709
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/sc/uiconfig/scalc/ui/textimportoptions.ui
b/sc/uiconfig/scalc/ui/textimportoptions.ui
index f09e0b052b4f..9afab394131f 100644
--- a/sc/uiconfig/scalc/ui/textimportoptions.ui
+++ b/sc/uiconfig/scalc/ui/textimportoptions.ui
@@ -145,7 +145,7 @@
True
False
-Select the Language to Use for
Import
+Select the Locale to Use for
Import
commit 05ad8b9c1b56c602bbfaa568a87e00de253167bd
Author: Pedro Pinto Silva
AuthorDate: Fri Jul 1 09:57:35 2022 +0200
Commit: Xisco Fauli
CommitDate: Fri Jul 1 15:07:47 2022 +0200
tdf#138748 Correct label locale group in CSV dialog
The second group in the dialog is about the "Locale"
and it was wrongly named "Language"
Signed-off-by: Pedro Pinto Silva
Change-Id: Ie140c6af4560300261f816d0eb73dd451a2c5376
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136724
Reviewed-by: Mike Kaganski
Tested-by: Jenkins
(cherry picked from commit 5ced993524305bad3c8f6637639e133f423cd285)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136710
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/sc/uiconfig/scalc/ui/textimportcsv.ui
b/sc/uiconfig/scalc/ui/textimportcsv.ui
index 5e6959e9b9f2..91a84d934aaa 100644
--- a/sc/uiconfig/scalc/ui/textimportcsv.ui
+++ b/sc/uiconfig/scalc/ui/textimportcsv.ui
@@ -130,7 +130,7 @@
True
False
-_Language:
+_Locale:
True
language
0
[Libreoffice-commits] core.git: 2 commits - sc/uiconfig
sc/uiconfig/scalc/ui/textimportcsv.ui |2 +-
sc/uiconfig/scalc/ui/textimportoptions.ui |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5ced993524305bad3c8f6637639e133f423cd285
Author: Pedro Pinto Silva
AuthorDate: Fri Jul 1 09:57:35 2022 +0200
Commit: Pedro Silva
CommitDate: Fri Jul 1 12:07:27 2022 +0200
tdf#138748 Correct label locale group in CSV dialog
The second group in the dialog is about the "Locale"
and it was wrongly named "Language"
Signed-off-by: Pedro Pinto Silva
Change-Id: Ie140c6af4560300261f816d0eb73dd451a2c5376
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136724
Reviewed-by: Mike Kaganski
Tested-by: Jenkins
diff --git a/sc/uiconfig/scalc/ui/textimportcsv.ui
b/sc/uiconfig/scalc/ui/textimportcsv.ui
index 5e6959e9b9f2..91a84d934aaa 100644
--- a/sc/uiconfig/scalc/ui/textimportcsv.ui
+++ b/sc/uiconfig/scalc/ui/textimportcsv.ui
@@ -130,7 +130,7 @@
True
False
-_Language:
+_Locale:
True
language
0
commit 05b80bc0cc082dd571bebbbc2de97e8de7499e86
Author: Pedro Pinto Silva
AuthorDate: Fri Jul 1 10:16:19 2022 +0200
Commit: Pedro Silva
CommitDate: Fri Jul 1 12:07:09 2022 +0200
tdf#138748 Correct group label in HTML import dialog
Use "Locale" as a label instead of "Language" for locale
options
Signed-off-by: Pedro Pinto Silva
Change-Id: Ic7edd5108a59cf1be1062b3709cb80a84606fe82
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136725
Reviewed-by: Mike Kaganski
Tested-by: Jenkins
diff --git a/sc/uiconfig/scalc/ui/textimportoptions.ui
b/sc/uiconfig/scalc/ui/textimportoptions.ui
index f09e0b052b4f..9afab394131f 100644
--- a/sc/uiconfig/scalc/ui/textimportoptions.ui
+++ b/sc/uiconfig/scalc/ui/textimportoptions.ui
@@ -145,7 +145,7 @@
True
False
-Select the Language to Use for
Import
+Select the Locale to Use for
Import
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - instsetoo_native/CustomTarget_setup.mk sysui/desktop
instsetoo_native/CustomTarget_setup.mk |2 +- sysui/desktop/icons/hicolor/1024x1024/apps/main.png|binary sysui/desktop/icons/hicolor/1024x1024/apps/startcenter.png |binary sysui/desktop/icons/hicolor/128x128/apps/main.png |binary sysui/desktop/icons/hicolor/128x128/apps/startcenter.png |binary sysui/desktop/icons/hicolor/16x16/apps/main.png|binary sysui/desktop/icons/hicolor/16x16/apps/startcenter.png |binary sysui/desktop/icons/hicolor/256x256/apps/main.png |binary sysui/desktop/icons/hicolor/256x256/apps/startcenter.png |binary sysui/desktop/icons/hicolor/32x32/apps/main.png|binary sysui/desktop/icons/hicolor/32x32/apps/startcenter.png |binary sysui/desktop/icons/hicolor/48x48/apps/main.png|binary sysui/desktop/icons/hicolor/48x48/apps/startcenter.png |binary sysui/desktop/icons/hicolor/512x512/apps/main.png |binary sysui/desktop/icons/hicolor/512x512/apps/startcenter.png |binary sysui/desktop/icons/hicolor/scalable/apps/main.svg |4 ++-- sysui/desktop/icons/hicolor/scalable/apps/startcenter.svg |4 ++-- sysui/desktop/icons/main.icns |binary sysui/desktop/icons/soffice.ico|binary 19 files changed, 5 insertions(+), 5 deletions(-) New commits: commit ae53ca083fa33ec8a8e1b6b9e99969a46eb11727 Author: Pedro Pinto Silva AuthorDate: Mon Apr 25 16:27:56 2022 +0200 Commit: Andras Timar CommitDate: Wed Apr 27 13:02:31 2022 +0200 [cp] Update brand colors: progress bar and app icons Signed-off-by: Pedro Pinto Silva Change-Id: I0a183c30eee7a6280cb59fc1d03805600c1e977f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133469 Tested-by: Andras Timar Reviewed-by: Andras Timar diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index d78d8ce8a460..862f71d22e1d 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -143,7 +143,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'HideEula=1' \ && echo 'Logo=1' \ && echo 'NativeProgress=false' \ - && echo 'ProgressBarColor=80,73,153' \ + && echo 'ProgressBarColor=92,41,131' \ && echo 'ProgressFrameColor=255,255,255' \ && echo 'ProgressPosition=268,106' \ && echo 'ProgressSize=212,4' \ diff --git a/sysui/desktop/icons/hicolor/1024x1024/apps/main.png b/sysui/desktop/icons/hicolor/1024x1024/apps/main.png index 89141931c921..e83663837199 100644 Binary files a/sysui/desktop/icons/hicolor/1024x1024/apps/main.png and b/sysui/desktop/icons/hicolor/1024x1024/apps/main.png differ diff --git a/sysui/desktop/icons/hicolor/1024x1024/apps/startcenter.png b/sysui/desktop/icons/hicolor/1024x1024/apps/startcenter.png index 24f9c06a52fe..e83663837199 100644 Binary files a/sysui/desktop/icons/hicolor/1024x1024/apps/startcenter.png and b/sysui/desktop/icons/hicolor/1024x1024/apps/startcenter.png differ diff --git a/sysui/desktop/icons/hicolor/128x128/apps/main.png b/sysui/desktop/icons/hicolor/128x128/apps/main.png index b8b464c53a59..624cdab34e5f 100644 Binary files a/sysui/desktop/icons/hicolor/128x128/apps/main.png and b/sysui/desktop/icons/hicolor/128x128/apps/main.png differ diff --git a/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png b/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png index b8b464c53a59..624cdab34e5f 100644 Binary files a/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png and b/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png differ diff --git a/sysui/desktop/icons/hicolor/16x16/apps/main.png b/sysui/desktop/icons/hicolor/16x16/apps/main.png index 0cf7c1aa675d..4b9e9f769142 100644 Binary files a/sysui/desktop/icons/hicolor/16x16/apps/main.png and b/sysui/desktop/icons/hicolor/16x16/apps/main.png differ diff --git a/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png b/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png index 0cf7c1aa675d..4b9e9f769142 100644 Binary files a/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png and b/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/main.png b/sysui/desktop/icons/hicolor/256x256/apps/main.png index 19abcb268960..42f62f9b6548 100644 Binary files a/sysui/desktop/icons/hicolor/256x256/apps/main.png and b/sysui/desktop/icons/hicolor/256x256/apps/main.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/startcenter.png b/sysui/desktop/icons/hicolor/256x256/apps/startcenter.png index 19abcb268960..42f62f9b6548 100644 Binary files a/sysui/desktop/icons/hicolor/25
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - instsetoo_native/inc_common
instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp |binary instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp |binary 2 files changed New commits: commit e8e02821b28f30a57ee214680c9eedc68d43b23d Author: Pedro Pinto Silva AuthorDate: Wed Apr 27 12:36:44 2022 +0200 Commit: Andras Timar CommitDate: Wed Apr 27 12:56:40 2022 +0200 [cp] Update brand colors: win installers Signed-off-by: Pedro Pinto Silva Change-Id: I4e6d3ba089ef8679c598535971f5417796a6adad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133501 Tested-by: Andras Timar Reviewed-by: Andras Timar diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp index 5f8be18fd7a0..19e748e2e547 100644 Binary files a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp and b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp differ diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp index 0fc8f7fb6c72..23a79c2a822d 100644 Binary files a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp and b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp differ
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - setup_native/source
setup_native/source/packinfo/osxdndinstall.png |binary 1 file changed New commits: commit 3a75c0a2ee3699eb45a17ebc13e0e9b707550a48 Author: Pedro Pinto Silva AuthorDate: Wed Apr 27 11:22:32 2022 +0200 Commit: Andras Timar CommitDate: Wed Apr 27 12:56:07 2022 +0200 [cp] Update brand colors: mac installer Signed-off-by: Pedro Pinto Silva Change-Id: Iaa5620207577ccc45418cc0137af12d4848e268d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133498 Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar diff --git a/setup_native/source/packinfo/osxdndinstall.png b/setup_native/source/packinfo/osxdndinstall.png index eb90a85c6028..4998aa8ce9b2 100644 Binary files a/setup_native/source/packinfo/osxdndinstall.png and b/setup_native/source/packinfo/osxdndinstall.png differ
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - icon-themes/galaxy
icon-themes/galaxy/brand_cp/about.svg | 20 +- icon-themes/galaxy/brand_cp/about_inverted.svg| 14 - icon-themes/galaxy/brand_cp/flat_logo.svg |4 icon-themes/galaxy/brand_cp/intro-highres.png |binary icon-themes/galaxy/brand_cp/intro.png |binary icon-themes/galaxy/brand_cp/logo-sc.svg |6 icon-themes/galaxy/brand_cp/logo-sc_inverted.svg |9 - icon-themes/galaxy/brand_cp/logo.svg | 39 ++-- icon-themes/galaxy/brand_cp/logo_inverted.svg |9 - icon-themes/galaxy/brand_cp_snapshot/about.svg| 20 +- icon-themes/galaxy/brand_cp_snapshot/about_inverted.svg | 12 - icon-themes/galaxy/brand_cp_snapshot/flat_logo.svg| 126 +++--- icon-themes/galaxy/brand_cp_snapshot/intro-highres.png|binary icon-themes/galaxy/brand_cp_snapshot/intro.png|binary icon-themes/galaxy/brand_cp_snapshot/logo-sc.svg |6 icon-themes/galaxy/brand_cp_snapshot/logo-sc_inverted.svg |9 - icon-themes/galaxy/brand_cp_snapshot/logo.svg |6 icon-themes/galaxy/brand_cp_snapshot/logo_inverted.svg|9 - 18 files changed, 144 insertions(+), 145 deletions(-) New commits: commit a72542df1d15aaac4c8a4772650130fd826a564c Author: Pedro Pinto Silva AuthorDate: Fri Apr 1 16:16:58 2022 +0200 Commit: Andras Timar CommitDate: Fri Apr 1 19:29:29 2022 +0200 [cp] Update brand colors Signed-off-by: Pedro Pinto Silva Change-Id: I8568f6f4bd4dd60a2559396ff83aef8f93bc0468 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132433 Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar diff --git a/icon-themes/galaxy/brand_cp/about.svg b/icon-themes/galaxy/brand_cp/about.svg index 1cb919f180aa..d81cb0f02e83 100644 --- a/icon-themes/galaxy/brand_cp/about.svg +++ b/icon-themes/galaxy/brand_cp/about.svg @@ -64,7 +64,7 @@ inkscape:collect="always" id="linearGradient1202"> @@ -169,15 +169,15 @@ id="stop4574" /> @@ -198,7 +198,7 @@ offset="0" id="stop4560" /> @@ -1396,11 +1396,11 @@ id="path1159" sodipodi:nodetypes="ccc" /> @@ -222,7 +222,7 @@ offset="0" id="stop4560" /> @@ -238,11 +238,11 @@ diff --git a/icon-themes/galaxy/brand_cp/flat_logo.svg b/icon-themes/galaxy/brand_cp/flat_logo.svg index e9e09330dcfa..a770a89ed3a7 100644 --- a/icon-themes/galaxy/brand_cp/flat_logo.svg +++ b/icon-themes/galaxy/brand_cp/flat_logo.svg @@ -708,10 +708,10 @@ id="polygon14-7" /> \ No newline at end of file + style="fill:#2e1a47;fill-opacity:1" /> diff --git a/icon-themes/galaxy/brand_cp/intro-highres.png b/icon-themes/galaxy/brand_cp/intro-highres.png index 17724c32f2fa..b2f86893405c 100644 Binary files a/icon-themes/galaxy/brand_cp/intro-highres.png and b/icon-themes/galaxy/brand_cp/intro-highres.png differ diff --git a/icon-themes/galaxy/brand_cp/intro.png b/icon-themes/galaxy/brand_cp/intro.png index 4f0937b451e2..3bba49ba72c9 100644 Binary files a/icon-themes/galaxy/brand_cp/intro.png and b/icon-themes/galaxy/brand_cp/intro.png differ diff --git a/icon-themes/galaxy/brand_cp/logo-sc.svg b/icon-themes/galaxy/brand_cp/logo-sc.svg index 18401b2a7284..341760ab4ce9 100644 --- a/icon-themes/galaxy/brand_cp/logo-sc.svg +++ b/icon-themes/galaxy/brand_cp/logo-sc.svg @@ -63,7 +63,7 @@ id="g14"> diff --git a/icon-themes/galaxy/brand_cp/logo-sc_inverted.svg b/icon-themes/galaxy/brand_cp/logo-sc_inverted.svg index a0f79104e711..118f676ecd1f 100644 --- a/icon-themes/galaxy/brand_cp/logo-sc_inverted.svg +++ b/icon-themes/galaxy/brand_cp/logo-sc_inverted.svg @@ -34,10 +34,9 @@ id="g14"> + id="path2" /> diff --git a/icon-themes/galaxy/brand_cp/logo.svg b/icon-themes/galaxy/brand_cp/logo.svg index 18401b2a7284..75eb88521bf6 100644 --- a/icon-themes/galaxy/brand_cp/logo.svg +++ b/icon-themes/galaxy/brand_cp/logo.svg @@ -1,12 +1,5 @@ http://purl.org/dc/elements/1.1/"; - xmlns:cc="http://creativecommons.org/ns#"; - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - xmlns:svg="http://www.w3.org/2000/svg"; - xmlns="http://www.w3.org/2000/svg"; - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; width="128" height="54"
[Libreoffice-commits] core.git: svx/uiconfig
svx/uiconfig/ui/sidebarparagraph.ui | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) New commits: commit baebd26c3548609872e0c523add135afa3dc66bf Author: Pedro Pinto Silva AuthorDate: Tue Mar 15 15:21:30 2022 +0100 Commit: Pedro Silva CommitDate: Wed Mar 16 10:08:35 2022 +0100 Sidebarparagraph: Replace generic ids Signed-off-by: Pedro Pinto Silva Change-Id: Ic6f0195c272f0442dc96cfff0321e15461f8bbc0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131616 Tested-by: Jenkins Reviewed-by: Pranam Lashkari diff --git a/svx/uiconfig/ui/sidebarparagraph.ui b/svx/uiconfig/ui/sidebarparagraph.ui index e0bf907a231b..a638dceacd51 100644 --- a/svx/uiconfig/ui/sidebarparagraph.ui +++ b/svx/uiconfig/ui/sidebarparagraph.ui @@ -248,12 +248,12 @@ - + True False 6 - + True False center @@ -297,12 +297,12 @@ - + True False 6 - + True False center @@ -448,12 +448,12 @@ - + True False 6 - + True False center @@ -497,12 +497,12 @@ - + True False 6 - + True False center @@ -546,12 +546,12 @@ - + True False 6 - + True False center @@ -708,12 +708,12 @@ vertical - - + + - - - + + +
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-21.06.21-1'
Tag 'cp-21.06.21-1' created by Andras Timar at 2022-03-15 19:20 + cp-21.06.21-1 Changes since cp-21.06.20-1-14: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - svx/uiconfig
svx/uiconfig/ui/sidebarparagraph.ui | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) New commits: commit caac95b2a6fe1fc9667299792d9e674517d36b5c Author: Pedro Pinto Silva AuthorDate: Tue Mar 15 15:21:30 2022 +0100 Commit: Pedro Silva CommitDate: Tue Mar 15 19:06:13 2022 +0100 Sidebarparagraph: Replace generic ids Signed-off-by: Pedro Pinto Silva Change-Id: Ic6f0195c272f0442dc96cfff0321e15461f8bbc0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131592 Tested-by: Jenkins CollaboraOffice diff --git a/svx/uiconfig/ui/sidebarparagraph.ui b/svx/uiconfig/ui/sidebarparagraph.ui index 1f34c35b1c67..9b62a6542020 100644 --- a/svx/uiconfig/ui/sidebarparagraph.ui +++ b/svx/uiconfig/ui/sidebarparagraph.ui @@ -259,12 +259,12 @@ - + True False 6 - + True False center @@ -308,12 +308,12 @@ - + True False 6 - + True False center @@ -463,12 +463,12 @@ - + True False 6 - + True False center @@ -512,12 +512,12 @@ - + True False 6 - + True False center @@ -561,12 +561,12 @@ - + True False 6 - + True False center @@ -716,12 +716,12 @@ vertical - - + + - - - + + +
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - icon-themes/colibre sd/uiconfig
icon-themes/colibre/cmd/sc_add.png |binary icon-themes/colibre/cmd/sc_list_remove.png |binary sd/uiconfig/simpress/ui/customanimationspanel.ui |4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 800142eca5c52ca1e936a1c435f6617806824155 Author: Pedro Pinto Silva AuthorDate: Mon Mar 14 15:36:32 2022 +0100 Commit: Pedro Silva CommitDate: Mon Mar 14 17:54:27 2022 +0100 Fix btn image size inconsistencies on CustomAnimationsPanel Animations btns (Add, Remove, Move Up, Move Down) - Images were being loaded from different locations - Images did not share the same size Signed-off-by: Pedro Pinto Silva Change-Id: I33c033d50c802b7f2c9506b2c5a7b82967af7db8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131551 Tested-by: Jenkins CollaboraOffice diff --git a/icon-themes/colibre/cmd/sc_add.png b/icon-themes/colibre/cmd/sc_add.png index 5d1b3b8e8146..7b0680d5c24e 100644 Binary files a/icon-themes/colibre/cmd/sc_add.png and b/icon-themes/colibre/cmd/sc_add.png differ diff --git a/icon-themes/colibre/cmd/sc_list_remove.png b/icon-themes/colibre/cmd/sc_list_remove.png new file mode 100644 index ..05a11237416f Binary files /dev/null and b/icon-themes/colibre/cmd/sc_list_remove.png differ diff --git a/sd/uiconfig/simpress/ui/customanimationspanel.ui b/sd/uiconfig/simpress/ui/customanimationspanel.ui index 618ac8b89577..43cb2119f5cd 100644 --- a/sd/uiconfig/simpress/ui/customanimationspanel.ui +++ b/sd/uiconfig/simpress/ui/customanimationspanel.ui @@ -20,7 +20,7 @@ True False -svtools/res/list_add.png +cmd/sc_add.png 2 @@ -37,7 +37,7 @@ True False -extensions/res/buttonminus.png +cmd/sc_list_remove.png 2
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - icon-themes/colibre
icon-themes/colibre/sw/res/page-shadow-mask.png |binary 1 file changed New commits: commit c39cd7bce80740ce5ef9df6f31107cbf870f1de1 Author: Pedro Pinto Silva AuthorDate: Thu Mar 10 10:47:00 2022 +0100 Commit: Pedro Silva CommitDate: Fri Mar 11 08:58:36 2022 +0100 Decrease page outline prominence Make the page border less prominent so user can focus more in the page's content and less in the page's surroundings Signed-off-by: Pedro Pinto Silva Change-Id: I54fd21bd9515c9c826ea369fb934dfe9343cf5dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131308 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos diff --git a/icon-themes/colibre/sw/res/page-shadow-mask.png b/icon-themes/colibre/sw/res/page-shadow-mask.png index 107f37d84982..6b0e64697786 100644 Binary files a/icon-themes/colibre/sw/res/page-shadow-mask.png and b/icon-themes/colibre/sw/res/page-shadow-mask.png differ
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - 2 commits - icon-themes/colibre
icon-themes/colibre/sw/res/page-shadow-mask.png |binary 1 file changed New commits: commit 549e865c80ce0ab0d106104cf4746166732c9574 Author: Pedro Pinto Silva AuthorDate: Fri Oct 15 18:06:26 2021 +0200 Commit: Andras Timar CommitDate: Sun Feb 20 13:40:56 2022 +0100 [cp] Restore light document border for writer part2 - Make shadow not so harsh - Add border radius fixes https://github.com/CollaboraOnline/online/issues/3403 Signed-off-by: Pedro Pinto Silva Change-Id: I5a46915ca4db7b484d5e816985e834b2777a9786 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123672 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos diff --git a/icon-themes/colibre/sw/res/page-shadow-mask.png b/icon-themes/colibre/sw/res/page-shadow-mask.png index 77b430c997a9..107f37d84982 100644 Binary files a/icon-themes/colibre/sw/res/page-shadow-mask.png and b/icon-themes/colibre/sw/res/page-shadow-mask.png differ commit 328be5c7fa94c76297d4780cde96a0e39516e158 Author: Szymon Kłos AuthorDate: Thu Oct 14 07:45:50 2021 +0200 Commit: Andras Timar CommitDate: Sun Feb 20 13:40:49 2022 +0100 [cp] Restore light document border for writer to apply use make postprocess.clean && make postprocess fixes https://github.com/CollaboraOnline/online/issues/3403 Change-Id: I3d0d12a60eacc73ace3f614360bc86a8a44f28a2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123572 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos diff --git a/icon-themes/colibre/sw/res/page-shadow-mask.png b/icon-themes/colibre/sw/res/page-shadow-mask.png index 4b2128da7530..77b430c997a9 100644 Binary files a/icon-themes/colibre/sw/res/page-shadow-mask.png and b/icon-themes/colibre/sw/res/page-shadow-mask.png differ
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - cui/source
cui/source/dialogs/about.cxx | 12
1 file changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 1d3e9fc71f8a1d048f1035b13c30cdbbcc27a970
Author: Pedro Pinto Silva
AuthorDate: Tue Jun 22 15:36:15 2021 +0200
Commit: Andras Timar
CommitDate: Sun Feb 13 19:14:14 2022 +0100
About: Darkmode: Use different about image
Fixes the use of the same about.svg even on darkmode
The way we are loading the svgs makes, when in presence of dark mode,
the rendering of svgs very very poor on those dialogs. It adds artifacts
, doesn't render gradients properly (at least when compared to
light mode) and adds white outlines everywhere.
Fix this by providing a simpler and more legible svgs to be use in
dark mode and load them only in that mode.
Signed-off-by: Pedro Pinto Silva
Change-Id: Ib1a95f7d7a2be62b9b001b4c811c22104cc01b2f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117663
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 9bb4042a2955..29a5310168c0 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -93,13 +93,9 @@ AboutDialog::AboutDialog(weld::Window *pParent)
const tools::Long nWidth(m_pCopyrightLabel->get_preferred_size().getWidth());
BitmapEx aBackgroundBitmap;
- if (SfxApplication::loadBrandSvg(Application::GetSettings()
- .GetStyleSettings()
- .GetDialogColor()
- .IsDark()
- ? "shell/logo_inverted"
- : "shell/logo",
- aBackgroundBitmap, nWidth * 0.8)) {
+ bool bIsDark =
Application::GetSettings().GetStyleSettings().GetDialogColor().IsDark();
+
+ if (SfxApplication::loadBrandSvg(bIsDark ? "shell/logo_inverted" :
"shell/logo", aBackgroundBitmap, nWidth * 0.8)) {
ScopedVclPtr m_pVirDev =
m_pBrandImage->create_virtual_device();
m_pVirDev->SetOutputSizePixel(aBackgroundBitmap.GetSizePixel());
@@ -107,7 +103,7 @@ AboutDialog::AboutDialog(weld::Window *pParent)
m_pBrandImage->set_image(m_pVirDev.get());
m_pVirDev.disposeAndClear();
}
- if (SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, nWidth *
0.9)) {
+ if (SfxApplication::loadBrandSvg(bIsDark ? "shell/about_inverted" :
"shell/about", aBackgroundBitmap, nWidth * 0.9)) {
ScopedVclPtr m_pVirDev =
m_pAboutImage->create_virtual_device();
m_pVirDev->SetOutputSizePixel(aBackgroundBitmap.GetSizePixel());
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - icon-themes/colibre
icon-themes/colibre/sw/res/page-shadow-mask.png |binary 1 file changed New commits: commit cc9b93213ed2b8d1955686d46e7505bf2113b912 Author: Pedro Pinto Silva AuthorDate: Fri Oct 15 18:06:26 2021 +0200 Commit: Szymon Kłos CommitDate: Mon Oct 18 10:49:57 2021 +0200 [cp] Restore light document border for writer part2 - Make shadow not so harsh - Add border radius fixes https://github.com/CollaboraOnline/online/issues/3403 Signed-off-by: Pedro Pinto Silva Change-Id: I5a46915ca4db7b484d5e816985e834b2777a9786 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123672 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos diff --git a/icon-themes/colibre/sw/res/page-shadow-mask.png b/icon-themes/colibre/sw/res/page-shadow-mask.png index 77b430c997a9..107f37d84982 100644 Binary files a/icon-themes/colibre/sw/res/page-shadow-mask.png and b/icon-themes/colibre/sw/res/page-shadow-mask.png differ
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - sc/source sc/uiconfig
sc/source/ui/dbgui/scuiasciiopt.cxx | 24 ++--
sc/source/ui/inc/scuiasciiopt.hxx |4 --
sc/uiconfig/scalc/ui/textimportcsv.ui | 50 +++---
3 files changed, 16 insertions(+), 62 deletions(-)
New commits:
commit dba4f1031ef5b308f60f354c160187321cba6bbe
Author: Pedro Pinto Silva
AuthorDate: Thu May 27 16:01:49 2021 +0200
Commit: Pedro Silva
CommitDate: Wed Jun 30 16:47:12 2021 +0200
Dialog: Import CSV: Improve layout
Remove extra padding from headers, they are already in bold no need
to add extra padding to emphasis hierarchy.
Do not use the first header to repeat what the dialog title already says
"Import", use instead "Character encoding" as the first header of the
first group (advantage: 1st dropdown does not need extra labeling)
The 2 radio buttons for Use/not use separators appear to be
grouping the elements underneath them. This is wrong, all those options
are actually related only to the user chooses to use separators.
- Convert those two radio buttons in one check button labeled "Use
separators"
- Fixes the confusion above mentioned
- Reduced the amount of items
- It does force the user to do trial and error in order to
understand
what is what
Change-Id: Iee63a6dd336d7c5a4e6f5ce8c845b32902e49a73
Signed-off-by: Pedro Pinto Silva
Signed-off-by: Mert Tumer
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116265
Tested-by: Jenkins CollaboraOffice
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118091
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 2d8efaefa3f3..af0c601c6010 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -295,14 +295,12 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent,
const OUString& aDatNa
, mcTextSep(ScAsciiOptions::cDefaultTextSep)
, meCall(eCall)
, mbDetectSpaceSep(eCall != SC_TEXTTOCOLUMNS)
-, mxFtCharSet(m_xBuilder->weld_label("textcharset"))
, mxLbCharSet(new
SvxTextEncodingBox(m_xBuilder->weld_combo_box("charset")))
, mxFtCustomLang(m_xBuilder->weld_label("textlanguage"))
, mxLbCustomLang(new
SvxLanguageBox(m_xBuilder->weld_combo_box("language")))
, mxFtRow(m_xBuilder->weld_label("textfromrow"))
, mxNfRow(m_xBuilder->weld_spin_button("fromrow"))
-, mxRbFixed(m_xBuilder->weld_radio_button("tofixedwidth"))
-, mxRbSeparated(m_xBuilder->weld_radio_button("toseparatedby"))
+, mxRbSeparated(m_xBuilder->weld_check_button("toseparatedby"))
, mxCkbTab(m_xBuilder->weld_check_button("tab"))
, mxCkbSemicolon(m_xBuilder->weld_check_button("semicolon"))
, mxCkbComma(m_xBuilder->weld_check_button("comma"))
@@ -370,7 +368,7 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent,
const OUString& aDatNa
if (bSkipEmptyCells)
mxCkbSkipEmptyCells->set_active(true);
if (bFixedWidth && !bIsTSV)
-mxRbFixed->set_active(true);
+mxRbSeparated->set_active(false);
if (nFromRow != 1)
mxNfRow->set_value(nFromRow);
@@ -500,10 +498,9 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent,
const OUString& aDatNa
mxTableBox->SetColTypeHdl( LINK( this, ScImportAsciiDlg, ColTypeHdl ) );
mxRbSeparated->connect_clicked( LINK( this, ScImportAsciiDlg, RbSepFixHdl
) );
-mxRbFixed->connect_clicked( LINK( this, ScImportAsciiDlg, RbSepFixHdl ) );
SetupSeparatorCtrls();
-RbSepFixHdl(*mxRbFixed);
+RbSepFixHdl( *mxRbSeparated );
UpdateVertical();
@@ -511,7 +508,6 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent,
const OUString& aDatNa
if (meCall == SC_TEXTTOCOLUMNS)
{
-mxFtCharSet->set_sensitive(false);
mxLbCharSet->set_sensitive(false);
mxFtCustomLang->set_sensitive(false);
mxLbCustomLang->set_active_id(LANGUAGE_SYSTEM);
@@ -551,7 +547,7 @@ bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString
&rText, sal_Unicode& r
return false;
bool bRet = true;
-bool bFixed = mxRbFixed->get_active();
+bool bFixed = !mxRbSeparated->get_active();
if (!mpRowPosArray)
mpRowPosArray.reset( new sal_uLong[ASCIIDLG_MAXROWS + 2] );
@@ -614,7 +610,7 @@ void ScImportAsciiDlg::GetOptions( ScAsciiOptions& rOpt )
rOpt.SetCharSet( meCharSet );
rOpt.SetCharSetSystem( mbCharSetSystem );
rOpt.SetLanguage(mxLbCustomLang->get_active_id());
-rOpt.SetFixedLen( mxRbFixed->get_active() );
+rOpt.SetFixedLen( !mxRbSeparated->get_active() );
rOpt.SetStartRo
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sc/source sc/uiconfig
sc/source/ui/dbgui/scuiasciiopt.cxx | 24 +++---
sc/source/ui/inc/scuiasciiopt.hxx |4 ---
sc/uiconfig/scalc/ui/textimportcsv.ui | 45 +++---
3 files changed, 16 insertions(+), 57 deletions(-)
New commits:
commit 3606632651f0b24c71f72cb7f59ad816170d08fd
Author: Pedro Pinto Silva
AuthorDate: Thu May 27 16:01:49 2021 +0200
Commit: Pedro Silva
CommitDate: Sat Jun 26 16:29:44 2021 +0200
Dialog: Import CSV: Improve layout
Remove extra padding from headers, they are already in bold no need
to add extra padding to emphasis hierarchy.
Do not use the first header to repeat what the dialog title already says
"Import", use instead "Character encoding" as the first header of the
first group (advantage: 1st dropdown does not need extra labeling)
The 2 radio buttons for Use/not use separators appear to be
grouping the elements underneath them. This is wrong, all those options
are actually related only to the user chooses to use separators.
- Convert those two radio buttons in one check button labeled "Use
separators"
- Fixes the confusion above mentioned
- Reduced the amount of items
- It does force the user to do trial and error in order to
understand
what is what
Change-Id: Iee63a6dd336d7c5a4e6f5ce8c845b32902e49a73
Signed-off-by: Pedro Pinto Silva
Signed-off-by: Mert Tumer
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116265
Tested-by: Jenkins CollaboraOffice
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 3a55f96b77b5..d665795b8224 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -288,14 +288,12 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent,
const OUString& aDatNa
, mcTextSep(ScAsciiOptions::cDefaultTextSep)
, meCall(eCall)
, mbDetectSpaceSep(eCall != SC_TEXTTOCOLUMNS)
-, mxFtCharSet(m_xBuilder->weld_label("textcharset"))
, mxLbCharSet(new
SvxTextEncodingBox(m_xBuilder->weld_combo_box("charset")))
, mxFtCustomLang(m_xBuilder->weld_label("textlanguage"))
, mxLbCustomLang(new
SvxLanguageBox(m_xBuilder->weld_combo_box("language")))
, mxFtRow(m_xBuilder->weld_label("textfromrow"))
, mxNfRow(m_xBuilder->weld_spin_button("fromrow"))
-, mxRbFixed(m_xBuilder->weld_radio_button("tofixedwidth"))
-, mxRbSeparated(m_xBuilder->weld_radio_button("toseparatedby"))
+, mxRbSeparated(m_xBuilder->weld_check_button("toseparatedby"))
, mxCkbTab(m_xBuilder->weld_check_button("tab"))
, mxCkbSemicolon(m_xBuilder->weld_check_button("semicolon"))
, mxCkbComma(m_xBuilder->weld_check_button("comma"))
@@ -363,7 +361,7 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent,
const OUString& aDatNa
if (bSkipEmptyCells)
mxCkbSkipEmptyCells->set_active(true);
if (bFixedWidth && !bIsTSV)
-mxRbFixed->set_active(true);
+mxRbSeparated->set_active(false);
if (nFromRow != 1)
mxNfRow->set_value(nFromRow);
@@ -488,10 +486,9 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent,
const OUString& aDatNa
mxTableBox->SetColTypeHdl( LINK( this, ScImportAsciiDlg, ColTypeHdl ) );
mxRbSeparated->connect_clicked( LINK( this, ScImportAsciiDlg, RbSepFixHdl
) );
-mxRbFixed->connect_clicked( LINK( this, ScImportAsciiDlg, RbSepFixHdl ) );
SetupSeparatorCtrls();
-RbSepFixHdl(*mxRbFixed);
+RbSepFixHdl( *mxRbSeparated );
UpdateVertical();
@@ -499,7 +496,6 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent,
const OUString& aDatNa
if (meCall == SC_TEXTTOCOLUMNS)
{
-mxFtCharSet->set_sensitive(false);
mxLbCharSet->set_sensitive(false);
mxFtCustomLang->set_sensitive(false);
mxLbCustomLang->set_active_id(LANGUAGE_SYSTEM);
@@ -539,7 +535,7 @@ bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString
&rText, sal_Unicode& r
return false;
bool bRet = true;
-bool bFixed = mxRbFixed->get_active();
+bool bFixed = !mxRbSeparated->get_active();
if (!mpRowPosArray)
mpRowPosArray.reset( new sal_uLong[ASCIIDLG_MAXROWS + 2] );
@@ -602,7 +598,7 @@ void ScImportAsciiDlg::GetOptions( ScAsciiOptions& rOpt )
rOpt.SetCharSet( meCharSet );
rOpt.SetCharSetSystem( mbCharSetSystem );
rOpt.SetLanguage(mxLbCustomLang->get_active_id());
-rOpt.SetFixedLen( mxRbFixed->get_active() );
+rOpt.SetFixedLen( !mxRbSeparated->get_active() );
rOpt.SetStartRow( mxNfRow->get_value() );
mxTableBox->FillColumnData( rOpt );
if( mxRbSe
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - cui/source icon-themes/galaxy
cui/source/dialogs/about.cxx| 12
icon-themes/galaxy/brand_cp/about_inverted.svg | 1452 +++
icon-themes/galaxy/brand_cp_snapshot/about_inverted.svg | 1535
3 files changed, 2991 insertions(+), 8 deletions(-)
New commits:
commit 8bc61249b5db50bbf8895bdca142e402b5fab496
Author: Pedro Pinto Silva
AuthorDate: Tue Jun 22 15:36:15 2021 +0200
Commit: Andras Timar
CommitDate: Wed Jun 23 12:38:38 2021 +0200
About: Darkmode: Use different about image
Fixes the use of the same about.svg even on darkmode
The way we are loading the svgs makes, when in presence of dark mode,
the rendering of svgs very very poor on those dialogs. It adds artifacts
, doesn't render gradients properly (at least when compared to
light mode) and adds white outlines everywhere.
Fix this by providing a simpler and more legible svgs to be use in
dark mode and load them only in that mode.
Signed-off-by: Pedro Pinto Silva
Change-Id: Ib1a95f7d7a2be62b9b001b4c811c22104cc01b2f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117663
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 6295f6dea6dd..fa44179142e8 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -93,13 +93,9 @@ AboutDialog::AboutDialog(weld::Window *pParent)
const tools::Long nWidth(m_pCopyrightLabel->get_preferred_size().getWidth());
BitmapEx aBackgroundBitmap;
- if (SfxApplication::loadBrandSvg(Application::GetSettings()
- .GetStyleSettings()
- .GetDialogColor()
- .IsDark()
- ? "shell/logo_inverted"
- : "shell/logo",
- aBackgroundBitmap, nWidth * 0.8)) {
+ bool bIsDark =
Application::GetSettings().GetStyleSettings().GetDialogColor().IsDark();
+
+ if (SfxApplication::loadBrandSvg(bIsDark ? "shell/logo_inverted" :
"shell/logo", aBackgroundBitmap, nWidth * 0.8)) {
ScopedVclPtr m_pVirDev =
m_pBrandImage->create_virtual_device();
m_pVirDev->SetOutputSizePixel(aBackgroundBitmap.GetSizePixel());
@@ -107,7 +103,7 @@ AboutDialog::AboutDialog(weld::Window *pParent)
m_pBrandImage->set_image(m_pVirDev.get());
m_pVirDev.disposeAndClear();
}
- if (SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, nWidth *
0.9)) {
+ if (SfxApplication::loadBrandSvg(bIsDark ? "shell/about_inverted" :
"shell/about", aBackgroundBitmap, nWidth * 0.9)) {
ScopedVclPtr m_pVirDev =
m_pAboutImage->create_virtual_device();
m_pVirDev->SetOutputSizePixel(aBackgroundBitmap.GetSizePixel());
diff --git a/icon-themes/galaxy/brand_cp/about_inverted.svg
b/icon-themes/galaxy/brand_cp/about_inverted.svg
new file mode 100644
index ..f03e022818f8
--- /dev/null
+++ b/icon-themes/galaxy/brand_cp/about_inverted.svg
@@ -0,0 +1,1452 @@
+
+http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ height="1340.7048"
+ viewBox="0 0 372.72406 354.72815"
+ width="1408.7208"
+ version="1.1"
[Libreoffice-commits] core.git: Changes to 'refs/tags/co-21.06.1-1'
Tag 'co-21.06.1-1' created by Andras Timar at 2021-06-23 09:48 + co-21.06.1-1 Changes since co-2021-branch-point-943: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - cui/uiconfig
cui/uiconfig/ui/aboutdialog.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0dda1ef42e835a0cbcc3de31103c1c190dfd44f2 Author: Pedro Pinto Silva AuthorDate: Mon Apr 26 11:14:35 2021 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Tue Apr 27 10:50:17 2021 +0200 AboutDialog: imgBrand: Fix alignment The imgBrand was "centered" aligned with the text bellow which was resulting in not only going against the dialog layout (2 sections) but was also appearing "false" centered aligned: - Left section: imgAbout - Right section: text left aligned - Right section: imgBrand was not left aligned and not centered aligned etheir (with the dialog) Fix: Left align imgBrand to be consistent with other elements in the same section. Signed-off-by: Pedro Pinto Silva Change-Id: I227f67863d5b6e951c498ee7acdfadc0fac75e6c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114648 Tested-by: Jenkins (cherry picked from commit 4e9df130a7f4084d1642a213792100187569900b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114606 Reviewed-by: Adolfo Jayme Barrientos diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui index 29fc5bc76ef2..ddd0c33a8503 100644 --- a/cui/uiconfig/ui/aboutdialog.ui +++ b/cui/uiconfig/ui/aboutdialog.ui @@ -79,7 +79,7 @@ True False -center +start center 24 24 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/aboutdialog.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4e9df130a7f4084d1642a213792100187569900b Author: Pedro Pinto Silva AuthorDate: Mon Apr 26 11:14:35 2021 +0200 Commit: Pedro Silva CommitDate: Mon Apr 26 16:24:59 2021 +0200 AboutDialog: imgBrand: Fix alignment The imgBrand was "centered" aligned with the text bellow which was resulting in not only going against the dialog layout (2 sections) but was also appearing "false" centered aligned: - Left section: imgAbout - Right section: text left aligned - Right section: imgBrand was not left aligned and not centered aligned etheir (with the dialog) Fix: Left align imgBrand to be consistent with other elements in the same section. Signed-off-by: Pedro Pinto Silva Change-Id: I227f67863d5b6e951c498ee7acdfadc0fac75e6c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114648 Tested-by: Jenkins diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui index 0121e26a2485..02103df42abc 100644 --- a/cui/uiconfig/ui/aboutdialog.ui +++ b/cui/uiconfig/ui/aboutdialog.ui @@ -78,7 +78,7 @@ True False -center +start center 24 24 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - cui/uiconfig icon-themes/galaxy
cui/uiconfig/ui/aboutdialog.ui| 209 +++--- icon-themes/galaxy/brand_cp/logo-sc.svg | 181 +++- icon-themes/galaxy/brand_cp/logo-sc_inverted.svg | 59 +++ icon-themes/galaxy/brand_cp/logo.svg | 178 +++ icon-themes/galaxy/brand_cp/logo_inverted.svg | 59 +++ icon-themes/galaxy/brand_cp_snapshot/about.svg| 144 ++--- icon-themes/galaxy/brand_cp_snapshot/logo-sc.svg | 181 +++- icon-themes/galaxy/brand_cp_snapshot/logo-sc_inverted.svg | 59 +++ icon-themes/galaxy/brand_cp_snapshot/logo.svg | 178 +++ icon-themes/galaxy/brand_cp_snapshot/logo_inverted.svg| 59 +++ 10 files changed, 629 insertions(+), 678 deletions(-) New commits: commit a6642e9b682ac245ff4700cb806e843d9afae53c Author: Pedro Pinto Silva AuthorDate: Fri Apr 23 19:46:22 2021 +0200 Commit: Pedro Silva CommitDate: Fri Apr 23 20:38:06 2021 +0200 [cp] Adjust About dialog, add missing assets - update assets - also add different image as imAbout for unstable snapshot - Dialog: Fix alignment: too many different alignments (graphic element on the left with text on the left and logo on top centered aligned with the text that is on the left). Force logo (imBrand) to be left aligned as well. Signed-off-by: Pedro Pinto Silva Change-Id: I369e8893d4ab9fb5f0ed3c39d157b5b9e7a7e952 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114566 Tested-by: Jenkins CollaboraOffice diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui index 29fc5bc76ef2..219ad8020ab9 100644 --- a/cui/uiconfig/ui/aboutdialog.ui +++ b/cui/uiconfig/ui/aboutdialog.ui @@ -1,44 +1,47 @@ - + True -False +False gtk-copy -False -6 +False +6 About %PRODUCTNAME False True -center-on-parent -dialog +center-on-parent +dialog + + + -False +False vertical 12 -False -12 +False +12 True -end +end gtk-close True -True -True -True -True +True +True +True +True True True -end +end 3 @@ -46,63 +49,61 @@ False True -end +end 0 - True -False +False True True -6 +6 True -False +False center center -12 -24 +12 +24 True True -0 -0 +0 +0 7 True -False -center +False +start center -24 -24 +24 +24 True True -1 -0 +1 +0 - True -False +False start -6 -12 +6 +12 True -False +False True Version: True @@ -112,14 +113,14 @@ -0 -0 +0 +0 True -False +False True Build: 0 @@ -128,14 +129,14 @@ -0 -1 +0 +1 True -False
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - icon-themes/galaxy
icon-themes/galaxy/brand_cp_snapshot/about.svg | 1463 +++
icon-themes/galaxy/brand_cp_snapshot/logo-sc.svg | 181 ++
icon-themes/galaxy/brand_cp_snapshot/logo.svg| 182 ++
3 files changed, 1826 insertions(+)
New commits:
commit e4adc0bea89db8a8dd5d5e7e4c75704b0be5519d
Author: Pedro Pinto Silva
AuthorDate: Wed Apr 21 21:00:28 2021 +0200
Commit: Andras Timar
CommitDate: Wed Apr 21 21:00:28 2021 +0200
[cp] Collabora Office snapshot logo and 'About' image
Change-Id: I8598a0432f294503f14afebf29270f24ec89f6eb
diff --git a/icon-themes/galaxy/brand_cp_snapshot/about.svg
b/icon-themes/galaxy/brand_cp_snapshot/about.svg
new file mode 100644
index ..1cb919f180aa
--- /dev/null
+++ b/icon-themes/galaxy/brand_cp_snapshot/about.svg
@@ -0,0 +1,1463 @@
+
+http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ height="1340.7048"
+ viewBox="0 0 372.72406 354.72815"
+ width="1408.7208"
+ version="1.1"
+ id="svg1334"
+ sodipodi:docname="about.svg"
+ inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+
+
+
+
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"; />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+!function(){const
t="<a rel="nofollow" href="http://www.w3.org/2000/svg",e="http://www.w3.org/1999/xlink",s="http://www.w3.org/1999/xhtml",r=2;if">http://www.w3.org/2000/svg",e="http://www.w3.org/1999/xlink",s="http://www.w3.org/1999/xhtml",r=2;if</a>(document.createElementNS(t,"meshgradient").x)return;const
n=(t,e,s,r)=>{let n=new x(.5*(e.x+s.x),.5*(e.y+s.y)),o=new
x(.5*(t.x+e.x),.5*(t.y+e.y)),i=new x(.5*(s.x+r.x),.5*(s.y+r.y)),a=new
x(.5*(n.x+o.x),.5*(n.y+o.y)),h=new x(.5*(n.x+i.x),.5*(n.y+i.y)),l=new
x(.5*(a.x+h.x),.5*(a.y+h.y));return[[t,o,a,l],[l,h,i,r]]},o=t=>{let
e=t[0].distSquared(t[1]),s=t[2].distSquared(t[3]),r=.25*t[0].distSquared(t[2]),n=.25*t[1].distSquared(t[3]),o=e>s?e:s,i=r>n?r:n;return
18*(o>i?o:i)},i=(t,e)=>Math.sqrt(t.distSquared(e)),a=(t,e)=>t.scale(2/3).add(e.scale(1/3)),h=t=>{let
e,s,r,n,o,i,a,h=new g;return t.match(/(\w+\(\s*[^)]+\))+/g).forEach(t=>{let
l=t.match(/[\w.-]+/g),d=l.shift();switch(d){case"translate":2===l.length?e=new
g(1,0,0,1,l[0],l[1]):(console.error("mesh.js: translate does not have 2
argum
ents!"),e=new
g(1,0,0,1,0,0)),h=h.append(e);break;case"scale":1===l.length?s=new
g(l[0],0,0,l[0],0,0):2===l.length?s=new
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - icon-themes/galaxy
icon-themes/galaxy/brand_cp/about.svg | 1463
icon-themes/galaxy/brand_cp/logo-sc.svg | 181 +++
icon-themes/galaxy/brand_cp/logo.svg| 182 +++
3 files changed, 1826 insertions(+)
New commits:
commit b1fe84365b700fdc9d42d844a49b7515e8d71fd7
Author: Pedro Pinto Silva
AuthorDate: Wed Apr 21 20:57:01 2021 +0200
Commit: Andras Timar
CommitDate: Wed Apr 21 20:57:01 2021 +0200
[cp] Collabora Office logo and 'About' image
Change-Id: I103343eb6da09bf5e58c2a2914887998deb37056
diff --git a/icon-themes/galaxy/brand_cp/about.svg
b/icon-themes/galaxy/brand_cp/about.svg
new file mode 100644
index ..1cb919f180aa
--- /dev/null
+++ b/icon-themes/galaxy/brand_cp/about.svg
@@ -0,0 +1,1463 @@
+
+http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ height="1340.7048"
+ viewBox="0 0 372.72406 354.72815"
+ width="1408.7208"
+ version="1.1"
+ id="svg1334"
+ sodipodi:docname="about.svg"
+ inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+
+
+
+
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"; />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+!function(){const
t="<a rel="nofollow" href="http://www.w3.org/2000/svg",e="http://www.w3.org/1999/xlink",s="http://www.w3.org/1999/xhtml",r=2;if">http://www.w3.org/2000/svg",e="http://www.w3.org/1999/xlink",s="http://www.w3.org/1999/xhtml",r=2;if</a>(document.createElementNS(t,"meshgradient").x)return;const
n=(t,e,s,r)=>{let n=new x(.5*(e.x+s.x),.5*(e.y+s.y)),o=new
x(.5*(t.x+e.x),.5*(t.y+e.y)),i=new x(.5*(s.x+r.x),.5*(s.y+r.y)),a=new
x(.5*(n.x+o.x),.5*(n.y+o.y)),h=new x(.5*(n.x+i.x),.5*(n.y+i.y)),l=new
x(.5*(a.x+h.x),.5*(a.y+h.y));return[[t,o,a,l],[l,h,i,r]]},o=t=>{let
e=t[0].distSquared(t[1]),s=t[2].distSquared(t[3]),r=.25*t[0].distSquared(t[2]),n=.25*t[1].distSquared(t[3]),o=e>s?e:s,i=r>n?r:n;return
18*(o>i?o:i)},i=(t,e)=>Math.sqrt(t.distSquared(e)),a=(t,e)=>t.scale(2/3).add(e.scale(1/3)),h=t=>{let
e,s,r,n,o,i,a,h=new g;return t.match(/(\w+\(\s*[^)]+\))+/g).forEach(t=>{let
l=t.match(/[\w.-]+/g),d=l.shift();switch(d){case"translate":2===l.length?e=new
g(1,0,0,1,l[0],l[1]):(console.error("mesh.js: translate does not have 2
argum
ents!"),e=new
g(1,0,0,1,0,0)),h=h.append(e);break;case"scale":1===l.length?s=new
g(l[0],0,0,l[0],0,0):2===l.length?s=new
g(l[0],0,0,l[1],0,0):(console.error("mesh.js
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 2 commits - icon-themes/galaxy instsetoo_native/CustomTarget_setup.mk sc/source
icon-themes/galaxy/brand_cp/intro-highres.png |binary
icon-themes/galaxy/brand_cp/intro.png |binary
icon-themes/galaxy/brand_cp_snapshot/intro-highres.png |binary
icon-themes/galaxy/brand_cp_snapshot/intro.png |binary
instsetoo_native/CustomTarget_setup.mk | 10 +-
sc/source/ui/app/inputwin.cxx | 12
sc/source/ui/inc/inputwin.hxx |1 +
7 files changed, 14 insertions(+), 9 deletions(-)
New commits:
commit 779808a7c3fb4cc47aeb21ba5919f57caffee35b
Author: Pedro Pinto Silva
AuthorDate: Wed Apr 21 17:17:48 2021 +0200
Commit: Andras Timar
CommitDate: Wed Apr 21 19:08:11 2021 +0200
[cp] Update splash screen
Change-Id: I661a9009dff0ad44b4c9bad3700c029f02631131
diff --git a/icon-themes/galaxy/brand_cp/intro-highres.png
b/icon-themes/galaxy/brand_cp/intro-highres.png
index 7891caaa8047..17724c32f2fa 100644
Binary files a/icon-themes/galaxy/brand_cp/intro-highres.png and
b/icon-themes/galaxy/brand_cp/intro-highres.png differ
diff --git a/icon-themes/galaxy/brand_cp/intro.png
b/icon-themes/galaxy/brand_cp/intro.png
index 7449b643cd95..4f0937b451e2 100644
Binary files a/icon-themes/galaxy/brand_cp/intro.png and
b/icon-themes/galaxy/brand_cp/intro.png differ
diff --git a/icon-themes/galaxy/brand_cp_snapshot/intro-highres.png
b/icon-themes/galaxy/brand_cp_snapshot/intro-highres.png
index 87cf05397686..59a87dac1f96 100644
Binary files a/icon-themes/galaxy/brand_cp_snapshot/intro-highres.png and
b/icon-themes/galaxy/brand_cp_snapshot/intro-highres.png differ
diff --git a/icon-themes/galaxy/brand_cp_snapshot/intro.png
b/icon-themes/galaxy/brand_cp_snapshot/intro.png
index fdfbda157a5f..2485dee83cfb 100644
Binary files a/icon-themes/galaxy/brand_cp_snapshot/intro.png and
b/icon-themes/galaxy/brand_cp_snapshot/intro.png differ
diff --git a/instsetoo_native/CustomTarget_setup.mk
b/instsetoo_native/CustomTarget_setup.mk
index e8c928d96fff..15802c36a754 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -135,11 +135,11 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'HideEula=1' \
&& echo 'Logo=1' \
&& echo 'NativeProgress=false' \
- && echo 'ProgressBarColor=0,0,0' \
- && echo 'ProgressFrameColor=102,102,102' \
- && echo 'ProgressPosition=26,235' \
- && echo 'ProgressSize=460,6' \
- && echo 'ProgressPositionHigh=46,212' \
+ && echo 'ProgressBarColor=80,73,153' \
+ && echo 'ProgressFrameColor=255,255,255' \
+ && echo 'ProgressPosition=268,106' \
+ && echo 'ProgressSize=212,4' \
+ && echo 'ProgressPositionHigh=268,137' \
&& echo 'ProgressSizeHigh=617,12' \
&& echo 'ProgressTextBaseline=230' \
&& echo 'ProgressTextColor=255,255,255' \
commit 9749c327c54762c14062941874b773b40cf76448
Author: Szymon Kłos
AuthorDate: Tue Apr 20 09:08:33 2021 +0200
Commit: Andras Timar
CommitDate: Wed Apr 21 19:08:11 2021 +0200
Fix early return in ScInputWindow::setPosSizePixel
change: Early return from ScInputWindow::setPosSizePixel() if no-op
0ad467d9abd27197bc5f7f22db5a25b3246e6808
was too agressive optimization causing input bar not
showing in the online and blocking the fix:
online: update calc inputbar position on change
09afa34955d76419ebe8f4d15780d801f95256ca
Sending message was originally introduced to update
information about position in the online when notebookbar
become visible (what causes input bar position change).
Send it only when vertical position changed.
Change-Id: Id7a231dabd20efe38094f31156f4f17f7d5a478e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114318
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index cfd01f1d962f..6c6fd824e8e6 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -159,7 +159,8 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, const
SfxBindings* pBind ) :
mpViewShell ( nullptr ),
mnMaxY (0),
bIsOkCancelMode ( false ),
-bInResize ( false )
+bInResize ( false ),
+nOldOutOffYPixel( GetOutOffYPixel() )
{
// #i73615# don't rely on SfxViewShell::Current while constructing the
input line
// (also for GetInputHdl belo
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/macroselectordialog.ui |4 1 file changed, 4 deletions(-) New commits: commit da698585ea981e7bf210f3d7d52cdcf3f196a7bf Author: Pedro Pinto Silva AuthorDate: Tue Mar 9 13:50:42 2021 +0100 Commit: Pedro Silva CommitDate: Tue Apr 13 12:19:41 2021 +0200 Macro Selector dialog: Remove extra padding and shadow + Remove extra left padding so everything is properly aligned - No need for extra padding to convey hierarchy we already have headings and vertical space to convey grouping + Description: Remove extra shadow from the scrolledwindow - To avoid giving the fall sense of interactivity since it's meant to be solely an element to display text and an outline around can suggest waiting for some input/selection (cherry picked from commit f9c40cad1eefb4f6329dfd229ba18507c8083649 with resolved conflicts, picking only relevant changes) Signed-off-by: Pedro Pinto Silva Change-Id: Ibbfac39cc46da9c9e91cdaca1a97c84d8a3cd8fd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112203 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113893 Tested-by: Jenkins diff --git a/cui/uiconfig/ui/macroselectordialog.ui b/cui/uiconfig/ui/macroselectordialog.ui index 4ebf9ba0731c..7756c141c052 100644 --- a/cui/uiconfig/ui/macroselectordialog.ui +++ b/cui/uiconfig/ui/macroselectordialog.ui @@ -181,7 +181,6 @@ True True in -12 6 @@ -277,7 +276,6 @@ True True in -12 6 @@ -374,8 +372,6 @@ True True True -in -12 6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - cui/uiconfig
cui/uiconfig/ui/macroselectordialog.ui |5 - 1 file changed, 5 deletions(-) New commits: commit f9c40cad1eefb4f6329dfd229ba18507c8083649 Author: Pedro Pinto Silva AuthorDate: Tue Mar 9 13:50:42 2021 +0100 Commit: Szymon Kłos CommitDate: Tue Mar 9 15:55:49 2021 +0100 Macro Selector dialog: Remove extra padding and shadow + Remove extra left padding so everything is properly aligned - No need for extra padding to convey hierarchy we already have headings and vertical space to convey grouping + Description: Remove extra shadow from the scrolledwindow - To avoid giving the fall sense of interactivity since it's meant to be solely an element to display text and an outline around can suggest waiting for some input/selection Signed-off-by: Pedro Pinto Silva Change-Id: Ibbfac39cc46da9c9e91cdaca1a97c84d8a3cd8fd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112203 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos diff --git a/cui/uiconfig/ui/macroselectordialog.ui b/cui/uiconfig/ui/macroselectordialog.ui index edc9fad32d9e..a04ebbd37dc8 100644 --- a/cui/uiconfig/ui/macroselectordialog.ui +++ b/cui/uiconfig/ui/macroselectordialog.ui @@ -182,7 +182,6 @@ True False 6 -12 True @@ -201,7 +200,6 @@ liststore1 False 1 -True True @@ -285,7 +283,6 @@ True False 6 -12 True @@ -388,7 +385,6 @@ True False 6 -12 100 @@ -396,7 +392,6 @@ True True True -in True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css
loleaflet/css/leaflet.css |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 76e1b68837615020b0ba8ef8a2f24daaf0b30d2c
Author: Pedro Pinto Silva
AuthorDate: Tue Sep 22 16:02:40 2020 +0200
Commit: Pedro Silva
CommitDate: Wed Sep 23 16:26: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
(cherry picked from commit f85c0c6a11b1389873635b763dbc9f86057d7068)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103192
Tested-by: Pedro Silva
diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css
index d8f1217ce..55f47bc1c 100644
--- a/loleaflet/css/leaflet.css
+++ b/loleaflet/css/leaflet.css
@@ -833,7 +833,9 @@ input.clipboard {
.loleaflet-ruler-breakcontainer {
height: 100%;
position: absolute;
- }
+ display: flex;
+ align-items: center;
+}
.loleaflet-ruler-tabstopcontainer {
height: 100%;
@@ -894,7 +896,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/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/images
loleaflet/images/lc_rotation.svg |1 + 1 file changed, 1 insertion(+) New commits: commit 220b4498f19bc680bea84927afb4b2786898fef4 Author: Pedro Pinto Silva AuthorDate: Mon Sep 21 15:38:44 2020 +0200 Commit: Pedro Silva CommitDate: Mon Sep 21 16:24:53 2020 +0200 Mobile: add missing rotation icon Change-Id: I380c2a21433ed1cb18fe059f70713028503cf966 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103112 Tested-by: Jenkins CollaboraOffice Reviewed-by: Pedro Silva diff --git a/loleaflet/images/lc_rotation.svg b/loleaflet/images/lc_rotation.svg new file mode 100644 index 0..6f57e10fe --- /dev/null +++ b/loleaflet/images/lc_rotation.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/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: Branch 'distro/collabora/co-4-2' - loleaflet/src
loleaflet/src/control/Control.Menubar.js |7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
New commits:
commit f29a261ba8e3fa28973bb5660fe90583deb52724
Author: Pedro Pinto Silva
AuthorDate: Mon Sep 14 16:03:10 2020 +0200
Commit: Pedro Silva
CommitDate: Tue Sep 15 16:17:58 2020 +0200
Mobile: Menu bar: Fix absent document-header on read-only documents
Change-Id: Icd23f8236cfd7d72335b0cc295d62fb979090512
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102645
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 2800a800f..a97ba8430 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -854,11 +854,8 @@ L.Control.Menubar = L.Control.extend({
});
$('#main-menu').attr('tabindex', 0);
- // The _createFileIcon function shows the Collabora logo in the
iOS app case, no
- // need to delay that until the document has been made editable.
- if (window.ThisIsTheiOSApp ||
!this._map.isPermissionReadOnly()) {
- this._createFileIcon();
- }
+
+ this._createFileIcon();
},
_onStyleMenu: function (e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.JSDialogBuilder.js |1 +
1 file changed, 1 insertion(+)
New commits:
commit fec0b314afcab140db51629469b10bd0c10a9757
Author: Pedro Pinto Silva
AuthorDate: Tue Sep 15 12:52:53 2020 +0200
Commit: Pedro Silva
CommitDate: Tue Sep 15 15:39:36 2020 +0200
Mobile: Set icon for combobox rotation
Change-Id: Id063188781165d8724cbe4b04ec7f9c5b767e37c
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102730
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index f6679381c..b3518afd4 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -424,6 +424,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
case 'masterslide':
case 'SdTableDesignPanel':
case 'ChartTypePanel':
+ case 'rotation':
iconURL = L.LOUtil.getImageURL('lc_'+
sectionTitle.id.toLowerCase() +'.svg');
break;
}
___
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 |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-wi
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Menubar.js |7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 661852ab6fec9c873dfee383d6f08b020223155d
Author: Pedro Pinto Silva
AuthorDate: Mon Sep 14 16:03:10 2020 +0200
Commit: Pedro Silva
CommitDate: Tue Sep 15 10:27:47 2020 +0200
Mobile: Menu bar: Fix absent document-header on read-only documents
Change-Id: Icd23f8236cfd7d72335b0cc295d62fb979090512
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102679
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index bcd427865..68997aae5 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -876,11 +876,8 @@ L.Control.Menubar = L.Control.extend({
});
$('#main-menu').attr('tabindex', 0);
- // The _createFileIcon function shows the Collabora logo in the
iOS app case, no
- // need to delay that until the document has been made editable.
- if (window.ThisIsTheiOSApp ||
!this._map.isPermissionReadOnly()) {
- this._createFileIcon();
- }
+
+ this._createFileIcon();
},
_onStyleMenu: function (e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src
loleaflet/src/control/Control.JSDialogBuilder.js |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 9f9fdfbb9c32570d07ce58986279dbcc64501bd8
Author: Pedro Pinto Silva
AuthorDate: Fri Sep 11 16:49:51 2020 +0200
Commit: Pedro Silva
CommitDate: Mon Sep 14 14:37:04 2020 +0200
Add missing class (selected) to _unoToolButton
Change-Id: Ia7a5cdb840240ffbbe3f73c23264750b5d8e9d82
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102486
Reviewed-by: Pranam Lashkari
Tested-by: Pedro Silva
Tested-by: Jenkins CollaboraOffice
(cherry picked from commit 8a20b74e36cc12f24b92105f8b20929d9f172bca)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102637
Reviewed-by: Pedro Silva
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 87fe1060d..e0b2f17be 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1648,10 +1648,14 @@ L.Control.JSDialogBuilder = L.Control.extend({
var items = builder.map['stateChangeHandler'];
var state = items.getItemValue(data.command);
- if (state && state === 'true')
+ if (state && state === 'true') {
$(button).addClass('selected');
- else
+ $(div).addClass('selected');
+ }
+ else {
$(button).removeClass('selected');
+ $(div).removeClass('selected');
+ }
if (state && state === 'disabled')
$(div).addClass('disabled');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.JSDialogBuilder.js |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 8a20b74e36cc12f24b92105f8b20929d9f172bca
Author: Pedro Pinto Silva
AuthorDate: Fri Sep 11 16:49:51 2020 +0200
Commit: Pedro Silva
CommitDate: Fri Sep 11 18:44:23 2020 +0200
Add missing class (selected) to _unoToolButton
Change-Id: Ia7a5cdb840240ffbbe3f73c23264750b5d8e9d82
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102486
Reviewed-by: Pranam Lashkari
Tested-by: Pedro Silva
Tested-by: Jenkins CollaboraOffice
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 8be8a1603..f6679381c 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1693,10 +1693,14 @@ L.Control.JSDialogBuilder = L.Control.extend({
var items = builder.map['stateChangeHandler'];
var state = items.getItemValue(data.command);
- if (state && state === 'true')
+ if (state && state === 'true') {
$(button).addClass('selected');
- else
+ $(div).addClass('selected');
+ }
+ else {
$(button).removeClass('selected');
+ $(div).removeClass('selected');
+ }
if (state && state === 'disabled')
$(div).addClass('disabled');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src
loleaflet/src/control/Control.JSDialogBuilder.js |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit a201d0f5903032d02b5a3bfc034b278643307688
Author: Pedro Pinto Silva
AuthorDate: Fri Sep 11 11:07:28 2020 +0200
Commit: Andras Timar
CommitDate: Fri Sep 11 13:46:14 2020 +0200
Mobile: set icon for watermark transparency spinfield
Reuse lc_settransparency icon used on objects instead of duplicating file
Change-Id: Iec2393aa43edcf5907f3ae401811414cdb4682f3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102421
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 1422a71b6..87fe1060d 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -46,6 +46,8 @@ L.Control.JSDialogBuilder = L.Control.extend({
builder._fixedtextControl(parentContainer,
fixedTextData, builder);
}
+ console.debug('baseSpinField: ' + data.id);
+
var div = L.DomUtil.create('div', 'spinfieldcontainer',
parentContainer);
div.id = data.id;
controls['container'] = div;
@@ -53,7 +55,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
var commandName = data.id ?
data.id.substring('.uno:'.length) : data.id;
if (commandName && commandName.length &&
L.LOUtil.existsIconForCommand(commandName, builder.map.getDocType())) {
var image = L.DomUtil.create('img',
'spinfieldimage', div);
- var icon = builder._createIconURL(data.id);
+ var icon = (data.id === 'Transparency') ?
builder._createIconURL('settransparency') : builder._createIconURL(data.id);
image.src = icon;
icon.alt = '';
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.JSDialogBuilder.js |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit adf8961cd376f5d5cf7424d0c89752a9663d6a42
Author: Pedro Pinto Silva
AuthorDate: Fri Sep 11 11:07:28 2020 +0200
Commit: Pedro Silva
CommitDate: Fri Sep 11 12:38:27 2020 +0200
Mobile: set icon for watermark transparency spinfield
Reuse lc_settransparency icon used on objects instead of duplicating file
Change-Id: Iec2393aa43edcf5907f3ae401811414cdb4682f3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102450
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 044d852e5..8be8a1603 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -46,6 +46,8 @@ L.Control.JSDialogBuilder = L.Control.extend({
builder._fixedtextControl(parentContainer,
fixedTextData, builder);
}
+ console.debug('baseSpinField: ' + data.id);
+
var div = L.DomUtil.create('div', 'spinfieldcontainer',
parentContainer);
div.id = data.id;
controls['container'] = div;
@@ -53,7 +55,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
var commandName = data.id ?
data.id.substring('.uno:'.length) : data.id;
if (commandName && commandName.length &&
L.LOUtil.existsIconForCommand(commandName, builder.map.getDocType())) {
var image = L.DomUtil.create('img',
'spinfieldimage', div);
- var icon = builder._createIconURL(data.id);
+ var icon = (data.id === 'Transparency') ?
builder._createIconURL('settransparency') : builder._createIconURL(data.id);
image.src = icon;
icon.alt = '';
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.JSDialogBuilder.js | 26 +++
1 file changed, 17 insertions(+), 9 deletions(-)
New commits:
commit e8b829f190fc89e3ffa7ef726f8a57b3531a4acb
Author: Pedro Pinto Silva
AuthorDate: Thu Sep 10 17:56:45 2020 +0200
Commit: Pedro Silva
CommitDate: Fri Sep 11 09:32:11 2020 +0200
Mobile: Fix missing img element for chart type and
opt for switch for better legibility and perhaps better performance
Change-Id: I629f9f8579b89e4123757c05292bc1223f226aa3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102395
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index a0e5a39f8..044d852e5 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -238,7 +238,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
(window.notebookbarId !== undefined ? window.notebookbarId :
(window.sidebarId !== undefined ? window.sidebarId : -1));
var message = 'dialogevent ' + windowId
- + ' {\"id\":\"' + object.id
+ + ' {\"id\":\"' + object.id
+ '\", \"cmd\": \"' + eventType
+ '\", \"data\": \"' + data
+ '\", \"type\": \"' + objectType + '\"}';
@@ -415,8 +415,16 @@ L.Control.JSDialogBuilder = L.Control.extend({
var leftDiv = L.DomUtil.create('div', 'ui-header-left',
sectionTitle);
var titleClass = '';
console.debug('sectionTitle.id' + sectionTitle.id);
- if (sectionTitle.id === 'paperformat' || sectionTitle.id ===
'orientation' || sectionTitle.id === 'masterslide' || sectionTitle.id ===
'SdTableDesignPanel')
+ switch (sectionTitle.id)
+ {
+ case 'paperformat':
+ case 'orientation':
+ case 'masterslide':
+ case 'SdTableDesignPanel':
+ case 'ChartTypePanel':
iconURL = L.LOUtil.getImageURL('lc_'+
sectionTitle.id.toLowerCase() +'.svg');
+ break;
+ }
if (iconURL) {
var icon = L.DomUtil.create('img', 'menu-entry-icon',
leftDiv);
icon.src = iconURL;
@@ -556,10 +564,10 @@ L.Control.JSDialogBuilder = L.Control.extend({
if (commandName ===
'LanguageStatus?Language:string=Paragraph_RESET_LANGUAGES')
return 'paragraphlanugagedefault';
if ((this.map.getDocType() === 'spreadsheet' ||
this.map.getDocType() === 'presentation') &&
-commandName.indexOf('LanguageStatus?Language:string=Paragraph_')
!== -1)
+
commandName.indexOf('LanguageStatus?Language:string=Paragraph_') !== -1)
return 'paragraphlanugagesuggestion';
if ((this.map.getDocType() === 'spreadsheet' ||
this.map.getDocType() === 'presentation') &&
-commandName.indexOf('LanguageStatus?Language:string=Current_') !==
-1)
+
commandName.indexOf('LanguageStatus?Language:string=Current_') !== -1)
return 'selectionlanugagesuggestion';
return commandName.toLowerCase();
},
@@ -2170,8 +2178,8 @@ L.Control.JSDialogBuilder = L.Control.extend({
} else if (!builder.map._clip ||
!builder.map._clip.filterExecCopyPaste(data.command)) {
// Header / footer is already inserted.
if
((data.command.startsWith('.uno:InsertPageHeader') ||
-
data.command.startsWith('.uno:InsertPageFooter')) &&
- data.checked && data.checked ===
true) {
+
data.command.startsWith('.uno:InsertPageFooter')) &&
+ data.checked &&
data.checked
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - 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 5c4a6a1dc6baa4f313475005fc4e3db68b4b0cd2
Author: Pedro Pinto Silva
AuthorDate: Thu Sep 10 15:05:17 2020 +0200
Commit: Pedro Silva
CommitDate: Fri Sep 11 09:31:50 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
(cherry picked from commit d42e41ce04a80a798053260c229ec159e20307ef)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102414
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 599e406de..8dfe1f9db 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -53,7 +53,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/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: Branch 'distro/collabora/co-4-2' - loleaflet/css
loleaflet/css/loleaflet.css |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 13a96f7cedbd3ee54be1a9187a4ec80643a56c24
Author: Pedro Pinto Silva
AuthorDate: Tue Sep 8 13:38:14 2020 +0200
Commit: Pedro Silva
CommitDate: Wed Sep 9 17:00:47 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
(cherry picked from commit 79d99156dc9a6851b50ef04e96a73894c8ffb19a)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102303
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 75b4a53a2..599e406de 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -53,7 +53,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: Branch 'distro/collabora/co-4-2' - 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 612f3d1ab497649c1ab9a974671e704847fd4bcb
Author: Pedro Pinto Silva
AuthorDate: Mon Sep 7 15:51:30 2020 +0200
Commit: Pedro Silva
CommitDate: Wed Sep 9 17:00:08 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
(cherry picked from commit 80542f6cf9646c89de54b6c7240ab6edbd7ba0f3)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102302
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index d7f0d95fa..3329a216e 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 2e75ea3a7..f2d8a1bae 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/.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 {
- bac
[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;
-}
-#doc
[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/images
loleaflet/images/lc_formatlegend.svg |1 + 1 file changed, 1 insertion(+) New commits: commit 233be8371417853ab2db2b16232f774b9b1c42d2 Author: Pedro Pinto Silva AuthorDate: Fri Sep 4 16:00:51 2020 +0200 Commit: Pedro Silva CommitDate: Fri Sep 4 16:34:21 2020 +0200 Mobile: Add missing formatlegend icon to the context menu Change-Id: I1acfcefbec8cce0f96a28062a0a1d3d105253ec8 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102050 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice Reviewed-by: Pedro Silva diff --git a/loleaflet/images/lc_formatlegend.svg b/loleaflet/images/lc_formatlegend.svg new file mode 100644 index 0..0f56e7d51 --- /dev/null +++ b/loleaflet/images/lc_formatlegend.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: Branch 'distro/collabora/co-4-2' - loleaflet/images
loleaflet/images/lc_formatlegend.svg |1 + 1 file changed, 1 insertion(+) New commits: commit 875d13dfb0ef349b9a27b72122a8acbbf3691f27 Author: Pedro Pinto Silva AuthorDate: Fri Sep 4 16:00:51 2020 +0200 Commit: Pedro Silva CommitDate: Fri Sep 4 16:34:34 2020 +0200 Mobile: Add missing formatlegend icon to the context menu Change-Id: I1acfcefbec8cce0f96a28062a0a1d3d105253ec8 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101968 Tested-by: Jenkins CollaboraOffice Reviewed-by: Pedro Silva diff --git a/loleaflet/images/lc_formatlegend.svg b/loleaflet/images/lc_formatlegend.svg new file mode 100644 index 0..0f56e7d51 --- /dev/null +++ b/loleaflet/images/lc_formatlegend.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/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: Branch 'distro/collabora/co-4-2' - loleaflet/src
loleaflet/src/control/Control.JSDialogBuilder.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 638c91af677d2034f31815d56840a460e495b790
Author: Pedro Pinto Silva
AuthorDate: Wed Sep 2 16:25:25 2020 +0200
Commit: Andras Timar
CommitDate: Wed Sep 2 17:24:32 2020 +0200
Mobile: menu entries with icon missing extra class
.flex-fullwidth
This was causing elements (without arrow) in the insert mobilewizard
to have its labels misaligned
Change-Id: I0472a5d39a2691b48d7920a75821447622cc1801
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101873
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index a925b0a1f..1422a71b6 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -2104,7 +2104,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
var titleSpan = L.DomUtil.create('span', '', menuEntry);
titleSpan.innerHTML = title;
- var paddingClass = icon ? 'menu-entry-with-icon' :
'menu-entry-no-icon';
+ var paddingClass = icon ? 'menu-entry-with-icon flex-fullwidth'
: 'menu-entry-no-icon';
L.DomUtil.addClass(titleSpan, paddingClass);
if (builder.wizard) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.JSDialogBuilder.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 337ce6373f66838b73e4b53bd10ca2ecb276f90d
Author: Pedro Pinto Silva
AuthorDate: Wed Sep 2 16:25:25 2020 +0200
Commit: Pedro Silva
CommitDate: Wed Sep 2 16:57:19 2020 +0200
Mobile: menu entries with icon missing extra class
.flex-fullwidth
This was causing elements (without arrow) in the insert mobilewizard
to have its labels misaligned
Change-Id: I0472a5d39a2691b48d7920a75821447622cc1801
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101937
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index ab9056aef..c4323d791 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -2138,7 +2138,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
var titleSpan = L.DomUtil.create('span', '', menuEntry);
titleSpan.innerHTML = title;
- var paddingClass = icon ? 'menu-entry-with-icon' :
'menu-entry-no-icon';
+ var paddingClass = icon ? 'menu-entry-with-icon flex-fullwidth'
: 'menu-entry-no-icon';
L.DomUtil.addClass(titleSpan, paddingClass);
if (builder.wizard) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css
loleaflet/css/toolbar.css |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0080eb76bc268730173a1c3fa8710bcfb9b28cfc
Author: Pedro Pinto Silva
AuthorDate: Wed Sep 2 15:24:00 2020 +0200
Commit: Pedro Silva
CommitDate: Wed Sep 2 15:52:18 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/+/101872
Tested-by: Pedro Silva
Reviewed-by: Pedro Silva
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index f8b720a61..b5c69c9f8 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/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: Branch 'distro/collabora/co-4-2' - 2 commits - loleaflet/css loleaflet/images
loleaflet/css/mobilewizard.css |1 +
loleaflet/css/toolbar.css|2 +-
loleaflet/images/lc_tableautofitmenu.svg |1 +
3 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 041d4d4d16c0f700f5e2be6d0841993559808cc2
Author: Pedro Pinto Silva
AuthorDate: Thu Aug 27 15:49:06 2020 +0200
Commit: Pedro Silva
CommitDate: Tue Sep 1 17:32:00 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
(cherry picked from commit a1b73c4001e007a33b3f1fb86ab9df15d3fb2e82)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101856
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index ace890f29..72350c49d 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -314,6 +314,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
commit 765d71be8601a0a1a023c93b44760e92d30e2e09
Author: Pedro Pinto Silva
AuthorDate: Wed Aug 26 14:27:04 2020 +0200
Commit: Pedro Silva
CommitDate: Tue Sep 1 17:31:51 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
(cherry picked from commit 48bb33748b9fb115be7641a85676ca67a5783807)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101855
Tested-by: Jenkins CollaboraOffice
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index d1c11613b..5f87541ee 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -856,7 +856,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: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/html loleaflet/src
loleaflet/css/menubar.css | 16
loleaflet/css/toolbar.css | 17 ++---
loleaflet/html/loleaflet.html.m4 |2 +-
loleaflet/src/control/Control.DocumentNameInput.js |2 +-
4 files changed, 24 insertions(+), 13 deletions(-)
New commits:
commit 65bef93e5e0ff4274a97fa42931d7443fa2e5d65
Author: Pedro Pinto Silva
AuthorDate: Thu Aug 20 12:35:10 2020 +0200
Commit: Pedro Silva
CommitDate: Tue Sep 1 16:00:12 2020 +0200
Document Name Input: make it flexible (dynamic width)
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
(cherry picked from commit 1c4dcc1f587876b6c3880d3b0e8e7b593eeb26b6)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101451
diff --git a/loleaflet/css/menubar.css b/loleaflet/css/menubar.css
index cab048379..0b3f90eac 100644
--- a/loleaflet/css/menubar.css
+++ b/loleaflet/css/menubar.css
@@ -27,19 +27,27 @@
}
.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 {
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index b6619f968..d1c11613b 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -153,10 +153,9 @@ w2ui-toolbar {
visibility: visible;
width: 24px;
height: 18px;
- position: absolute;
- right: 10px;
+ position: relative;
+ right: 24px;
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;
@@ -167,9 +166,12 @@ w2ui-toolbar {
}
#document-name-input {
- font-size: 16px;
- border: 1px solid transparent;
- background-color: transparent;
+ font-size: 16px;
+ border: 1px solid transparent;
+ background-color: transparent;
+ border-radius: 1px;
+ padding: 0px 2px;
+ transition: 0.5s;
}
#document-name-input.editable {
@@ -181,12 +183,13 @@ w2ui-toolbar {
text-overflow:ellipsis;
height: 18px;
}
-
#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;
+ outline: none;
+ flex: 2;
}
#document-name-input.editable:hover:not(:focus) {
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 8724b4394..9f42ed9f9 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -145,8 +145,8 @@ m4_ifelse(MOBILEAPP,[true],
-
+
diff --git a/loleaflet/src/control/Control.DocumentNameInput.js
b/loleaflet/src/control/Control.DocumentNameInput.js
index 16dd68dbd..0a79ff736 100644
--- a/loleaflet/src/control/Control.DocumentNameInput.js
+++ b/loleaflet/src/control/Control.DocumentNameInput.js
@@ -129,7 +129,7 @@ L.Control.DocumentNameInput = L.Control.extend({
var documentNameInput = $('#document-name-input');
var content = (typeof tail === 'string') ?
documentNameInput.val() + tail : documentNameInput.val();
var font = documentNameInput.css('font');
- var textWidth = L.getTextWidth(content, font) + 10;
+ var textWidth = L.getTextWidth(content, font) + 24;
var maxWidth = this._getMaxAvailableWidth();
//console.log('_setNameInputWidth: textWidth: ' + textWidth +
', maxWidth: ' + maxWidth);
textWidth = Math.min(textWidth, maxWidth);
___
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: Branch 'distro/collabora/co-4-2' - loleaflet/css
loleaflet/css/toolbar.css | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 4fe32b6d640d7ff0f7cb9e198c13eb8a741f7dc3
Author: Pedro Pinto Silva
AuthorDate: Tue Jul 14 11:47:17 2020 +0200
Commit: Pedro Silva
CommitDate: Tue Sep 1 10:21:32 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
(cherry picked from commit c1730cf7c1d3f84141f33e7ee516ab7a8cad05f6)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101685
Tested-by: Jenkins CollaboraOffice
Tested-by: Pedro Silva
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index aed7e7e2b..d1f9c3637 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,10 +175,14 @@ 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%;
+<<<<<<< HEAD (dcbaeb loleaflet: Slides preview section improvements.)
+===
+ overflow: hidden;
+ text-overflow:ellipsis;
+ height: 18px;
+>>>>>>> CHANGE (c1730c Desktop: Document name input and pencil: remove unused
style)
}
#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/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/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: Branch 'distro/collabora/co-4-2' - loleaflet/css
loleaflet/css/device-mobile.css |3 +++
loleaflet/css/device-tablet.css |3 +++
2 files changed, 6 insertions(+)
New commits:
commit 8b171655748b5e3a28ed842c424eb349822e39c9
Author: Pedro Pinto Silva
AuthorDate: Wed Aug 26 09:50:43 2020 +0200
Commit: Andras Timar
CommitDate: Wed Aug 26 11:47:24 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
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101357
Tested-by: Jenkins CollaboraOffice
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index ba7c0cb76..c6f8e7d5f 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: 150px;
border: 4px solid #f0f0f0 !important;
diff --git a/loleaflet/css/device-tablet.css b/loleaflet/css/device-tablet.css
index 519300405..07e5731b8 100644
--- a/loleaflet/css/device-tablet.css
+++ b/loleaflet/css/device-tablet.css
@@ -35,3 +35,6 @@
.main-nav {
margin: 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: Branch 'distro/collabora/co-4-2' - loleaflet/images
loleaflet/images/lc_hidenote.svg |4 loleaflet/images/lc_shownote.svg |3 +++ 2 files changed, 7 insertions(+) New commits: commit c2927c2af5b4a9f2b3001aa7dd24c394fd904113 Author: Pedro Pinto Silva AuthorDate: Wed Aug 26 10:54:48 2020 +0200 Commit: Andras Timar CommitDate: Wed Aug 26 11:00:42 2020 +0200 Mobile: Context menu: add missing assets (show/hide note) Change-Id: I231c8ae917c9c3b694477c37e276d0b4dd97f6f2 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101389 Tested-by: Pedro Silva Reviewed-by: Pedro Silva (cherry picked from commit 43543a7437ae85d0aa2fb18b9f09679c14d0677f) Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101358 Tested-by: Andras Timar Reviewed-by: Andras Timar diff --git a/loleaflet/images/lc_hidenote.svg b/loleaflet/images/lc_hidenote.svg new file mode 100644 index 0..737b60742 --- /dev/null +++ b/loleaflet/images/lc_hidenote.svg @@ -0,0 +1,4 @@ +http://www.w3.org/2000/svg";> + + + diff --git a/loleaflet/images/lc_shownote.svg b/loleaflet/images/lc_shownote.svg new file mode 100644 index 0..8e9fb4a64 --- /dev/null +++ b/loleaflet/images/lc_shownote.svg @@ -0,0 +1,3 @@ +http://www.w3.org/2000/svg";> + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/images
loleaflet/images/lc_hidenote.svg |4 loleaflet/images/lc_shownote.svg |3 +++ 2 files changed, 7 insertions(+) New commits: commit 43543a7437ae85d0aa2fb18b9f09679c14d0677f Author: Pedro Pinto Silva AuthorDate: Wed Aug 26 10:54:48 2020 +0200 Commit: Pedro Silva CommitDate: Wed Aug 26 10:58:54 2020 +0200 Mobile: Context menu: add missing assets (show/hide note) Change-Id: I231c8ae917c9c3b694477c37e276d0b4dd97f6f2 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101389 Tested-by: Pedro Silva Reviewed-by: Pedro Silva diff --git a/loleaflet/images/lc_hidenote.svg b/loleaflet/images/lc_hidenote.svg new file mode 100644 index 0..737b60742 --- /dev/null +++ b/loleaflet/images/lc_hidenote.svg @@ -0,0 +1,4 @@ +http://www.w3.org/2000/svg";> + + + diff --git a/loleaflet/images/lc_shownote.svg b/loleaflet/images/lc_shownote.svg new file mode 100644 index 0..8e9fb4a64 --- /dev/null +++ b/loleaflet/images/lc_shownote.svg @@ -0,0 +1,3 @@ +http://www.w3.org/2000/svg";> + + ___ 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 |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/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/notebo
[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/images
loleaflet/images/lc_calculate.svg|1 loleaflet/images/lc_datafilterhideautofilter.svg | 90 + loleaflet/images/lc_datafilterstandardfilter.svg |1 loleaflet/images/lc_menubar.svg | 98 +++ loleaflet/images/lc_validation.svg | 18 5 files changed, 208 insertions(+) New commits: commit 33fcdbb6245c17bc14501ea681b23d786acbf7ea Author: Pedro Pinto Silva AuthorDate: Wed Aug 5 11:09:03 2020 +0200 Commit: Pedro Silva CommitDate: Wed Aug 5 14:04:24 2020 +0200 Notebookbar: Calc: Data Tab: add icons Change-Id: I9286dd25dc9dff45a3a588ba5576a49c47edae4d Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100155 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice Reviewed-by: Pedro Silva diff --git a/loleaflet/images/lc_calculate.svg b/loleaflet/images/lc_calculate.svg new file mode 100644 index 0..ea5290317 --- /dev/null +++ b/loleaflet/images/lc_calculate.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/loleaflet/images/lc_datafilterhideautofilter.svg b/loleaflet/images/lc_datafilterhideautofilter.svg new file mode 100644 index 0..318397998 --- /dev/null +++ b/loleaflet/images/lc_datafilterhideautofilter.svg @@ -0,0 +1,90 @@ + +http://purl.org/dc/elements/1.1/"; + xmlns:cc="http://creativecommons.org/ns#"; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + xmlns:svg="http://www.w3.org/2000/svg"; + xmlns="http://www.w3.org/2000/svg"; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; + viewBox="0 0 24 24" + version="1.1" + id="svg8" + sodipodi:docname="lc_datafilterhideautofilter.svg" + inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"> + + + +image/svg+xml +http://purl.org/dc/dcmitype/StillImage"; /> + + + + + + + + + + + + + diff --git a/loleaflet/images/lc_datafilterstandardfilter.svg b/loleaflet/images/lc_datafilterstandardfilter.svg new file mode 100644 index 0..72cbdbaaa --- /dev/null +++ b/loleaflet/images/lc_datafilterstandardfilter.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/loleaflet/images/lc_menubar.svg b/loleaflet/images/lc_menubar.svg new file mode 100644 index 0..b1533a621 --- /dev/null +++ b/loleaflet/images/lc_menubar.svg @@ -0,0 +1,98 @@ + +http://purl.org/dc/elements/1.1/"; + xmlns:cc="http://creativecommons.org/ns#"; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + xmlns:svg="http://www.w3.org/2000/svg"; + xmlns="http://www.w3.org/2000/svg"; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; + height="16" + width="16" + inkscape:version="1.0 (4035a4f, 2020-05-01)" + sodipodi:docname="lc_menubar.svg" + id="svg6" + version="1.1" + viewBox="0 0 16 16"> + + + +image/svg+xml +http://purl.org/dc/dcmitype/StillImage"; /> + + + + + + + + + + + + + + + + diff --git a/loleaflet/images/lc_validation.svg b/loleaflet/images/lc_validation.svg new file mode 100644 index 0..42171674c --- /dev/null +++ b/loleaflet/images/lc_validation.svg @@ -0,0 +1,18 @@ +http://www.w3.org/2000/svg";> + + + + + ___ 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 |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 @@
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.NotebookbarBuilder.js | 75
1 file changed, 75 insertions(+)
New commits:
commit 9f5d7b05cff5ba471e8d6d604f246aeb0412dfa8
Author: Pedro Pinto Silva
AuthorDate: Mon Aug 3 11:00:21 2020 +0200
Commit: Pedro Silva
CommitDate: Mon Aug 3 11:32:26 2020 +0200
Notebookbar: Hamburger menu: add aditional entries
to impress and calc plus group it with separators
Change-Id: I1ef0cc04adb1a74c5c8211fd3cd72a96cf8259fb
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/1
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js
b/loleaflet/src/control/Control.NotebookbarBuilder.js
index fa151479f..f78570ea4 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -551,6 +551,7 @@ L.Control.NotebookbarBuilder =
L.Control.JSDialogBuilder.extend({
{name: _('Menu'), type: 'menu', menu: [
{name: _UNO('.uno:FullScreen', 'text'),
id: 'fullscreen', type: 'action'},
{name: _('Show Ruler'), id:
'showruler', type: 'action'},
+ {type: 'separator'},
{name: _UNO('.uno:ChangesMenu',
'text'), id: 'changesmenu', type: 'menu', menu: [
{uno: '.uno:TrackChanges'},
{uno:
'.uno:ShowTrackedChanges'},
@@ -562,6 +563,7 @@ L.Control.NotebookbarBuilder =
L.Control.JSDialogBuilder.extend({
{uno: '.uno:NextTrackedChange'}
]},
{uno: '.uno:SearchDialog'},
+ {type: 'separator'},
{name: _('Repair'), id: 'repair',
type: 'action'},
{name: _UNO('.uno:ToolsMenu', 'text'),
id: 'tools', type: 'menu', menu: [
{uno:
'.uno:SpellingAndGrammarDialog'},
@@ -586,11 +588,84 @@ L.Control.NotebookbarBuilder =
L.Control.JSDialogBuilder.extend({
spreadsheet: [
{name: _('Menu'), type: 'menu', menu: [
{name: _UNO('.uno:FullScreen', 'text'),
id: 'fullscreen', type: 'action'},
+ {name: _('Show Ruler'), id:
'showruler', type: 'action'},
+ {type: 'separator'},
+ {name: _UNO('.uno:ChangesMenu',
'text'), id: 'changesmenu', type: 'menu', menu: [
+ {uno: '.uno:TrackChanges'},
+ {uno:
'.uno:ShowTrackedChanges'},
+ {type: 'separator'},
+ {uno:
'.uno:AcceptTrackedChanges'},
+ {uno:
'.uno:AcceptAllTrackedChanges'},
+ {uno:
'.uno:RejectAllTrackedChanges'},
+ {uno:
'.uno:PreviousTrackedChange'},
+ {uno: '.uno:NextTrackedChange'}
+ ]},
+ {uno: '.uno:SearchDialog'},
+ {type: 'separator'},
+ {name: _('Repair'), id: 'repair',
type: 'action'},
+ {name: _UNO('.uno:ToolsMenu', 'text'),
id: 'tools', type: 'menu', menu: [
+ {uno:
'.uno:SpellingAndGrammarDialog'},
+ {uno: '.uno:SpellOnline'},
+ {uno: '.uno:ThesaurusDialog'},
+ {name:
_UNO('.uno:LanguageMenu'), type: 'menu', menu: [
+ {name:
_UNO('.uno:SetLanguageSelectionMe
[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/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/src
loleaflet/src/control/Control.NotebookbarBuilder.js |8
1 file changed, 8 insertions(+)
New commits:
commit e2f43e8a5dce4f846248329628217b5d7f93
Author: Pedro Pinto Silva
AuthorDate: Wed Jul 29 12:07:48 2020 +0200
Commit: Pedro Silva
CommitDate: Wed Jul 29 13:19:17 2020 +0200
Notebookbar: check for StateChanged and
if there are things to be save change class from save icon
Change-Id: Iaacc48a62d7626b8cfc489efd80141b209039b2a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99677
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js
b/loleaflet/src/control/Control.NotebookbarBuilder.js
index 5dbd14d27..e743ae794 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -163,6 +163,14 @@ L.Control.NotebookbarBuilder =
L.Control.JSDialogBuilder.extend({
} else if (commandName === '.uno:StyleApply') {
$('#applystyle').val(state).trigger('change');
}
+ else if (commandName === '.uno:ModifiedStatus') {
+ if (e.state === 'true') {
+ $('#Saveimg').addClass('savemodified');
+ }
+ else {
+ $('#Saveimg').removeClass('savemodified');
+ }
+ }
},
_setupComboboxSelectionHandler: function(combobox, id, 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/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: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src
loleaflet/css/toolbar.css |2 +-
loleaflet/src/control/Control.DocumentNameInput.js |3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit e6face35a9de1152e19122adf417e17ffca2b210
Author: Pedro Pinto Silva
AuthorDate: Thu Jun 25 16:10:49 2020 +0200
Commit: Marco Cecchetti
CommitDate: Tue Jul 28 20:56:22 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
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98647
Reviewed-by: Marco Cecchetti
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index ff228e7eb..604120e54 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -154,7 +154,7 @@ w2ui-toolbar {
width: 24px;
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%);
}
diff --git a/loleaflet/src/control/Control.DocumentNameInput.js
b/loleaflet/src/control/Control.DocumentNameInput.js
index cfc4e5998..a01a974f1 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/src
loleaflet/src/layer/marker/Annotation.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 80f75315d798d8ae04e57201f280a66415f9cbb3
Author: Pedro Pinto Silva
AuthorDate: Tue Jul 28 15:37:35 2020 +0200
Commit: Pedro Silva
CommitDate: Tue Jul 28 16:16:33 2020 +0200
Annotations: Use svg instead of png
follow up to complement but on desktop :
edaea8a3896ba37fab38ecb11644f98c14076f60
Change-Id: Ic33bd0216d163872c42d8742d821c319c41e0ce6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99630
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/src/layer/marker/Annotation.js
b/loleaflet/src/layer/marker/Annotation.js
index b8d24a482..e11665af9 100644
--- a/loleaflet/src/layer/marker/Annotation.js
+++ b/loleaflet/src/layer/marker/Annotation.js
@@ -222,7 +222,7 @@ L.Annotation = L.Layer.extend({
var tdImg = L.DomUtil.create(tagTd, 'loleaflet-annotation-img',
tr);
var tdAuthor = L.DomUtil.create(tagTd,
'loleaflet-annotation-author', tr);
var imgAuthor = L.DomUtil.create('img', 'avatar-img', tdImg);
- imgAuthor.setAttribute('src', L.LOUtil.getImageURL('user.png'));
+ imgAuthor.setAttribute('src', L.LOUtil.getImageURL('user.svg'));
imgAuthor.setAttribute('width', this.options.imgSize.x);
imgAuthor.setAttribute('height', this.options.imgSize.y);
this._authorAvatarImg = imgAuthor;
___
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/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 #CellVertCe
[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%);
+}
+
+
/* unobut
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.JSDialogBuilder.js |8
1 file changed, 8 insertions(+)
New commits:
commit 1fb8e2475464d7adc6fb7d3590ad0f72a1e9a0e9
Author: Pedro Pinto Silva
AuthorDate: Tue Jul 21 15:48:58 2020 +0200
Commit: Pedro Silva
CommitDate: Tue Jul 21 17:10:36 2020 +0200
Notebookbar: make tabs collapsing and extending
- by clicking again in the selected tab title
Change-Id: Idbb0892f341865cd9696f9037b87146f7a3cc3a8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99146
Tested-by: Jenkins CollaboraOffice
Tested-by: Jenkins
Reviewed-by: Pedro Silva
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 967e2bd7b..1519947b3 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -653,6 +653,14 @@ L.Control.JSDialogBuilder = L.Control.extend({
_createTabClick: function(builder, t, tabs, contentDivs, tabIds)
{
return function() {
+ if ($(tabs[t]).hasClass('selected') &&
!$('#document-container').hasClass('tabs-collapsed')) {
+ $('#document-container').css('top', '38px');
+
$('#document-container').addClass('tabs-collapsed');
+ }
+ else if ($(tabs[t]).hasClass('selected') &&
$('#document-container').hasClass('tabs-collapsed')) {
+ $('#document-container').css('top', '120px');
+
$('#document-container').removeClass('tabs-collapsed');
+ }
$(tabs[t]).addClass('selected');
for (var i = 0; i < tabs.length; i++) {
if (i !== t)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/images
loleaflet/images/lc_downloadas-odg.svg |1 + 1 file changed, 1 insertion(+) New commits: commit 46c8673475bfe852f10b59fe24dbe48769056f8d Author: Pedro Pinto Silva AuthorDate: Tue Jul 21 15:06:41 2020 +0200 Commit: Pedro Silva CommitDate: Tue Jul 21 15:51:40 2020 +0200 Add missing icon for dowloadas-odg Change-Id: I2ca9493d1dae4b8c24e1b312074f210d9ed04d16 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99144 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice Reviewed-by: Pedro Silva diff --git a/loleaflet/images/lc_downloadas-odg.svg b/loleaflet/images/lc_downloadas-odg.svg new file mode 100644 index 0..eb20c4913 --- /dev/null +++ b/loleaflet/images/lc_downloadas-odg.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/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(
[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/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
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/map/Map.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cb68187c5e560dc0f040a5869f9b844e7426be89
Author: Pedro Pinto Silva
AuthorDate: Thu Jul 9 14:47:56 2020 +0200
Commit: Mike Kaganski
CommitDate: Thu Jul 16 09:46:20 2020 +0200
Don't remove html of last modification indicator but instead hide it when
data is unavailable
Change-Id: If86d66a616ccc09a3eed8d083f8a81a5c0b233e2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98433
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index e74b99e0e..8d1f0302a 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -375,7 +375,7 @@ L.Map = L.Evented.extend({
&& lastModButton.firstChild.childElementCount == 0) {
if (this._lastmodtime == null) {
// No modification time -> hide the indicator
- lastModButton.innerHTML = '';
+ L.DomUtil.setStyle(lastModButton, 'display',
'none');
return;
}
var mainSpan = document.createElement('span');
___
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/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 |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
