From 97f05fcd9d7956e1cae325203e434bb6f860c22b Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 5 Mar 2013 11:44:11 +0100 Subject: [ADD] kanban view for goals bzr revid: mat@openerp.com-20130305104411-akwb7r6viq4vv7qi --- addons/gamification/static/src/css/goal.css | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 addons/gamification/static/src/css/goal.css (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css new file mode 100644 index 00000000000..621a75e514a --- /dev/null +++ b/addons/gamification/static/src/css/goal.css @@ -0,0 +1,16 @@ +.oe_kanban_goal { + width: 200px; + min-height: 160px; +} +.openerp .oe_kanban_view .oe_kanban_color_reached { + background-color: #A1FF81; + color: #0B1907; +} +.openerp .oe_kanban_view .oe_kanban_color_failed { + background-color: #ffc7c7; + color: #7a3737; +} +.oe_kanban_color_inprogress,.oe_kanban_color_inprogress_update,.oe_kanban_color_draft { + background-color: white; + color: black; +} \ No newline at end of file -- cgit v1.2.3 From d6f0f1870486ffeead883d55066c296d90198a95 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 5 Mar 2013 14:24:39 +0100 Subject: [FIX] correct domain for paid sale order bzr revid: mat@openerp.com-20130305132439-osy5e921w30lt5k1 --- addons/gamification/static/src/css/goal.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index 621a75e514a..7fd96f3356e 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -1,5 +1,5 @@ .oe_kanban_goal { - width: 200px; + width: 160px; min-height: 160px; } .openerp .oe_kanban_view .oe_kanban_color_reached { -- cgit v1.2.3 From fca11bc1f10ade70338dc838a6f62c14d45a26d0 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Wed, 6 Mar 2013 15:45:44 +0100 Subject: [IMP] various changes after review bzr revid: mat@openerp.com-20130306144544-nxtwzbcx600phczf --- addons/gamification/static/src/css/goal.css | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index 7fd96f3356e..14a92450d03 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -1,16 +1,10 @@ .oe_kanban_goal { - width: 160px; - min-height: 160px; } -.openerp .oe_kanban_view .oe_kanban_color_reached { +.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_color_reached { background-color: #A1FF81; color: #0B1907; } -.openerp .oe_kanban_view .oe_kanban_color_failed { +.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_color_failed { background-color: #ffc7c7; color: #7a3737; } -.oe_kanban_color_inprogress,.oe_kanban_color_inprogress_update,.oe_kanban_color_draft { - background-color: white; - color: black; -} \ No newline at end of file -- cgit v1.2.3 From d53a53d31587337043f155d1ca7a06f3194523b5 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 7 Mar 2013 12:16:14 +0100 Subject: [IMP] better display and group_by bzr revid: mat@openerp.com-20130307111614-zfbem9daqxmi0vdx --- addons/gamification/static/src/css/goal.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index 14a92450d03..849291ca9bc 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -8,3 +8,9 @@ background-color: #ffc7c7; color: #7a3737; } +.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_color_draft, +.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_color_canceled { + background-color: #E6E6E6; + color: #585858; + font-size: 0.9em; +} \ No newline at end of file -- cgit v1.2.3 From 2510783e3636c19541450ac13da2f31b206c4c87 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Wed, 20 Mar 2013 11:00:16 +0100 Subject: [IMP] better display of kanban bzr revid: mat@openerp.com-20130320100016-kuc3y18d9qrlv3di --- addons/gamification/static/src/css/goal.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index 849291ca9bc..a357d97bd61 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -1,4 +1,5 @@ -.oe_kanban_goal { +.openerp .oe_notebook_page .oe_kanban_view .oe_kanban_card.oe_kanban_goal { + width: 190px; } .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_color_reached { background-color: #A1FF81; -- cgit v1.2.3 From 24edc5615ba7e20f465e4b1b8e11fcabb81fdb79 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 21 Mar 2013 12:01:52 +0100 Subject: [ADD] basic widget for goal list bzr revid: mat@openerp.com-20130321110152-0wa9b3uuyk2qvk0d --- addons/gamification/static/src/css/goal.css | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index a357d97bd61..c36bd69be17 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -1,3 +1,4 @@ +/* Kanban views */ .openerp .oe_notebook_page .oe_kanban_view .oe_kanban_card.oe_kanban_goal { width: 190px; } @@ -14,4 +15,22 @@ background-color: #E6E6E6; color: #585858; font-size: 0.9em; +} + + +/* Mail Sidebar */ +/*.openerp .oe_mail_wall { + column-count: 3; + -webkit-column-count: 3; + -moz-column-count: 3; +}*/ + +.openerp .oe_mail_wall .oe_user_sidebar { + margin-left: 20px; + position: relative; + display: inline-block; + width: 200px; +} +.openerp .oe_mail_wall .oe_mail { + display: inline-block; } \ No newline at end of file -- cgit v1.2.3 From c4f2c671839c5d1d5b2922724c01d5d170aa0639 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 21 Mar 2013 17:48:02 +0100 Subject: [IMP] goal look based on state bzr revid: mat@openerp.com-20130321164802-qzndxa29utwxtdoh --- addons/gamification/static/src/css/goal.css | 34 ++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index c36bd69be17..52d90152d6a 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -27,9 +27,41 @@ .openerp .oe_mail_wall .oe_user_sidebar { margin-left: 20px; + margin-top: 20px; position: relative; display: inline-block; - width: 200px; + vertical-align: top; + width: 220px; +} +.openerp .oe_user_sidebar .oe_gamification_goal { + background: #EDEDF6; + height: auto; + padding: 15px; + border: solid 1px rgba(0,0,0,0.03); +} + +.openerp .oe_user_sidebar .oe_gamification_goal .oe_goal_reached:before { + content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMSCREbCamR5gAAAXhJREFUOMuV0z9rlEEQBvDf7htFFIwQBCvRQuFAJSJooY29VrH0E1hcCqNign8SYzAxRfTA0nyAg3wBK1GCKSwTK8G7j6AgiHl3LbLmwOQu8Wl2mZ15Zp6ZnWC/GMcrjBvBdTRkX4P/QdNZrGKkWN7sn+CuE5IvsqOyKFnRMhb3DJwsZ2VV5ZgoCt5qGdsyD8ITzGJSW3BVkAUdlZsu++0T/SU8xxQeuyj7LKEWJKcs6Px16y9harv0NVEQBZWmBR33e26Dm/hMW3BLLUvW/XJBlM31XIZMlNsi7pWa5jGjIbiBXBLd8UL+N0e0WIInvMNp8+Wltqx2SBJk06Z98HRnkUHTOZWPomEVojOiUZV26foP2XkHdD3aSRBxXDIsSRKyddmyGklQa5vRtbl7myprvrnisOBa0TuEgyBhziXwfneCrTG+9kDSkgQJSbaJ2ix42H9QYXvTakdEG4KThfanoKHS9XIvgt7KjspW8F2wIbhtSRr0Vf4AD6Nod0TaN4kAAAAASUVORK5CYII=); + margin-left:-40px; +} +.openerp .oe_user_sidebar .oe_gamification_goal .oe_goal_failed:before { + content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMVECkXmaDBcAAAAUxJREFUKM+N0jFrVEEUhuFnV1KICS7ExcLCSgiCYJXCxt5C8B+ohYVgYeUfMJBCUIydkCpRLG3EThSxU0ypxMZKYQkSzd7cO3dmLJxNNhckGTgMfHPe+c6ZOZ7Sb7gauOIIq+V2wwVjFjNtYhS4dgh0L1EnvhtzKbGdyQW+8R/ofmJc8r64Ra/hYuJHEbda7nSgB1PQRsVpc2j+xfnEZjncjtz9zLHIw0SdyZH3uwx/wmDq5oaFyKeJc2QzsVOgVzXDveRBp5fAucjbTJ5E5EWYhtDvPkJiC1878rdEdUAZHHQ7FVkrpdaJ35lQXJ8EZveST5a9Zr7lZYFS5HHF2cjztF/ys11OgDP0auYjbwrURFZGzMAvjkfW077z6z/MGjGMfCxQFXnU7fsdvcjq5FsSH1RcnkAty4eM3EqiyTTW6AeuB5aOOOTLgZt/AfLdvLh74DfrAAAAAElFTkSuQmCC); + margin-left:-40px; +} +.openerp .oe_user_sidebar .oe_gamification_goal .oe_goal_reached, +.openerp .oe_user_sidebar .oe_gamification_goal .oe_goal_failed { + text-decoration: line-through; + padding-left: 20px; +} + +.openerp .oe_mail_wall .oe_user_sidebar ul { + list-style-type: none; + padding-left: 20px; +} + +.openerp .oe_mail_wall .oe_user_sidebar li progress { + width: 80%; + display: inline-block; } .openerp .oe_mail_wall .oe_mail { display: inline-block; -- cgit v1.2.3 From 80541abdbf27d77014dec403d562f616408061c5 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 22 Mar 2013 12:13:44 +0100 Subject: [IMP] update button with refresh bzr revid: mat@openerp.com-20130322111344-7qs3o2tvbx7h4qln --- addons/gamification/static/src/css/goal.css | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index 52d90152d6a..443455a20a7 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -31,7 +31,7 @@ position: relative; display: inline-block; vertical-align: top; - width: 220px; + width: 250px; } .openerp .oe_user_sidebar .oe_gamification_goal { background: #EDEDF6; @@ -57,12 +57,18 @@ .openerp .oe_mail_wall .oe_user_sidebar ul { list-style-type: none; padding-left: 20px; + margin-bottom: 10px; +} +.openerp .oe_mail_wall .oe_user_sidebar li { + margin-bottom: 10px; } - .openerp .oe_mail_wall .oe_user_sidebar li progress { width: 80%; display: inline-block; } +.openerp .oe_mail_wall .oe_user_sidebar li p { + margin:5px 0; +} .openerp .oe_mail_wall .oe_mail { display: inline-block; } \ No newline at end of file -- cgit v1.2.3 From 391947f7cc94c237d05f970872fdbec02f56fc65 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 22 Mar 2013 16:18:03 +0100 Subject: [IMP] using sidebar and better javascript bzr revid: mat@openerp.com-20130322151803-nzb41s0mxvaidrel --- addons/gamification/static/src/css/goal.css | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index 443455a20a7..e6bc4acf14c 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -25,7 +25,7 @@ -moz-column-count: 3; }*/ -.openerp .oe_mail_wall .oe_user_sidebar { +.openerp .oe_mail_wall .oe_mail_wall_aside { margin-left: 20px; margin-top: 20px; position: relative; @@ -33,40 +33,40 @@ vertical-align: top; width: 250px; } -.openerp .oe_user_sidebar .oe_gamification_goal { +.openerp .oe_mail_wall_aside .oe_gamification_goal { background: #EDEDF6; height: auto; padding: 15px; border: solid 1px rgba(0,0,0,0.03); } -.openerp .oe_user_sidebar .oe_gamification_goal .oe_goal_reached:before { +.openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached:before { content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMSCREbCamR5gAAAXhJREFUOMuV0z9rlEEQBvDf7htFFIwQBCvRQuFAJSJooY29VrH0E1hcCqNign8SYzAxRfTA0nyAg3wBK1GCKSwTK8G7j6AgiHl3LbLmwOQu8Wl2mZ15Zp6ZnWC/GMcrjBvBdTRkX4P/QdNZrGKkWN7sn+CuE5IvsqOyKFnRMhb3DJwsZ2VV5ZgoCt5qGdsyD8ITzGJSW3BVkAUdlZsu++0T/SU8xxQeuyj7LKEWJKcs6Px16y9harv0NVEQBZWmBR33e26Dm/hMW3BLLUvW/XJBlM31XIZMlNsi7pWa5jGjIbiBXBLd8UL+N0e0WIInvMNp8+Wltqx2SBJk06Z98HRnkUHTOZWPomEVojOiUZV26foP2XkHdD3aSRBxXDIsSRKyddmyGklQa5vRtbl7myprvrnisOBa0TuEgyBhziXwfneCrTG+9kDSkgQJSbaJ2ix42H9QYXvTakdEG4KThfanoKHS9XIvgt7KjspW8F2wIbhtSRr0Vf4AD6Nod0TaN4kAAAAASUVORK5CYII=); margin-left:-40px; } -.openerp .oe_user_sidebar .oe_gamification_goal .oe_goal_failed:before { +.openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_failed:before { content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMVECkXmaDBcAAAAUxJREFUKM+N0jFrVEEUhuFnV1KICS7ExcLCSgiCYJXCxt5C8B+ohYVgYeUfMJBCUIydkCpRLG3EThSxU0ypxMZKYQkSzd7cO3dmLJxNNhckGTgMfHPe+c6ZOZ7Sb7gauOIIq+V2wwVjFjNtYhS4dgh0L1EnvhtzKbGdyQW+8R/ofmJc8r64Ra/hYuJHEbda7nSgB1PQRsVpc2j+xfnEZjncjtz9zLHIw0SdyZH3uwx/wmDq5oaFyKeJc2QzsVOgVzXDveRBp5fAucjbTJ5E5EWYhtDvPkJiC1878rdEdUAZHHQ7FVkrpdaJ35lQXJ8EZveST5a9Zr7lZYFS5HHF2cjztF/ys11OgDP0auYjbwrURFZGzMAvjkfW077z6z/MGjGMfCxQFXnU7fsdvcjq5FsSH1RcnkAty4eM3EqiyTTW6AeuB5aOOOTLgZt/AfLdvLh74DfrAAAAAElFTkSuQmCC); margin-left:-40px; } -.openerp .oe_user_sidebar .oe_gamification_goal .oe_goal_reached, -.openerp .oe_user_sidebar .oe_gamification_goal .oe_goal_failed { +.openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached, +.openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_failed { text-decoration: line-through; padding-left: 20px; } -.openerp .oe_mail_wall .oe_user_sidebar ul { +.openerp .oe_mail_wall .oe_mail_wall_aside ul { list-style-type: none; padding-left: 20px; margin-bottom: 10px; } -.openerp .oe_mail_wall .oe_user_sidebar li { +.openerp .oe_mail_wall .oe_mail_wall_aside li { margin-bottom: 10px; } -.openerp .oe_mail_wall .oe_user_sidebar li progress { +.openerp .oe_mail_wall .oe_mail_wall_aside li progress { width: 80%; display: inline-block; } -.openerp .oe_mail_wall .oe_user_sidebar li p { +.openerp .oe_mail_wall .oe_mail_wall_aside li p { margin:5px 0; } .openerp .oe_mail_wall .oe_mail { -- cgit v1.2.3 From 0b0ecfa3f8474480e850fec7a64c6cd5207054e6 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 22 Mar 2013 16:41:30 +0100 Subject: [IMP] css width for kanban badge bzr revid: mat@openerp.com-20130322154130-nmudmkp5vskcgxol --- addons/gamification/static/src/css/goal.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index e6bc4acf14c..d1eb83b161c 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -1,6 +1,7 @@ /* Kanban views */ -.openerp .oe_notebook_page .oe_kanban_view .oe_kanban_card.oe_kanban_goal { - width: 190px; +.openerp .oe_notebook_page .oe_kanban_view .oe_kanban_card.oe_kanban_goal, +.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge { + width: 220px; } .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_color_reached { background-color: #A1FF81; -- cgit v1.2.3 From 632a9d4bcbd89398e9d165422a35779902552039 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 22 Mar 2013 17:05:20 +0100 Subject: [IMP] show description button bzr revid: mat@openerp.com-20130322160520-pq9eaoqtnsvwvj7d --- addons/gamification/static/src/css/goal.css | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index d1eb83b161c..8757006aad1 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -20,11 +20,6 @@ /* Mail Sidebar */ -/*.openerp .oe_mail_wall { - column-count: 3; - -webkit-column-count: 3; - -moz-column-count: 3; -}*/ .openerp .oe_mail_wall .oe_mail_wall_aside { margin-left: 20px; @@ -58,10 +53,10 @@ .openerp .oe_mail_wall .oe_mail_wall_aside ul { list-style-type: none; padding-left: 20px; - margin-bottom: 10px; + margin-bottom: 15px; } .openerp .oe_mail_wall .oe_mail_wall_aside li { - margin-bottom: 10px; + margin-bottom: 15px; } .openerp .oe_mail_wall .oe_mail_wall_aside li progress { width: 80%; -- cgit v1.2.3 From 364612d0be52e6677a26f8a083d58b52d81c7f0a Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 25 Mar 2013 16:39:53 +0100 Subject: [IMP] use board view for sidebar bzr revid: mat@openerp.com-20130325153953-zch12sfx62s5i6xc --- addons/gamification/static/src/css/goal.css | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index 8757006aad1..8feb80ed4ad 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -58,6 +58,13 @@ .openerp .oe_mail_wall .oe_mail_wall_aside li { margin-bottom: 15px; } +.openerp .oe_mail_wall .oe_mail_wall_aside table { + margin: 10px 0; +} +.openerp .oe_mail_wall .oe_mail_wall_aside table progress { + width: 100%; + display: inline-block; +} .openerp .oe_mail_wall .oe_mail_wall_aside li progress { width: 80%; display: inline-block; -- cgit v1.2.3 From 0aa973b9f024ebefaa2f2ec9f47060e721a5c54a Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 25 Mar 2013 17:15:27 +0100 Subject: [IMP] refresh button for plan bzr revid: mat@openerp.com-20130325161527-qes3lqpzevdmdsx6 --- addons/gamification/static/src/css/goal.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index 8feb80ed4ad..84f07df8e4a 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -72,6 +72,10 @@ .openerp .oe_mail_wall .oe_mail_wall_aside li p { margin:5px 0; } +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_update_plan { + display: inline-block; + float: right; +} .openerp .oe_mail_wall .oe_mail { display: inline-block; } \ No newline at end of file -- cgit v1.2.3 From 6674de3e04d258d9408034f15270ac98f4e31c9e Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 26 Mar 2013 17:43:15 +0100 Subject: [IMP] better css bzr revid: mat@openerp.com-20130326164315-c917of9zp771loz0 --- addons/gamification/static/src/css/goal.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index 84f07df8e4a..3d2c25d1cad 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -27,7 +27,7 @@ position: relative; display: inline-block; vertical-align: top; - width: 250px; + width: 300px; } .openerp .oe_mail_wall_aside .oe_gamification_goal { background: #EDEDF6; @@ -59,11 +59,11 @@ margin-bottom: 15px; } .openerp .oe_mail_wall .oe_mail_wall_aside table { - margin: 10px 0; + margin: 10px 0; } .openerp .oe_mail_wall .oe_mail_wall_aside table progress { - width: 100%; - display: inline-block; + width: 100%; + display: inline-block; } .openerp .oe_mail_wall .oe_mail_wall_aside li progress { width: 80%; @@ -73,8 +73,8 @@ margin:5px 0; } .openerp .oe_mail_wall .oe_mail_wall_aside .oe_update_plan { - display: inline-block; - float: right; + display: inline-block; + float: right; } .openerp .oe_mail_wall .oe_mail { display: inline-block; -- cgit v1.2.3 From 6c20a6a5277ec47258aba04da109c4259522987d Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Wed, 27 Mar 2013 14:27:06 +0100 Subject: [IMP] css tweaks bzr revid: mat@openerp.com-20130327132706-bqw9h1oqzh09bj50 --- addons/gamification/static/src/css/goal.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index 3d2c25d1cad..072655cd470 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -61,6 +61,18 @@ .openerp .oe_mail_wall .oe_mail_wall_aside table { margin: 10px 0; } +.oe_mail_wall_aside .oe_list_content tbody tr:nth-child(even) { + background-color: #fff; +} +.openerp .oe_mail_wall .oe_mail_wall_aside table td,th { + vertical-align: center; + border: none; +} +.openerp .oe_mail_wall .oe_mail_wall_aside table td.col1 { width: 25%; } +.openerp .oe_mail_wall .oe_mail_wall_aside table td.col2 { width: 20%; } +.openerp .oe_mail_wall .oe_mail_wall_aside table td.col3 { width: 45%; } +/* ... and 10% left for ranking */ + .openerp .oe_mail_wall .oe_mail_wall_aside table progress { width: 100%; display: inline-block; -- cgit v1.2.3 From 00d76ef66600e5127175b6e5e1dc19b434453ad6 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 29 Mar 2013 14:14:54 +0100 Subject: [IMP] template and css bzr revid: mat@openerp.com-20130329131454-1eyyt4mw75p1s6i2 --- addons/gamification/static/src/css/goal.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index 072655cd470..030aca800d2 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -73,11 +73,11 @@ .openerp .oe_mail_wall .oe_mail_wall_aside table td.col3 { width: 45%; } /* ... and 10% left for ranking */ -.openerp .oe_mail_wall .oe_mail_wall_aside table progress { +.openerp .oe_mail_wall .oe_mail_wall_aside table progress,.oe_form_field_progressbar { width: 100%; display: inline-block; } -.openerp .oe_mail_wall .oe_mail_wall_aside li progress { +.openerp .oe_mail_wall .oe_mail_wall_aside li progress,.oe_form_field_progressbar { width: 80%; display: inline-block; } -- cgit v1.2.3 From 85feebfe9880d0845739f63a42c49247123063c8 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 2 Apr 2013 10:40:27 +0200 Subject: [ADD] display list of unique user in badge kanban view bzr revid: mat@openerp.com-20130402084027-n3g0lp3riikfukk0 --- addons/gamification/static/src/css/goal.css | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index 030aca800d2..f3134f704b8 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -19,6 +19,16 @@ } +.oe_kanban_badge_avatars img { + width: 30px; + height: 30px; + padding-left: 0; + margin-top: 3px; + border-radius: 2px; + -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); +} + + /* Mail Sidebar */ .openerp .oe_mail_wall .oe_mail_wall_aside { -- cgit v1.2.3 From 32b523c1d6f52bfb13eff396cf329074ad6bb654 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 8 Apr 2013 15:17:29 +0200 Subject: [IMP] better UI bzr revid: mat@openerp.com-20130408131729-lhlv0mhss502j9m1 --- addons/gamification/static/src/css/goal.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index f3134f704b8..41bc282df5b 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -1,7 +1,8 @@ /* Kanban views */ -.openerp .oe_notebook_page .oe_kanban_view .oe_kanban_card.oe_kanban_goal, +.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal, .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge { width: 220px; + min-height: 160px; } .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_color_reached { background-color: #A1FF81; @@ -18,7 +19,9 @@ font-size: 0.9em; } - +.oe_kanban_badge_avatars { + margin-top: 8px; +} .oe_kanban_badge_avatars img { width: 30px; height: 30px; @@ -29,6 +32,7 @@ } + /* Mail Sidebar */ .openerp .oe_mail_wall .oe_mail_wall_aside { -- cgit v1.2.3 From 0f2dad413b0d0cd3325c7b880bce10a2f6e4a5c4 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 9 Apr 2013 16:23:02 +0200 Subject: [ADD] use gauge for kanbans bzr revid: mat@openerp.com-20130409142302-lsyye6g5cfl3wa90 --- addons/gamification/static/src/css/goal.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index 41bc282df5b..57b76dd70c3 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -3,6 +3,7 @@ .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge { width: 220px; min-height: 160px; + /*height: 200px;*/ } .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_color_reached { background-color: #A1FF81; @@ -30,7 +31,10 @@ border-radius: 2px; -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } - +.oe_goal_gauge { + width:200px; + height:150px; +} /* Mail Sidebar */ -- cgit v1.2.3 From 5fe85f22782127e2f090d350353624b5ce22d386 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 9 Apr 2013 16:40:30 +0200 Subject: [IMP] better UI bzr revid: mat@openerp.com-20130409144030-rb609qteloq3vrgf --- addons/gamification/static/src/css/goal.css | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index 57b76dd70c3..0856bd60135 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -3,21 +3,6 @@ .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge { width: 220px; min-height: 160px; - /*height: 200px;*/ -} -.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_color_reached { - background-color: #A1FF81; - color: #0B1907; -} -.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_color_failed { - background-color: #ffc7c7; - color: #7a3737; -} -.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_color_draft, -.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_color_canceled { - background-color: #E6E6E6; - color: #585858; - font-size: 0.9em; } .oe_kanban_badge_avatars { -- cgit v1.2.3 From f70b0017f63fa9baef330e05e67517d2127e798e Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Wed, 10 Apr 2013 12:14:54 +0200 Subject: [IMP] fixing and UI bzr revid: mat@openerp.com-20130410101454-nkt8mbt8qb13zrge --- addons/gamification/static/src/css/goal.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index 0856bd60135..f6c38ea1ccb 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -2,7 +2,7 @@ .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal, .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge { width: 220px; - min-height: 160px; + min-height: 150px; } .oe_kanban_badge_avatars { -- cgit v1.2.3 From 1e9805fbfd0936cd228fb7177cc8519d2554432f Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Wed, 10 Apr 2013 17:30:31 +0200 Subject: [IMP] use suffix in kanban and better view bzr revid: mat@openerp.com-20130410153031-s6op7d7wyfdzrcti --- addons/gamification/static/src/css/goal.css | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index f6c38ea1ccb..7481a853295 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -2,7 +2,10 @@ .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal, .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge { width: 220px; - min-height: 150px; + min-height: 200px; +} +.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal p { + text-align: center; } .oe_kanban_badge_avatars { @@ -18,7 +21,12 @@ } .oe_goal_gauge { width:200px; - height:150px; + height:130px; + margin: auto; + margin-bottom: -30px; +} +.oe_goal_gauge svg { + margin-top: -30px; } -- cgit v1.2.3 From e68c4b5e235b34ceb42270007e5efe205416ebee Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 11 Apr 2013 11:21:03 +0200 Subject: [IMP] ponctual goal type bzr revid: mat@openerp.com-20130411092103-5sowdvkm09wbvhtv --- addons/gamification/static/src/css/goal.css | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index 7481a853295..3738d0bc51f 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -19,14 +19,21 @@ border-radius: 2px; -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } -.oe_goal_gauge { +.oe_kanban_goal .oe_goal_state_block { width:200px; height:130px; margin: auto; - margin-bottom: -30px; + margin-bottom: -20px; } -.oe_goal_gauge svg { - margin-top: -30px; +.oe_kanban_goal .oe_goal_state_block p { + line-height: 70px; + font-size: 3em; +} +.openerp .oe_kanban_view .oe_kanban_content .oe_goal_gauge:first-child { + margin: auto; /* avoid margin-right: 16px; */ +} +.oe_kanban_goal .oe_kanban_content .oe_goal_gauge svg { + margin-top: -20px; } @@ -47,18 +54,17 @@ border: solid 1px rgba(0,0,0,0.03); } -.openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached:before { +.openerp .oe_gamification_goal .oe_goal_reached:before { content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMSCREbCamR5gAAAXhJREFUOMuV0z9rlEEQBvDf7htFFIwQBCvRQuFAJSJooY29VrH0E1hcCqNign8SYzAxRfTA0nyAg3wBK1GCKSwTK8G7j6AgiHl3LbLmwOQu8Wl2mZ15Zp6ZnWC/GMcrjBvBdTRkX4P/QdNZrGKkWN7sn+CuE5IvsqOyKFnRMhb3DJwsZ2VV5ZgoCt5qGdsyD8ITzGJSW3BVkAUdlZsu++0T/SU8xxQeuyj7LKEWJKcs6Px16y9harv0NVEQBZWmBR33e26Dm/hMW3BLLUvW/XJBlM31XIZMlNsi7pWa5jGjIbiBXBLd8UL+N0e0WIInvMNp8+Wltqx2SBJk06Z98HRnkUHTOZWPomEVojOiUZV26foP2XkHdD3aSRBxXDIsSRKyddmyGklQa5vRtbl7myprvrnisOBa0TuEgyBhziXwfneCrTG+9kDSkgQJSbaJ2ix42H9QYXvTakdEG4KThfanoKHS9XIvgt7KjspW8F2wIbhtSRr0Vf4AD6Nod0TaN4kAAAAASUVORK5CYII=); - margin-left:-40px; + margin-left:-20px; } -.openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_failed:before { +.openerp .oe_gamification_goal .oe_goal_failed:before { content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMVECkXmaDBcAAAAUxJREFUKM+N0jFrVEEUhuFnV1KICS7ExcLCSgiCYJXCxt5C8B+ohYVgYeUfMJBCUIydkCpRLG3EThSxU0ypxMZKYQkSzd7cO3dmLJxNNhckGTgMfHPe+c6ZOZ7Sb7gauOIIq+V2wwVjFjNtYhS4dgh0L1EnvhtzKbGdyQW+8R/ofmJc8r64Ra/hYuJHEbda7nSgB1PQRsVpc2j+xfnEZjncjtz9zLHIw0SdyZH3uwx/wmDq5oaFyKeJc2QzsVOgVzXDveRBp5fAucjbTJ5E5EWYhtDvPkJiC1878rdEdUAZHHQ7FVkrpdaJ35lQXJ8EZveST5a9Zr7lZYFS5HHF2cjztF/ys11OgDP0auYjbwrURFZGzMAvjkfW077z6z/MGjGMfCxQFXnU7fsdvcjq5FsSH1RcnkAty4eM3EqiyTTW6AeuB5aOOOTLgZt/AfLdvLh74DfrAAAAAElFTkSuQmCC); - margin-left:-40px; + margin-left:-20px; } .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached, .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_failed { text-decoration: line-through; - padding-left: 20px; } .openerp .oe_mail_wall .oe_mail_wall_aside ul { -- cgit v1.2.3 From cff925cf3e6120e293528b1729cbfa95c71bb222 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 11 Apr 2013 12:15:43 +0200 Subject: [IMP] display goals lower than bzr revid: mat@openerp.com-20130411101543-wal4yed64rynchfn --- addons/gamification/static/src/css/goal.css | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index 3738d0bc51f..32d2eb2c7d0 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -1,13 +1,9 @@ /* Kanban views */ .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal, .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge { - width: 220px; + width: 200px; min-height: 200px; } -.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal p { - text-align: center; -} - .oe_kanban_badge_avatars { margin-top: 8px; } @@ -25,9 +21,16 @@ margin: auto; margin-bottom: -20px; } -.oe_kanban_goal .oe_goal_state_block p { - line-height: 70px; - font-size: 3em; +.oe_kanban_goal .oe_goal_state_block,p { + text-align: center; +} +.oe_kanban_goal .oe_goal_state_block .oe_goal_state { + font-size: 2.5em; + font-weight: bold; + padding-top: 30px; +} +.oe_kanban_goal .oe_goal_state_block .oe_goal_state.oe_e{ + font-size: 7em; } .openerp .oe_kanban_view .oe_kanban_content .oe_goal_gauge:first-child { margin: auto; /* avoid margin-right: 16px; */ -- cgit v1.2.3 From 28761467fc3c13f45f655b39b58cb233a7a1c1ea Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 11 Apr 2013 17:11:32 +0200 Subject: [IMP] better UI bzr revid: mat@openerp.com-20130411151132-vsk2cnff5uhqmzas --- addons/gamification/static/src/css/goal.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index 32d2eb2c7d0..82a0d60b903 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -1,7 +1,7 @@ /* Kanban views */ .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal, .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge { - width: 200px; + width: 220px; min-height: 200px; } .oe_kanban_badge_avatars { -- cgit v1.2.3 From 252365095a18b71ac0912ca2bc3f5262ffdd87b8 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 12 Apr 2013 10:54:52 +0200 Subject: [IMP] better badge views and checks bzr revid: mat@openerp.com-20130412085452-mnecqo80cgmo2ecs --- addons/gamification/static/src/css/goal.css | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index 82a0d60b903..cb8054f33b4 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -1,9 +1,12 @@ /* Kanban views */ -.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal, -.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge { +.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal { width: 220px; min-height: 200px; } +.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge { + width: 250px; + min-height: 150px; +} .oe_kanban_badge_avatars { margin-top: 8px; } @@ -21,7 +24,8 @@ margin: auto; margin-bottom: -20px; } -.oe_kanban_goal .oe_goal_state_block,p { +.oe_kanban_goal .oe_goal_state_block, +.oe_kanban_goal p { text-align: center; } .oe_kanban_goal .oe_goal_state_block .oe_goal_state { -- cgit v1.2.3 From 2cb06d79a63a7abdd288d0087c3b0febb5df60b1 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 12 Apr 2013 11:43:13 +0200 Subject: [IMP] better badge views bzr revid: mat@openerp.com-20130412094313-x530vhkzrwvt0tei --- addons/gamification/static/src/css/goal.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index cb8054f33b4..d5792d7864b 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -1,6 +1,6 @@ /* Kanban views */ .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal { - width: 220px; + width: 230px; min-height: 200px; } .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge { -- cgit v1.2.3 From d52cb29c5fcda99b0301feda9cdc8ab5206a981a Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 12 Apr 2013 12:09:33 +0200 Subject: [IMP] color for goal kanban bzr revid: mat@openerp.com-20130412100933-pmh9cl2tejthzi9x --- addons/gamification/static/src/css/goal.css | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index d5792d7864b..dc8273e6f69 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -43,6 +43,15 @@ margin-top: -20px; } +.openerp .oe_red { + color: red; +} +.openerp .oe_green { + color: green; +} +.openerp .oe_orange { + color: orange; +} /* Mail Sidebar */ -- cgit v1.2.3 From 6f7a0852ac56a1553213820e2beb00eecae658b4 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 12 Apr 2013 14:19:13 +0200 Subject: [IMP] better handling of past goals bzr revid: mat@openerp.com-20130412121913-zp30gchk5tfbsuzy --- addons/gamification/static/src/css/goal.css | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index dc8273e6f69..90baa758808 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -53,6 +53,7 @@ color: orange; } + /* Mail Sidebar */ .openerp .oe_mail_wall .oe_mail_wall_aside { -- cgit v1.2.3 From 8f05129bcda7de790b33b561330dcd881f5c8da2 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 12 Apr 2013 16:09:58 +0200 Subject: [IMP] display sent count instead of remaining bzr revid: mat@openerp.com-20130412140958-nnsc7io1cs57qdq6 --- addons/gamification/static/src/css/goal.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index 90baa758808..c231f9447c1 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -52,7 +52,10 @@ .openerp .oe_orange { color: orange; } - +/* compensate padding from .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell */ +.openerp .oe_form td .oe_no_padding { + margin-left: -6px; +} /* Mail Sidebar */ -- cgit v1.2.3 From b18bc579197837ddcc97d9f7292d8cec3bc05d49 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 12 Apr 2013 17:21:50 +0200 Subject: [ADD] use sparklines bzr revid: mat@openerp.com-20130412152150-8679huigt6cfmool --- addons/gamification/static/src/css/goal.css | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index c231f9447c1..e081b666bc3 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -74,14 +74,14 @@ border: solid 1px rgba(0,0,0,0.03); } -.openerp .oe_gamification_goal .oe_goal_reached:before { +/*.openerp .oe_gamification_goal .oe_goal_reached:before { content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMSCREbCamR5gAAAXhJREFUOMuV0z9rlEEQBvDf7htFFIwQBCvRQuFAJSJooY29VrH0E1hcCqNign8SYzAxRfTA0nyAg3wBK1GCKSwTK8G7j6AgiHl3LbLmwOQu8Wl2mZ15Zp6ZnWC/GMcrjBvBdTRkX4P/QdNZrGKkWN7sn+CuE5IvsqOyKFnRMhb3DJwsZ2VV5ZgoCt5qGdsyD8ITzGJSW3BVkAUdlZsu++0T/SU8xxQeuyj7LKEWJKcs6Px16y9harv0NVEQBZWmBR33e26Dm/hMW3BLLUvW/XJBlM31XIZMlNsi7pWa5jGjIbiBXBLd8UL+N0e0WIInvMNp8+Wltqx2SBJk06Z98HRnkUHTOZWPomEVojOiUZV26foP2XkHdD3aSRBxXDIsSRKyddmyGklQa5vRtbl7myprvrnisOBa0TuEgyBhziXwfneCrTG+9kDSkgQJSbaJ2ix42H9QYXvTakdEG4KThfanoKHS9XIvgt7KjspW8F2wIbhtSRr0Vf4AD6Nod0TaN4kAAAAASUVORK5CYII=); margin-left:-20px; } .openerp .oe_gamification_goal .oe_goal_failed:before { content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMVECkXmaDBcAAAAUxJREFUKM+N0jFrVEEUhuFnV1KICS7ExcLCSgiCYJXCxt5C8B+ohYVgYeUfMJBCUIydkCpRLG3EThSxU0ypxMZKYQkSzd7cO3dmLJxNNhckGTgMfHPe+c6ZOZ7Sb7gauOIIq+V2wwVjFjNtYhS4dgh0L1EnvhtzKbGdyQW+8R/ofmJc8r64Ra/hYuJHEbda7nSgB1PQRsVpc2j+xfnEZjncjtz9zLHIw0SdyZH3uwx/wmDq5oaFyKeJc2QzsVOgVzXDveRBp5fAucjbTJ5E5EWYhtDvPkJiC1878rdEdUAZHHQ7FVkrpdaJ35lQXJ8EZveST5a9Zr7lZYFS5HHF2cjztF/ys11OgDP0auYjbwrURFZGzMAvjkfW077z6z/MGjGMfCxQFXnU7fsdvcjq5FsSH1RcnkAty4eM3EqiyTTW6AeuB5aOOOTLgZt/AfLdvLh74DfrAAAAAElFTkSuQmCC); margin-left:-20px; -} +}*/ .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached, .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_failed { text-decoration: line-through; @@ -105,9 +105,8 @@ vertical-align: center; border: none; } -.openerp .oe_mail_wall .oe_mail_wall_aside table td.col1 { width: 25%; } -.openerp .oe_mail_wall .oe_mail_wall_aside table td.col2 { width: 20%; } -.openerp .oe_mail_wall .oe_mail_wall_aside table td.col3 { width: 45%; } +.openerp .oe_mail_wall .oe_mail_wall_aside table td.col1 { width: 40%; } +.openerp .oe_mail_wall .oe_mail_wall_aside table td.col2 { width: 50%; } /* ... and 10% left for ranking */ .openerp .oe_mail_wall .oe_mail_wall_aside table progress,.oe_form_field_progressbar { -- cgit v1.2.3 From 0222ae2a211667f9f38e173ff3211615cd5dc7af Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 15 Apr 2013 17:50:14 +0200 Subject: [IMP] better data bzr revid: mat@openerp.com-20130415155014-y6bdafhnmb5g7kqj --- addons/gamification/static/src/css/goal.css | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index e081b666bc3..81a7d0bf9c9 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -102,7 +102,7 @@ background-color: #fff; } .openerp .oe_mail_wall .oe_mail_wall_aside table td,th { - vertical-align: center; + vertical-align: middle; border: none; } .openerp .oe_mail_wall .oe_mail_wall_aside table td.col1 { width: 40%; } @@ -120,10 +120,16 @@ .openerp .oe_mail_wall .oe_mail_wall_aside li p { margin:5px 0; } -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_update_plan { - display: inline-block; +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_update_plan, +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_goal_action { + visibility: hidden; + display: block; float: right; } +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal:hover > .oe_update_plan, +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal:hover .oe_goal_action { + visibility: visible; +} .openerp .oe_mail_wall .oe_mail { display: inline-block; } \ No newline at end of file -- cgit v1.2.3 From 06159a516abb7203d997d2dcb77b0fcc849c2b5a Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 18 Apr 2013 12:32:29 +0200 Subject: [IMP] show suggested threads bzr revid: mat@openerp.com-20130418103229-xkyu6qyzdola03hn --- addons/gamification/static/src/css/goal.css | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index 81a7d0bf9c9..e3dd25b67e4 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -58,30 +58,23 @@ } /* Mail Sidebar */ - .openerp .oe_mail_wall .oe_mail_wall_aside { - margin-left: 20px; - margin-top: 20px; + margin-top: 15px; position: relative; display: inline-block; vertical-align: top; - width: 300px; + width: 260px; +} +.openerp .oe_mail_wall .oe_mail_wall_aside { + position: relative; + vertical-align: top; + background: #EDEDF6; + border-radius: 2px; } -.openerp .oe_mail_wall_aside .oe_gamification_goal { +.openerp .oe_mail_wall_aside > div { background: #EDEDF6; - height: auto; - padding: 15px; - border: solid 1px rgba(0,0,0,0.03); + padding: 5px 0 0 15px; } - -/*.openerp .oe_gamification_goal .oe_goal_reached:before { - content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMSCREbCamR5gAAAXhJREFUOMuV0z9rlEEQBvDf7htFFIwQBCvRQuFAJSJooY29VrH0E1hcCqNign8SYzAxRfTA0nyAg3wBK1GCKSwTK8G7j6AgiHl3LbLmwOQu8Wl2mZ15Zp6ZnWC/GMcrjBvBdTRkX4P/QdNZrGKkWN7sn+CuE5IvsqOyKFnRMhb3DJwsZ2VV5ZgoCt5qGdsyD8ITzGJSW3BVkAUdlZsu++0T/SU8xxQeuyj7LKEWJKcs6Px16y9harv0NVEQBZWmBR33e26Dm/hMW3BLLUvW/XJBlM31XIZMlNsi7pWa5jGjIbiBXBLd8UL+N0e0WIInvMNp8+Wltqx2SBJk06Z98HRnkUHTOZWPomEVojOiUZV26foP2XkHdD3aSRBxXDIsSRKyddmyGklQa5vRtbl7myprvrnisOBa0TuEgyBhziXwfneCrTG+9kDSkgQJSbaJ2ix42H9QYXvTakdEG4KThfanoKHS9XIvgt7KjspW8F2wIbhtSRr0Vf4AD6Nod0TaN4kAAAAASUVORK5CYII=); - margin-left:-20px; -} -.openerp .oe_gamification_goal .oe_goal_failed:before { - content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMVECkXmaDBcAAAAUxJREFUKM+N0jFrVEEUhuFnV1KICS7ExcLCSgiCYJXCxt5C8B+ohYVgYeUfMJBCUIydkCpRLG3EThSxU0ypxMZKYQkSzd7cO3dmLJxNNhckGTgMfHPe+c6ZOZ7Sb7gauOIIq+V2wwVjFjNtYhS4dgh0L1EnvhtzKbGdyQW+8R/ofmJc8r64Ra/hYuJHEbda7nSgB1PQRsVpc2j+xfnEZjncjtz9zLHIw0SdyZH3uwx/wmDq5oaFyKeJc2QzsVOgVzXDveRBp5fAucjbTJ5E5EWYhtDvPkJiC1878rdEdUAZHHQ7FVkrpdaJ35lQXJ8EZveST5a9Zr7lZYFS5HHF2cjztF/ys11OgDP0auYjbwrURFZGzMAvjkfW077z6z/MGjGMfCxQFXnU7fsdvcjq5FsSH1RcnkAty4eM3EqiyTTW6AeuB5aOOOTLgZt/AfLdvLh74DfrAAAAAElFTkSuQmCC); - margin-left:-20px; -}*/ .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached, .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_failed { text-decoration: line-through; -- cgit v1.2.3 From 8a95c92353868f4a1a53ddc27eb6bc5943c06188 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 18 Apr 2013 18:05:12 +0200 Subject: [ADD] wizard to accept challenges bzr revid: mat@openerp.com-20130418160512-v9tw81ddki79kwv5 --- addons/gamification/static/src/css/goal.css | 32 ++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 10 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index e3dd25b67e4..360cf1d9046 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -63,17 +63,13 @@ position: relative; display: inline-block; vertical-align: top; - width: 260px; -} -.openerp .oe_mail_wall .oe_mail_wall_aside { - position: relative; - vertical-align: top; + width: 280px; background: #EDEDF6; border-radius: 2px; } .openerp .oe_mail_wall_aside > div { background: #EDEDF6; - padding: 5px 0 0 15px; + padding: 5px 5px 0 15px; } .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached, .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_failed { @@ -94,14 +90,30 @@ .oe_mail_wall_aside .oe_list_content tbody tr:nth-child(even) { background-color: #fff; } -.openerp .oe_mail_wall .oe_mail_wall_aside table td,th { +.openerp .oe_mail_wall .oe_mail_wall_aside td, +.openerp .oe_mail_wall .oe_mail_wall_aside th { vertical-align: middle; border: none; } -.openerp .oe_mail_wall .oe_mail_wall_aside table td.col1 { width: 40%; } -.openerp .oe_mail_wall .oe_mail_wall_aside table td.col2 { width: 50%; } -/* ... and 10% left for ranking */ +.openerp .oe_mail_wall_aside .oe_list_content tbody th { + padding-left: 5px; +} +.openerp .oe_mail_wall .oe_mail_wall_aside table .col0 { + font-size: 150%; + font-weight: bold; +} +.openerp .oe_mail_wall .oe_mail_wall_aside table td.col0 { width: 25px; } +.openerp .oe_mail_wall .oe_mail_wall_aside table td.col1 { width: 32px; } +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_user_avatar { width: 32px; } + +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_progress { + background: rgb(173, 219, 178); +/* background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QQSDDgQbtbJfgAAABl0RVh0Q29tbWVudABDcmVhdGVkIHdpdGggR0lNUFeBDhcAAAAMSURBVAjXY2jY2AoAA2sBt0HZbqoAAAAASUVORK5CYII=); + background-image: url("http://lorempixel.com/20/10/"); + background-repeat: repeat-y; + background-position: 0 50%;*/ +} .openerp .oe_mail_wall .oe_mail_wall_aside table progress,.oe_form_field_progressbar { width: 100%; display: inline-block; -- cgit v1.2.3 From b7a6b6e1307eac912d88a786ba6cce1b4088e71b Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 19 Apr 2013 12:22:45 +0200 Subject: [ADD] display single kanban bzr revid: mat@openerp.com-20130419102245-pri7z7tdyh7xe5c9 --- addons/gamification/static/src/css/goal.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index 360cf1d9046..d8f4f7ca3fe 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -7,10 +7,10 @@ width: 250px; min-height: 150px; } -.oe_kanban_badge_avatars { +.openerp .oe_kanban_badge_avatars { margin-top: 8px; } -.oe_kanban_badge_avatars img { +.openerp .oe_kanban_badge_avatars img { width: 30px; height: 30px; padding-left: 0; @@ -18,7 +18,7 @@ border-radius: 2px; -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } -.oe_kanban_goal .oe_goal_state_block { +.openerp .oe_kanban_goal .oe_goal_state_block { width:200px; height:130px; margin: auto; -- cgit v1.2.3 From 4fb6e9b682901e02e615936c75bbe8ca6cee8b8b Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 19 Apr 2013 17:48:17 +0200 Subject: [IMP] display user's badges on employee bzr revid: mat@openerp.com-20130419154817-rq09s1f5nl6ryhka --- addons/gamification/static/src/css/goal.css | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index d8f4f7ca3fe..e481a800c79 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -107,12 +107,9 @@ .openerp .oe_mail_wall .oe_mail_wall_aside .oe_user_avatar { width: 32px; } +/* background progress bar */ .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_progress { background: rgb(173, 219, 178); -/* background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QQSDDgQbtbJfgAAABl0RVh0Q29tbWVudABDcmVhdGVkIHdpdGggR0lNUFeBDhcAAAAMSURBVAjXY2jY2AoAA2sBt0HZbqoAAAAASUVORK5CYII=); - background-image: url("http://lorempixel.com/20/10/"); - background-repeat: repeat-y; - background-position: 0 50%;*/ } .openerp .oe_mail_wall .oe_mail_wall_aside table progress,.oe_form_field_progressbar { width: 100%; -- cgit v1.2.3 From 38f205ef32a1acd3d5712d203c5f18d2d0805c95 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 22 Apr 2013 11:32:36 +0200 Subject: [IMP] more consistent display of challenges bzr revid: mat@openerp.com-20130422093236-y76ad91yoyemejxa --- addons/gamification/static/src/css/goal.css | 78 ++++++++++++++++++----------- 1 file changed, 48 insertions(+), 30 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index e481a800c79..c113ac6ad2e 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -71,23 +71,49 @@ background: #EDEDF6; padding: 5px 5px 0 15px; } -.openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached, +.openerp .oe_mail_wall_aside h3 { + font-size: 1.3em; + margin-left: -7px; + font-variant: small-caps; + text-transform: capitalize; + line-height: 1em; +} +/* mark goal as completed */ +.openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached { + /*text-decoration: line-through;*/ + color: rgb(17, 95, 17); +} .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_failed { - text-decoration: line-through; + color: rgb(95, 17, 17); } -.openerp .oe_mail_wall .oe_mail_wall_aside ul { +.openerp .oe_mail_wall_aside .oe_goals_list { list-style-type: none; - padding-left: 20px; + padding-left: 15px; margin-bottom: 15px; + width: 200px; } -.openerp .oe_mail_wall .oe_mail_wall_aside li { - margin-bottom: 15px; +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_outer_box { + background: rgb(173, 219, 178); + min-height: 32px; +} +.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box { + display: inline-block; + width: 200px; + min-height: 32px; + vertical-align: middle; + border: solid 1px white; +} +.openerp .oe_mail_wall_aside table.oe_goals_list .oe_goal_inner_box { + border: none; +} +.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box strong { + padding-left: 5px; } .openerp .oe_mail_wall .oe_mail_wall_aside table { margin: 10px 0; } -.oe_mail_wall_aside .oe_list_content tbody tr:nth-child(even) { +.oe_mail_wall_aside .oe_goals_list tbody tr:nth-child(even) { background-color: #fff; } .openerp .oe_mail_wall .oe_mail_wall_aside td, @@ -95,41 +121,33 @@ vertical-align: middle; border: none; } -.openerp .oe_mail_wall_aside .oe_list_content tbody th { +.openerp .oe_mail_wall_aside .oe_goals_list thead th { + padding: 5px; +} +.openerp .oe_mail_wall_aside .oe_goals_list tbody tr { + height: 32px; +} +.openerp .oe_mail_wall_aside .oe_goals_list tbody th { padding-left: 5px; + height: 32px; } .openerp .oe_mail_wall .oe_mail_wall_aside table .col0 { - font-size: 150%; + font-size: 160%; font-weight: bold; + width: 24px; } -.openerp .oe_mail_wall .oe_mail_wall_aside table td.col0 { width: 25px; } -.openerp .oe_mail_wall .oe_mail_wall_aside table td.col1 { width: 32px; } - -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_user_avatar { width: 32px; } - -/* background progress bar */ -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_progress { - background: rgb(173, 219, 178); -} -.openerp .oe_mail_wall .oe_mail_wall_aside table progress,.oe_form_field_progressbar { - width: 100%; - display: inline-block; -} -.openerp .oe_mail_wall .oe_mail_wall_aside li progress,.oe_form_field_progressbar { - width: 80%; - display: inline-block; -} -.openerp .oe_mail_wall .oe_mail_wall_aside li p { - margin:5px 0; +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_user_avatar { + width: 32px; + padding-right: 5px; } .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_update_plan, -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_goal_action { +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_inner_box .oe_goal_action { visibility: hidden; display: block; float: right; } .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal:hover > .oe_update_plan, -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal:hover .oe_goal_action { +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_inner_box:hover .oe_goal_action { visibility: visible; } .openerp .oe_mail_wall .oe_mail { -- cgit v1.2.3 From 8b400f7e883a0bcee2cd29c7539f786a084b40f5 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 22 Apr 2013 15:33:55 +0200 Subject: [IMP] remove many2many display and clean ups bzr revid: mat@openerp.com-20130422133355-ffhglxrkdia2hz4j --- addons/gamification/static/src/css/goal.css | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index c113ac6ad2e..c4f74aae557 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -80,11 +80,8 @@ } /* mark goal as completed */ .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached { - /*text-decoration: line-through;*/ - color: rgb(17, 95, 17); -} -.openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_failed { - color: rgb(95, 17, 17); + text-decoration: line-through; + color: rgb(138, 137, 137); } .openerp .oe_mail_wall_aside .oe_goals_list { @@ -94,7 +91,7 @@ width: 200px; } .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_outer_box { - background: rgb(173, 219, 178); + background: rgb(213, 213, 213); min-height: 32px; } .openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box { @@ -110,8 +107,12 @@ .openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box strong { padding-left: 5px; } -.openerp .oe_mail_wall .oe_mail_wall_aside table { +.openerp .oe_mail_wall .oe_mail_wall_aside table.oe_goals_list { margin: 10px 0; + border: solid 1px white; +} +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goals_list thead { + font-weight: normal; } .oe_mail_wall_aside .oe_goals_list tbody tr:nth-child(even) { background-color: #fff; @@ -122,6 +123,7 @@ border: none; } .openerp .oe_mail_wall_aside .oe_goals_list thead th { + font-weight: normal; padding: 5px; } .openerp .oe_mail_wall_aside .oe_goals_list tbody tr { -- cgit v1.2.3 From c76b9fb8e874e18fe9f2f34436125a94d944569e Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 22 Apr 2013 15:55:40 +0200 Subject: [IMP] remove unused sparklines and display actions bzr revid: mat@openerp.com-20130422135540-9ozlret4qjz6ivcq --- addons/gamification/static/src/css/goal.css | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index c4f74aae557..fa6c9e096ab 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -117,8 +117,8 @@ .oe_mail_wall_aside .oe_goals_list tbody tr:nth-child(even) { background-color: #fff; } -.openerp .oe_mail_wall .oe_mail_wall_aside td, -.openerp .oe_mail_wall .oe_mail_wall_aside th { +.openerp .oe_mail_wall_aside td, +.openerp .oe_mail_wall_aside th { vertical-align: middle; border: none; } @@ -133,22 +133,24 @@ padding-left: 5px; height: 32px; } -.openerp .oe_mail_wall .oe_mail_wall_aside table .col0 { +.openerp .oe_mail_wall_aside table.oe_goals_list .col0 { font-size: 160%; font-weight: bold; width: 24px; } +.openerp .oe_mail_wall_aside table.oe_goals_list .col1 { + width: 200px; +} .openerp .oe_mail_wall .oe_mail_wall_aside .oe_user_avatar { width: 32px; padding-right: 5px; } .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_update_plan, -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_inner_box .oe_goal_action { +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_goal_action { visibility: hidden; - display: block; - float: right; + font-size: 25px; } -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal:hover > .oe_update_plan, +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_clear:hover .oe_update_plan, .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_inner_box:hover .oe_goal_action { visibility: visible; } -- cgit v1.2.3 From c1d645e2cd0ecf6d7ce1e653ec524bb91596c9f5 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 22 Apr 2013 17:41:22 +0200 Subject: [FIX] css tweak bzr revid: mat@openerp.com-20130422154122-yv99mjhpcrn7dwd4 --- addons/gamification/static/src/css/goal.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index fa6c9e096ab..f4b064ef074 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -78,7 +78,7 @@ text-transform: capitalize; line-height: 1em; } -/* mark goal as completed */ + .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached { text-decoration: line-through; color: rgb(138, 137, 137); @@ -150,7 +150,7 @@ visibility: hidden; font-size: 25px; } -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_clear:hover .oe_update_plan, +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_update_plan, .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_inner_box:hover .oe_goal_action { visibility: visible; } -- cgit v1.2.3 From 99505e351d8f3b38e2adc3bdfa5f09f0e58fb896 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 23 Apr 2013 15:20:34 +0200 Subject: [IMP] better kanban view bzr revid: mat@openerp.com-20130423132034-fgblz5f4658n2i8g --- addons/gamification/static/src/css/goal.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index f4b064ef074..bf73a0273de 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -42,7 +42,9 @@ .oe_kanban_goal .oe_kanban_content .oe_goal_gauge svg { margin-top: -20px; } - +.openerp .oe_no_overflow { + overflow: hidden; +} .openerp .oe_red { color: red; } -- cgit v1.2.3 From 4bcaa718bd1f45c79a688c1a47d0a69cae0348ae Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Wed, 24 Apr 2013 14:33:50 +0200 Subject: [IMP] display actions bzr revid: mat@openerp.com-20130424123350-cgx663vd31vvnw7w --- addons/gamification/static/src/css/goal.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index bf73a0273de..1d9aee31500 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -153,7 +153,8 @@ font-size: 25px; } .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_update_plan, -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_inner_box:hover .oe_goal_action { +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_goal_action, +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal th:hover > .oe_goal_action { visibility: visible; } .openerp .oe_mail_wall .oe_mail { -- cgit v1.2.3 From 5794e60f148fc0a3500be3d7082eff4fa8366854 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 25 Apr 2013 10:52:17 +0200 Subject: [IMP] better design bzr revid: mat@openerp.com-20130425085217-bmt8tsdbtrfn7j7d --- .../gamification/static/src/css/gamification.css | 202 +++++++++++++++++++++ addons/gamification/static/src/css/goal.css | 162 ----------------- 2 files changed, 202 insertions(+), 162 deletions(-) create mode 100644 addons/gamification/static/src/css/gamification.css delete mode 100644 addons/gamification/static/src/css/goal.css (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/gamification.css b/addons/gamification/static/src/css/gamification.css new file mode 100644 index 00000000000..c5c5a3be6dd --- /dev/null +++ b/addons/gamification/static/src/css/gamification.css @@ -0,0 +1,202 @@ +/* Kanban views */ +.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal { + width: 230px; + min-height: 200px; +} +.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge { + width: 250px; + min-height: 150px; +} +.openerp .oe_kanban_badge_avatars { + margin-top: 8px; +} +.openerp .oe_kanban_badge_avatars img { + width: 30px; + height: 30px; + padding-left: 0; + margin-top: 3px; + border-radius: 2px; + -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); +} +.openerp .oe_kanban_goal .oe_goal_state_block { + width:200px; + height:130px; + margin: auto; + margin-bottom: -20px; +} +.oe_kanban_goal .oe_goal_state_block, +.oe_kanban_goal p { + text-align: center; +} +.oe_kanban_goal .oe_goal_state_block .oe_goal_state { + font-size: 2.5em; + font-weight: bold; + padding-top: 30px; +} +.oe_kanban_goal .oe_goal_state_block .oe_goal_state.oe_e{ + font-size: 7em; +} +.openerp .oe_kanban_view .oe_kanban_content .oe_goal_gauge:first-child { + margin: auto; /* avoid margin-right: 16px; */ +} +.oe_kanban_goal .oe_kanban_content .oe_goal_gauge svg { + margin-top: -20px; +} +.openerp .oe_no_overflow { + overflow: hidden; +} +.openerp .oe_red { + color: red; +} +.openerp .oe_green { + color: green; +} +.openerp .oe_orange { + color: orange; +} +/* compensate padding from .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell */ +.openerp .oe_form td .oe_no_padding { + margin-left: -6px; +} + +/* Mail Sidebar */ +.openerp .oe_mail_wall .oe_mail_wall_aside { + margin-top: 15px; + position: relative; + display: inline-block; + vertical-align: top; + width: 280px; + background: #EDEDF6; + border-radius: 2px; +} +.openerp .oe_mail_wall_aside > div { + background: #EDEDF6; + padding: 5px 5px 0 15px; +} +.openerp .oe_mail_wall_aside h3 { + font-size: 1.3em; + margin-left: -7px; + font-variant: small-caps; + text-transform: capitalize; + line-height: 1em; +} +.openerp .oe_mail_wall_aside .oe_goal { + width: 95%; +} +.openerp .oe_mail_wall_aside ul.oe_goals_list { + +} +.openerp .oe_mail_wall_aside .oe_goals_list { + list-style-type: none; + /*list-style-type: disc;*/ + padding-left: 0; + /*margin-left: 15px;*/ + margin-top: 0; + margin-bottom: 15px; +} +.openerp .oe_mail_wall_aside table.oe_goals_list { + /*width: 95%;*/ + border: 1px dotted rgb(221, 221, 221); + border-color: rgba(133, 133, 133, 0.3); +} +.openerp .oe_mail_wall_aside .oe_goals_list > li::before { + content: "\0BB \020"; + width: 15px; +} +.openerp .oe_mail_wall_aside .oe_goals_list > li.oe_goal_reached::before { + color: rgb(27, 70, 7); + content: "✓"; + font-size: 65%; /* reduce font to have the same size as "\0BB \020" */ +} +.openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached .oe_goal_inner_box { + text-decoration: line-through; +} + +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_outer_box { + display: inline-block; + position: relative; + height: 100%; + min-height: 12px; + width: 94%; + z-index: 0; + vertical-align: top; +} +.openerp .oe_mail_wall .oe_mail_wall_aside li .oe_goal_outer_box { + border: 1px dotted rgb(221, 221, 221); + border-color: rgba(133, 133, 133, 0.3); +} +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_progress { + background: rgb(183, 231, 179); + background: rgba(183, 231, 179, 0.5); + display: inline-block; + position: absolute; + height: 100%; + width: 0; + z-index: -1; + top: 0; left: 0; +} +.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box { + display: inline-block; + /*position: absolute;*/ + /*width: 200px;*/ + /*min-height: 32px;*/ + /*vertical-align: middle;*/ + z-index: 2; + /*top: 0; left: 0;*/ + height: 100%; +} +.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box strong { + padding-left: 5px; +} +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goals_list thead { + font-weight: normal; + background: none; +} +.openerp .oe_mail_wall_aside td, +.openerp .oe_mail_wall_aside th { + vertical-align: middle; + /*border: none;*/ +} +.openerp .oe_mail_wall_aside .oe_goals_list thead th { + font-weight: normal; + padding: 5px; +} +.openerp .oe_mail_wall_aside .oe_goals_list tbody tr { + height: 32px; +} +.oe_mail_wall_aside .oe_goals_list tbody tr:nth-child(even) { + background-color: #fff; +} +.openerp .oe_mail_wall_aside .oe_goals_list tbody th { + padding-left: 5px; + height: 32px; +} +.openerp .oe_mail_wall_aside table.oe_goals_list .col0 { + font-size: 160%; + font-weight: bold; +} +.openerp .oe_mail_wall_aside table.oe_goals_list .col1 { + padding: 0 5px; +} +.openerp .oe_mail_wall_aside table.oe_goals_list .col2 { + width: 200px; +} +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_user_avatar { + width: 32px; + padding-right: 5px; +} +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_update_plan.oe_e, +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_goal_action.oe_e { + visibility: hidden; + font-size: 25px; + float: right; + position: relative; +} +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_update_plan, +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_goal_action, +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal th:hover > .oe_goal_action { + visibility: visible; +} +.openerp .oe_mail_wall .oe_mail { + display: inline-block; +} \ No newline at end of file diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css deleted file mode 100644 index 1d9aee31500..00000000000 --- a/addons/gamification/static/src/css/goal.css +++ /dev/null @@ -1,162 +0,0 @@ -/* Kanban views */ -.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal { - width: 230px; - min-height: 200px; -} -.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge { - width: 250px; - min-height: 150px; -} -.openerp .oe_kanban_badge_avatars { - margin-top: 8px; -} -.openerp .oe_kanban_badge_avatars img { - width: 30px; - height: 30px; - padding-left: 0; - margin-top: 3px; - border-radius: 2px; - -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); -} -.openerp .oe_kanban_goal .oe_goal_state_block { - width:200px; - height:130px; - margin: auto; - margin-bottom: -20px; -} -.oe_kanban_goal .oe_goal_state_block, -.oe_kanban_goal p { - text-align: center; -} -.oe_kanban_goal .oe_goal_state_block .oe_goal_state { - font-size: 2.5em; - font-weight: bold; - padding-top: 30px; -} -.oe_kanban_goal .oe_goal_state_block .oe_goal_state.oe_e{ - font-size: 7em; -} -.openerp .oe_kanban_view .oe_kanban_content .oe_goal_gauge:first-child { - margin: auto; /* avoid margin-right: 16px; */ -} -.oe_kanban_goal .oe_kanban_content .oe_goal_gauge svg { - margin-top: -20px; -} -.openerp .oe_no_overflow { - overflow: hidden; -} -.openerp .oe_red { - color: red; -} -.openerp .oe_green { - color: green; -} -.openerp .oe_orange { - color: orange; -} -/* compensate padding from .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell */ -.openerp .oe_form td .oe_no_padding { - margin-left: -6px; -} - -/* Mail Sidebar */ -.openerp .oe_mail_wall .oe_mail_wall_aside { - margin-top: 15px; - position: relative; - display: inline-block; - vertical-align: top; - width: 280px; - background: #EDEDF6; - border-radius: 2px; -} -.openerp .oe_mail_wall_aside > div { - background: #EDEDF6; - padding: 5px 5px 0 15px; -} -.openerp .oe_mail_wall_aside h3 { - font-size: 1.3em; - margin-left: -7px; - font-variant: small-caps; - text-transform: capitalize; - line-height: 1em; -} - -.openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached { - text-decoration: line-through; - color: rgb(138, 137, 137); -} - -.openerp .oe_mail_wall_aside .oe_goals_list { - list-style-type: none; - padding-left: 15px; - margin-bottom: 15px; - width: 200px; -} -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_outer_box { - background: rgb(213, 213, 213); - min-height: 32px; -} -.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box { - display: inline-block; - width: 200px; - min-height: 32px; - vertical-align: middle; - border: solid 1px white; -} -.openerp .oe_mail_wall_aside table.oe_goals_list .oe_goal_inner_box { - border: none; -} -.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box strong { - padding-left: 5px; -} -.openerp .oe_mail_wall .oe_mail_wall_aside table.oe_goals_list { - margin: 10px 0; - border: solid 1px white; -} -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goals_list thead { - font-weight: normal; -} -.oe_mail_wall_aside .oe_goals_list tbody tr:nth-child(even) { - background-color: #fff; -} -.openerp .oe_mail_wall_aside td, -.openerp .oe_mail_wall_aside th { - vertical-align: middle; - border: none; -} -.openerp .oe_mail_wall_aside .oe_goals_list thead th { - font-weight: normal; - padding: 5px; -} -.openerp .oe_mail_wall_aside .oe_goals_list tbody tr { - height: 32px; -} -.openerp .oe_mail_wall_aside .oe_goals_list tbody th { - padding-left: 5px; - height: 32px; -} -.openerp .oe_mail_wall_aside table.oe_goals_list .col0 { - font-size: 160%; - font-weight: bold; - width: 24px; -} -.openerp .oe_mail_wall_aside table.oe_goals_list .col1 { - width: 200px; -} -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_user_avatar { - width: 32px; - padding-right: 5px; -} -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_update_plan, -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_goal_action { - visibility: hidden; - font-size: 25px; -} -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_update_plan, -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_goal_action, -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal th:hover > .oe_goal_action { - visibility: visible; -} -.openerp .oe_mail_wall .oe_mail { - display: inline-block; -} \ No newline at end of file -- cgit v1.2.3 From e920347b012d0e88cf59ae34d5f3ba1d347863f9 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 25 Apr 2013 12:17:59 +0200 Subject: [IMP] make it beautiful bzr revid: mat@openerp.com-20130425101759-y3cwymvey8i9mwie --- .../gamification/static/src/css/gamification.css | 77 +++++++++++++--------- 1 file changed, 45 insertions(+), 32 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/gamification.css b/addons/gamification/static/src/css/gamification.css index c5c5a3be6dd..62b7e2c8091 100644 --- a/addons/gamification/static/src/css/gamification.css +++ b/addons/gamification/static/src/css/gamification.css @@ -66,11 +66,12 @@ display: inline-block; vertical-align: top; width: 280px; - background: #EDEDF6; + /*background: #EDEDF6;*/ + background-color: #f8f8f8; + border: solid 1px rgba(0,0,0,0.03); border-radius: 2px; } .openerp .oe_mail_wall_aside > div { - background: #EDEDF6; padding: 5px 5px 0 15px; } .openerp .oe_mail_wall_aside h3 { @@ -81,32 +82,31 @@ line-height: 1em; } .openerp .oe_mail_wall_aside .oe_goal { - width: 95%; -} -.openerp .oe_mail_wall_aside ul.oe_goals_list { - + width: 100%; } +/*.openerp .oe_mail_wall_aside .oe_goal a { + color: #4c4c4c;; +}*/ .openerp .oe_mail_wall_aside .oe_goals_list { list-style-type: none; - /*list-style-type: disc;*/ padding-left: 0; - /*margin-left: 15px;*/ - margin-top: 0; + margin-top: 5px; margin-bottom: 15px; } .openerp .oe_mail_wall_aside table.oe_goals_list { - /*width: 95%;*/ - border: 1px dotted rgb(221, 221, 221); - border-color: rgba(133, 133, 133, 0.3); + width: 95%; + /*border: 1px dotted rgb(221, 221, 221); + border-color: rgba(133, 133, 133, 0.3);*/ + border: solid 1px rgba(0,0,0,0.05); } .openerp .oe_mail_wall_aside .oe_goals_list > li::before { content: "\0BB \020"; - width: 15px; } .openerp .oe_mail_wall_aside .oe_goals_list > li.oe_goal_reached::before { color: rgb(27, 70, 7); content: "✓"; - font-size: 65%; /* reduce font to have the same size as "\0BB \020" */ + /*font-size: 65%;*/ /* reduce font to have the same size as "\0BB \020" */ + margin-right: -4px; } .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached .oe_goal_inner_box { text-decoration: line-through; @@ -116,34 +116,42 @@ display: inline-block; position: relative; height: 100%; - min-height: 12px; - width: 94%; + width: 90%; z-index: 0; vertical-align: top; + padding-bottom: 5px; +} +.openerp .oe_mail_wall .oe_mail_wall_aside table .oe_goal_outer_box { + width: 100%; } -.openerp .oe_mail_wall .oe_mail_wall_aside li .oe_goal_outer_box { +/*.openerp .oe_mail_wall .oe_mail_wall_aside li .oe_goal_outer_box { border: 1px dotted rgb(221, 221, 221); border-color: rgba(133, 133, 133, 0.3); +}*/ +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_progress_background { + background-color: rgb(231, 190, 190); + position: absolute; + height: 4px; + width: 100%; + z-index: -2; + top: 0; left: 0; } .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_progress { - background: rgb(183, 231, 179); - background: rgba(183, 231, 179, 0.5); - display: inline-block; + /*background: rgb(183, 231, 179);*/ + /*background: rgba(183, 231, 179, 0.5);*/ + /*background-color: #7c7bad;*/ + background-color: rgb(88, 155, 91); position: absolute; - height: 100%; + height: 3px; width: 0; z-index: -1; top: 0; left: 0; } .openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box { display: inline-block; - /*position: absolute;*/ - /*width: 200px;*/ - /*min-height: 32px;*/ - /*vertical-align: middle;*/ - z-index: 2; - /*top: 0; left: 0;*/ height: 100%; + padding-top: 3px; + line-height: 1em; } .openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box strong { padding-left: 5px; @@ -162,14 +170,18 @@ padding: 5px; } .openerp .oe_mail_wall_aside .oe_goals_list tbody tr { - height: 32px; + height: 24px; } -.oe_mail_wall_aside .oe_goals_list tbody tr:nth-child(even) { +/*.oe_mail_wall_aside .oe_goals_list tbody tr:nth-child(even) { background-color: #fff; } +*/ +.openerp .oe_mail_wall_aside .oe_goals_list tbody td { + padding-bottom: 5px; +} .openerp .oe_mail_wall_aside .oe_goals_list tbody th { padding-left: 5px; - height: 32px; + height: 24px; } .openerp .oe_mail_wall_aside table.oe_goals_list .col0 { font-size: 160%; @@ -179,10 +191,10 @@ padding: 0 5px; } .openerp .oe_mail_wall_aside table.oe_goals_list .col2 { - width: 200px; + width: 100%; } .openerp .oe_mail_wall .oe_mail_wall_aside .oe_user_avatar { - width: 32px; + width: 24px; padding-right: 5px; } .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_update_plan.oe_e, @@ -190,6 +202,7 @@ visibility: hidden; font-size: 25px; float: right; + margin-right: 15px; position: relative; } .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_update_plan, -- cgit v1.2.3 From d14496e578149f76ad612add11b623dfcc2bd195 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 25 Apr 2013 17:40:28 +0200 Subject: [IMP] tweak css bzr revid: mat@openerp.com-20130425154028-rt3uv8mtykl9ff2g --- .../gamification/static/src/css/gamification.css | 68 +++++++++++++++------- 1 file changed, 47 insertions(+), 21 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/gamification.css b/addons/gamification/static/src/css/gamification.css index 62b7e2c8091..6a8869dd466 100644 --- a/addons/gamification/static/src/css/gamification.css +++ b/addons/gamification/static/src/css/gamification.css @@ -1,7 +1,7 @@ /* Kanban views */ .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal { - width: 230px; - min-height: 200px; + width: 230px; + min-height: 200px; } .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge { width: 250px; @@ -59,30 +59,42 @@ margin-left: -6px; } -/* Mail Sidebar */ + +/* + ============ + Mail Sidebar + ============ +*/ .openerp .oe_mail_wall .oe_mail_wall_aside { margin-top: 15px; position: relative; display: inline-block; vertical-align: top; width: 280px; - /*background: #EDEDF6;*/ background-color: #f8f8f8; - border: solid 1px rgba(0,0,0,0.03); + background-color: #EDEDF6; + /*border: solid 1px rgba(0,0,0,0.03);*/ border-radius: 2px; } + .openerp .oe_mail_wall_aside > div { - padding: 5px 5px 0 15px; + border-bottom: solid 3px white; + border-radius: 2px; +} +.openerp .oe_mail_wall_aside .oe_goal { + border-bottom: solid 3px white; } .openerp .oe_mail_wall_aside h3 { font-size: 1.3em; - margin-left: -7px; - font-variant: small-caps; - text-transform: capitalize; + /*font-variant: small-caps; + text-transform: capitalize;*/ line-height: 1em; } .openerp .oe_mail_wall_aside .oe_goal { - width: 100%; + padding: 5px 5px 0 15px; +} +.openerp .oe_mail_wall_aside .oe_goal h4 { + font-size: 110%; } /*.openerp .oe_mail_wall_aside .oe_goal a { color: #4c4c4c;; @@ -91,23 +103,34 @@ list-style-type: none; padding-left: 0; margin-top: 5px; - margin-bottom: 15px; + margin-bottom: 10px; } .openerp .oe_mail_wall_aside table.oe_goals_list { width: 95%; /*border: 1px dotted rgb(221, 221, 221); border-color: rgba(133, 133, 133, 0.3);*/ - border: solid 1px rgba(0,0,0,0.05); + /*border: solid 1px rgba(0,0,0,0.05);*/ +} +.openerp .oe_mail_wall_aside .oe_goals_list > li { + padding-bottom: 8px; + vertical-align: middle; +} +.openerp .oe_mail_wall_aside .oe_goals_list > li.oe_no_progress { + padding-bottom: 2px; } .openerp .oe_mail_wall_aside .oe_goals_list > li::before { content: "\0BB \020"; + font-size: 175%; } .openerp .oe_mail_wall_aside .oe_goals_list > li.oe_goal_reached::before { color: rgb(27, 70, 7); content: "✓"; - /*font-size: 65%;*/ /* reduce font to have the same size as "\0BB \020" */ margin-right: -4px; } +.openerp .oe_mail_wall_aside .oe_goals_list li .oe_goal_current { + font-size: 150%; + font-weight: bold; +} .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached .oe_goal_inner_box { text-decoration: line-through; } @@ -116,10 +139,9 @@ display: inline-block; position: relative; height: 100%; - width: 90%; + width: 80%; z-index: 0; - vertical-align: top; - padding-bottom: 5px; + vertical-align: middle; } .openerp .oe_mail_wall .oe_mail_wall_aside table .oe_goal_outer_box { width: 100%; @@ -129,9 +151,10 @@ border-color: rgba(133, 133, 133, 0.3); }*/ .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_progress_background { - background-color: rgb(231, 190, 190); + /*background-color: rgb(231, 190, 190);*/ + background-color: white; position: absolute; - height: 4px; + height: 3px; width: 100%; z-index: -2; top: 0; left: 0; @@ -139,8 +162,8 @@ .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_progress { /*background: rgb(183, 231, 179);*/ /*background: rgba(183, 231, 179, 0.5);*/ - /*background-color: #7c7bad;*/ background-color: rgb(88, 155, 91); + background-color: #7c7bad; position: absolute; height: 3px; width: 0; @@ -150,9 +173,12 @@ .openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box { display: inline-block; height: 100%; - padding-top: 3px; + margin-top: 6px; line-height: 1em; } +.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box.oe_no_progress { + margin-top: 0; +} .openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box strong { padding-left: 5px; } @@ -184,7 +210,7 @@ height: 24px; } .openerp .oe_mail_wall_aside table.oe_goals_list .col0 { - font-size: 160%; + font-size: 200%; font-weight: bold; } .openerp .oe_mail_wall_aside table.oe_goals_list .col1 { -- cgit v1.2.3 From 9c0936e6582f3aa117f721219f9dff17712245fd Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 26 Apr 2013 17:52:42 +0200 Subject: [IMP] design using display table bzr revid: mat@openerp.com-20130426155242-1do1w4mrch23lhbm --- .../gamification/static/src/css/gamification.css | 168 +++++++++------------ 1 file changed, 73 insertions(+), 95 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/gamification.css b/addons/gamification/static/src/css/gamification.css index 6a8869dd466..15a6daa48d2 100644 --- a/addons/gamification/static/src/css/gamification.css +++ b/addons/gamification/static/src/css/gamification.css @@ -71,14 +71,19 @@ display: inline-block; vertical-align: top; width: 280px; - background-color: #f8f8f8; - background-color: #EDEDF6; - /*border: solid 1px rgba(0,0,0,0.03);*/ border-radius: 2px; } - +.openerp .oe_mail_wall .oe_mail_wall_aside > .oe_gamification_goal { + background-color: #EDEDF6; +} +.openerp .oe_mail_wall_aside .oe_gamification_suggestion { + background-color: rgb(211, 222, 241); +} +.openerp .oe_mail_wall_aside .oe_gamification_suggestion ul { + padding-left: 15px; +} .openerp .oe_mail_wall_aside > div { - border-bottom: solid 3px white; + border-bottom: solid 5px white; border-radius: 2px; } .openerp .oe_mail_wall_aside .oe_goal { @@ -86,138 +91,101 @@ } .openerp .oe_mail_wall_aside h3 { font-size: 1.3em; - /*font-variant: small-caps; - text-transform: capitalize;*/ line-height: 1em; } .openerp .oe_mail_wall_aside .oe_goal { - padding: 5px 5px 0 15px; + /*padding: 5px 5px 0 15px;*/ + padding: 5px 10px; } -.openerp .oe_mail_wall_aside .oe_goal h4 { - font-size: 110%; -} -/*.openerp .oe_mail_wall_aside .oe_goal a { - color: #4c4c4c;; -}*/ -.openerp .oe_mail_wall_aside .oe_goals_list { - list-style-type: none; - padding-left: 0; - margin-top: 5px; - margin-bottom: 10px; -} -.openerp .oe_mail_wall_aside table.oe_goals_list { - width: 95%; - /*border: 1px dotted rgb(221, 221, 221); - border-color: rgba(133, 133, 133, 0.3);*/ - /*border: solid 1px rgba(0,0,0,0.05);*/ -} -.openerp .oe_mail_wall_aside .oe_goals_list > li { - padding-bottom: 8px; - vertical-align: middle; +.openerp .oe_mail_wall_aside .oe_goal h4, +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goals_list .oe_thead { + text-align: center; + padding-bottom: 15px; } -.openerp .oe_mail_wall_aside .oe_goals_list > li.oe_no_progress { - padding-bottom: 2px; +.openerp .oe_mail_wall_aside .oe_goals_list .oe_no_progress div { + display: inline-block; } -.openerp .oe_mail_wall_aside .oe_goals_list > li::before { - content: "\0BB \020"; - font-size: 175%; +.openerp .oe_mail_wall_aside .oe_goals_list .oe_no_progress::before { + content: "•"; + padding-right: 4px; + /*font-size: 175%;*/ } -.openerp .oe_mail_wall_aside .oe_goals_list > li.oe_goal_reached::before { - color: rgb(27, 70, 7); +.openerp .oe_mail_wall_aside .oe_goals_list .oe_no_progress.oe_goal_reached::before { + /*color: rgb(27, 70, 7);*/ content: "✓"; - margin-right: -4px; + padding-right: 0; + margin-left: -2px; } -.openerp .oe_mail_wall_aside .oe_goals_list li .oe_goal_current { +.openerp .oe_mail_wall_aside .oe_goals_list .oe_cell.oe_goal_current { font-size: 150%; font-weight: bold; + min-width: 20px; + padding: 0 5px; } -.openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached .oe_goal_inner_box { +.openerp .oe_mail_wall_aside .oe_goals_list .oe_no_progress.oe_goal_reached .oe_cell { text-decoration: line-through; } -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_outer_box { +.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_outer_box { display: inline-block; position: relative; - height: 100%; - width: 80%; z-index: 0; vertical-align: middle; -} -.openerp .oe_mail_wall .oe_mail_wall_aside table .oe_goal_outer_box { width: 100%; + border: solid 1px rgba(0,0,0,0.03); + border-radius: 2px; +} +.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_outer_box.oe_no_progress { + border: none; } -/*.openerp .oe_mail_wall .oe_mail_wall_aside li .oe_goal_outer_box { - border: 1px dotted rgb(221, 221, 221); - border-color: rgba(133, 133, 133, 0.3); -}*/ -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_progress_background { - /*background-color: rgb(231, 190, 190);*/ +.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_progress_background { background-color: white; position: absolute; - height: 3px; + height: 100%; width: 100%; z-index: -2; top: 0; left: 0; } -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_progress { - /*background: rgb(183, 231, 179);*/ - /*background: rgba(183, 231, 179, 0.5);*/ - background-color: rgb(88, 155, 91); - background-color: #7c7bad; +.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_progress { + background-color: rgb(212, 233, 222); + /*background-color: #7c7bad;*/ position: absolute; - height: 3px; + height: 100%; width: 0; z-index: -1; top: 0; left: 0; } -.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box { - display: inline-block; - height: 100%; - margin-top: 6px; - line-height: 1em; -} -.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box.oe_no_progress { - margin-top: 0; -} -.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box strong { - padding-left: 5px; -} -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goals_list thead { - font-weight: normal; - background: none; + +.openerp .oe_mail_wall_aside .oe_goals_list { + padding-left: 0; + margin-top: 5px; + margin-bottom: 10px; + width: 95%; } -.openerp .oe_mail_wall_aside td, -.openerp .oe_mail_wall_aside th { - vertical-align: middle; - /*border: none;*/ +.openerp .oe_mail_wall_aside .oe_goals_list .oe_row { + margin-bottom: 10px; } -.openerp .oe_mail_wall_aside .oe_goals_list thead th { + +.openerp .oe_mail_wall_aside .oe_goals_list .oe_thead { font-weight: normal; padding: 5px; + text-align: center; } -.openerp .oe_mail_wall_aside .oe_goals_list tbody tr { - height: 24px; -} -/*.oe_mail_wall_aside .oe_goals_list tbody tr:nth-child(even) { - background-color: #fff; -} -*/ -.openerp .oe_mail_wall_aside .oe_goals_list tbody td { - padding-bottom: 5px; -} -.openerp .oe_mail_wall_aside .oe_goals_list tbody th { - padding-left: 5px; - height: 24px; + +.openerp .oe_mail_wall_aside .oe_goals_list .oe_cell { + padding: 3px 0; } -.openerp .oe_mail_wall_aside table.oe_goals_list .col0 { +.openerp .oe_mail_wall_aside .oe_table.oe_goals_list .col0 { font-size: 200%; font-weight: bold; + width: 25px; + text-align: center; } -.openerp .oe_mail_wall_aside table.oe_goals_list .col1 { +.openerp .oe_mail_wall_aside .oe_table.oe_goals_list .col1 { padding: 0 5px; } -.openerp .oe_mail_wall_aside table.oe_goals_list .col2 { - width: 100%; +.openerp .oe_mail_wall_aside .oe_table.oe_goals_list .col2 { + width: auto; } .openerp .oe_mail_wall .oe_mail_wall_aside .oe_user_avatar { width: 24px; @@ -228,7 +196,7 @@ visibility: hidden; font-size: 25px; float: right; - margin-right: 15px; + /*margin-right: 15px;*/ position: relative; } .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_update_plan, @@ -238,4 +206,14 @@ } .openerp .oe_mail_wall .oe_mail { display: inline-block; +} +.openerp .oe_table { + display: table; +} +.openerp .oe_row { + display: table-row; +} +.openerp .oe_cell { + display: table-cell; + vertical-align: middle; } \ No newline at end of file -- cgit v1.2.3 From 3ee9aa428b1cd29834ee6ed5e8c3adc760c24ade Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 29 Apr 2013 15:20:00 +0200 Subject: [FIX]gamification: design issues bzr revid: mat@openerp.com-20130429132000-kibmf1u17h24j92c --- addons/gamification/static/src/css/gamification.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/gamification.css b/addons/gamification/static/src/css/gamification.css index cc20afede80..fd12ea8966f 100644 --- a/addons/gamification/static/src/css/gamification.css +++ b/addons/gamification/static/src/css/gamification.css @@ -119,7 +119,7 @@ .openerp .oe_mail_wall_aside .oe_goals_list .oe_cell.oe_goal_current { font-size: 150%; font-weight: bold; - min-width: 50px; + min-width: 0px; padding: 0 5px; } .openerp .oe_mail_wall_aside .oe_goals_list .oe_no_progress.oe_goal_reached .oe_cell { -- cgit v1.2.3 From 0ea12d6d918b8bcecb9125272ae7fd31f94b7827 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 29 Apr 2013 17:30:07 +0200 Subject: [IMP] design tweaks bzr revid: mat@openerp.com-20130429153007-tha1wmcvbtp89dz2 --- addons/gamification/static/src/css/gamification.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/gamification.css b/addons/gamification/static/src/css/gamification.css index fd12ea8966f..cc20afede80 100644 --- a/addons/gamification/static/src/css/gamification.css +++ b/addons/gamification/static/src/css/gamification.css @@ -119,7 +119,7 @@ .openerp .oe_mail_wall_aside .oe_goals_list .oe_cell.oe_goal_current { font-size: 150%; font-weight: bold; - min-width: 0px; + min-width: 50px; padding: 0 5px; } .openerp .oe_mail_wall_aside .oe_goals_list .oe_no_progress.oe_goal_reached .oe_cell { -- cgit v1.2.3 From f77aefc07ace66587bc13f7d2fa55755968437c5 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 20 Dec 2013 15:45:21 +0100 Subject: [REF] gamification: cleaning methods and reports bzr revid: mat@openerp.com-20131220144521-wyu1gx8bcitu6nk4 --- addons/gamification/static/src/css/gamification.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/gamification.css b/addons/gamification/static/src/css/gamification.css index cc20afede80..fd39b130fad 100644 --- a/addons/gamification/static/src/css/gamification.css +++ b/addons/gamification/static/src/css/gamification.css @@ -73,7 +73,7 @@ width: 280px; border-radius: 2px; } -.openerp .oe_mail_wall .oe_mail_wall_aside > .oe_gamification_goal { +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_gamification_challenge_list { background-color: #EDEDF6; } .openerp .oe_mail_wall_aside .oe_gamification_suggestion { @@ -188,7 +188,7 @@ width: 24px; padding-right: 5px; } -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_update_plan.oe_e, +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_update_challenge.oe_e, .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_goal_action.oe_e { visibility: hidden; font-size: 25px; @@ -196,7 +196,7 @@ /*margin-right: 15px;*/ position: relative; } -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_update_plan, +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_update_challenge, .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_goal_action, .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal th:hover > .oe_goal_action { visibility: visible; -- cgit v1.2.3 From 22a291d47a3808168cf96395a0c9ec9e59da1c3e Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 24 Dec 2013 14:44:05 +0100 Subject: [REF] gamification: use sass files instead of native css bzr revid: mat@openerp.com-20131224134405-9k4potbzq7ea20p4 --- addons/gamification/static/src/css/Makefile | 3 + .../gamification/static/src/css/gamification.css | 342 ++++++++++----------- .../gamification/static/src/css/gamification.sass | 181 +++++++++++ 3 files changed, 342 insertions(+), 184 deletions(-) create mode 100644 addons/gamification/static/src/css/Makefile create mode 100644 addons/gamification/static/src/css/gamification.sass (limited to 'addons/gamification/static/src/css') diff --git a/addons/gamification/static/src/css/Makefile b/addons/gamification/static/src/css/Makefile new file mode 100644 index 00000000000..3a6a70cf59b --- /dev/null +++ b/addons/gamification/static/src/css/Makefile @@ -0,0 +1,3 @@ +gamification.css: gamification.sass + sass --trace -t expanded gamification.sass gamification.css + diff --git a/addons/gamification/static/src/css/gamification.css b/addons/gamification/static/src/css/gamification.css index fd39b130fad..4ac3a0340fa 100644 --- a/addons/gamification/static/src/css/gamification.css +++ b/addons/gamification/static/src/css/gamification.css @@ -1,216 +1,190 @@ -/* Kanban views */ +@charset "UTF-8"; .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal { - width: 230px; - min-height: 200px; + width: 230px; + min-height: 200px; } .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge { - width: 250px; - min-height: 150px; + width: 250px; + min-height: 150px; } .openerp .oe_kanban_badge_avatars { - margin-top: 8px; + margin-top: 8px; } .openerp .oe_kanban_badge_avatars img { - width: 30px; - height: 30px; - padding-left: 0; - margin-top: 3px; - border-radius: 2px; - -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); + width: 30px; + height: 30px; + padding-left: 0; + margin-top: 3px; + border-radius: 2px; + -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } .openerp .oe_kanban_goal .oe_goal_state_block { - width:200px; - height:130px; - margin: auto; - margin-bottom: -20px; + width: 200px; + height: 130px; + margin: auto; + margin-bottom: -20px; } -.oe_kanban_goal .oe_goal_state_block, -.oe_kanban_goal p { - text-align: center; +.openerp .oe_kanban_goal .oe_goal_state_block .oe_goal_state { + font-size: 2.5em; + font-weight: bold; + padding-top: 30px; } -.oe_kanban_goal .oe_goal_state_block .oe_goal_state { - font-size: 2.5em; - font-weight: bold; - padding-top: 30px; +.openerp .oe_kanban_goal .oe_goal_state_block .oe_goal_state.oe_e { + font-size: 7em; } -.oe_kanban_goal .oe_goal_state_block .oe_goal_state.oe_e{ - font-size: 7em; +.openerp .oe_kanban_goal .oe_goal_state_block, .openerp .oe_kanban_goal p { + text-align: center; } -.openerp .oe_kanban_view .oe_kanban_content .oe_goal_gauge:first-child { - margin: auto; /* avoid margin-right: 16px; */ +.openerp .oe_kanban_content .oe_goal_gauge:first-child { + margin: auto; } -.oe_kanban_goal .oe_kanban_content .oe_goal_gauge svg { - margin-top: -20px; +.openerp .oe_kanban_content .oe_goal_gauge svg { + margin-top: -20px; } .openerp .oe_no_overflow { - overflow: hidden; + overflow: hidden; } .openerp .oe_red { - color: red; + color: red; } .openerp .oe_green { - color: green; + color: green; } .openerp .oe_orange { - color: orange; + color: orange; } -/* compensate padding from .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell */ .openerp .oe_form td .oe_no_padding { - margin-left: -6px; -} - - -/* - ============ - Mail Sidebar - ============ -*/ + margin-left: -6px; +} .openerp .oe_mail_wall .oe_mail_wall_aside { - margin-top: 15px; - position: relative; - display: inline-block; - vertical-align: top; - width: 280px; - border-radius: 2px; + margin-top: 15px; + position: relative; + display: inline-block; + vertical-align: top; + width: 280px; + border-radius: 2px; } .openerp .oe_mail_wall .oe_mail_wall_aside .oe_gamification_challenge_list { - background-color: #EDEDF6; -} -.openerp .oe_mail_wall_aside .oe_gamification_suggestion { - background-color: rgb(211, 222, 241); -} -.openerp .oe_mail_wall_aside .oe_gamification_suggestion ul { - padding-left: 15px; -} -.openerp .oe_mail_wall_aside > div { - border-bottom: solid 5px white; - border-radius: 2px; -} -.openerp .oe_mail_wall_aside .oe_goal { - border-bottom: solid 3px white; -} -.openerp .oe_mail_wall_aside h3 { - font-size: 1.3em; - line-height: 1em; -} -.openerp .oe_mail_wall_aside .oe_goal { - /*padding: 5px 5px 0 15px;*/ - padding: 5px 10px; -} -.openerp .oe_mail_wall_aside .oe_goal h4, -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goals_list .oe_thead { - text-align: center; - padding-bottom: 15px; -} -.openerp .oe_mail_wall_aside .oe_goals_list .oe_no_progress div { - display: inline-block; -} -.openerp .oe_mail_wall_aside .oe_goals_list .oe_no_progress::before { - content: "•"; - padding-right: 4px; - /*font-size: 175%;*/ -} -.openerp .oe_mail_wall_aside .oe_goals_list .oe_no_progress.oe_goal_reached::before { - /*color: rgb(27, 70, 7);*/ - content: "✓"; - padding-right: 0; - margin-left: -2px; -} -.openerp .oe_mail_wall_aside .oe_goals_list .oe_cell.oe_goal_current { - font-size: 150%; - font-weight: bold; - min-width: 50px; - padding: 0 5px; -} -.openerp .oe_mail_wall_aside .oe_goals_list .oe_no_progress.oe_goal_reached .oe_cell { - text-decoration: line-through; -} - -.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_outer_box { - display: inline-block; - position: relative; - z-index: 0; - vertical-align: middle; - width: 100%; - border: solid 1px rgba(0,0,0,0.03); - border-radius: 2px; -} -.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_outer_box.oe_no_progress { - border: none; -} -.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_progress_background { - background-color: white; - position: absolute; - height: 100%; - width: 100%; - z-index: -2; - top: 0; left: 0; -} -.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_progress { - background-color: rgb(212, 233, 222); - /*background-color: #7c7bad;*/ - position: absolute; - height: 100%; - width: 0; - z-index: -1; - top: 0; left: 0; -} - -.openerp .oe_mail_wall_aside .oe_goals_list { - padding-left: 0; - margin-top: 5px; - margin-bottom: 10px; - width: 100%; -} - -.openerp .oe_mail_wall_aside .oe_goals_list .oe_thead { - font-weight: normal; - padding: 5px; - text-align: center; -} - -.openerp .oe_mail_wall_aside .oe_goals_list .oe_cell { - padding: 3px 0; -} -.openerp .oe_mail_wall_aside .oe_table.oe_goals_list .col0 { - font-size: 200%; - font-weight: bold; - width: 25px; - text-align: center; -} -.openerp .oe_mail_wall_aside .oe_table.oe_goals_list .col1 { - padding: 0 5px; -} -.openerp .oe_mail_wall_aside .oe_table.oe_goals_list .col2 { - width: auto; -} -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_user_avatar { - width: 24px; - padding-right: 5px; -} -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_update_challenge.oe_e, -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_goal_action.oe_e { - visibility: hidden; - font-size: 25px; - float: right; - /*margin-right: 15px;*/ - position: relative; -} -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_update_challenge, -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_goal_action, -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal th:hover > .oe_goal_action { - visibility: visible; + background-color: #ededf6; +} +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_gamification_suggestion { + background-color: #d3def1; +} +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_gamification_suggestion ul { + padding-left: 15px; +} +.openerp .oe_mail_wall .oe_mail_wall_aside h4, .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goals_list .oe_thead { + text-align: center; + padding-bottom: 15px; +} +.openerp .oe_mail_wall .oe_mail_wall_aside > div { + border-bottom: solid 5px white; + border-radius: 2px; +} +.openerp .oe_mail_wall .oe_goal { + border-bottom: solid 3px white; + padding: 5px 10px; +} +.openerp .oe_mail_wall .oe_goal .oe_update_challenge.oe_e, .openerp .oe_mail_wall .oe_goal .oe_goal_action.oe_e { + visibility: hidden; + font-size: 25px; + float: right; + position: relative; +} +.openerp .oe_mail_wall .oe_goal div:hover > .oe_update_challenge, .openerp .oe_mail_wall .oe_goal div:hover > .oe_goal_action, .openerp .oe_mail_wall .oe_goal th:hover > .oe_goal_action { + visibility: visible; +} +.openerp .oe_mail_wall .oe_goal .oe_goals_list { + padding-left: 0; + margin-top: 5px; + margin-bottom: 10px; + width: 100%; +} +.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_no_progress div { + display: inline-block; +} +.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_no_progress::before { + content: "•"; + padding-right: 4px; +} +.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_no_progress.oe_goal_reached::before { + content: "✓"; + padding-right: 0; + margin-left: -2px; +} +.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_no_progress.oe_goal_reached .oe_cell { + text-decoration: line-through; +} +.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_cell.oe_goal_current { + font-size: 150%; + font-weight: bold; + min-width: 50px; + padding: 0 5px; +} +.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_goal_outer_box { + display: inline-block; + position: relative; + z-index: 0; + vertical-align: middle; + width: 100%; + border: solid 1px rgba(0, 0, 0, 0.03); + border-radius: 2px; +} +.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_goal_outer_box.oe_no_progress { + border: none; +} +.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_goal_progress_background { + background-color: white; + position: absolute; + height: 100%; + width: 100%; + z-index: -2; + top: 0; + left: 0; +} +.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_goal_progress { + background-color: #d4e9de; + position: absolute; + height: 100%; + width: 0; + z-index: -1; + top: 0; + left: 0; +} +.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_thead { + font-weight: normal; + padding: 5px; + text-align: center; +} +.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_cell { + padding: 3px 0; +} +.openerp .oe_mail_wall .oe_table.oe_goals_list .col0 { + font-size: 200%; + font-weight: bold; + width: 25px; + text-align: center; +} +.openerp .oe_mail_wall .oe_table.oe_goals_list .col1 { + padding: 0 5px; +} +.openerp .oe_mail_wall .oe_table.oe_goals_list .col2 { + width: auto; +} +.openerp .oe_mail_wall .oe_user_avatar { + width: 24px; + padding-right: 5px; } .openerp .oe_mail_wall .oe_mail { - display: inline-block; + display: inline-block; +} +.openerp .oe_mail_wall .oe_table { + display: table; } -.openerp .oe_table { - display: table; +.openerp .oe_mail_wall .oe_row { + display: table-row; } -.openerp .oe_row { - display: table-row; +.openerp .oe_mail_wall .oe_cell { + display: table-cell; + vertical-align: middle; } -.openerp .oe_cell { - display: table-cell; - vertical-align: middle; -} \ No newline at end of file diff --git a/addons/gamification/static/src/css/gamification.sass b/addons/gamification/static/src/css/gamification.sass new file mode 100644 index 00000000000..3bb6b570e66 --- /dev/null +++ b/addons/gamification/static/src/css/gamification.sass @@ -0,0 +1,181 @@ +@charset "utf-8" + +.openerp + // Kanban views + .oe_kanban_view + .oe_kanban_card.oe_kanban_goal + width: 230px + min-height: 200px + .oe_kanban_card.oe_kanban_badge + width: 250px + min-height: 150px + .oe_kanban_badge_avatars + margin-top: 8px + img + width: 30px + height: 30px + padding-left: 0 + margin-top: 3px + border-radius: 2px + -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) + + .oe_kanban_goal + .oe_goal_state_block + width: 200px + height: 130px + margin: auto + margin-bottom: -20px + .oe_goal_state + font-size: 2.5em + font-weight: bold + padding-top: 30px + .oe_goal_state.oe_e + font-size: 7em + .oe_goal_state_block,p + text-align: center + + .oe_kanban_content + .oe_goal_gauge:first-child + margin: auto /* avoid margin-right: 16px */ + .oe_goal_gauge + svg + margin-top: -20px + .oe_no_overflow + overflow: hidden + + + .oe_red + color: red + .oe_green + color: green + .oe_orange + color: orange + + + // compensate padding from .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell + .oe_form td .oe_no_padding + margin-left: -6px + + + .oe_mail_wall + .oe_mail_wall_aside + margin-top: 15px + position: relative + display: inline-block + vertical-align: top + width: 280px + border-radius: 2px + + .oe_gamification_challenge_list + background-color: #EDEDF6 + .oe_gamification_suggestion + background-color: rgb(211, 222, 241) + ul + padding-left: 15px + + h4, .oe_goals_list .oe_thead + text-align: center + padding-bottom: 15px + + .oe_mail_wall_aside > div + border-bottom: solid 5px white + border-radius: 2px + + .oe_goal + border-bottom: solid 3px white + padding: 5px 10px + .oe_update_challenge.oe_e, .oe_goal_action.oe_e + visibility: hidden + font-size: 25px + float: right + position: relative + div:hover > .oe_update_challenge, div:hover > .oe_goal_action, th:hover > .oe_goal_action + visibility: visible + + .oe_goals_list + padding-left: 0 + margin-top: 5px + margin-bottom: 10px + width: 100% + + .oe_no_progress + div + display: inline-block + .oe_no_progress::before + content: "•" + padding-right: 4px + .oe_no_progress.oe_goal_reached::before + content: "✓" + padding-right: 0 + margin-left: -2px + .oe_no_progress.oe_goal_reached + .oe_cell + text-decoration: line-through + + .oe_cell.oe_goal_current + font-size: 150% + font-weight: bold + min-width: 50px + padding: 0 5px + + .oe_goal_outer_box + display: inline-block + position: relative + z-index: 0 + vertical-align: middle + width: 100% + border: solid 1px rgba(0,0,0,0.03) + border-radius: 2px + .oe_goal_outer_box.oe_no_progress + border: none + + .oe_goal_progress_background + background-color: white + position: absolute + height: 100% + width: 100% + z-index: -2 + top: 0 + left: 0 + + .oe_goal_progress + background-color: rgb(212, 233, 222) + position: absolute + height: 100% + width: 0 + z-index: -1 + top: 0 + left: 0 + + .oe_thead + font-weight: normal + padding: 5px + text-align: center + .oe_cell + padding: 3px 0 + + .oe_table.oe_goals_list + .col0 + font-size: 200% + font-weight: bold + width: 25px + text-align: center + .col1 + padding: 0 5px + .col2 + width: auto + + .oe_user_avatar + width: 24px + padding-right: 5px + + .oe_mail + display: inline-block + + .oe_table + display: table + .oe_row + display: table-row + .oe_cell + display: table-cell + vertical-align: middle -- cgit v1.2.3