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

wip 

bzr revid: nicolas.vanhoren@openerp.com-20120904164241-lrvvsj5i7axni5ng
This commit is contained in:
niv-openerp 2012-09-04 18:42:41 +02:00
parent 78395326ff
commit 006ed33ff3
6 changed files with 121 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/web/static/src/css/Makefile
View File

@ -1,3 +1,3 @@
base.css: base.sass
sass -t expanded base.sass base.css
sass --trace -t expanded base.sass base.css

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

@ -97,13 +97,6 @@
background-image: -o-linear-gradient(top, #eeeeee, #dedede);
background-image: linear-gradient(to bottom, #eeeeee, #dedede);
}
.openerp ul, .openerp li, .openerp ol {
margin: 0;
padding: 0;
}
.openerp li {
list-style-type: none;
}
.openerp input, .openerp textarea, .openerp select {
padding: 2px 4px;
border: 1px solid #cccccc;
@ -118,6 +111,24 @@
.openerp h4 {
margin: 4px 0;
}
.openerp .oe_semantic_html_override_ul {
margin: 0;
padding: 0;
}
.openerp .oe_semantic_html_override_ul li {
margin: 0;
padding: 0;
list-style-type: none;
}
.openerp .oe_semantic_html_override ul, .openerp .oe_semantic_html_override ol {
margin: 0;
padding: 0;
}
.openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol li {
margin: 0;
padding: 0;
list-style-type: none;
}
.openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
display: inline-block;
border: 1px solid #ababab;
@ -589,6 +600,22 @@
padding: 0 16px;
list-style: none;
zoom: 1;
margin: 0;
padding: 0;
}
.openerp .oe_notebook li {
margin: 0;
padding: 0;
list-style-type: none;
}
.openerp .oe_notebook ul, .openerp .oe_notebook ol {
margin: 0;
padding: 0;
}
.openerp .oe_notebook ul li, .openerp .oe_notebook ol li {
margin: 0;
padding: 0;
list-style-type: none;
}
.openerp .oe_notebook.ui-corner-all {
-moz-border-radius: 0;
@ -893,6 +920,15 @@
-webkit-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9);
box-shadow: 0 0 18px rgba(0, 0, 0, 0.9);
}
.openerp .oe_login .oe_login_pane ul, .openerp .oe_login .oe_login_pane ol {
margin: 0;
padding: 0;
}
.openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol li {
margin: 0;
padding: 0;
list-style-type: none;
}
.openerp .oe_login .oe_login_pane h2 {
margin-top: 0;
font-size: 18px;
@ -972,6 +1008,15 @@
background-image: -o-linear-gradient(top, #646060, #262626);
background-image: linear-gradient(to bottom, #646060, #262626);
}
.openerp .oe_topbar ul, .openerp .oe_topbar ol {
margin: 0;
padding: 0;
}
.openerp .oe_topbar ul li, .openerp .oe_topbar ol li {
margin: 0;
padding: 0;
list-style-type: none;
}
.openerp .oe_topbar .oe_topbar_item {
display: block;
padding: 5px 10px 7px;
@ -1044,6 +1089,15 @@
text-shadow: 0 1px 1px white;
padding-bottom: 16px;
}
.openerp .oe_leftbar ul, .openerp .oe_leftbar ol {
margin: 0;
padding: 0;
}
.openerp .oe_leftbar ul li, .openerp .oe_leftbar ol li {
margin: 0;
padding: 0;
list-style-type: none;
}
.openerp a.oe_logo {
width: 220px;
display: block;
@ -1246,6 +1300,15 @@
width: 100%;
table-layout: fixed;
}
.openerp .oe_view_manager table.oe_view_manager_header ul, .openerp .oe_view_manager table.oe_view_manager_header ol {
margin: 0;
padding: 0;
}
.openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol li {
margin: 0;
padding: 0;
list-style-type: none;
}
.openerp .oe_view_manager table.oe_view_manager_header .oe_header_row {
clear: both;
text-shadow: 0 1px 1px white;
@ -1946,7 +2009,7 @@
max-width: 650px;
margin: 0 0 10px 0;
}
.openerp .oe_form div.oe_form_configuration p {
.openerp .oe_form div.oe_form_configuration p, .openerp .oe_form div.oe_form_configuration ul, .openerp .oe_form div.oe_form_configuration ol {
color: #aaaaaa;
max-width: 650px;
}
@ -2376,6 +2439,24 @@
.openerp.ui-autocomplete li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option {
margin-top: 10px;
}
.openerp .oe_form_field_status {
margin: 0;
padding: 0;
}
.openerp .oe_form_field_status ul, .openerp .oe_form_field_status ol {
margin: 0;
padding: 0;
}
.openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol li {
margin: 0;
padding: 0;
list-style-type: none;
}
.openerp .oe_form_field_status li {
margin: 0;
padding: 0;
list-style-type: none;
}
.openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
display: none;
}

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

@ -124,6 +124,18 @@ $sheet-max-width: 860px
content: $icon-name
color: $color
@mixin ul-html-override()
margin: 0
padding: 0
li
margin: 0
padding: 0
list-style-type: none
@mixin semantic-html-override()
ul, ol
@include ul-html-override()
// }}}
@media print
@ -178,11 +190,6 @@ $sheet-max-width: 860px
@include vertical-gradient(#f0f0fa, #eeeef6)
.zebra tbody tr:hover td
@include vertical-gradient(#eee, #dedede)
ul, li, ol
margin: 0
padding: 0
li
list-style-type: none
input, textarea, select
padding: 2px 4px
border: 1px solid #ccc
@ -192,6 +199,10 @@ $sheet-max-width: 860px
vertical-align: middle
h4
margin: 4px 0
.oe_semantic_html_override
@include semantic-html-override
.oe_semantic_html_override_ul
@include ul-html-override
// }}}
// Button style {{{
a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button
@ -497,6 +508,8 @@ $sheet-max-width: 860px
padding: 0 16px
list-style: none
zoom: 1
@include ul-html-override
@include semantic-html-override
.oe_notebook.ui-corner-all
@include radius(0)
.oe_notebook:before, .oe_notebook:after
@ -716,6 +729,7 @@ $sheet-max-width: 860px
text-align: left
@include radius(8px)
@include box-shadow(0 0 18px rgba(0, 0, 0, 0.9))
@include semantic-html-override
h2
margin-top: 0
font-size: 18px
@ -781,6 +795,7 @@ $sheet-max-width: 860px
height: 31px
border-top: solid 1px #d3d3d3
@include vertical-gradient(#646060, #262626)
@include semantic-html-override
.oe_topbar_item
display: block
padding: 5px 10px 7px
@ -831,6 +846,7 @@ $sheet-max-width: 860px
border-right: 1px solid $tag-border
text-shadow: 0 1px 1px white
padding-bottom: 16px
@include semantic-html-override
a.oe_logo
width: 220px
display: block
@ -995,6 +1011,7 @@ $sheet-max-width: 860px
table.oe_view_manager_header
width: 100%
table-layout: fixed
@include semantic-html-override
.oe_header_row
//min-height: 26px
//line-height: 26px
@ -1532,7 +1549,7 @@ $sheet-max-width: 860px
max-width: 650px
margin: 0 0 10px 0
div.oe_form_configuration
p
p, ul, ol
color: #aaa
max-width: 650px
label
@ -1848,6 +1865,11 @@ $sheet-max-width: 860px
li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option
margin-top: 10px
// }}}
// FormView.fieldstatus {{{
.oe_form_field_status
@include semantic-html-override
@include ul-html-override
// }}}
// FormView.one2many {{{
.oe_form .oe_form_field_one2many > .oe_view_manager
.oe_list_pager_single_page

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

@ -1064,7 +1064,7 @@
</span>
</t>
<t t-name="FieldStatus">
<ul t-att-class="widget.options.clickable ? 'oe_form_steps_clickable' : 'oe_form_steps'" t-att-style="widget.node.attrs.style"/>
<ul t-att-class="'oe_form_field_status ' + (widget.options.clickable ? 'oe_form_steps_clickable' : 'oe_form_steps')" t-att-style="widget.node.attrs.style"/>
</t>
<t t-name="FieldStatus.content">
<t t-foreach="widget.selection" t-as="i">

2
addons/web_graph/static/src/xml/web_graph.xml
View File

@ -1,5 +1,5 @@
<template>
<div t-name="GraphView" id="element-chart" class="editor-render" style="position:relative; width: 300px;">
<div t-name="GraphView" id="element-chart" class="oe_semantic_html_override editor-render" style="position:relative; width: 300px;">
<a href="#" class="oe_e dropdown-menu-icon" data-toggle="dropdown" title="Graph Options">&amp;iacute;</a>
<div class="graph_header_legend">
</div>

2
addons/web_kanban/static/src/xml/web_kanban.xml
View File

@ -30,7 +30,7 @@
<t t-name="KanbanView.group_header">
<td class="oe_kanban_group_header">
<t t-if="widget.view.group_by">
<div class="oe_kanban_header">
<div class="oe_kanban_header oe_semantic_html_override">
<t t-if="widget.view._is_quick_create_enabled()">
<div class="oe_kanban_add oe_e" original-title="Quick create">]</div>
</t>