loleaflet/dist/images/spinner.gif |binary loleaflet/dist/leaflet.css | 31 +++++++++++++++----------- loleaflet/dist/toolbar/toolbar.js | 4 +-- loleaflet/src/layer/marker/ProgressOverlay.js | 1 4 files changed, 21 insertions(+), 15 deletions(-)
New commits: commit b50b159aed5a8844ac2d3f0af335b866d2e165c2 Author: Pranav Kant <[email protected]> Date: Tue May 10 16:12:50 2016 +0530 loleaflet: Use Standard styles if Default is missing 'Standard', and 'Default' styles seem to containing same values anyways. If we do not have 'Default', use 'Standard' ones. Change-Id: I4402f78fb54c77a7cf6d9868210cb97a9e2c4580 diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index 2839313..48b6deb 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -746,7 +746,7 @@ map.on('updatetoolbarcommandvalues', function (e) { styles = e.commandValues.CellStyles; } else if (map.getDocType() === 'presentation' || map.getDocType() === 'drawing') { - styles = e.commandValues.Default; + styles = e.commandValues.Default || e.commandValues.Standard; } if (topStyles.length > 0) { commit 6fb9a5becf7b15d8cc58d46501c0d21045625101 Author: Pranav Kant <[email protected]> Date: Tue May 10 16:10:49 2016 +0530 bccu#1756: Style the presentation list box Upon creating an .odp file from owncloud, 'Default' styles are not created which leads to a js error as variable styles go undefined later in the script. Change-Id: I30caf980bd924e6329559b36b1f0a5fbe60ecc4b diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index 58a6cb5..2839313 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -758,7 +758,7 @@ map.on('updatetoolbarcommandvalues', function (e) { }, this); } - if (styles.length > 0) { + if (styles !== undefined && styles.length > 0) { // Inserts a separator element data = data.concat({text: '\u2500\u2500\u2500\u2500\u2500\u2500', disabled: true}); commit 6d18572c629d32ffb0d638bf90c13031398abc3b Author: Lenny Horstink <[email protected]> Date: Mon May 9 22:40:29 2016 +0530 Visual improvements to spinner Change-Id: I54f945867efe5e56c2e6696b905a97f04b832f90 diff --git a/loleaflet/dist/images/spinner.gif b/loleaflet/dist/images/spinner.gif index 318c372..3eb32ef 100644 Binary files a/loleaflet/dist/images/spinner.gif and b/loleaflet/dist/images/spinner.gif differ diff --git a/loleaflet/dist/leaflet.css b/loleaflet/dist/leaflet.css index 400246f..c3f8b8b 100644 --- a/loleaflet/dist/leaflet.css +++ b/loleaflet/dist/leaflet.css @@ -9,7 +9,6 @@ .leaflet-map-pane canvas, .leaflet-zoom-box, .leaflet-image-layer, -.leaflet-progress-layer, .leaflet-layer { position: absolute; left: 0; @@ -651,12 +650,19 @@ a.leaflet-control-buttons:hover:first-child { margin: 0 auto; } +.leaflet-progress-layer { + background: #fff; + border: 2px solid #eee; + padding: 10px; +} + .leaflet-progress { background: #ebebeb; border-left: 1px solid transparent; border-right: 1px solid transparent; border-radius: 10px; - height:100%; + height: 24px; + margin: 10px 0 0; } .leaflet-progress > span { @@ -665,14 +671,14 @@ a.leaflet-control-buttons:hover:first-child { margin: 0 -1px; height: 100%; text-align: right; - background: #5aaadb; + background: #5c3dcc; border: 1px solid; - border-color: #459fd6 #3094d2 #277db2; + border-color: #4422bf #5435c4; border-radius: 10px; - background-image: -webkit-linear-gradient(top, #aed5ed, #7bbbe2 70%, #5aaadb); - background-image: -moz-linear-gradient(top, #aed5ed, #7bbbe2 70%, #5aaadb); - background-image: -o-linear-gradient(top, #aed5ed, #7bbbe2 70%, #5aaadb); - background-image: linear-gradient(to bottom, #aed5ed, #7bbbe2 70%, #5aaadb); + background-image: -webkit-linear-gradient(top, #745dc6, #6549cc 70%, #5c3dcc); + background-image: -moz-linear-gradient(top, #745dc6, #6549cc 70%, #5c3dcc); + background-image: -o-linear-gradient(top, #745dc6, #6549cc 70%, #5c3dcc); + background-image: linear-gradient(to bottom, #745dc6, #6549cc 70%, #5c3dcc); -webkit-box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px rgba(0, 0, 0, 0.2); box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px rgba(0, 0, 0, 0.2); } @@ -681,17 +687,18 @@ a.leaflet-control-buttons:hover:first-child { padding: 0 8px; font-size: 11px; font-weight: bold; - color: #404040; - color: rgba(0, 0, 0, 0.7); - text-shadow: 0 1px rgba(255, 255, 255, 0.4); + color: #fff; + text-shadow: 0 1px rgba(0, 0, 0, 0.4); } .leaflet-progress-spinner { background-image: url(images/spinner.gif); + background-color: white; background-repeat: no-repeat; background-position: center center; width: 100%; - height: 48px; + margin: 0 0 4px; + height: 34px; } .leaflet-progress-label { diff --git a/loleaflet/src/layer/marker/ProgressOverlay.js b/loleaflet/src/layer/marker/ProgressOverlay.js index 1212618..2b096c9 100644 --- a/loleaflet/src/layer/marker/ProgressOverlay.js +++ b/loleaflet/src/layer/marker/ProgressOverlay.js @@ -46,7 +46,6 @@ L.ProgressOverlay = L.Layer.extend({ L.DomUtil.setStyle(this._value, 'line-height', this._size.y + 'px'); this._container.style.width = this._size.x + 'px'; - this._container.style.height = this._size.y + 'px'; L.DomEvent .disableClickPropagation(this._progress) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
