notebookbar: add more cond format styles

Signed-off-by: Szymon Kłos <[email protected]> Change-Id: I57a3e0aaf35a91b1d307b43c90758dd483e6996e
CollaboraOnline · Oct 26, 2023 · 4e0a2a8 · 4e0a2a8
1 parent 5c44942
commit 4e0a2a8
Show file tree

Hide file tree

Showing 14 changed files with 50 additions and 2 deletions.
diff --git a/browser/css/toolbar.css b/browser/css/toolbar.css
@@ -879,6 +879,30 @@ button.leaflet-control-search-next
 	background-size: 32px 32px !important;
 	width: 32px !important;
 	height: 32px !important; }
+.w2ui-icon.scaleset06 { background: url('images/scale-set-06.png') no-repeat;
+	background-size: 32px 32px !important;
+	width: 32px !important;
+	height: 32px !important; }
+.w2ui-icon.scaleset07 { background: url('images/scale-set-07.png') no-repeat;
+	background-size: 32px 32px !important;
+	width: 32px !important;
+	height: 32px !important; }
+.w2ui-icon.scaleset08 { background: url('images/scale-set-08.png') no-repeat;
+	background-size: 32px 32px !important;
+	width: 32px !important;
+	height: 32px !important; }
+.w2ui-icon.scaleset09 { background: url('images/scale-set-09.png') no-repeat;
+	background-size: 32px 32px !important;
+	width: 32px !important;
+	height: 32px !important; }
+.w2ui-icon.scaleset10 { background: url('images/scale-set-10.png') no-repeat;
+	background-size: 32px 32px !important;
+	width: 32px !important;
+	height: 32px !important; }
+.w2ui-icon.scaleset11 { background: url('images/scale-set-11.png') no-repeat;
+	background-size: 32px 32px !important;
+	width: 32px !important;
+	height: 32px !important; }
 
 .w2ui-icon.databarset00 { background: url('images/databar-set-00.png') no-repeat;
 	background-size: 32px 32px !important;
@@ -904,6 +928,30 @@ button.leaflet-control-search-next
 	background-size: 32px 32px !important;
 	width: 32px !important;
 	height: 32px !important; }
+.w2ui-icon.databarset06 { background: url('images/databar-set-06.png') no-repeat;
+	background-size: 32px 32px !important;
+	width: 32px !important;
+	height: 32px !important; }
+.w2ui-icon.databarset07 { background: url('images/databar-set-07.png') no-repeat;
+	background-size: 32px 32px !important;
+	width: 32px !important;
+	height: 32px !important; }
+.w2ui-icon.databarset08 { background: url('images/databar-set-08.png') no-repeat;
+	background-size: 32px 32px !important;
+	width: 32px !important;
+	height: 32px !important; }
+.w2ui-icon.databarset09 { background: url('images/databar-set-09.png') no-repeat;
+	background-size: 32px 32px !important;
+	width: 32px !important;
+	height: 32px !important; }
+.w2ui-icon.databarset10 { background: url('images/databar-set-10.png') no-repeat;
+	background-size: 32px 32px !important;
+	width: 32px !important;
+	height: 32px !important; }
+.w2ui-icon.databarset11 { background: url('images/databar-set-11.png') no-repeat;
+	background-size: 32px 32px !important;
+	width: 32px !important;
+	height: 32px !important; }
 
 .w2ui-icon.print{ background: url('images/lc_print.svg') no-repeat center; }
 .w2ui-icon.undo{ background: url('images/lc_undo.svg') no-repeat center; }

diff --git a/browser/images/databar-set-06.png b/browser/images/databar-set-06.png
diff --git a/browser/images/databar-set-07.png b/browser/images/databar-set-07.png
diff --git a/browser/images/databar-set-08.png b/browser/images/databar-set-08.png
diff --git a/browser/images/databar-set-09.png b/browser/images/databar-set-09.png
diff --git a/browser/images/databar-set-10.png b/browser/images/databar-set-10.png
diff --git a/browser/images/databar-set-11.png b/browser/images/databar-set-11.png
diff --git a/browser/images/scale-set-06.png b/browser/images/scale-set-06.png
diff --git a/browser/images/scale-set-07.png b/browser/images/scale-set-07.png
diff --git a/browser/images/scale-set-08.png b/browser/images/scale-set-08.png
diff --git a/browser/images/scale-set-09.png b/browser/images/scale-set-09.png
diff --git a/browser/images/scale-set-10.png b/browser/images/scale-set-10.png
diff --git a/browser/images/scale-set-11.png b/browser/images/scale-set-11.png
diff --git a/browser/src/control/Control.Toolbar.js b/browser/src/control/Control.Toolbar.js
@@ -301,14 +301,14 @@ global.getConditionalFormatMenuHtml = getConditionalFormatMenuHtml;
 
 // for color scale conditional formatting
 function getConditionalColorScaleMenuHtml(more, jsdialogDropdown) {
-	return getConditionalFormatMenuHtmlImpl(more, 'scaleset', 6, '.uno:ColorScaleFormatDialog', jsdialogDropdown);
+	return getConditionalFormatMenuHtmlImpl(more, 'scaleset', 12, '.uno:ColorScaleFormatDialog', jsdialogDropdown);
 }
 
 global.getConditionalColorScaleMenuHtml = getConditionalColorScaleMenuHtml;
 
 // for data bar conditional formatting
 function getConditionalDataBarMenuHtml(more, jsdialogDropdown) {
-	return getConditionalFormatMenuHtmlImpl(more, 'databarset', 6, '.uno:DataBarFormatDialog', jsdialogDropdown);
+	return getConditionalFormatMenuHtmlImpl(more, 'databarset', 12, '.uno:DataBarFormatDialog', jsdialogDropdown);
 }
 
 global.getConditionalDataBarMenuHtml = getConditionalDataBarMenuHtml;