diff options
| author | Amit Bhavsar (Open ERP) <amb@tinyerp.com> | 2013-05-28 14:28:53 +0530 |
|---|---|---|
| committer | Amit Bhavsar (Open ERP) <amb@tinyerp.com> | 2013-05-28 14:28:53 +0530 |
| commit | 20210d96f8327961af7815fc5618b63e6bb0dc64 (patch) | |
| tree | 31042b227735e45a5e6dbe5053e12cd6109e08f3 /addons/web/doc/module/static/src/css/web_example.css.1.diff | |
| parent | d11391c5759d4308afde38abccea2e264c39d2d2 (diff) | |
| parent | 978c76c5ea6bf16f7db2f94630ceb4b27caec037 (diff) | |
[MERGE] merge with latest trunk
bzr revid: amb@tinyerp.com-20130528085853-33ak0wen7shv6af2
Diffstat (limited to 'addons/web/doc/module/static/src/css/web_example.css.1.diff')
| -rw-r--r-- | addons/web/doc/module/static/src/css/web_example.css.1.diff | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/addons/web/doc/module/static/src/css/web_example.css.1.diff b/addons/web/doc/module/static/src/css/web_example.css.1.diff deleted file mode 100644 index 442211a252b..00000000000 --- a/addons/web/doc/module/static/src/css/web_example.css.1.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- web_example/static/src/css/web_example.css -+++ web_example/static/src/css/web_example.css -@@ -1,6 +1,13 @@ - .openerp .oe_web_example { - color: white; - background-color: black; - height: 100%; -- font-size: 400%; - } -+.openerp .oe_web_example h4 { -+ margin: 0; -+ font-size: 200%; -+} -+.openerp .oe_web_example.oe_web_example_started .oe_web_example_start button, -+.openerp .oe_web_example.oe_web_example_stopped .oe_web_example_stop button { -+ display: none -+} |