[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
Szymon KÅ‚os (via logerrit)
logerrit at kemper.freedesktop.org
Fri May 1 19:39:59 UTC 2020
loleaflet/css/notebookbar.css | 31 +++++++++-
loleaflet/images/lc_charmapcontrol.svg | 1
loleaflet/images/lc_editstyle.svg | 1
loleaflet/images/lc_insertannotation.svg | 1
loleaflet/images/lc_styleapply3fstyle3astring3demphasis26familyname3astring3dcharacterstyles.svg | 1
loleaflet/images/lc_styleapply3fstyle3astring3dheading20126familyname3astring3dparagraphstyles.svg | 1
loleaflet/images/lc_styleapply3fstyle3astring3dheading20226familyname3astring3dparagraphstyles.svg | 1
loleaflet/images/lc_styleapply3fstyle3astring3dheading20326familyname3astring3dparagraphstyles.svg | 1
loleaflet/images/lc_styleapply3fstyle3astring3dheading20426familyname3astring3dparagraphstyles.svg | 1
loleaflet/images/lc_styleapply3fstyle3astring3dstrong20emphasis26familyname3astring3dcharacterstyles.svg | 1
loleaflet/src/control/Control.NotebookbarBuilder.js | 6 +
11 files changed, 44 insertions(+), 2 deletions(-)
New commits:
commit 9e020d60241ccf36d6ae99f6d0e47a1f47794c89
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Apr 29 12:11:59 2020 +0200
Commit: Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri May 1 21:39:38 2020 +0200
notebookbar: icons & layout the home tab
Change-Id: I73f8b1dcc51994f89db6debce83bcf20dfa90c31
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93296
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 4cf5403bb..585075e39 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -81,7 +81,7 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, #SendToBack.notebookb
border: 1px solid silver;
}
-/* Reset attributes control */
+/* Home tab */
#clearFormatting.notebookbar div img {
width: 24px !important;
height: 24px !important;
@@ -89,4 +89,33 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, #SendToBack.notebookb
#clearFormatting.notebookbar {
height: 24px !important;
+}
+
+#Paste.notebookbar img, #InsertAnnotation.notebookbar img, #SearchDialog.notebookbar img {
+ height: 32px !important;
+ width: 32px !important;
+}
+
+#ControlCodes.notebookbar {
+ padding-left: 30px !important;
+}
+
+#fontnamecombobox.notebookbar ~ .select2 {
+ width: 150px !important;
+}
+
+#fontsizecombobox.notebookbar ~ .select2 {
+ width: 50px !important;
+}
+
+#applystyle.notebookbar ~ .select2 {
+ width: 170px !important;
+}
+
+#table-StyleParagraphSection1.notebookbar, #table-GroupB15.notebookbar, #table-GroupB11.notebookbar {
+ margin-top: -5px;
+}
+
+#Copy.notebookbar, #clearFormatting.notebookbar, #table-GroupB20.notebookbar {
+ margin-top: 10px;
}
\ No newline at end of file
diff --git a/loleaflet/images/lc_charmapcontrol.svg b/loleaflet/images/lc_charmapcontrol.svg
new file mode 100644
index 000000000..87497d495
--- /dev/null
+++ b/loleaflet/images/lc_charmapcontrol.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m12 2c-5.5228488 0-9.0000019 3.9175089-9 8.75 0 4.25 1.8908055 6.695601 5 8.25v1h-4.75c-.992825-.26605-1.2087-1.27845-1.25-1.546875v3.546875h8.007812v-2.5-.507812l-.664062-.273438c-2.1905344-1.337018-3.3404919-4.072801-3.34375-7.21875-.0000099-4.4873253 2-7.5 6-7.5s6.00001 3.0126747 6 7.5c-.0033 3.145949-1.153216 5.881732-3.34375 7.21875l-.664062.273438v.507812 2.5h8.007812v-3.546875c-.0413.268425-.257175 1.280825-1.25 1.546875h-4.75v-1c3.109194-1.554399 5-4 5-8.25.000002-4.8324911-3.477151-8.75-9-8.75z" fill="#4d82b8"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_editstyle.svg b/loleaflet/images/lc_editstyle.svg
new file mode 100644
index 000000000..8d9d0dec1
--- /dev/null
+++ b/loleaflet/images/lc_editstyle.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m9.8964844 4-7.8964844 16h2.3476562c.2450593 0 .4626205-.068532.6523438-.205078.1897233-.144578.327106-.305715.4140625-.482422l1.4941406-3.216797h6.1660159l.091797.412109 2.359375-2.357421-2.556641-10.150391zm1.2109376 2.7832031c.055339.3935744.110682.7583538.166016 1.0957031.063243.3293173.122401.6181916.177734.8671876l1.15039 5.2167972h-4.7089839l2.4199219-5.1914066c.110672-.2570282.2328-.5552288.367188-.8925782.142292-.3373493.285442-.7021287.427734-1.0957031z" fill="#696969"/><g fill="#eac282"><path d="m17.480469 13.611328-5.529297 5.523438-.951172 3.865234 3.806641-1.011719 5.509765-5.544922z"/><path d="m20.419922 11c-.189562 0-.378184.07172-.523438.216797l-1.673828 1.669922 2.847656 2.849609 1.710938-1.638672c.290506-.290127.290506-.756747 0-1.046875l-1.835938-1.833984c-.145254-.145064-.335828-.216797-.52539-.216797z"/></g></svg>
diff --git a/loleaflet/images/lc_insertannotation.svg b/loleaflet/images/lc_insertannotation.svg
new file mode 100644
index 000000000..2b0e791fa
--- /dev/null
+++ b/loleaflet/images/lc_insertannotation.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2.5 2.5c.0000238-.0000237 0 14 0 14h4v5l5.5-5v-1.546875-1.953125c0-.554.446-1 1-1h2.078125 6.421875v-9.5z" fill="#fff"/><path d="m14 13c-.554 0-1 .446-1 1v5c0 .554.446 1 1 1h1v2.5c.000174.445319.538519.668295.853516.353516l2.853515-2.853516h3.292969c.554 0 1-.446 1-1v-5c0-.554-.446-1-1-1z" fill="#eac282"/><path d="m2.5 2c-.277 0-.5.223-.5.5v7 7c .0000276.276131.2238691.499972.5.5h3.5v4.5c.00113.433187.5150257.660119.8359375.369141l5.1640625-4.69336v-1.175781c-.124355.000331-.244124.04698-.335938.130859l-4.664062 4.240235v-3.871094c-.0000276-.276131-.2238691-.499972-.5-.5h-3.5v-6.5-6.5h18v9h1v-9.5c-.000028-.2761309-.223869-.4999724-.5-.5z" fill="#808080"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_styleapply3fstyle3astring3demphasis26familyname3astring3dcharacterstyles.svg b/loleaflet/images/lc_styleapply3fstyle3astring3demphasis26familyname3astring3dcharacterstyles.svg
new file mode 100644
index 000000000..8c61f612b
--- /dev/null
+++ b/loleaflet/images/lc_styleapply3fstyle3astring3demphasis26familyname3astring3dcharacterstyles.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="m13.210149 2.0000002h-7.3030139l-.3976878 4.9999999h5.7633627l-.493102 2h-5.4912613l-.6065003 4.9999999h7.0722756l-.192 2h-9.2060576l1.92233-16h9.0776696z" fill="#696969"/></svg>
diff --git a/loleaflet/images/lc_styleapply3fstyle3astring3dheading20126familyname3astring3dparagraphstyles.svg b/loleaflet/images/lc_styleapply3fstyle3astring3dheading20126familyname3astring3dparagraphstyles.svg
new file mode 100644
index 000000000..885e34997
--- /dev/null
+++ b/loleaflet/images/lc_styleapply3fstyle3astring3dheading20126familyname3astring3dparagraphstyles.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="m13.214444 7q .610169 0 1.094326.1790715.490788.1790715.829034.4907885.338246.3050847.517318.7229182.185704.4112012.185704.8820929 0 .4178335-.09285.7361829-.08622.318349-.258659.557111-.172439.238762-.424466.404569-.252026.165807-.570376.271923 1.505525.510686 1.505525 2.03611 0 .66986-.245394 1.180545-.238762.504053-.649963.848931-.404569.344879-.948416.517318-.537214.172439-1.134119.172439-.630067 0-1.114223-.14591-.477524-.14591-.842299-.43773-.358143-.298453-.623434-.736183-.258659-.43773-.4443627-1.014738l.7030217-.298453q.278555-.112749.517317-.05306.245395.05306.344879.258659.119381.225497.252026.424466.132646.192336.298453.344878.172439.14591.391304.23213.218865.08622.504053.08622.351511 0 .61017-.112748.265291-.119381.43773-.305085.172439-.192336.258659-.431098.08622-.238762.08622-.477524 0-.305085-.05969-.557112-.05306-.252026-.252027-.431098-.192336-.179071-.570375-.278555-.37804-.09948-1.028003-.09948v
-1.13412q.543846-.0066.888725-.09948.35151-.09285.550479-.258659.198968-.172439.271923-.404569.07296-.2321293.07296-.5173173 0-.6035372-.305085-.908622-.298458-.3050917-.842305-.3050917-.484156 0-.809138.2719234-.324981.2719233-.450994.66986-.106117.3050847-.285188.3979366-.17244.092852-.497421.039794l-.842299-.1459104q.092851-.6433309.35151-1.1208549.258659-.4841562.649963-.8025055.391305-.3249816.888726-.4841563.504053-.1658069 1.081061-.1658069z" fill="none"/><path d="m0 0v16h2v-7h6v7h2v-7-2-7h-2v7h-6v-7z" fill="#696969"/><path d="m13.90625 7-2.90625 2.3417969.552734.7031251c.02913.03609.0716.07329.125.109375.05825.03158.122493.052876.195313.066406s.151845.01353.234375 0c .08252-.01354.163574-.05208.246094-.115234l1.259765-1.0078128c-.01455.2255641-.021484.4428718-.021484.6503907v6.2519531h1.408203v-9z" fill="#4d82b8"/></svg>
diff --git a/loleaflet/images/lc_styleapply3fstyle3astring3dheading20226familyname3astring3dparagraphstyles.svg b/loleaflet/images/lc_styleapply3fstyle3astring3dheading20226familyname3astring3dparagraphstyles.svg
new file mode 100644
index 000000000..86db3f966
--- /dev/null
+++ b/loleaflet/images/lc_styleapply3fstyle3astring3dheading20226familyname3astring3dparagraphstyles.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="m0 0v16h2v-7h6v5h2v-5-2-7h-2v7h-6v-7z" fill="#696969"/><path d="m13.13363 8.0000055c.4098 0 .781737.055597 1.115812.1667904.338531.107223.625836.2601145.861917.4586745.240534.1985606.425389.4388188.554566.7207746.133629.2779846.200444.5857532.200444.923306 0 .289898-.04677.55994-.140311.810126-.09354.246215-.218263.482502-.374164.708861-.155902.222387-.33853.440804-.547885.655249-.209354.210474-.429844.422934-.661471.63738l-2.142538 1.918833 3.432071-.0038c.169265 0 .305122.04368.407573.13105.106904.087349.160356.202514.160356.345478v.527272h-6v-.482501c0-.09134.02005-.188633.06014-.291885.04455-.107222.120271-.206502.227172-.29784l2.579068-2.364854c.218263-.202532.4098-.395135.57461-.57781.169266-.182677.309578-.363367.420936-.542071.115813-.182675.202673-.365351.260579-.548027.05791-.186647.08686-.381236.08686-.583767 0-.3653514-.10245-.6413503-.30735-.8279968-.2049-.1866469-.494432-.2799704-.868597-.2799704-.160
356 0-.307349.021843-.44098.065528-.13363.043685-.253897.1032533-.360802.178704-.106903.075453-.198217.1648051-.273942.2680569-.07572.1032512-.133626.2144449-.173718.3335813-.07127.182676-.169268.301812-.293988.357409-.120267.05559-.287305.06751-.501112.03574l-.855236-.13105c.06681-.3852104.187079-.720779.360798-1.006706.173719-.2898977.389755-.5301556.648107-.7207738.262807-.1945893.563475-.3395382.902005-.4348465.33853-.09928.701559-.1489208 1.08908-.1489152z" fill="#4d82b8"/></svg>
diff --git a/loleaflet/images/lc_styleapply3fstyle3astring3dheading20326familyname3astring3dparagraphstyles.svg b/loleaflet/images/lc_styleapply3fstyle3astring3dheading20326familyname3astring3dparagraphstyles.svg
new file mode 100644
index 000000000..cb097ed11
--- /dev/null
+++ b/loleaflet/images/lc_styleapply3fstyle3astring3dheading20326familyname3astring3dparagraphstyles.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="m13.214444 7q .610169 0 1.094326.1790715.490788.1790715.829034.4907885.338246.3050847.517318.7229182.185704.4112012.185704.8820929 0 .4178335-.09285.7361829-.08622.318349-.258659.557111-.172439.238762-.424466.404569-.252026.165807-.570376.271923 1.505525.510686 1.505525 2.03611 0 .66986-.245394 1.180545-.238762.504053-.649963.848931-.404569.344879-.948416.517318-.537214.172439-1.134119.172439-.630067 0-1.114223-.14591-.477524-.14591-.842299-.43773-.358143-.298453-.623434-.736183-.258659-.43773-.4443627-1.014738l.7030217-.298453q.278555-.112749.517317-.05306.245395.05306.344879.258659.119381.225497.252026.424466.132646.192336.298453.344878.172439.14591.391304.23213.218865.08622.504053.08622.351511 0 .61017-.112748.265291-.119381.43773-.305085.172439-.192336.258659-.431098.08622-.238762.08622-.477524 0-.305085-.05969-.557112-.05306-.252026-.252027-.431098-.192336-.179071-.570375-.278555-.37804-.09948-1.028003-.09948v
-1.13412q.543846-.0066.888725-.09948.35151-.09285.550479-.258659.198968-.172439.271923-.404569.07296-.2321293.07296-.5173173 0-.6035372-.305085-.908622-.298458-.3050917-.842305-.3050917-.484156 0-.809138.2719234-.324981.2719233-.450994.66986-.106117.3050847-.285188.3979366-.17244.092852-.497421.039794l-.842299-.1459104q.092851-.6433309.35151-1.1208549.258659-.4841562.649963-.8025055.391305-.3249816.888726-.4841563.504053-.1658069 1.081061-.1658069z" fill="#4d82b8"/><path d="m0 0v16h2v-7h6v1h2v-1-2-7h-2v7h-6v-7z" fill="#696969"/></svg>
diff --git a/loleaflet/images/lc_styleapply3fstyle3astring3dheading20426familyname3astring3dparagraphstyles.svg b/loleaflet/images/lc_styleapply3fstyle3astring3dheading20426familyname3astring3dparagraphstyles.svg
new file mode 100644
index 000000000..f478cbf0a
--- /dev/null
+++ b/loleaflet/images/lc_styleapply3fstyle3astring3dheading20426familyname3astring3dparagraphstyles.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="m13.214444 7q .610169 0 1.094326.1790715.490788.1790715.829034.4907885.338246.3050847.517318.7229182.185704.4112012.185704.8820929 0 .4178335-.09285.7361829-.08622.318349-.258659.557111-.172439.238762-.424466.404569-.252026.165807-.570376.271923 1.505525.510686 1.505525 2.03611 0 .66986-.245394 1.180545-.238762.504053-.649963.848931-.404569.344879-.948416.517318-.537214.172439-1.134119.172439-.630067 0-1.114223-.14591-.477524-.14591-.842299-.43773-.358143-.298453-.623434-.736183-.258659-.43773-.4443627-1.014738l.7030217-.298453q.278555-.112749.517317-.05306.245395.05306.344879.258659.119381.225497.252026.424466.132646.192336.298453.344878.172439.14591.391304.23213.218865.08622.504053.08622.351511 0 .61017-.112748.265291-.119381.43773-.305085.172439-.192336.258659-.431098.08622-.238762.08622-.477524 0-.305085-.05969-.557112-.05306-.252026-.252027-.431098-.192336-.179071-.570375-.278555-.37804-.09948-1.028003-.09948v
-1.13412q.543846-.0066.888725-.09948.35151-.09285.550479-.258659.198968-.172439.271923-.404569.07296-.2321293.07296-.5173173 0-.6035372-.305085-.908622-.298458-.3050917-.842305-.3050917-.484156 0-.809138.2719234-.324981.2719233-.450994.66986-.106117.3050847-.285188.3979366-.17244.092852-.497421.039794l-.842299-.1459104q.092851-.6433309.35151-1.1208549.258659-.4841562.649963-.8025055.391305-.3249816.888726-.4841563.504053-.1658069 1.081061-.1658069z" fill="none"/><path d="m0 0v16h2v-7h6v1h2v-1-2-7h-2v7h-6v-7z" fill="#696969"/><path d="m14.920362 12.580136h1.079638v.934537q0 .13544-.09174.230248-.09174.09481-.254032.09481h-.733872v2.16027h-1.481854v-2.16027h-3.8034274q-.1622985 0-.2963711-.09481-.1270161-.10158-.1622983-.257336l-.1764113-.819413 4.2973791-5.6681719h1.622983v5.5801359zm-1.481854-2.7832965q0-.1963879.007-.4266363.01412-.2370203.0494-.4875847l-2.702621 3.6975175h2.646169v-2.7832965z" fill="#4d82b8"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/sc_defaultcharstyle.svg b/loleaflet/images/lc_styleapply3fstyle3astring3dstandard26familyname3astring3dparagraphstyles.svg
similarity index 100%
rename from loleaflet/images/sc_defaultcharstyle.svg
rename to loleaflet/images/lc_styleapply3fstyle3astring3dstandard26familyname3astring3dparagraphstyles.svg
diff --git a/loleaflet/images/lc_styleapply3fstyle3astring3dstrong20emphasis26familyname3astring3dcharacterstyles.svg b/loleaflet/images/lc_styleapply3fstyle3astring3dstrong20emphasis26familyname3astring3dcharacterstyles.svg
new file mode 100644
index 000000000..1dae49ac6
--- /dev/null
+++ b/loleaflet/images/lc_styleapply3fstyle3astring3dstrong20emphasis26familyname3astring3dcharacterstyles.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><text fill="#696969" font-family="sans-serif" font-size="23.869326" letter-spacing="0" transform="scale(.98848495 1.0116492)" word-spacing="0" x="2.59206" y="15.65259"><tspan fill="#696969" font-family="Carlito" font-weight="bold" x="2.59206" y="15.65259">S</tspan></text></svg>
diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js b/loleaflet/src/control/Control.NotebookbarBuilder.js
index 4614f27b9..c7582a5c3 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -39,7 +39,11 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({
this._toolitemHandlers['.uno:BasicShapes'] = this._shapesControl;
this._toolitemHandlers['.uno:SelectWidth'] = function() {};
-
+ this._toolitemHandlers['.uno:SetOutline'] = function() {};
+ this._toolitemHandlers['.uno:DesignerDialog'] = function() {};
+ this._toolitemHandlers['.uno:Zoom'] = function() {};
+ this._toolitemHandlers['.uno:PrintPreview'] = function() {};
+ this._toolitemHandlers['.uno:Navigator'] = function() {};
this._toolitemHandlers['vnd.sun.star.findbar:FocusToFindbar'] = function() {};
},
More information about the Libreoffice-commits
mailing list