Odoo Web (MOVED TO GITHUB)

Merge lp:~openerp-dev/openerp-web/7.0-bug-1092869-nwi into lp:openerp-web/7.0

  1. 7.0-bug-1092869-nwi
  2. Merge into 7.0
Proposed by Niko (OpenERP)
Status: Merged
Merged at revision: 3855
Proposed branch: lp:~openerp-dev/openerp-web/7.0-bug-1092869-nwi
Merge into: lp:openerp-web/7.0
Diff against target: 76 lines (+10/-6)
2 files modified
addons/web/static/src/css/base.css (+8/-6)
addons/web/static/src/css/base.sass (+2/-0)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-bug-1092869-nwi
Reviewer Review Type Date Requested Status
Xavier (Open ERP) (community) Needs Fixing
Review via email: mp+141353@code.launchpad.net

Description of the change

Add a width to input type file.

To post a comment you must log in.
Revision history for this message
Xavier (Open ERP) (xmo-deactivatedaccount) wrote :

Noise alternations to base.css bearing no relation to the actual issue. Fix sass compiler settings.

review: Needs Fixing

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 2012-12-20 18:37:56 +0000
3+++ addons/web/static/src/css/base.css 2012-12-27 14:37:00 +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@@ -30,7 +30,7 @@
11 text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
12 /* http://www.quirksmode.org/dom/inputfile.html
13 * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
14- */ */
15+ */
16 }
17 .openerp.openerp_webclient_container {
18 height: 100%;
19@@ -1265,7 +1265,7 @@
20 color: white;
21 padding: 2px 4px;
22 margin: 1px 6px 0 0;
23- border: 1px solid lightGray;
24+ border: 1px solid lightgrey;
25 text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
26 -moz-border-radius: 4px;
27 -webkit-border-radius: 4px;
28@@ -1290,7 +1290,7 @@
29 transform: scale(1.1);
30 }
31 .openerp .oe_secondary_submenu .oe_active {
32- border-top: 1px solid lightGray;
33+ border-top: 1px solid lightgrey;
34 border-bottom: 1px solid #dedede;
35 text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
36 -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
37@@ -2240,7 +2240,7 @@
38 }
39 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
40 font-size: 80%;
41- color: darkGreen;
42+ color: darkgreen;
43 vertical-align: top;
44 position: relative;
45 top: -4px;
46@@ -3131,6 +3131,9 @@
47 border-radius: 3px;
48 }
49
50+.openerp_ie .oe_form_binary_file {
51+ width: 80px;
52+}
53 .openerp_ie .oe_form_field_boolean input {
54 background: white;
55 }
56@@ -3291,7 +3294,6 @@
57 overflow: hidden !important;
58 }
59 }
60-
61 .blockUI.blockOverlay {
62 background-color: black;
63 opacity: 0.6;
64
65=== modified file 'addons/web/static/src/css/base.sass'
66--- addons/web/static/src/css/base.sass 2012-12-20 18:37:56 +0000
67+++ addons/web/static/src/css/base.sass 2012-12-27 14:37:00 +0000
68@@ -2472,6 +2472,8 @@
69
70 // Internet Explorer 9+ specifics {{{
71 .openerp_ie
72+ .oe_form_binary_file
73+ width: 80px
74 .oe_form_field_boolean input
75 background: #fff
76 input[type='checkbox']