[Libreoffice-commits] online.git: 4 commits - loleaflet/dist
Pranav Kant
pranavk at collabora.co.uk
Mon Jan 16 08:15:57 UTC 2017
loleaflet/dist/toolbar.css | 31 ++++++++++++++++++++++++++++---
loleaflet/dist/toolbar/toolbar.js | 6 +++---
2 files changed, 31 insertions(+), 6 deletions(-)
New commits:
commit f182c53a666921fcc2eba230f773f37de90a1ae8
Author: Pranav Kant <pranavk at collabora.co.uk>
Date: Mon Jan 16 13:43:16 2017 +0530
loleaflet: Override default evo-pop z-index
... so that these pop ups doesn't come over the inactive overlay.
Change-Id: I2e4ff68da7549e42283211ef4aed04d0efe7e6f5
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 2824d32..a2b5c31 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -276,6 +276,14 @@ button.leaflet-control-search-next
right: 200px; /* backcolor popup has 200px width, place it to the left from its right edge */
}
+#backcolor-wrapper .evo-pop {
+ z-index: 1000; /* Override default value of 10000 of evo-pop class */
+}
+
+#fontcolor-wrapper .evo-pop {
+ z-index: 1000; /* Override default value of 10000 of evo-pop class */
+}
+
/* for 10x10 grid 10x20+10*.col.margin */
.inserttable-grid {
box-sizing: border-box;
commit 84c73eccb25386eb8de140eb29ebb2cff629f02e
Author: Pranav Kant <pranavk at collabora.co.uk>
Date: Mon Jan 16 13:38:36 2017 +0530
Fix fontcolor, backcolor popup getting truncated
Open them from the right edge of the popup to the left and wrap
them inside wrappers to make it possible.
Change-Id: Ib97fe6a3e306c8cc8612304b53ec42607234d5a7
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 7806dd0..2824d32 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -266,6 +266,16 @@ button.leaflet-control-search-next
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
}
+#fontcolor-wrapper {
+ position: relative;
+ right: 200px; /* fontcolor popup has 200px width, place it to the left from its right edge */
+}
+
+#backcolor-wrapper {
+ position: relative;
+ right: 200px; /* backcolor popup has 200px width, place it to the left from its right edge */
+}
+
/* for 10x10 grid 10x20+10*.col.margin */
.inserttable-grid {
box-sizing: border-box;
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 807ef5d..d51d24b 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -484,9 +484,9 @@ $(function () {
{type: 'break', id: 'formatbreak'},
{type: 'button', id: 'insertfootnote', img: 'insertfootnote', hint: _('Insert Footnote'), uno: 'InsertFootnote' },
{type: 'break' },
- {type: 'html', id: 'fontcolor-html', html: '<input id="fontColorPicker" style="display:none;">'},
+ {type: 'html', id: 'fontcolor-html', html: '<div id="fontcolor-wrapper"><input id="fontColorPicker" style="display:none;"></div>'},
{type: 'button', id: 'fontcolor', img: 'color', hint: _('Font color')},
- {type: 'html', id: 'backcolor-html', html: '<input id="backColorPicker" style="display:none;">'},
+ {type: 'html', id: 'backcolor-html', html: '<div id="backcolor-wrapper"><input id="backColorPicker" style="display:none;"></div>'},
{type: 'button', id: 'backcolor', img: 'backcolor', hint: _('Highlighting')},
{type: 'break'},
{type: 'button', id: 'leftpara', img: 'alignleft', hint: _('Align left'), uno: 'LeftPara', unosheet: 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"1"}}'},
commit 6901ad9251821e1b0003e1b1536a7e92a780aab5
Author: Pranav Kant <pranavk at collabora.co.uk>
Date: Mon Jan 16 13:27:10 2017 +0530
tdf#103777: Fix inserttable popup truncates when no space on right
Easy solution is move the popup to open from its right edge
instead of the left.
This also overrides overflow: hidden from w2ui-toolbar class,
that doesn't seem to have any side-effect, hopefully there really
isn't.
Change-Id: Iab258cf7e3473b178aa9acdb746b51a5ca582b46
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index a638355..7806dd0 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -1,8 +1,9 @@
-#toolbar-up {
+#toolbar-up.w2ui-toolbar {
left: 0;
right: 0;
text-align: center;
z-index: 1000;
+ overflow: visible !important;
}
#toolbar-down {
@@ -15,13 +16,14 @@
z-index: 1000;
}
-#toolbar-up-more {
+#toolbar-up-more,w2ui-toolbar {
position: absolute;
right: 10px;
top: 40px;
border: 1px solid darkgrey;
z-index: 1000;
display: none;
+ overflow: visible !important;
}
#spreadsheet-toolbar {
@@ -254,6 +256,11 @@ button.leaflet-control-search-next
.w2ui-icon.repair{ background: url('../images/lc_backward.svg') no-repeat center !important; }
.w2ui-icon.specialcharacter{ background: url('../images/lc_insertsymbol.svg') no-repeat center !important; }
+#inserttable-wrapper {
+ position: relative;
+ right: 230px; /* insertable popup has ~230px width, place it to open from its right edge to the left */
+}
+
.inserttable-pop {
z-index: 1000;
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 02a89f0..807ef5d 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -513,7 +513,7 @@ $(function () {
{type: 'button', id: 'incrementindent', img: 'incrementindent', hint: _('Increase indent'), uno: 'IncrementIndent'},
{type: 'button', id: 'decrementindent', img: 'decrementindent', hint: _('Decrease indent'), uno: 'DecrementIndent'},
{type: 'break', id: 'incdecindent'},
- {type: 'html', id: 'inserttable-html', html: '<div id="inserttable-popup" class="inserttable-pop ui-widget ui-widget-content ui-corner-all" style="position: absolute; display: none;"><div class="inserttable-grid"></div><div id="inserttable-status" class="loleaflet-font" style="padding: 5px;"><br/></div>'},
+ {type: 'html', id: 'inserttable-html', html: '<div id="inserttable-wrapper"><div id="inserttable-popup" class="inserttable-pop ui-widget ui-widget-content ui-corner-all" style="position: absolute; display: none;"><div class="inserttable-grid"></div><div id="inserttable-status" class="loleaflet-font" style="padding: 5px;"><br/></div></div>'},
{type: 'button', id: 'inserttable', img: 'inserttable', hint: _('Insert table')},
{type: 'button', id: 'insertannotation', img: 'annotation', hint: _('Insert comment'), uno: 'InsertAnnotation'},
{type: 'button', id: 'insertgraphic', img: 'insertgraphic', hint: _('Insert graphic')},
commit ebd5b377d75611c50379b89520a37fc32c9084b4
Author: Pranav Kant <pranavk at collabora.co.uk>
Date: Mon Jan 16 12:45:57 2017 +0530
Fix z-index of insertable popup
Reduce it to 1000, its sufficient and also allow inactive overlay
to come over the popup, not under it as was before this commit.
Change-Id: If078dc929027dfb938000c5a0135c83704da7d6f
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 2f21d7a..a638355 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -255,7 +255,7 @@ button.leaflet-control-search-next
.w2ui-icon.specialcharacter{ background: url('../images/lc_insertsymbol.svg') no-repeat center !important; }
.inserttable-pop {
- z-index: 100000;
+ z-index: 1000;
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
}
More information about the Libreoffice-commits
mailing list