Antony Lesuisse (OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-improve-css-all-browsers into lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
Related bugs:
Bug #1068359 in OpenERP Web: "7.0 checkbox and label must be on the same line"
https://bugs.launchpad.net/openerp-web/+bug/1068359
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-improve-css-all-browsers/+merge/132701
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-improve-css-all-browsers/+merge/132701
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-improve-css-all-browsers.
=== modified file 'addons/web/__openerp__.py'
--- addons/web/__openerp__.py 2012-09-11 06:36:07 +0000
+++ addons/web/__openerp__.py 2012-11-02 13:41:21 +0000
@@ -61,6 +61,7 @@
"static/lib/jquery.tipsy/tipsy.css",
"static/lib/jquery.textext/jquery.textext.css",
"static/src/css/base.css",
+ "static/src/css/base-ie.css",
"static/src/css/data_export.css",
"static/lib/cleditor/jquery.cleditor.css",
],
=== modified file 'addons/web/static/lib/jquery.blockUI/jquery.blockUI.js'
--- addons/web/static/lib/jquery.blockUI/jquery.blockUI.js 2012-09-11 08:15:59 +0000
+++ addons/web/static/lib/jquery.blockUI/jquery.blockUI.js 2012-11-02 13:41:21 +0000
@@ -265,7 +265,7 @@
}
// style the overlay
- if (!opts.theme && (!opts.applyPlatformOpacityRules || !($.browser.mozilla && /Linux/.test(navigator.platform))))
+ if (!opts.theme && (opts.applyPlatformOpacityRules || ($.browser.mozilla && /Linux/.test(navigator.platform))))
lyr2.css(opts.overlayCSS);
lyr2.css('position', full ? 'fixed' : 'absolute');
=== added file 'addons/web/static/src/css/base-ie.css'
--- addons/web/static/src/css/base-ie.css 1970-01-01 00:00:00 +0000
+++ addons/web/static/src/css/base-ie.css 2012-11-02 13:41:21 +0000
@@ -0,0 +1,46 @@
+.openerp .oe_form .oe_form_field_selection {
+ width/*\**/:60%\9;
+}
+a:link img {
+ border/*\**/: none\9;
+ text-decoration/*\**/: none\9;
+}
+.openerp input[type=checkbox]{
+ padding/*\**/: 2px 4px\9;
+ border-radius/*\**/: 3px\9;
+ box-shadow/*\**/: inset rgba(0, 0, 0, 0.1);\9;
+ border/*\**/:0px solid #cccccc\9;
+ background: white;
+}
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {
+ filter/*\**/:none\9;
+}
+.openerp .oe_form_field_text {
+ float/*\**/: left\9;
+}
+.openerp .oe_form_field.oe_tags {
+ float/*\**/: left\9;
+}
+.openerp ul.oe_form_status li .label, .openerp ul.oe_form_status_clickable li .label {
+ padding-bottom/*\**/: 10px\9;
+}
+.openerp ul.oe_form_status li, .openerp ul.oe_form_status_clickable li,.openerp ul.oe_form_status li .arrow span, .openerp ul.oe_form_status_clickable li .arrow span {
+ background-color/*\**/: #e8e8e8\9;
+ background: -ms-linear-gradient(top, #fcfcfc, #dedede); /* For IE 10 */
+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfcfc', endColorstr='#dedede'); /* For IE 9 */
+}
+.openerp ul.oe_form_status_clickable li:hover,.openerp ul.oe_form_status_clickable li:hover .arrow span {
+ background-color/*\**/: #dedede\9;
+ background: -ms-linear-gradient(top, #e8e8e8, #cacaca); /* For IE 10 */
+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e8e8e8', endColorstr='#cacaca'); /* For IE 9 */
+}
+.openerp ul.oe_form_status li.oe_active, .openerp ul.oe_form_status_clickable li.oe_active, .openerp ul.oe_form_status li.oe_active .arrow span, .openerp ul.oe_form_status_clickable li.oe_active .arrow span {
+ background-color/*\**/: #729fcf\9;
+ background: -ms-linear-gradient(top, #729fcf, #3465a4); /* For IE 10 */
+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#729fcf', endColorstr='#3465a4'); /* For IE 9 */
+}
+.openerp ul.oe_form_status_clickable li.oe_active:hover, .openerp ul.oe_form_status_clickable li.oe_active:hover .arrow span {
+ background-color: #4c85c2;
+ background: -ms-linear-gradient(top, #4c85c2, #284d7d); /* For IE 10 */
+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#4c85c2', endColorstr='#284d7d'); /* For IE 9 */
+}
\ No newline at end of file
=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css 2012-10-31 14:06:09 +0000
+++ addons/web/static/src/css/base.css 2012-11-02 13:41:21 +0000
@@ -54,6 +54,10 @@
color: #afafb6 !important;
font-style: italic !important;
}
+.openerp :-ms-input-placeholder {
+ color: #afafb6 !important;
+ font-style: italic !important;
+}
.openerp a {
text-decoration: none;
cursor: pointer !important;
@@ -446,7 +450,7 @@
visibility: hidden;
}
.openerp .oe_button_box {
- width: 270px;
+ width: 280px;
text-align: right;
}
.openerp .oe_button_box button {
@@ -806,7 +810,7 @@
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=);
text-align: center;
font-size: 14px;
- height: 100%;
+ height: 600px;
}
.openerp .oe_login ul, .openerp .oe_login li {
margin: 0;
@@ -1316,12 +1320,14 @@
height: 100%;
}
.openerp .oe_application .oe_breadcrumb_item:not(:last-child) {
- display: inline-block;
max-width: 7em;
white-space: nowrap;
- overflow: hidden;
text-overflow: ellipsis;
}
+.openerp .oe_application .oe_breadcrumb_title > * {
+ display: inline-block;
+ overflow: hidden;
+}
.openerp .oe_view_manager .oe_view_manager_body {
height: inherit;
}
@@ -2011,6 +2017,7 @@
.openerp .oe_form_sheet {
background: white;
min-height: 330px;
+ overflow: auto;
padding: 16px;
}
.openerp .oe_application .oe_form_sheetbg {
@@ -2037,7 +2044,8 @@
background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede));
background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede);
background-image: -moz-linear-gradient(top, #fcfcfc, #dedede);
- background-image: -ms-linear-gradient(top, #fcfcfc, #dedede);
+ background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); /* For IE 10 */
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfcfc', endColorstr='#dedede'); /* For IE 9 */
background-image: -o-linear-gradient(top, #fcfcfc, #dedede);
background-image: linear-gradient(to bottom, #fcfcfc, #dedede);
}
@@ -2184,6 +2192,9 @@
.openerp .oe_form_field_progressbar.ui-progressbar .ui-widget-header {
background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
}
+.openerp .oe_form h1 .oe_form_required {
+ float: inherit;
+}
.openerp .oe_form .oe_form_field_text {
width: 100%;
}
@@ -2261,6 +2272,7 @@
}
.openerp .oe_form .oe_form_required input:not([disabled]):not([readonly]), .openerp .oe_form .oe_form_required select:not([disabled]):not([readonly]), .openerp .oe_form .oe_form_required textarea:not([disabled]):not([readonly]) {
background-color: #d2d2ff !important;
+ width: 100%;
}
.openerp .oe_form .oe_form_invalid input, .openerp .oe_form .oe_form_invalid select, .openerp .oe_form .oe_form_invalid textarea {
background-color: #ff6666 !important;
@@ -2290,12 +2302,14 @@
border-bottom-left-radius: 0px;
height: 22px;
}
+.openerp .oe_form .oe_form_field_with_button:not(.oe_no_button) > div {
+ overflow: hidden;
+}
.openerp .oe_form .oe_form_field_with_button input {
width: 100%;
}
.openerp .oe_form .oe_form_field_with_button > div {
position: relative;
- overflow: hidden;
}
.openerp .oe_form .oe_form_embedded_html {
position: relative;
@@ -2395,7 +2409,6 @@
background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede));
background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede);
background-image: -moz-linear-gradient(top, #fcfcfc, #dedede);
- background-image: -ms-linear-gradient(top, #fcfcfc, #dedede);
background-image: -o-linear-gradient(top, #fcfcfc, #dedede);
background-image: linear-gradient(to bottom, #fcfcfc, #dedede);
}
@@ -2438,7 +2451,7 @@
box-shadow: -1px 1px 2px rgba(255, 255, 255, 0.2), inset -1px 1px 1px rgba(0, 0, 0, 0.2);
background-color: #dedede;
background: -moz-linear-gradient(135deg, #dedede, #fcfcfc);
- background: -o-linear-gradient(135deg, #fcfcfc, #dedede);
+ background: -o-linear-gradient(135deg, #dedede, #fcfcfc);
background: -webkit-gradient(linear, left top, right bottom, from(#fcfcfc), to(#dedede));
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
@@ -2454,14 +2467,13 @@
background-image: -webkit-gradient(linear, left top, left bottom, from(#729fcf), to(#3465a4));
background-image: -webkit-linear-gradient(top, #729fcf, #3465a4);
background-image: -moz-linear-gradient(top, #729fcf, #3465a4);
- background-image: -ms-linear-gradient(top, #729fcf, #3465a4);
background-image: -o-linear-gradient(top, #729fcf, #3465a4);
background-image: linear-gradient(to bottom, #729fcf, #3465a4);
}
.openerp ul.oe_form_status li.oe_active .arrow span, .openerp ul.oe_form_status_clickable li.oe_active .arrow span {
background-color: #3465a4;
background: -moz-linear-gradient(135deg, #3465a4, #729fcf);
- background: -o-linear-gradient(135deg, #729fcf, #3465a4);
+ background: -o-linear-gradient(135deg, #3465a4, #729fcf);
background: -webkit-gradient(linear, left top, right bottom, from(#729fcf), to(#3465a4));
}
.openerp ul.oe_form_status li.oe_active .label, .openerp ul.oe_form_status_clickable li.oe_active .label {
@@ -2476,7 +2488,6 @@
background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca));
background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca);
background-image: -moz-linear-gradient(top, #e8e8e8, #cacaca);
- background-image: -ms-linear-gradient(top, #e8e8e8, #cacaca);
background-image: -o-linear-gradient(top, #e8e8e8, #cacaca);
background-image: linear-gradient(to bottom, #e8e8e8, #cacaca);
}
@@ -2488,7 +2499,6 @@
background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca));
background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca);
background-image: -moz-linear-gradient(top, #e8e8e8, #cacaca);
- background-image: -ms-linear-gradient(top, #e8e8e8, #cacaca);
background-image: -o-linear-gradient(top, #e8e8e8, #cacaca);
background-image: linear-gradient(to bottom, #e8e8e8, #cacaca);
}
@@ -2500,7 +2510,6 @@
background-image: -webkit-gradient(linear, left top, left bottom, from(#4c85c2), to(#284d7d));
background-image: -webkit-linear-gradient(top, #4c85c2, #284d7d);
background-image: -moz-linear-gradient(top, #4c85c2, #284d7d);
- background-image: -ms-linear-gradient(top, #4c85c2, #284d7d);
background-image: -o-linear-gradient(top, #4c85c2, #284d7d);
background-image: linear-gradient(to bottom, #4c85c2, #284d7d);
}
@@ -2510,8 +2519,10 @@
.openerp ul.oe_form_status_clickable li.oe_active:hover .arrow span {
background-color: #284d7d;
background: -moz-linear-gradient(135deg, #284d7d, #4c85c2);
- background: -o-linear-gradient(135deg, #4c85c2, #284d7d);
+ background: -o-linear-gradient(135deg, #284d7d, #4c85c2);
background: -webkit-gradient(linear, left top, right bottom, from(#4c85c2), to(#284d7d));
+ background: -ms-linear-gradient(top, #4c85c2, #284d7d); /* For IE 10 */
+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#4c85c2', endColorstr='#284d7d');
}
.openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
display: none;
@@ -2875,6 +2886,72 @@
color: #333333;
}
+@-moz-document url-prefix() {
+ .openerp .oe_view_manager .oe_view_manager_switch li {
+ line-height: 21px;
+ }
+}
+
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+ .openerp .oe_login {
+ height: 100%;
+ }
+}
+
+.kitten-mode-activated {
+ background-image: url(http://placekitten.com/g/1365/769);
+ background-size: cover;
+ background-attachment: fixed;
+}
+.kitten-mode-activated > * {
+ opacity: 0.7;
+}
+
+div.ui-widget-overlay {
+ background: black;
+ filter: alpha(opacity=30);
+ opacity: 0.3;
+}
+
+.ui-widget {
+ font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
+ color: #4c4c4c;
+ font-size: 13px;
+}
+
+.ui-menu {
+ padding: 2px 0;
+ -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+ -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+ box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+ margin-top: 4px;
+ border: 1px solid #afafb6;
+}
+.ui-menu .ui-menu-item {
+ width: 100%;
+ padding: 0;
+}
+.ui-menu .ui-menu-item a {
+ padding: 1px 16px;
+}
+.ui-menu .ui-menu-item a.ui-corner-all {
+ -moz-border-radius: 0;
+ -webkit-border-radius: 0;
+ border-radius: 0;
+}
+.ui-menu .ui-menu-item a.ui-state-active {
+ background: #f0f0fa;
+}
+.ui-menu .ui-menu-item a.ui-state-hover, .ui-menu .ui-menu-item a.ui-state-active {
+ background: #7c7bad;
+}
+
+.ui-corner-all {
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
+}
+
.openerp .oe_fileupload {
display: inline-block;
clear: both;
@@ -2946,61 +3023,6 @@
.openerp .oe_fileupload .oe_attachments .oe_attachment:nth-child(even) {
background: #f4f5fa;
}
-
-.kitten-mode-activated {
- background-image: url(http://placekitten.com/g/1365/769);
- background-size: cover;
- background-attachment: fixed;
-}
-.kitten-mode-activated > * {
- opacity: 0.7;
-}
-
-div.ui-widget-overlay {
- background: black;
- filter: alpha(opacity=30);
- opacity: 0.3;
-}
-
-.ui-widget {
- font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
- color: #4c4c4c;
- font-size: 13px;
-}
-
-.ui-menu {
- padding: 2px 0;
- -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
- -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
- box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
- margin-top: 4px;
- border: 1px solid #afafb6;
-}
-.ui-menu .ui-menu-item {
- width: 100%;
- padding: 0;
-}
-.ui-menu .ui-menu-item a {
- padding: 1px 16px;
-}
-.ui-menu .ui-menu-item a.ui-corner-all {
- -moz-border-radius: 0;
- -webkit-border-radius: 0;
- border-radius: 0;
-}
-.ui-menu .ui-menu-item a.ui-state-active {
- background: #f0f0fa;
-}
-.ui-menu .ui-menu-item a.ui-state-hover, .ui-menu .ui-menu-item a.ui-state-active {
- background: #7c7bad;
-}
-
-.ui-corner-all {
- -moz-border-radius: 3px;
- -webkit-border-radius: 3px;
- border-radius: 3px;
-}
-
@media print {
.openerp {
text-shadow: none;
=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass 2012-10-31 14:06:09 +0000
+++ addons/web/static/src/css/base.sass 2012-11-02 13:41:21 +0000
@@ -49,6 +49,7 @@
background-image: -ms-linear-gradient(top, $startColor, $endColor) /* IE10 */
background-image: -o-linear-gradient(top, $startColor, $endColor) /* Opera 11.10+ */
background-image: linear-gradient(to bottom, $startColor, $endColor)
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=$startColor, endColorstr=$endColor) /* IE9 */
@mixin radial-gradient($gradient)
background-position: center center
@@ -95,6 +96,8 @@
background: -moz-linear-gradient(135deg, $endColor, $startColor)
background: -o-linear-gradient(135deg, $startColor, $endColor)
background: -webkit-gradient(linear, left top, right bottom, from($startColor), to($endColor))
+ background: -ms-linear-gradient(top, $startColor, $endColor) /* IE10 */
+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=$startColor, endColorstr=$endColor) /* IE9 */
@mixin transform($transform)
-webkit-transform: $transform
@@ -115,7 +118,6 @@
@keyframes #{$name}
@content
-
// Transforms the (readable) text of an inline element into an mmlicons icon,
// allows for actual readable text in-code (and in readers?) with iconic looks
@mixin text-to-icon($icon-name, $color: #404040)
@@ -169,6 +171,9 @@
\::-webkit-input-placeholder
color: $tag-border !important
font-style: italic !important
+ \:-ms-input-placeholder
+ color: $tag-border !important
+ font-style: italic !important
//}}}
// Tag reset {{{
a
@@ -417,7 +422,7 @@
clear: both
visibility: hidden
.oe_button_box
- width: 270px
+ width: 280px
text-align: right
button
margin: 4px
@@ -685,7 +690,7 @@
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=)
text-align: center
font-size: 14px
- height: 100%
+ height: 600px
ul, li
margin: 0
list-style-type: none
@@ -1063,11 +1068,12 @@
> div
height: 100%
.oe_breadcrumb_item:not(:last-child)
- display: inline-block
max-width: 7em
white-space: nowrap
- overflow: hidden
text-overflow: ellipsis
+ .oe_breadcrumb_title > *
+ display: inline-block
+ overflow: hidden
// }}}
// ViewManager common {{{
.oe_view_manager
@@ -1743,6 +1749,9 @@
// }}}
// FormView.fields {{{
.oe_form
+ h1
+ .oe_form_required
+ float: inherit
.oe_form_field_text
width: 100%
.oe_form_field_char input,
@@ -1797,6 +1806,7 @@
.oe_form_required
input:not([disabled]):not([readonly]), select:not([disabled]):not([readonly]), textarea:not([disabled]):not([readonly])
background-color: #D2D2FF !important
+ width : 100%
.oe_form_invalid
input, select, textarea
background-color: #F66 !important
@@ -1820,12 +1830,13 @@
@include radius(0)
border-bottom-left-radius: 0px
height: 22px
+ > div
+ overflow: hidden
.oe_form_field_with_button
input
width: 100%
> div
position: relative
- overflow: hidden
.oe_form_embedded_html
position: relative
width: 600px
@@ -1918,6 +1929,9 @@
margin: 0 -18px 0 0
padding: 0
@include vertical-gradient(#fcfcfc, #dedede)
+ background-color/*\**/: #e8e8e8\9
+ background: -ms-linear-gradient(top, #fcfcfc, #dedede)
+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfcfc', endColorstr='#dedede')
&:first-child .label
border-left: 1px solid #cacaca
padding-left: 14px
@@ -1950,12 +1964,23 @@
margin-top: 3px
box-shadow: -1px 1px 2px rgba(255,255,255,0.2), inset -1px 1px 1px rgba(0,0,0,0.2)
@include skew-gradient(#fcfcfc, #dedede)
+ background: -o-linear-gradient(135deg, #dedede, #fcfcfc)
+ background-color/*\**/: #e8e8e8\9
+ background: -ms-linear-gradient(top, #fcfcfc, #dedede)
+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfcfc', endColorstr='#dedede')
@include radius(3px)
@include transform(rotate(45deg))
li.oe_active
@include vertical-gradient(#729fcf, #3465a4)
+ background-color/*\**/: #729fcf\9
+ background: -ms-linear-gradient(top, #729fcf, #3465a4)
+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#729fcf', endColorstr='#3465a4')
.arrow span
@include skew-gradient(#729fcf, #3465a4)
+ background: -o-linear-gradient(135deg, #3465a4, #729fcf)
+ background-color/*\**/: #729fcf\9
+ background: -ms-linear-gradient(top, #729fcf, #3465a4)
+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#729fcf', endColorstr='#3465a4')
.label
color: white
text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4
@@ -1964,19 +1989,31 @@
cursor: pointer
&:hover
@include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%))
+ background-color/*\**/: #dedede\9
+ background: -ms-linear-gradient(top, #e8e8e8, #cacaca)
+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e8e8e8', endColorstr='#cacaca')
.label
text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede
.arrow span
@include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%))
+ background-color/*\**/: #dedede\9
+ background: -ms-linear-gradient(top, #e8e8e8, #cacaca)
+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e8e8e8', endColorstr='#cacaca')
.label
color: $link-color
li.oe_active
&:hover
@include vertical-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%))
+ background-color/*\**/: #4c85c2\9;
+ background: -ms-linear-gradient(top, #4c85c2, #284d7d)
+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#4c85c2', endColorstr='#284d7d')
.label
text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4
.arrow span
@include skew-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%))
+ background-color/*\**/: #4c85c2\9;
+ background: -ms-linear-gradient(top, #4c85c2, #284d7d)
+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#4c85c2', endColorstr='#284d7d')
// }}}
// FormView.one2many {{{
.oe_form .oe_form_field_one2many > .oe_view_manager
@@ -2278,6 +2315,58 @@
color: #333
// }}}
+@-moz-document url-prefix()
+ .openerp
+ .oe_view_manager
+ .oe_view_manager_switch
+ li
+ line-height: 21px
+@media screen and (-webkit-min-device-pixel-ratio:0)
+ .openerp
+ .oe_login
+ height: 100%
+
+// Kitten Mode {{{
+.kitten-mode-activated
+ background-image: url(http://placekitten.com/g/1365/769)
+ background-size: cover
+ background-attachment: fixed
+ >*
+ opacity: 0.70
+// }}}
+
+// The jQuery-ui overlay and Autocomplete are outside the .openerp div, please don't add indentation !!!
+div.ui-widget-overlay
+ background: black
+ @include opacity(0.3)
+
+.ui-widget
+ font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif
+ color: #4c4c4c
+ font-size: 13px
+
+.ui-menu
+ padding: 2px 0
+ @include box-shadow(0 1px 4px rgba(0,0,0,0.3))
+ margin-top: 4px
+ border: 1px solid $tag-border
+ .ui-menu-item
+ width: 100%
+ padding: 0
+ a
+ padding: 1px 16px
+ a.ui-corner-all
+ @include radius(0)
+ a.ui-state-active
+ background: #f0f0fa
+ .ui-menu-item a.ui-state-hover, .ui-menu-item a.ui-state-active
+ background: $tag-bg-dark
+ //color: #4c4c4c
+ //@include vertical-gradient(#f0f0fa, #eeeef6)
+
+.ui-corner-all
+ @include radius(3px)
+
.openerp
.oe_fileupload
display: inline-block
@@ -2338,47 +2427,6 @@
.oe_attachment:nth-child(even)
background: #F4F5FA
-// Kitten Mode {{{
-.kitten-mode-activated
- background-image: url(http://placekitten.com/g/1365/769)
- background-size: cover
- background-attachment: fixed
- >*
- opacity: 0.70
-// }}}
-
-// The jQuery-ui overlay and Autocomplete are outside the .openerp div, please don't add indentation !!!
-div.ui-widget-overlay
- background: black
- @include opacity(0.3)
-
-.ui-widget
- font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif
- color: #4c4c4c
- font-size: 13px
-
-.ui-menu
- padding: 2px 0
- @include box-shadow(0 1px 4px rgba(0,0,0,0.3))
- margin-top: 4px
- border: 1px solid $tag-border
- .ui-menu-item
- width: 100%
- padding: 0
- a
- padding: 1px 16px
- a.ui-corner-all
- @include radius(0)
- a.ui-state-active
- background: #f0f0fa
- .ui-menu-item a.ui-state-hover, .ui-menu-item a.ui-state-active
- background: $tag-bg-dark
- //color: #4c4c4c
- //@include vertical-gradient(#f0f0fa, #eeeef6)
-
-.ui-corner-all
- @include radius(3px)
-
@media print
.openerp
.oe_header_row, ul.oe_header, div.oe_mail_thread_action, .oe_mail_recthread_actions, .oe_button_box, .oe_form button, button.oe_invite, .oe_form header, .openerp .oe_notebook > li.ui-state-default
=== modified file 'addons/web/static/src/js/coresetup.js'
--- addons/web/static/src/js/coresetup.js 2012-10-26 09:54:36 +0000
+++ addons/web/static/src/js/coresetup.js 2012-11-02 13:41:21 +0000
@@ -3,7 +3,13 @@
*--------------------------------------------------------*/
var console;
if (!console) {
- console = {log: function () {}};
+ console = {};
+ var noop = function () {};
+ _.each('log error debug info warn assert clear dir dirxml trace group \
+ groupCollapsed groupEnd time timeEnd profile profileEnd count \
+ exception'.split(/\s+/), function (property) {
+ console[property] = noop;
+ });
}
if (!console.debug) {
console.debug = console.log;
=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js 2012-10-31 15:03:24 +0000
+++ addons/web/static/src/js/view_form.js 2012-11-02 13:41:21 +0000
@@ -1163,6 +1163,7 @@
this.process_version();
this.fields_to_init = [];
+ this.buttons = [];
this.tags_to_init = [];
this.widgets_to_init = [];
this.labels = {};
@@ -1190,7 +1191,8 @@
self.view.register_field(w, $elem.attr("name"));
self.to_replace.push([w, $elem]);
});
- _.each(this.tags_to_init, function($elem) {
+ _.each(this.tags_to_init, function($elem, k) {
+ if(self.buttons[k] && self.buttons[k].type) $elem[0].setAttribute("type", self.buttons[k].type)
var tag_name = $elem[0].tagName.toLowerCase();
var obj = self.tags_registry.get_object(tag_name);
var w = new (obj)(self.view, instance.web.xml_to_json($elem[0]));
@@ -1229,10 +1231,25 @@
}
this.$target.toggleClass('oe_layout_debugging');
},
+ get_button_json: function(obj, child){
+ this.buttons = child || [];
+ if (obj.children && obj.children.length) {
+ for (var i = 0, ii = obj.children.length; i < ii; i++) {
+ if(obj.children[i].tag=="button"){
+ this.buttons.push(obj.children[i].attrs)
+ }
+ if(obj.children[i].children){
+ this.get_button_json(obj.children[i], this.buttons)
+ }
+ }
+ return this.buttons;
+ }
+ },
process: function($tag) {
var self = this;
var tagname = $tag[0].nodeName.toLowerCase();
if (this.tags_registry.contains(tagname)) {
+ this.get_button_json(this.fvg.arch)
this.tags_to_init.push($tag);
return $tag;
}
@@ -2951,6 +2968,12 @@
}
}
});
+ // Autocomplete close on dialog content scroll
+ this.$input.closest(".ui-dialog .ui-dialog-content").scroll(function(){
+ if(self.$input.autocomplete("widget").is(":visible")){
+ self.$input.autocomplete("close");
+ }
+ });
self.ed_def = $.Deferred();
self.uned_def = $.Deferred();
var ed_delay = 200;
=== modified file 'addons/web_calendar/static/src/css/web_calendar.css'
--- addons/web_calendar/static/src/css/web_calendar.css 2012-10-23 10:11:19 +0000
+++ addons/web_calendar/static/src/css/web_calendar.css 2012-11-02 13:41:21 +0000
@@ -99,13 +99,16 @@
font-weight:normal;
}
.openerp .dhx_cal_prev_button {
+ background: url("/web_calendar/static/src/img/minical_left.png") no-repeat 8px 7px;
background: url("/web_calendar/static/src/img/minical_left.png") no-repeat 8px 7px, -webkit-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8));
background: url("/web_calendar/static/src/img/minical_left.png") no-repeat 8px 7px, -webkit-linear-gradient(#efefef, #d8d8d8);
background: url("/web_calendar/static/src/img/minical_left.png") no-repeat 8px 7px, -moz-linear-gradient(#efefef, #d8d8d8);
background: url("/web_calendar/static/src/img/minical_left.png") no-repeat 8px 7px, -o-linear-gradient(top, #efefef, #d8d8d8);
background: url("/web_calendar/static/src/img/minical_left.png") no-repeat 8px 7px, -khtml-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8));
}
+
.openerp .dhx_cal_next_button {
+ background: url("/web_calendar/static/src/img/minical_right.png") no-repeat 8px 7px;
background: url("/web_calendar/static/src/img/minical_right.png") no-repeat 8px 7px, -webkit-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8));
background: url("/web_calendar/static/src/img/minical_right.png") no-repeat 8px 7px, -webkit-linear-gradient(#efefef, #d8d8d8);
background: url("/web_calendar/static/src/img/minical_right.png") no-repeat 8px 7px, -moz-linear-gradient(#efefef, #d8d8d8);
=== modified file 'addons/web_gantt/static/src/js/gantt.js'
--- addons/web_gantt/static/src/js/gantt.js 2012-10-18 11:49:50 +0000
+++ addons/web_gantt/static/src/js/gantt.js 2012-11-02 13:41:21 +0000
@@ -152,7 +152,7 @@
} else { // we assume date_duration is defined
var tmp = instance.web.format_value(task[self.fields_view.arch.attrs.date_delay],
self.fields[self.fields_view.arch.attrs.date_delay]);
- if (!tmp)
+ if (!tmp || tmp < 1)
return;
task_stop = task_start.clone().addMilliseconds(tmp * 60 * 60 * 1000);
}
=== modified file 'addons/web_graph/static/lib/flotr2/js/DOM.js'
--- addons/web_graph/static/lib/flotr2/js/DOM.js 2012-05-07 08:19:08 +0000
+++ addons/web_graph/static/lib/flotr2/js/DOM.js 2012-11-02 13:41:21 +0000
@@ -18,7 +18,6 @@
var div = Flotr.DOM.create('div'), n;
div.innerHTML = html;
n = div.children[0];
- div.innerHTML = '';
return n;
},
/**
=== modified file 'addons/web_kanban/static/src/css/kanban.css'
--- addons/web_kanban/static/src/css/kanban.css 2012-10-28 08:33:24 +0000
+++ addons/web_kanban/static/src/css/kanban.css 2012-11-02 13:41:21 +0000
@@ -1,7 +1,12 @@
@charset "utf-8";
+.openerp .oe_application {
+ height: 100%;
+}
+
.openerp .oe_kanban_view {
background: white;
height: inherit;
+ position: relative;
}
.openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_dummy_cell {
background: url(/web/static/src/img/form_sheetbg.png);
@@ -127,6 +132,7 @@
}
.openerp .oe_kanban_view .oe_kanban_group_title_vertical {
writing-mode: tb-rl;
+ -ms-writing-mode: tb;
-webkit-transform: rotate(90deg);
-moz-transform: rotate(90deg);
-o-transform: rotate(90deg);
@@ -139,6 +145,7 @@
position: relative;
opacity: 0.75;
top: 20px;
+ -o-transform-origin: 80% 50%; /* Opera */
}
.openerp .oe_kanban_view .oe_kanban_add, .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle {
margin-left: 4px;
@@ -191,12 +198,14 @@
height: 64px;
text-align: center;
overflow: hidden;
+ border-collapse: separate;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
-webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+ box-shadow: 0 1px 4px 3px rgba(0, 0, 0, 0.4);
}
.openerp .oe_kanban_view .oe_kanban_details {
display: inline-block;
@@ -279,7 +288,7 @@
-webkit-box-sizing: border-box;
}
.openerp .oe_kanban_view .oe_kanban_action_button {
- height: 22px;
+ height: 20%;
margin: 0;
}
.openerp .oe_kanban_view .oe_kanban_action_a {
=== modified file 'addons/web_kanban/static/src/css/kanban.sass'
--- addons/web_kanban/static/src/css/kanban.sass 2012-10-28 08:33:24 +0000
+++ addons/web_kanban/static/src/css/kanban.sass 2012-11-02 13:41:21 +0000
@@ -46,11 +46,14 @@
transition: $transition
// }}}
+.openerp .oe_application
+ height: 100%
.openerp .oe_kanban_view
// KanbanView {{{
//background: url(data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAKElEQVQIHWP8DwTv379nAAFBQUEGhnfv3oHEwADEZgJLIRGMIClkLQCr3x2Htp/lLwAAAABJRU5ErkJggg==)
background: white
height: inherit
+ position: relative
&.oe_kanban_grouped .oe_kanban_dummy_cell
background: url(/web/static/src/img/form_sheetbg.png)
.ui-sortable-placeholder
@@ -150,6 +153,7 @@
color: #666666
.oe_kanban_group_title_vertical
writing-mode: tb-rl
+ -ms-writing-mode: tb
-webkit-transform: rotate(90deg)
-moz-transform: rotate(90deg)
-o-transform: rotate(90deg)
@@ -162,6 +166,7 @@
position: relative
opacity: 0.75
top: 20px
+ -o-transform-origin: 80% 50%
// }}}
// KanbanQuickCreate {{{
.oe_kanban_add, .oe_kanban_header .oe_dropdown_toggle
@@ -204,8 +209,10 @@
height: 64px
text-align: center
overflow: hidden
+ border-collapse: separate
@include radius(3px)
@include box-shadow(0 1px 4px rgba(0, 0, 0, 0.4))
+ box-shadow: 0 1px 4px 3px rgba(0, 0, 0, 0.4)
.oe_kanban_details
display: inline-block
vertical-align: top
@@ -267,7 +274,7 @@
-moz-box-sizing: border-box
-webkit-box-sizing: border-box
.oe_kanban_action_button
- height: 22px
+ height: 20%
margin: 0
.oe_kanban_action_a
text-decoration: none
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
