odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] css fixes 

bzr revid: fva@openerp.com-20121004125132-kgz156y5uiv5njek
This commit is contained in:
Frédéric van der Essen 2012-10-04 14:51:32 +02:00
parent 73087c62cf d685cf4ee2
commit c9f108acc3
6 changed files with 53 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
addons/web/static/src/css/base.css
View File

@ -1103,9 +1103,8 @@
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset;
}
.openerp .oe_menu > li > .oe_active {
background: rgba(0, 0, 0, 0.2);
background: rgba(0, 0, 0, 0.3);
text-shadow: black 0px 0px 3px;
font-weight: bold;
-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset;
@ -1865,6 +1864,13 @@
margin: 0;
white-space: nowrap;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced li:first-child .searchview_extended_prop_or {
visibility: hidden;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced .searchview_extended_prop_or {
opacity: 0.5;
margin-left: -14px;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_opened h4:before {
content: "▾ ";
position: relative;
@ -2206,16 +2212,12 @@
min-width: 60px;
color: #1f1f1f;
}
.openerp .oe_form textarea {
height: 32px;
}
.openerp .oe_form input[readonly], .openerp .oe_form select[readonly], .openerp .oe_form textarea[readonly], .openerp .oe_form input[disabled], .openerp .oe_form select[disabled] {
background: #e5e5e5 !important;
color: #666666;
}
.openerp .oe_form textarea[disabled] {
border: none;
border-left: 8px solid #eeeeee;
padding-left: 8px;
-moz-box-shadow: none;
-webkit-box-shadow: none;
@ -2224,6 +2226,9 @@
-webkit-border-radius: 0px;
border-radius: 0px;
}
.openerp .oe_form textarea.oe_inline[disabled] {
border-left: 8px solid #eeeeee;
}
.openerp .oe_form .oe_form_field_url button img {
vertical-align: top;
}
@ -2241,7 +2246,7 @@
.openerp .oe_form .oe_datepicker_root {
display: inline-block;
}
.openerp .oe_form .oe_form_required input, .openerp .oe_form .oe_form_required select, .openerp .oe_form .oe_form_required textarea {
.openerp .oe_form .oe_form_required input:not([disabled]), .openerp .oe_form .oe_form_required select:not([disabled]), .openerp .oe_form .oe_form_required textarea:not([disabled]) {
background-color: #d2d2ff !important;
}
.openerp .oe_form .oe_form_invalid input, .openerp .oe_form .oe_form_invalid select, .openerp .oe_form .oe_form_invalid textarea {

17
addons/web/static/src/css/base.sass
View File

@ -891,9 +891,8 @@ $sheet-max-width: 860px
color: white
@include box-shadow(0 1px 2px rgba(0,0,0,0.4) inset)
> .oe_active
background: rgba(0,0,0,0.2)
background: rgba(0,0,0,0.30)
text-shadow: black 0px 0px 3px
font-weight: bold
@include box-shadow(0 1px 2px rgba(0,0,0,0.4) inset)
.oe_user_menu
@ -1482,6 +1481,11 @@ $sheet-max-width: 860px
list-style: none
margin: 0
white-space: nowrap
&:first-child .searchview_extended_prop_or
visibility: hidden
.searchview_extended_prop_or
opacity: 0.5
margin-left: -14px
.oe_opened
h4:before
content: "▾ "
@ -1753,17 +1757,16 @@ $sheet-max-width: 860px
background: white
min-width: 60px
color: #1f1f1f
textarea
height: 32px
input[readonly], select[readonly], textarea[readonly], input[disabled], select[disabled]
background: #E5E5E5 !important
color: #666
textarea[disabled]
border: none
border-left: 8px solid #eee
padding-left: 8px
@include box-shadow(none)
@include radius(0px)
textarea.oe_inline[disabled]
border-left: 8px solid #eee
.oe_form_field_url button img
vertical-align: top
.oe_form_field_date,
@ -1776,8 +1779,8 @@ $sheet-max-width: 860px
display: none
.oe_datepicker_root
display: inline-block
.oe_form_required
input, select, textarea
.oe_form_required
input:not([disabled]), select:not([disabled]), textarea:not([disabled])
background-color: #D2D2FF !important
.oe_form_invalid
input, select, textarea

1
addons/web/static/src/xml/base.xml
View File

@ -1485,6 +1485,7 @@
</div>
<t t-name="SearchView.extended_search.proposition">
<li>
<span class="searchview_extended_prop_or">or</span>
<select class="searchview_extended_prop_field">
<t t-foreach="widget.attrs.fields" t-as="field">
<option t-att="{'selected': field === widget.attrs.selected ? 'selected' : null}"

18
addons/web_kanban/static/src/css/kanban.css
View File

@ -9,7 +9,6 @@
.openerp .oe_kanban_view .ui-sortable-placeholder {
border: 1px solid rgba(0, 0, 0, 0.1);
visibility: visible !important;
height: 60px !important;
}
.openerp .oe_kanban_view .ui-sortable-helper {
-moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.3);
@ -19,6 +18,9 @@
-webkit-transform: rotate(3deg);
-o-transform: rotate(3deg);
-ms-transform: rotate(3deg);
-webkit-transition: -webkit-transform 100ms linear;
-moz-transition: -moz-transform 100ms linear;
transition: transform 100ms linear;
}
.openerp .oe_kanban_view .oe_kanban_left {
float: left;
@ -364,17 +366,18 @@
border-bottom-color: rgba(0, 0, 0, 0.3);
padding: 8px;
display: block;
-webkit-transition: -webkit-transform, -webkit-box-shadow, border 200ms linear;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
}
.openerp .oe_kanban_view .oe_kanban_card:hover, .openerp .oe_kanban_view .oe_kanban_quick_create:hover {
.openerp .oe_kanban_view .oe_kanban_card:not(.ui-sortable-helper):hover, .openerp .oe_kanban_view .oe_kanban_quick_create:not(.ui-sortable-helper):hover {
border: 1px solid #7c7bad;
-moz-box-shadow: 0 0 4px #7c7bad;
-webkit-box-shadow: 0 0 4px #7c7bad;
-box-shadow: 0 0 4px #7c7bad;
}
.openerp .oe_kanban_view .oe_kanban_card:hover .oe_dropdown_kanban > span, .openerp .oe_kanban_view .oe_kanban_quick_create:hover .oe_dropdown_kanban > span {
.openerp .oe_kanban_view .oe_kanban_card:not(.ui-sortable-helper):hover .oe_dropdown_kanban > span, .openerp .oe_kanban_view .oe_kanban_quick_create:not(.ui-sortable-helper):hover .oe_dropdown_kanban > span {
visibility: visible;
}
.openerp .oe_kanban_view .oe_kanban_card h3, .openerp .oe_kanban_view .oe_kanban_quick_create h3 {
@ -385,9 +388,6 @@
.openerp .oe_kanban_view .oe_kanban_card h3:hover, .openerp .oe_kanban_view .oe_kanban_quick_create h3:hover {
text-decoration: none;
}
.openerp .oe_kanban_view .oe_kanban_card .oe_dropdown_kanban, .openerp .oe_kanban_view .oe_kanban_quick_create .oe_dropdown_kanban {
margin-top: 4px;
}
.openerp .oe_kanban_view .oe_kanban_card .oe_dropdown_kanban .oe_kanban_project_times li, .openerp .oe_kanban_view .oe_kanban_quick_create .oe_dropdown_kanban .oe_kanban_project_times li {
float: left;
}
@ -480,10 +480,10 @@
white-space: nowrap;
}
.openerp .oe_kanban_view .oe_dropdown_kanban {
position: absolute;
top: -8px;
right: 3px;
float: right;
clear: both;
cursor: pointer;
margin-top: -6px;
}
.openerp .oe_kanban_view .oe_dropdown_kanban:hover {
text-decoration: none;

21
addons/web_kanban/static/src/css/kanban.sass
View File

@ -37,6 +37,13 @@
-webkit-transform: $transform
-o-transform: $transform
-ms-transform: $transform
@mixin transition($transition: all 200ms linear)
-webkit-transition: $transition
-moz-transition: $transition
-ms-transition: $transition
-o-transition: $transition
transition: $transition
// }}}
.openerp .oe_kanban_view
@ -49,10 +56,12 @@
.ui-sortable-placeholder
border: 1px solid rgba(0,0,0,0.1)
visibility: visible !important
height: 60px !important
.ui-sortable-helper
@include box-shadow(0 1px 10px rgba(0, 0, 0, 0.3))
@include transform(rotate(3deg))
-webkit-transition: -webkit-transform 100ms linear
-moz-transition: -moz-transform 100ms linear
transition: transform 100ms linear
.oe_kanban_left
float: left
.oe_kanban_right
@ -328,8 +337,9 @@
border-bottom-color: rgba(0,0,0,0.3)
padding: 8px
display: block
-webkit-transition: -webkit-transform, -webkit-box-shadow, border 200ms linear
@include radius(4px)
&:hover
&:not(.ui-sortable-helper):hover
border: 1px solid #7C7BAD
@include box-shadow(0 0 4px #7C7BAD)
.oe_dropdown_kanban > span
@ -341,7 +351,6 @@
h3:hover
text-decoration: none
.oe_dropdown_kanban
margin-top: 4px
.oe_kanban_project_times
li
float: left
@ -404,10 +413,10 @@
// }}}
// KanbanDropDown {{{
.oe_dropdown_kanban
position: absolute
top: -8px
right: 3px
float: right
clear: both
cursor: pointer
margin-top: -6px
&:hover
text-decoration: none
.oe_dropdown_menu

6
addons/web_kanban/static/src/js/kanban.js
View File

@ -309,8 +309,14 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
ui.item.find('*').on('click.prevent', function(ev) {
return false;
});
ui.placeholder.height(ui.item.height());
},
revert: 150,
beforeStop: function(event,ui){
console.log('beforeStop:',ui);
},
stop: function(event, ui) {
console.log('stop:',ui);
var record = ui.item.data('widget');
var old_index = self.currently_dragging.index;
var new_index = ui.item.index();