Tejas Tank (OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/kanban-fixcss-setborder-setcolorpicket_top-tta into
lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/kanban-fixcss-setborder-setcolorpicket_top-tta/+merge/79522
Hello,
I have fixed the kanban-view bottom bar separator and also fix the issue of
color picker box which at top layer.
Thanks,
Tejas - TTA
--
https://code.launchpad.net/~openerp-dev/openerp-web/kanban-fixcss-setborder-setcolorpicket_top-tta/+merge/79522
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/kanban-fixcss-setborder-setcolorpicket_top-tta.
=== added file 'addons/web/static/src/img/icons/pad-openerp.png'
Binary files addons/web/static/src/img/icons/pad-openerp.png 1970-01-01 00:00:00 +0000 and addons/web/static/src/img/icons/pad-openerp.png 2011-10-17 09:14:24 +0000 differ
=== modified file 'addons/web_kanban/static/src/css/kanban.css'
--- addons/web_kanban/static/src/css/kanban.css 2011-09-26 15:04:24 +0000
+++ addons/web_kanban/static/src/css/kanban.css 2011-10-17 09:14:24 +0000
@@ -98,6 +98,7 @@
-moz-box-shadow: 2px 2px 5px #666;
-webkit-box-shadow: 2px 2px 5px #666;
box-shadow: 2px 2px 5px #666;
+ z-index:5000;
}
.oe_kanban_color_picker a {
display: block;
@@ -123,7 +124,31 @@
.openerp .oe_kanban_draghandle {
cursor: move;
}
+.openerp .oe_kanban_color_border{
+ border-color: #CCCCCC;
+}
+.openerp .oe_kanban_color_border{
+ border-color: #CCCCCC;
+}
+.openerp .oe_kanban_record .oe_kanban_left a {
+ border-right: 1px;
+ border-style: dotted;
+ padding-top: 5px;
+ border-left: 0px;
+ border-top: 0px;
+ border-bottom: 0px;
+ border-color: #CCCCCC;
+}
+.openerp .oe_kanban_record .oe_kanban_right a {
+ border-left: 1px;
+ border-right: 0px;
+ border-style: dotted;
+ padding-top: 5px;
+ border-top: 0px;
+ border-bottom: 0px;
+ border-color: #CCCCCC;
+}
/* Custom colors are also present in kanban.js */
/* Custom color#1 */
.openerp .oe_kanban_color_1 .oe_kanban_color_bglight {
@@ -135,6 +160,25 @@
.openerp .oe_kanban_color_1 .oe_kanban_color_border {
border-color: #D97979;
}
+.openerp .oe_kanban_color_1 .oe_kanban_left a {
+ border-right: 1px;
+ border-style: dotted;
+ padding-top: 5px;
+ border-left: 0px;
+ border-top: 0px;
+ border-bottom: 0px;
+ border-color: #D97979;
+}
+.openerp .oe_kanban_color_1 .oe_kanban_right a {
+ border-left: 1px;
+ border-right: 0px;
+ border-style: dotted;
+ padding-top: 5px;
+ border-top: 0px;
+ border-bottom: 0px;
+ border-color: #D97979;
+}
+
/* Custom color#2 */
.openerp .oe_kanban_color_2 .oe_kanban_color_bglight {
@@ -146,6 +190,25 @@
.openerp .oe_kanban_color_2 .oe_kanban_color_border {
border-color: #D9C179;
}
+.openerp .oe_kanban_color_2 .oe_kanban_left a {
+ border-right: 1px;
+ border-style: dotted;
+ padding-top: 5px;
+ border-left: 0px;
+ border-top: 0px;
+ border-bottom: 0px;
+ border-color: #D9C179;
+}
+.openerp .oe_kanban_color_2 .oe_kanban_right a {
+ border-left: 1px;
+ border-right: 0px;
+ border-style: dotted;
+ padding-top: 5px;
+ border-top: 0px;
+ border-bottom: 0px;
+ border-color: #D9C179;
+}
+
/* Custom color#3 */
.openerp .oe_kanban_color_3 .oe_kanban_color_bglight {
@@ -157,7 +220,24 @@
.openerp .oe_kanban_color_3 .oe_kanban_color_border {
border-color: #A9D979;
}
-
+.openerp .oe_kanban_color_3 .oe_kanban_left a {
+ border-right: 1px;
+ border-style: dotted;
+ padding-top: 5px;
+ border-left: 0px;
+ border-top: 0px;
+ border-bottom: 0px;
+ border-color: #A9D979;
+}
+.openerp .oe_kanban_color_3 .oe_kanban_right a {
+ border-left: 1px;
+ border-right: 0px;
+ border-style: dotted;
+ padding-top: 5px;
+ border-top: 0px;
+ border-bottom: 0px;
+ border-color: #A9D979;
+}
/* Custom color#4 */
.openerp .oe_kanban_color_4 .oe_kanban_color_bglight {
background: #C7FFD5;
@@ -168,7 +248,24 @@
.openerp .oe_kanban_color_4 .oe_kanban_color_border {
border-color: #79D991;
}
-
+.openerp .oe_kanban_color_4 .oe_kanban_left a {
+ border-right: 1px;
+ border-style: dotted;
+ padding-top: 5px;
+ border-left: 0px;
+ border-top: 0px;
+ border-bottom: 0px;
+ border-color: #79D991;
+}
+.openerp .oe_kanban_color_4 .oe_kanban_right a {
+ border-left: 1px;
+ border-right: 0px;
+ border-style: dotted;
+ padding-top: 5px;
+ border-top: 0px;
+ border-bottom: 0px;
+ border-color: #79D991;
+}
/* Custom color#5 */
.openerp .oe_kanban_color_5 .oe_kanban_color_bglight {
background: #C7FFFF;
@@ -179,7 +276,24 @@
.openerp .oe_kanban_color_5 .oe_kanban_color_border {
border-color: #79D9D9;
}
-
+.openerp .oe_kanban_color_5 .oe_kanban_left a {
+ border-right: 1px;
+ border-style: dotted;
+ padding-top: 5px;
+ border-left: 0px;
+ border-top: 0px;
+ border-bottom: 0px;
+ border-color: #79D9D9;
+}
+.openerp .oe_kanban_color_5 .oe_kanban_right a {
+ border-left: 1px;
+ border-right: 0px;
+ border-style: dotted;
+ padding-top: 5px;
+ border-top: 0px;
+ border-bottom: 0px;
+ border-color: #79D9D9;
+}
/* Custom color#6 */
.openerp .oe_kanban_color_6 .oe_kanban_color_bglight {
background: #C7D5FF;
@@ -190,7 +304,24 @@
.openerp .oe_kanban_color_6 .oe_kanban_color_border {
border-color: #8FABFF;
}
-
+.openerp .oe_kanban_color_6 .oe_kanban_left a {
+ border-right: 1px;
+ border-style: dotted;
+ padding-top: 5px;
+ border-left: 0px;
+ border-top: 0px;
+ border-bottom: 0px;
+ border-color: #8FABFF;
+}
+.openerp .oe_kanban_color_6 .oe_kanban_right a {
+ border-left: 1px;
+ border-right: 0px;
+ border-style: dotted;
+ padding-top: 5px;
+ border-top: 0px;
+ border-bottom: 0px;
+ border-color: #8FABFF;
+}
/* Custom color#7 */
.openerp .oe_kanban_color_7 .oe_kanban_color_bglight {
background: #E3C7FF;
@@ -201,7 +332,24 @@
.openerp .oe_kanban_color_7 .oe_kanban_color_border {
border-color: #A979D9;
}
-
+.openerp .oe_kanban_color_7 .oe_kanban_left a {
+ border-right: 1px;
+ border-style: dotted;
+ padding-top: 5px;
+ border-left: 0px;
+ border-top: 0px;
+ border-bottom: 0px;
+ border-color: #A979D9;
+}
+.openerp .oe_kanban_color_7 .oe_kanban_right a {
+ border-left: 1px;
+ border-right: 0px;
+ border-style: dotted;
+ padding-top: 5px;
+ border-top: 0px;
+ border-bottom: 0px;
+ border-color: #A979D9;
+}
/* Custom color#8 */
.openerp .oe_kanban_color_8 .oe_kanban_color_bglight {
background: #FFC7F1;
@@ -212,8 +360,46 @@
.openerp .oe_kanban_color_8 .oe_kanban_color_border {
border-color: #D979C1;
}
-
+.openerp .oe_kanban_color_8 .oe_kanban_left a {
+ border-right: 1px;
+ border-style: dotted;
+ padding-top: 5px;
+ border-left: 0px;
+ border-top: 0px;
+ border-bottom: 0px;
+ border-color: #D979C1;
+}
+.openerp .oe_kanban_color_8 .oe_kanban_right a {
+ border-left: 1px;
+ border-right: 0px;
+ border-style: dotted;
+ padding-top: 5px;
+ border-top: 0px;
+ border-bottom: 0px;
+ border-color: #D979C1;
+}
/* Alert color */
.openerp .oe_kanban_color_alert .oe_kanban_color_border {
border-color: #c00 !important;
}
+<<<<<<< TREE
+=======
+.openerp .oe_kanban_color_alert .oe_kanban_right a{
+ border-color: #c00 !important;
+ border-left: 1px;
+ border-right: 0px;
+ border-style: dotted;
+ padding-top: 5px;
+ border-top: 0px;
+ border-bottom: 0px;
+}
+.openerp .oe_kanban_color_alert .oe_kanban_left a{
+ border-color: #c00 !important;
+ border-right: 1px;
+ border-style: dotted;
+ padding-top: 5px;
+ border-left: 0px;
+ border-top: 0px;
+ border-bottom: 0px;
+}
+>>>>>>> MERGE-SOURCE
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
