[Libreoffice-commits] online.git: 2 commits - loleaflet/dist loleaflet/src

[Mihai Varga]

 loleaflet/dist/images/defaultbullet.png    |binary
 loleaflet/dist/images/defaultnumbering.png |binary
 loleaflet/dist/leaflet.css                 |    1 +
 loleaflet/src/control/Control.Buttons.js   |    4 +++-
 loleaflet/src/control/Control.Search.js    |    1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit f58eeaf319cd0a19df78f2e985e93bd88068df44
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Mon Sep 14 13:06:21 2015 +0300

    loleaflet: numbering and bullets buttons

diff --git a/loleaflet/dist/images/defaultbullet.png b/loleaflet/dist/images/defaultbullet.png
new file mode 100644
index 0000000..6dfcdac
Binary files /dev/null and b/loleaflet/dist/images/defaultbullet.png differ
diff --git a/loleaflet/dist/images/defaultnumbering.png b/loleaflet/dist/images/defaultnumbering.png
new file mode 100644
index 0000000..7715687
Binary files /dev/null and b/loleaflet/dist/images/defaultnumbering.png differ
diff --git a/loleaflet/src/control/Control.Buttons.js b/loleaflet/src/control/Control.Buttons.js
index 4a02c04..01d1c69 100644
--- a/loleaflet/src/control/Control.Buttons.js
+++ b/loleaflet/src/control/Control.Buttons.js
@@ -16,6 +16,8 @@ L.Control.Buttons = L.Control.extend({
 			'italic':        {title: 'Italic',             uno: 'Italic',          iconName: 'italic.png'},
 			'underline':     {title: 'Underline',          uno: 'Underline',       iconName: 'underline.png'},
 			'strikethrough': {title: 'Strike-through',     uno: 'Strikeout',       iconName: 'strikethrough.png'},
+			'bullet'       : {title: 'Bullets ON/OFF',     uno: 'DefaultBullet',   iconName: 'defaultbullet.png'},
+			'numbering'    : {title: 'Numbering ON/OFF',   uno: 'DefaultNumbering',iconName: 'defaultnumbering.png'},
 			'alignleft':     {title: 'Align left',         uno: 'LeftPara',        iconName: 'alignleft.png'},
 			'aligncenter':   {title: 'Center horizontaly', uno: 'CenterPara',      iconName: 'aligncenter.png'},
 			'alignright':    {title: 'Align right',        uno: 'RightPara',       iconName: 'alignright.png'},
@@ -29,7 +31,7 @@ L.Control.Buttons = L.Control.extend({
 		};
 		for (var key in this._buttons) {
 			var button = this._buttons[key];
-			if (key === 'alignleft' || key === 'save' || key === 'edit') {
+			if (key === 'alignleft' || key === 'save' || key === 'bullet' || key === 'edit') {
 				// add a separator
 				L.DomUtil.create('span', 'leaflet-control-button-separator', container);
 			}
commit 7259d00349b09c2e3183ae3fa9b43f905ebc49ad
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Mon Sep 14 09:29:23 2015 +0300

    loleaflet: search bar ui tweak

diff --git a/loleaflet/dist/leaflet.css b/loleaflet/dist/leaflet.css
index b72dd39..66d889d 100644
--- a/loleaflet/dist/leaflet.css
+++ b/loleaflet/dist/leaflet.css
@@ -788,6 +788,7 @@ label.leaflet-control-editviewswitch {
 
 input.leaflet-control-search-bar {
     padding: 0.3em;
+	max-width: 100px;
 }
 
 .leaflet-control-fonts-container {
diff --git a/loleaflet/src/control/Control.Search.js b/loleaflet/src/control/Control.Search.js
index 38ea2af..3dc46b5 100644
--- a/loleaflet/src/control/Control.Search.js
+++ b/loleaflet/src/control/Control.Search.js
@@ -83,6 +83,7 @@ L.Control.Search = L.Control.extend({
 		var bar = L.DomUtil.create('input', className, container);
 		bar.type = 'text';
 		bar.title = title;
+		bar.placeholder = 'Search';
 
 		L.DomEvent
 			.on(bar, 'click', L.DomEvent.stop)