[FIX] various small css fixes for kanban and tree view

bzr revid: fva@openerp.com-20120927131706-81d0sqqeaiy7c4c2
This commit is contained in:
Frédéric van der Essen 2012-09-27 15:17:06 +02:00
parent 92efdf10c8
commit 92c6ff7ce6
6 changed files with 73 additions and 36 deletions

View File

@ -1489,7 +1489,6 @@
height: 100%; height: 100%;
} }
.openerp .oe_view_manager_current > .oe_view_manager_header { .openerp .oe_view_manager_current > .oe_view_manager_header {
border-top: 1px solid #cacaca;
border-bottom: 1px solid #cacaca; border-bottom: 1px solid #cacaca;
background-color: #fcfcfc; background-color: #fcfcfc;
background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede));
@ -2207,6 +2206,9 @@
min-width: 60px; min-width: 60px;
color: #1f1f1f; 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] { .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; background: #e5e5e5 !important;
color: #666666; color: #666666;
@ -2763,26 +2765,32 @@
width: 100%; width: 100%;
background-color: white; background-color: white;
border-spacing: 0; border-spacing: 0;
color: #4c4c4c;
} }
.openerp .oe-treeview-table th { .openerp .oe-treeview-table th {
padding: 10px; padding: 10px;
color: #4c4c4c;
font-weight: bold; font-weight: bold;
background-color: #f0f0f0; background-color: #f0f0f0;
border-bottom: 2px solid #cacaca; border-bottom: 2px solid #cacaca;
} }
.openerp .oe-treeview-table .treeview-tr, .openerp .oe-treeview-table .treeview-td { .openerp .oe-treeview-table td {
cursor: pointer; cursor: pointer;
border-right: 1px dotted #afafb6; vertical-align: middle;
vertical-align: top;
text-align: left; text-align: left;
border-bottom: 1px solid #cfcccc; vertical-align: middle;
height: 20px;
padding-left: 4px;
padding-right: 4px;
border-right: 1px solid #e7e7e7;
}
.openerp .oe-treeview-table td.oe_number {
text-align: right !important;
}
.openerp .oe-treeview-table tr {
border-bottom: 1px solid #d6d6d6;
} }
.openerp .oe-treeview-table tr:hover { .openerp .oe-treeview-table tr:hover {
background-color: #e0e0f8; background-color: #e7e7e7;
}
.openerp .oe-treeview-table .oe-number {
text-align: right !important;
} }
.openerp .oe-treeview-table span { .openerp .oe-treeview-table span {
font-size: 90%; font-size: 90%;

View File

@ -1197,7 +1197,6 @@ $sheet-max-width: 860px
.oe_view_manager_current .oe_view_manager_current
height: 100% height: 100%
> .oe_view_manager_header > .oe_view_manager_header
border-top: 1px solid #cacaca
border-bottom: 1px solid #cacaca border-bottom: 1px solid #cacaca
@include vertical-gradient(#fcfcfc, #dedede) @include vertical-gradient(#fcfcfc, #dedede)
@include box-shadow((0 1px 0 rgba(255,255,255,0.4), 0 0 9px rgba(0,0,0,0.1))) @include box-shadow((0 1px 0 rgba(255,255,255,0.4), 0 0 9px rgba(0,0,0,0.1)))
@ -1751,6 +1750,8 @@ $sheet-max-width: 860px
background: white background: white
min-width: 60px min-width: 60px
color: #1f1f1f color: #1f1f1f
textarea
height: 32px
input[readonly], select[readonly], textarea[readonly], input[disabled], select[disabled] input[readonly], select[readonly], textarea[readonly], input[disabled], select[disabled]
background: #E5E5E5 !important background: #E5E5E5 !important
color: #666 color: #666
@ -2180,22 +2181,29 @@ $sheet-max-width: 860px
width: 100% width: 100%
background-color: white background-color: white
border-spacing: 0 border-spacing: 0
color: #4c4c4c
th th
padding: 10px padding: 10px
color: #4c4c4c
font-weight: bold font-weight: bold
background-color: #f0f0f0 background-color: #f0f0f0
border-bottom: 2px solid #cacaca border-bottom: 2px solid #cacaca
.treeview-tr, .treeview-td
td
cursor: pointer cursor: pointer
border-right: 1px dotted $tag-border vertical-align: middle
vertical-align: top
text-align: left text-align: left
border-bottom: 1px solid #cfcccc vertical-align: middle
tr:hover height: 20px
background-color: #e0e0f8 padding-left: 4px
.oe-number padding-right: 4px
border-right: 1px solid #e7e7e7
td.oe_number
text-align: right !important text-align: right !important
tr
border-bottom: 1px solid #d6d6d6
&:hover
background-color: #e7e7e7
span span
font-size: 90% font-size: 90%
font-weight: normal font-weight: normal
@ -2207,6 +2215,7 @@ $sheet-max-width: 860px
background-image: url(/web/static/src/img/collapse.gif) background-image: url(/web/static/src/img/collapse.gif)
.treeview-tr.oe-treeview-first span, .treeview-td.oe-treeview-first span .treeview-tr.oe-treeview-first span, .treeview-td.oe-treeview-first span
margin-left: 16px margin-left: 16px
// }}} // }}}
// Debugging stuff {{{ // Debugging stuff {{{
.oe_layout_debugging .oe_layout_debugging

View File

@ -3007,7 +3007,9 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
if (!this.get("effective_readonly")) { if (!this.get("effective_readonly")) {
this.$input.val(str.split("\n")[0]); this.$input.val(str.split("\n")[0]);
this.current_display = this.$input.val(); this.current_display = this.$input.val();
this.$('.oe_m2o_cm_button').css({'visibility': this.is_false() ? 'hidden' : 'visible'}); if(this.is_false()){
this.$('.oe_m2o_cm_button').css({'display':'none'});
}
} else { } else {
var lines = _.escape(str).split("\n"); var lines = _.escape(str).split("\n");
var link = ""; var link = "";

View File

@ -314,7 +314,7 @@
<t t-name="Menu"> <t t-name="Menu">
<ul class="oe_menu" t-if="widget.data"> <ul class="oe_menu" t-if="widget.data">
<li t-foreach="widget.data.data.children" t-as="menu"> <li t-foreach="widget.data.data.children" t-as="menu">
<t t-call="Menu.secondary.link"/> <t t-call="Menu.link"/>
</li> </li>
</ul> </ul>
</t> </t>
@ -333,7 +333,7 @@
<t t-esc="menu.name"/> <t t-esc="menu.name"/>
<!-- <!--
Shall the section be still clickable ? Shall the section be still clickable ?
<t t-call="Menu.secondary.link"/> <t t-call="Menu.link"/>
--> -->
</div> </div>
<t t-call="Menu.secondary.submenu"/> <t t-call="Menu.secondary.submenu"/>
@ -343,13 +343,13 @@
<t t-name="Menu.secondary.submenu"> <t t-name="Menu.secondary.submenu">
<ul t-if="menu.children.length" class="oe_secondary_submenu"> <ul t-if="menu.children.length" class="oe_secondary_submenu">
<li t-foreach="menu.children" t-as="menu"> <li t-foreach="menu.children" t-as="menu">
<t t-call="Menu.secondary.link"/> <t t-call="Menu.link"/>
<!--<span class="oe_menu_label">8</span>--> <!--<span class="oe_menu_label">8</span>-->
<t t-call="Menu.secondary.submenu"/> <t t-call="Menu.secondary.submenu"/>
</li> </li>
</ul> </ul>
</t> </t>
<t t-name="Menu.secondary.link"> <t t-name="Menu.link">
<a t-attf-href="#menu_id=#{menu.id}&amp;action=#{menu.action ? menu.action.split(',')[1] : ''}" <a t-attf-href="#menu_id=#{menu.id}&amp;action=#{menu.action ? menu.action.split(',')[1] : ''}"
t-att-class="menu.children.length ? 'oe_menu_toggler' : 'oe_menu_leaf'" t-att-class="menu.children.length ? 'oe_menu_toggler' : 'oe_menu_leaf'"
t-att-data-menu="menu.id" t-att-data-menu="menu.id"
@ -592,7 +592,7 @@
<t t-set="children" t-value="record[children_field]"/> <t t-set="children" t-value="record[children_field]"/>
<t t-set="class" t-value="children and children.length ? 'treeview-tr' : 'treeview-td'"/> <t t-set="class" t-value="children and children.length ? 'treeview-tr' : 'treeview-td'"/>
<t t-set="rank" t-value="'oe-treeview-first'"/> <t t-set="rank" t-value="'oe-treeview-first'"/>
<t t-set="style" t-value="'background-position: ' + 19*(level-1) + 'px; padding-left: ' + 19*(level-1) + 'px;'"/> <t t-set="style" t-value="'background-position: ' + 19*(level-1) + 'px; padding-left: ' + (4 + 19*(level-1)) + 'px;'"/>
<td t-foreach="fields_view" t-as="field" <td t-foreach="fields_view" t-as="field"
t-if="!field.attrs.modifiers.tree_invisible" t-if="!field.attrs.modifiers.tree_invisible"

View File

@ -159,15 +159,24 @@
padding: 10px; padding: 10px;
} }
.openerp .oe_kanban_view .oe_kanban_quick_create input { .openerp .oe_kanban_view .oe_kanban_quick_create input {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
outline: none; outline: none;
border: none; border: 1px solid transparent;
display: block;
margin-bottom: 8px;
font-size: 13px;
width: 100%;
-moz-box-shadow: none; -moz-box-shadow: none;
-webkit-box-shadow: none; -webkit-box-shadow: none;
-box-shadow: none; -box-shadow: none;
display: block; }
margin: 0 0 8px 0; .openerp .oe_kanban_view .oe_kanban_quick_create input:focus {
font-size: 13px; border: 1px solid #a6a6fe;
width: 100%; -moz-box-shadow: 0px 0px 7px rgba(0, 133, 255, 0.3) inset;
-webkit-box-shadow: 0px 0px 7px rgba(0, 133, 255, 0.3) inset;
-box-shadow: 0px 0px 7px rgba(0, 133, 255, 0.3) inset;
} }
.openerp .oe_kanban_view .oe_kanban_vignette { .openerp .oe_kanban_view .oe_kanban_vignette {
padding: 8px; padding: 8px;
@ -200,7 +209,7 @@
} }
.openerp .oe_kanban_view .oe_kanban_details .oe_tag { .openerp .oe_kanban_view .oe_kanban_details .oe_tag {
display: inline-block; display: inline-block;
margin: 0 0 2px 0; margin: 0 2px 2px 0;
} }
.openerp .oe_kanban_view .oe_kanban_record { .openerp .oe_kanban_view .oe_kanban_record {
position: relative; position: relative;

View File

@ -27,6 +27,11 @@
-webkit-box-shadow: $bsval -webkit-box-shadow: $bsval
-box-shadow: $bsval -box-shadow: $bsval
@mixin box-sizing($sizing: border-box)
-webkit-box-sizing: $sizing
-moz-box-sizing: $sizing
box-sizing: $sizing
@mixin transform($transform) @mixin transform($transform)
-moz-transform: $transform -moz-transform: $transform
-webkit-transform: $transform -webkit-transform: $transform
@ -167,13 +172,17 @@
width: 200px width: 200px
padding: 10px padding: 10px
.oe_kanban_quick_create input .oe_kanban_quick_create input
@include box-sizing(border-box)
outline: none outline: none
border: none border: 1px solid transparent
@include box-shadow(none)
display: block display: block
margin: 0 0 8px 0 margin-bottom: 8px
font-size: 13px font-size: 13px
width: 100% width: 100%
@include box-shadow(none)
&:focus
border: 1px solid #A6A6FE
@include box-shadow(0px 0px 7px rgba(0, 133, 255, 0.3) inset)
// }}} // }}}
// KanbanRecords {{{ // KanbanRecords {{{
.oe_kanban_vignette .oe_kanban_vignette
@ -199,7 +208,7 @@
margin: 0 0 4px 0 margin: 0 0 4px 0
.oe_tag .oe_tag
display: inline-block display: inline-block
margin: 0 0 2px 0 margin: 0 2px 2px 0
.oe_kanban_record .oe_kanban_record
position: relative position: relative
display: block display: block