Merge lp:~openerp-dev/openerp-web/trunk-add-x2many-widget-sgo into lp:openerp-web

Proposed by Sanjay Gohel (Open ERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openerp-web/trunk-add-x2many-widget-sgo
Merge into: lp:openerp-web
Diff against target: 68 lines (+28/-1)
2 files modified
addons/web/static/src/css/base.css (+16/-1)
addons/web/static/src/css/base.sass (+12/-0)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/trunk-add-x2many-widget-sgo
Reviewer Review Type Date Requested Status
OpenERP R&D Web Team Pending
Review via email: mp+196482@code.launchpad.net

Description of the change

Hello,
   Add css classes for adding separator on x2many widget field and button with oe_link.

Thank You.
sanjay gohel

To post a comment you must log in.
3886. By Sanjay Gohel (Open ERP)

[MERGE]with trunk

3887. By Sanjay Gohel (Open ERP)

[MERGE]sync with trunk

3888. By Sanjay Gohel (Open ERP)

[MERGE]sync with trunk

Unmerged revisions

3888. By Sanjay Gohel (Open ERP)

[MERGE]sync with trunk

3887. By Sanjay Gohel (Open ERP)

[MERGE]sync with trunk

3886. By Sanjay Gohel (Open ERP)

[MERGE]with trunk

3885. By Sanjay Gohel (Open ERP)

[IMP]improve css and sass for vertical sperator

3884. By Sanjay Gohel (Open ERP)

[MERGE]sync with trunk

3883. By Sanjay Gohel (Open ERP)

[IMP]improve css

3882. By Sanjay Gohel (Open ERP)

[IMP]improve css and sass

3881. By Sanjay Gohel (Open ERP)

[IMP]add css class for inline x2many widget field

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/static/src/css/base.css'
2--- addons/web/static/src/css/base.css 2013-12-02 13:19:43 +0000
3+++ addons/web/static/src/css/base.css 2013-12-04 06:24:54 +0000
4@@ -1,4 +1,4 @@
5-@charset "utf-8";
6+@charset "UTF-8";
7 @font-face {
8 font-family: "mnmliconsRegular";
9 src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
10@@ -459,6 +459,13 @@
11 .openerp .oe_button_box button {
12 margin: 4px;
13 }
14+.openerp .oe_button_box .oe_button.oe_vertical_separator {
15+ border-left: 1px solid #dddddd;
16+}
17+.openerp .oe_button_box .oe_button.oe_link span {
18+ padding: 0 10px;
19+ font-weight: normal;
20+}
21 .openerp .oe_avatar > img {
22 max-height: 90px;
23 max-width: 90px;
24@@ -2798,6 +2805,14 @@
25 background: -webkit-gradient(linear, left top, right bottom, from(#4c85c2), to(#284d7d));
26 background: -ms-linear-gradient(top, #4c85c2, #284d7d);
27 }
28+.openerp .oe_form .oe_form_x2many_counter {
29+ display: inline-block;
30+ padding-left: 10px;
31+ padding-right: 10px;
32+}
33+.openerp .oe_form .oe_form_x2many_counter.oe_vertical_separator {
34+ border-left: 1px solid #dddddd;
35+}
36 .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
37 display: none;
38 }
39
40=== modified file 'addons/web/static/src/css/base.sass'
41--- addons/web/static/src/css/base.sass 2013-12-02 13:19:43 +0000
42+++ addons/web/static/src/css/base.sass 2013-12-04 06:24:54 +0000
43@@ -430,6 +430,12 @@
44 text-align: right
45 button
46 margin: 4px
47+ .oe_button.oe_vertical_separator
48+ border-left: 1px solid #dddddd
49+ .oe_button.oe_link
50+ span
51+ padding: 0 10px
52+ font-weight: normal
53 .oe_avatar
54 > img
55 max-height: 90px
56@@ -2222,6 +2228,12 @@
57 @include skew-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%))
58 // }}}
59 // FormView.one2many {{{
60+ .oe_form .oe_form_x2many_counter
61+ display: inline-block
62+ padding-left: 10px
63+ padding-right: 10px
64+ .oe_form .oe_form_x2many_counter.oe_vertical_separator
65+ border-left: 1px solid #dddddd
66 .oe_form .oe_form_field_one2many > .oe_view_manager
67 .oe_list_pager_single_page
68 display: none