diff -urN ../roundcube-thunderbird_labels-1.4.2.orig/skins/classic/includes/toolbar.html ./skins/classic/includes/toolbar.html
--- ../roundcube-thunderbird_labels-1.4.2.orig/skins/classic/includes/toolbar.html 2020-02-17 16:18:45.000000000 +0200
+++ ./skins/classic/includes/toolbar.html 2020-05-16 18:23:46.629249000 +0300
@@ -1,6 +1,7 @@
diff -urN ../roundcube-thunderbird_labels-1.4.2.orig/skins/classic/tb_label.css ./skins/classic/tb_label.css
--- ../roundcube-thunderbird_labels-1.4.2.orig/skins/classic/tb_label.css 2020-02-17 16:18:45.000000000 +0200
+++ ./skins/classic/tb_label.css 2020-05-16 15:58:07.405989000 +0300
@@ -9,66 +9,59 @@
text-indent: -5000px;
}
+
+div.contextmenu ul.iconized li a.tb-label span.icon {position: relative;}
+div.contextmenu ul.iconized li a.tb-label span.icon:after {display: block; content: ''; position: absolute; top: 4px; left: 10px; width: 0; height: 0; border: 4px solid #AAAAAA; border-radius: 4px;}
+
/* for menuitems non-active */
-.toolbarmenu li a.label0
-{
- color: #CCC;
-}
-.toolbarmenu li a.label0.active
-{
- color: #333;
-}
-.toolbarmenu li a.label1
-{
- color: #FCC;
-}
-.toolbarmenu li a.label2,
-{
- color: #FC3;
-}
-.toolbarmenu li a.label3
-{
- color: #3C3;
-}
-.toolbarmenu li a.label4
-{
- color: #99F;
-}
-.toolbarmenu li a.label5
-{
- color: #C9C;
-}
+.toolbarmenu li a.label0 {color: #CCC !important;}
+.toolbarmenu li a.label1 {color: #FCC !important;}
+.toolbarmenu li a.label2 {color: #FC3 !important;}
+.toolbarmenu li a.label3 {color: #3C3 !important;}
+.toolbarmenu li a.label4 {color: #99F !important;}
+.toolbarmenu li a.label5 {color: #C9C !important;}
+.toolbarmenu li a.label0 span.icon:after {border-color: #CCC !important;}
+.toolbarmenu li a.label1 span.icon:after {border-color: #FCC !important;}
+.toolbarmenu li a.label2 span.icon:after {border-color: #FC3 !important;}
+.toolbarmenu li a.label3 span.icon:after {border-color: #3C3 !important;}
+.toolbarmenu li a.label4 span.icon:after {border-color: #99F !important;}
+.toolbarmenu li a.label5 span.icon:after {border-color: #C9C !important;}
+
/* for menuitems active */
-.toolbarmenu li a.label1.active,
-span.label1
-{
- color: #FF0000;
-}
+.toolbarmenu li a.label0.active, span.label0 {color: #333 !important;}
+.toolbarmenu li a.label1.active, span.label1 {color: #FF0000 !important;}
+.toolbarmenu li a.label2.active, span.label2 {color: #FF9900 !important;}
+.toolbarmenu li a.label3.active, span.label3 {color: #009900 !important;}
+.toolbarmenu li a.label4.active, span.label4 {color: #3333FF !important;}
+.toolbarmenu li a.label5.active, span.label5 {color: #993399 !important;}
-.toolbarmenu li a.label2.active,
-span.label2
-{
- color: #FF9900;
-}
+.toolbarmenu li a.label0.active span.icon:after {border-color: #333333 !important;}
+.toolbarmenu li a.label1.active span.icon:after {border-color: #FF0000 !important;}
+.toolbarmenu li a.label2.active span.icon:after {border-color: #FF9900 !important;}
+.toolbarmenu li a.label3.active span.icon:after {border-color: #009900 !important;}
+.toolbarmenu li a.label4.active span.icon:after {border-color: #3333FF !important;}
+.toolbarmenu li a.label5.active span.icon:after {border-color: #993399 !important;}
-.toolbarmenu li a.label3.active,
-span.label3
-{
- color: #009900;
-}
-.toolbarmenu li a.label4.active,
-span.label4
-{
- color: #3333FF;
-}
+div#tb-label-menu.popupmenu ul.toolbarmenu li a.tb-label {position: relative;}
+div#tb-label-menu.popupmenu ul.toolbarmenu li a.tb-label:after {display: block; content: ''; position: absolute; top: 6px; left: 10px; width: 0; height: 0; border: 4px solid #AAAAAA; border-radius: 4px;}
-.toolbarmenu li a.label5.active,
-span.label5
-{
- color: #993399;
-}
+/* for menuitems non-active */
+div#tb-label-menu.popupmenu ul.toolbarmenu li a.tb-label.label0:after {border-color: #CCC !important;}
+div#tb-label-menu.popupmenu ul.toolbarmenu li a.tb-label.label1:after {border-color: #FCC !important;}
+div#tb-label-menu.popupmenu ul.toolbarmenu li a.tb-label.label2:after {border-color: #FC3 !important;}
+div#tb-label-menu.popupmenu ul.toolbarmenu li a.tb-label.label3:after {border-color: #3C3 !important;}
+div#tb-label-menu.popupmenu ul.toolbarmenu li a.tb-label.label4:after {border-color: #99F !important;}
+div#tb-label-menu.popupmenu ul.toolbarmenu li a.tb-label.label5:after {border-color: #C9C !important;}
+
+/* for menuitems active */
+div#tb-label-menu.popupmenu ul.toolbarmenu li a.tb-label.label0.active:after {border-color: #333333 !important;}
+div#tb-label-menu.popupmenu ul.toolbarmenu li a.tb-label.label1.active:after {border-color: #FF0000 !important;}
+div#tb-label-menu.popupmenu ul.toolbarmenu li a.tb-label.label2.active:after {border-color: #FF9900 !important;}
+div#tb-label-menu.popupmenu ul.toolbarmenu li a.tb-label.label3.active:after {border-color: #009900 !important;}
+div#tb-label-menu.popupmenu ul.toolbarmenu li a.tb-label.label4.active:after {border-color: #3333FF !important;}
+div#tb-label-menu.popupmenu ul.toolbarmenu li a.tb-label.label5.active:after {border-color: #993399 !important;}
/* dots for labels */
diff -urN ../roundcube-thunderbird_labels-1.4.2.orig/skins/elastic/includes/toolbar.html ./skins/elastic/includes/toolbar.html
--- ../roundcube-thunderbird_labels-1.4.2.orig/skins/elastic/includes/toolbar.html 2020-02-17 16:18:45.000000000 +0200
+++ ./skins/elastic/includes/toolbar.html 2020-05-24 01:04:02.314980000 +0300
@@ -1,9 +1,5 @@
-
-
-
-
+ label="thunderbird_labels.tb_label_button_label" title="thunderbird_labels.tb_label_button_title"
+ data-popup="tb-label-menu" innerclass="inner" />
diff -urN ../roundcube-thunderbird_labels-1.4.2.orig/skins/elastic/tb_label.css ./skins/elastic/tb_label.css
--- ../roundcube-thunderbird_labels-1.4.2.orig/skins/elastic/tb_label.css 2020-02-17 16:18:45.000000000 +0200
+++ ./skins/elastic/tb_label.css 2020-05-25 03:07:29.872470000 +0300
@@ -66,3 +66,57 @@
.toolbar a.button.tb-label:before {
content: "\f507"; /* user-tag */
}
+
+.toolbarmenu li a.tb-label.label0:before,
+.toolbarmenu li a.tb-label.label1:before,
+.toolbarmenu li a.tb-label.label2:before,
+.toolbarmenu li a.tb-label.label3:before,
+.toolbarmenu li a.tb-label.label4:before,
+.toolbarmenu li a.tb-label.label5:before {
+ font-family: 'Icons';
+ font-style: normal;
+ font-weight: 900;
+ text-align: center;
+ line-height: inherit;
+ height: inherit !important;
+ margin-right: .5rem !important;
+ float: left !important;
+/* width: 1.18em !important; */
+/* min-width: 1.18em; */
+ content: "\2219";
+ font-size: 300%;
+ width: 0.5em !important;
+ min-width: 0.5em;
+/* margin-top: -2px; */
+}
+
+.menu a.button.tb-label:before {
+ content: "\f507"; /* user-tag */
+}
+
+.menu a.button.tb-label.label0:before,
+.menu a.button.tb-label.label1:before,
+.menu a.button.tb-label.label2:before,
+.menu a.button.tb-label.label3:before,
+.menu a.button.tb-label.label4:before,
+.menu a.button.tb-label.label5:before {
+ text-align: center;
+ line-height: inherit;
+ height: inherit !important;
+ margin-right: .5rem !important;
+ float: left !important;
+/* width: 1.18em !important; */
+/* min-width: 1.18em; */
+ content: "\2219";
+ font-size: 300%;
+ width: 0.5em !important;
+ min-width: 0.5em;
+ margin-top: -2px;
+}
+
+.menu a.button.tb-label.label0 {color: #2c363a !important;}
+.menu a.button.tb-label.label1 {color: #FF0000 !important;}
+.menu a.button.tb-label.label2 {color: #FF9900 !important;}
+.menu a.button.tb-label.label3 {color: #009900 !important;}
+.menu a.button.tb-label.label4 {color: #3333FF !important;}
+.menu a.button.tb-label.label5 {color: #993399 !important;}
diff -urN ../roundcube-thunderbird_labels-1.4.2.orig/skins/larry/includes/toolbar.html ./skins/larry/includes/toolbar.html
--- ../roundcube-thunderbird_labels-1.4.2.orig/skins/larry/includes/toolbar.html 2020-02-17 16:18:45.000000000 +0200
+++ ./skins/larry/includes/toolbar.html 2020-05-16 16:46:08.772713000 +0300
@@ -1,6 +1,7 @@