From e3bcd71d1b7f1abbc2580248bcd173c367b2ce52 Mon Sep 17 00:00:00 2001 From: Arnaud Pineux Date: Fri, 26 Oct 2012 13:39:01 +0200 Subject: [CORRECT]Lunch bzr revid: api@openerp.com-20121026113901-9o8wi1v1k0j8coj4 --- addons/lunch/static/src/css/lunch_style.css | 55 +++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 addons/lunch/static/src/css/lunch_style.css (limited to 'addons/lunch/static/src/css') diff --git a/addons/lunch/static/src/css/lunch_style.css b/addons/lunch/static/src/css/lunch_style.css new file mode 100644 index 00000000000..eeb6ae3f754 --- /dev/null +++ b/addons/lunch/static/src/css/lunch_style.css @@ -0,0 +1,55 @@ + +.openerp .oe_lunch_view { +} + +.openerp .oe_lunch_30pc { + width: 33%; + display: inline-block; + vertical-align: top; +} +.openerp .oe_lunch_title { + font-weight: bold; + font-size: 17px; + margin-left: 10px; + color: #7C7BAD; +} + +.openerp .oe_lunch_vignette { + padding: 8px; + min-height: 50px; + border: 1px solid; + border-color: grey; + margin-right: 12px; + margin-bottom: 5px; + -moz-border-radius: 15px; + border-radius: 15px; + box-shadow: grey 1.5px 1.5px 1.5px; +} + +.openerp .oe_small_textarea>textarea { + min-height: 20px; + height: 20px; + color: red; +} + +.openerp .oe_lunch_button { + margin: 0px; + padding: 0px; + text-align: right; + width: 29%; + min-width: 55px; + max-width: 30%; + display: inline-block; +} + +.openerp .oe_lunch_note { + margin: 0px; + padding: 0px; + margin-top: 4px; + text-align: left; + font-style: italic; + color: #6374AB; + width: 69%; + max-width: 70%; + display: inline-block; +} -- cgit v1.2.3 From bffa00134f1139b266761eee9e0de1855ff77e19 Mon Sep 17 00:00:00 2001 From: Arnaud Pineux Date: Tue, 30 Oct 2012 09:47:01 +0100 Subject: [MERGE]lunch bzr revid: api@openerp.com-20121030084701-lgiss30ih4elg4hh --- addons/lunch/static/src/css/lunch_style.css | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'addons/lunch/static/src/css') diff --git a/addons/lunch/static/src/css/lunch_style.css b/addons/lunch/static/src/css/lunch_style.css index eeb6ae3f754..098cab12d26 100644 --- a/addons/lunch/static/src/css/lunch_style.css +++ b/addons/lunch/static/src/css/lunch_style.css @@ -48,8 +48,14 @@ margin-top: 4px; text-align: left; font-style: italic; - color: #6374AB; + color: #686464; + display: inline-block; +} + +.openerp .oe_lunch_text { + font-size: 15px; + font-style: bold; width: 69%; max-width: 70%; display: inline-block; -} +} \ No newline at end of file -- cgit v1.2.3 From a692a215469aaeec2515286be08d7bfbbf355c27 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 31 Oct 2012 11:23:07 +0100 Subject: [IMP] CSS lunch bzr revid: fp@tinyerp.com-20121031102307-d4s8sq9v32poebzj --- addons/lunch/static/src/css/Makefile | 3 ++ addons/lunch/static/src/css/lunch.css | 37 +++++++++++++++++ addons/lunch/static/src/css/lunch.sass | 32 +++++++++++++++ addons/lunch/static/src/css/lunch_style.css | 61 ----------------------------- 4 files changed, 72 insertions(+), 61 deletions(-) create mode 100644 addons/lunch/static/src/css/Makefile create mode 100644 addons/lunch/static/src/css/lunch.css create mode 100644 addons/lunch/static/src/css/lunch.sass delete mode 100644 addons/lunch/static/src/css/lunch_style.css (limited to 'addons/lunch/static/src/css') diff --git a/addons/lunch/static/src/css/Makefile b/addons/lunch/static/src/css/Makefile new file mode 100644 index 00000000000..941e8dbfe7d --- /dev/null +++ b/addons/lunch/static/src/css/Makefile @@ -0,0 +1,3 @@ +lunch.css: lunch.sass + sass -t expanded lunch.sass lunch.css + diff --git a/addons/lunch/static/src/css/lunch.css b/addons/lunch/static/src/css/lunch.css new file mode 100644 index 00000000000..8f4aa1dcd39 --- /dev/null +++ b/addons/lunch/static/src/css/lunch.css @@ -0,0 +1,37 @@ +@charset "utf-8"; +.openerp .oe_lunch .oe_lunch_alert textarea { + background-color: #ffc7c7; + padding: 10px; + height: 1em; + margin-bottom: 20px; +} +.openerp .oe_lunch button.oe_button_add { + position: relative; + top: -2px; + left: 3px; +} +.openerp .oe_lunch button.oe_button_plus { + margin: -2px; +} +.openerp .oe_lunch .oe_lunch_30pc { + width: 30%; + display: inline-block; + vertical-align: top; +} +.openerp .oe_lunch .oe_lunch_30pc + .oe_lunch_30pc { + padding-left: 5%; +} +.openerp .oe_lunch h2 { + color: #7c7bad; +} +.openerp .oe_lunch .oe_lunch_button { + float: right; +} +.openerp .oe_lunch .oe_lunch_vignette { + border-bottom: 1px solid #dddddd; + padding-top: 5px; + padding-bottom: 5px; +} +.openerp .oe_lunch .oe_group_text_button { + margin-bottom: 3px; +} diff --git a/addons/lunch/static/src/css/lunch.sass b/addons/lunch/static/src/css/lunch.sass new file mode 100644 index 00000000000..209d114f4c2 --- /dev/null +++ b/addons/lunch/static/src/css/lunch.sass @@ -0,0 +1,32 @@ +@charset "utf-8" + +.openerp + .oe_lunch + .oe_lunch_alert + textarea + background-color: #ffc7c7 + padding: 10px + height: 1em + margin-bottom: 20px + button.oe_button_add + position: relative + top: -2px + left: 3px + button.oe_button_plus + margin: -2px + .oe_lunch_30pc + width: 30% + display: inline-block + vertical-align: top + .oe_lunch_30pc + .oe_lunch_30pc + padding-left: 5% + h2 + color: #7C7BAD + .oe_lunch_button + float: right + .oe_lunch_vignette + border-bottom: 1px solid #dddddd + padding-top: 5px + padding-bottom: 5px + .oe_group_text_button + margin-bottom: 3px diff --git a/addons/lunch/static/src/css/lunch_style.css b/addons/lunch/static/src/css/lunch_style.css deleted file mode 100644 index 098cab12d26..00000000000 --- a/addons/lunch/static/src/css/lunch_style.css +++ /dev/null @@ -1,61 +0,0 @@ - -.openerp .oe_lunch_view { -} - -.openerp .oe_lunch_30pc { - width: 33%; - display: inline-block; - vertical-align: top; -} -.openerp .oe_lunch_title { - font-weight: bold; - font-size: 17px; - margin-left: 10px; - color: #7C7BAD; -} - -.openerp .oe_lunch_vignette { - padding: 8px; - min-height: 50px; - border: 1px solid; - border-color: grey; - margin-right: 12px; - margin-bottom: 5px; - -moz-border-radius: 15px; - border-radius: 15px; - box-shadow: grey 1.5px 1.5px 1.5px; -} - -.openerp .oe_small_textarea>textarea { - min-height: 20px; - height: 20px; - color: red; -} - -.openerp .oe_lunch_button { - margin: 0px; - padding: 0px; - text-align: right; - width: 29%; - min-width: 55px; - max-width: 30%; - display: inline-block; -} - -.openerp .oe_lunch_note { - margin: 0px; - padding: 0px; - margin-top: 4px; - text-align: left; - font-style: italic; - color: #686464; - display: inline-block; -} - -.openerp .oe_lunch_text { - font-size: 15px; - font-style: bold; - width: 69%; - max-width: 70%; - display: inline-block; -} \ No newline at end of file -- cgit v1.2.3 From 4c73fdc993cb02f58a196913bb3f26ca86d20d59 Mon Sep 17 00:00:00 2001 From: Arnaud Pineux Date: Wed, 31 Oct 2012 15:24:48 +0100 Subject: Lunch bzr revid: api@openerp.com-20121031142448-4te52l1vfjtp5pqb --- addons/lunch/static/src/css/lunch.css | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'addons/lunch/static/src/css') diff --git a/addons/lunch/static/src/css/lunch.css b/addons/lunch/static/src/css/lunch.css index 8f4aa1dcd39..d18ea6ee38b 100644 --- a/addons/lunch/static/src/css/lunch.css +++ b/addons/lunch/static/src/css/lunch.css @@ -5,6 +5,16 @@ height: 1em; margin-bottom: 20px; } + +.openerp .oe_lunch .oe_lunch_intro { + + text-align: center; +} + +.openerp .oe_lunch .oe_lunch_intro_title { + font-size: 17px; +} + .openerp .oe_lunch button.oe_button_add { position: relative; top: -2px; -- cgit v1.2.3 From ed791d908c5fe8da2e5fe7eec9af66031cf8f33a Mon Sep 17 00:00:00 2001 From: Arnaud Pineux Date: Fri, 2 Nov 2012 09:15:48 +0100 Subject: Lunch bzr revid: api@openerp.com-20121102081548-1ujcb6v6ivsx9dr5 --- addons/lunch/static/src/css/lunch.css | 17 +++++------------ addons/lunch/static/src/css/lunch.sass | 6 ++++-- 2 files changed, 9 insertions(+), 14 deletions(-) (limited to 'addons/lunch/static/src/css') diff --git a/addons/lunch/static/src/css/lunch.css b/addons/lunch/static/src/css/lunch.css index d18ea6ee38b..151e2a1bdbc 100644 --- a/addons/lunch/static/src/css/lunch.css +++ b/addons/lunch/static/src/css/lunch.css @@ -5,16 +5,6 @@ height: 1em; margin-bottom: 20px; } - -.openerp .oe_lunch .oe_lunch_intro { - - text-align: center; -} - -.openerp .oe_lunch .oe_lunch_intro_title { - font-size: 17px; -} - .openerp .oe_lunch button.oe_button_add { position: relative; top: -2px; @@ -28,8 +18,11 @@ display: inline-block; vertical-align: top; } -.openerp .oe_lunch .oe_lunch_30pc + .oe_lunch_30pc { - padding-left: 5%; +.openerp .oe_lunch .oe_lunch_30pc:nth-child(3) { + padding-right: 0; +} +.openerp .oe_lunch .oe_lunch_30pc { + padding-right: 5%; } .openerp .oe_lunch h2 { color: #7c7bad; diff --git a/addons/lunch/static/src/css/lunch.sass b/addons/lunch/static/src/css/lunch.sass index 209d114f4c2..4d27c026ec8 100644 --- a/addons/lunch/static/src/css/lunch.sass +++ b/addons/lunch/static/src/css/lunch.sass @@ -18,8 +18,10 @@ width: 30% display: inline-block vertical-align: top - .oe_lunch_30pc + .oe_lunch_30pc - padding-left: 5% + .oe_lunch_30pc:nth-child(3) + padding-right: 0 + .oe_lunch_30pc + padding-right: 5% h2 color: #7C7BAD .oe_lunch_button -- cgit v1.2.3 From 3d3873339e28bbd47caa855547db86c0c71d82b3 Mon Sep 17 00:00:00 2001 From: Arnaud Pineux Date: Mon, 5 Nov 2012 17:05:41 +0100 Subject: [Lunch] bzr revid: api@openerp.com-20121105160541-t8x8t7de2fjt0sq3 --- addons/lunch/static/src/css/lunch.css | 3 +++ addons/lunch/static/src/css/lunch.sass | 2 ++ 2 files changed, 5 insertions(+) (limited to 'addons/lunch/static/src/css') diff --git a/addons/lunch/static/src/css/lunch.css b/addons/lunch/static/src/css/lunch.css index 151e2a1bdbc..96e39c53fa6 100644 --- a/addons/lunch/static/src/css/lunch.css +++ b/addons/lunch/static/src/css/lunch.css @@ -35,6 +35,9 @@ padding-top: 5px; padding-bottom: 5px; } +.openerp .oe_lunch .oe_lunch_vignette:last-child { + border: none; +} .openerp .oe_lunch .oe_group_text_button { margin-bottom: 3px; } diff --git a/addons/lunch/static/src/css/lunch.sass b/addons/lunch/static/src/css/lunch.sass index 4d27c026ec8..9612b5fdd3d 100644 --- a/addons/lunch/static/src/css/lunch.sass +++ b/addons/lunch/static/src/css/lunch.sass @@ -30,5 +30,7 @@ border-bottom: 1px solid #dddddd padding-top: 5px padding-bottom: 5px + .oe_lunch_vignette:last-child + border: none .oe_group_text_button margin-bottom: 3px -- cgit v1.2.3