Merge lp:~openerp-dev/openerp-web/trunk-x2many-action-field-sgo into lp:openerp-web

[Sanjay Gohel (Open ERP)]

Hello,
  I have changed and add css classes for adding separator on field with x2many widget and button with oe_link.also changed oe_link hover classes which is not shown text decoration on firefox.(browser issue)

Thank You.
sanjay gohel

[lp:~openerp-dev/openerp-web/trunk-x2many-action-field-sgo]

3903. By Sanjay Gohel (Open ERP) on 2014-02-10

[MERGE]sync with trunk

Unmerged revisions

3903. By Sanjay Gohel (Open ERP) on 2014-02-10

[MERGE]sync with trunk

3902. By Sanjay Gohel (Open ERP) on 2013-12-06

[MERGE]with trunk

3901. By Sanjay Gohel (Open ERP) on 2013-12-06

[IMP]improve css and sass for oe_link hoverunderline not shown on firefox

3900. By Sanjay Gohel (Open ERP) on 2013-12-05

[IMP]improve css and sas

3899. By Sanjay Gohel (Open ERP) on 2013-12-05

[MERGE/IMP]merge and improce css

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2014-01-31 00:52:02 +0000
+++ addons/web/static/src/css/base.css	2014-02-10 06:30:07 +0000
@@ -448,6 +448,12 @@
 .openerp .oe_button_box button {
   margin: 4px;
 }
+.openerp .oe_button_box .oe_button.oe_vertical_separator {
+  border-left: 1px solid #dddddd;
+}
+.openerp .oe_button_box .oe_button.oe_link span {
+  padding: 0 10px;
+}
 .openerp .oe_avatar > img {
   max-height: 90px;
   max-width: 90px;
@@ -486,6 +492,9 @@
 .openerp .oe_button.oe_link img {
   display: inline-block;
 }
+.openerp .oe_button.oe_link:hover {
+  text-decoration: underline;
+}
 .openerp .oe_button.oe_link span {
   border: none;
   padding: 0;
@@ -500,9 +509,6 @@
   color: #7c7bad;
   font-weight: bold;
 }
-.openerp .oe_button.oe_link span:hover {
-  text-decoration: underline;
-}
 .openerp .oe_webclient .oe_star_on, .openerp .oe_webclient .oe_star_off {
   color: #cccccc;
   text-shadow: 0 0 2px black;
@@ -2650,6 +2656,14 @@
   background: -webkit-gradient(linear, left top, right bottom, from(#4c85c2), to(#284d7d));
   background: -ms-linear-gradient(top, #4c85c2, #284d7d);
 }
+.openerp .oe_form .oe_form_x2many_counter {
+  display: inline-block;
+  padding-left: 10px;
+  padding-right: 10px;
+}
+.openerp .oe_form .oe_form_x2many_counter.oe_vertical_separator {
+  border-left: 1px solid #dddddd;
+}
 .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
   display: none;
 }
 
=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2014-01-31 00:52:02 +0000
+++ addons/web/static/src/css/base.sass	2014-02-10 06:30:07 +0000
@@ -422,6 +422,11 @@
         text-align: right
         button
             margin: 4px
+        .oe_button.oe_vertical_separator
+            border-left: 1px solid #dddddd 
+        .oe_button.oe_link
+            span
+                padding: 0 10px
     .oe_avatar
         > img
             max-height: 90px
@@ -442,12 +447,12 @@
         @include reset()
         img
             display: inline-block
+        &:hover
+            text-decoration: underline
         span
             @include reset()
             color: $link-color
             font-weight: bold
-            &:hover
-                text-decoration: underline
     .oe_webclient
         .oe_star_on, .oe_star_off
             color: #cccccc
@@ -2121,6 +2126,12 @@
                     @include skew-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%))
     // }}}
     // FormView.one2many {{{
+    .oe_form .oe_form_x2many_counter
+        display: inline-block
+        padding-left: 10px
+        padding-right: 10px
+    .oe_form .oe_form_x2many_counter.oe_vertical_separator
+        border-left: 1px solid #dddddd
     .oe_form .oe_form_field_one2many > .oe_view_manager
         .oe_list_pager_single_page
             display: none