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

merge from mit-trunk 

bzr revid: mit@openerp.com-20120821111316-run49r554i1ay3uk
This commit is contained in:
Minh Tran 2012-08-21 13:13:16 +02:00
parent 0fdded4d4e fff594348a
commit 6647c92bb7
3 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
@charset "utf-8";
@charset "UTF-8";
@font-face {
font-family: "mnmliconsRegular";
src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@ -1037,14 +1037,6 @@
-webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
}
.openerp .oe_topbar .oe_topbar_item .oe_active {
background: #303030;
font-weight: bold;
color: white;
-moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
}
.openerp .oe_topbar .oe_topbar_avatar {
width: 24px;
height: 24px;
@ -1155,10 +1147,10 @@
padding: 0;
margin: 0;
}
.openerp .oe_menu li {
.openerp .oe_menu > li {
float: left;
}
.openerp .oe_menu a {
.openerp .oe_menu > li > a {
display: block;
padding: 5px 10px 7px;
line-height: 20px;
@ -1167,14 +1159,14 @@
vertical-align: top;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
}
.openerp .oe_menu a:hover {
.openerp .oe_menu > li > a:hover {
background: #303030;
color: white;
-moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
}
.openerp .oe_menu .oe_active {
.openerp .oe_menu > li > .oe_active {
background: #303030;
font-weight: bold;
color: white;
@ -1960,7 +1952,7 @@
padding: 16px 0 48px;
}
.openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator {
margin: 25px 0 10px 0;
margin: 12px 0 8px 0;
}
.openerp .oe_form div.oe_form_configuration p {
color: #aaaaaa;
@ -1969,6 +1961,12 @@
.openerp .oe_form div.oe_form_configuration label {
min-width: 150px;
}
.openerp .oe_form div.oe_form_configuration .oe_form_group_cell_label {
padding: 2px 0;
}
.openerp .oe_form div.oe_form_configuration .oe_form_group_cell div div {
padding: 1px 0;
}
.openerp ul.oe_form_steps, .openerp ul.oe_form_steps_clickable {
display: inline-block;
padding-right: 18px;
@ -2160,7 +2158,7 @@
.openerp .oe_form td.oe_form_group_cell_label label {
line-height: 18px;
display: block;
min-width: 120px;
min-width: 160px;
}
.openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
padding-left: 6px;
@ -2192,7 +2190,7 @@
font-weight: bold;
font-size: 20px;
margin: 8px 0px 8px 0px;
color: #53637e;
color: #7c7bad;
}
.openerp .oe_horizontal_separator:empty {
height: 5px;

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

@ -814,11 +814,6 @@ $sheet-max-width: 860px
background: #303030
color: white
@include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
.oe_active
background: #303030
font-weight: bold
color: white
@include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
.oe_topbar_avatar
width: 24px
@ -906,25 +901,25 @@ $sheet-max-width: 860px
float: left
padding: 0
margin: 0
li
> li
float: left
a
display: block
padding: 5px 10px 7px
line-height: 20px
height: 20px
color: #eee
vertical-align: top
text-shadow: 0 1px 1px rgba(0,0,0,0.2)
&:hover
> a
display: block
padding: 5px 10px 7px
line-height: 20px
height: 20px
color: #eee
vertical-align: top
text-shadow: 0 1px 1px rgba(0,0,0,0.2)
&:hover
background: #303030
color: white
@include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
> .oe_active
background: #303030
font-weight: bold
color: white
@include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
.oe_active
background: #303030
font-weight: bold
color: white
@include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
.oe_secondary_menu_section
font-weight: bold
margin-left: 8px
@ -1526,12 +1521,16 @@ $sheet-max-width: 860px
padding: 16px 0 48px
div.oe_form_configuration
div.oe_horizontal_separator
margin: 25px 0 10px 0
margin: 12px 0 8px 0
p
color: #aaa
max-width: 650px
label
min-width: 150px
.oe_form_group_cell_label
padding: 2px 0
.oe_form_group_cell div div
padding: 1px 0
ul.oe_form_steps, ul.oe_form_steps_clickable
@ -1654,7 +1653,7 @@ $sheet-max-width: 860px
label
line-height: 18px
display: block
min-width: 120px
min-width: 160px
td.oe_form_group_cell + .oe_form_group_cell
padding-left: 6px
.oe_form_group
@ -1684,7 +1683,7 @@ $sheet-max-width: 860px
font-weight: bold
font-size: 20px
margin: 8px 0px 8px 0px
color: #53637e
color: $section-title-color
.oe_horizontal_separator:empty
height: 5px
.oe_vertical_separator

1
addons/web/static/src/js/chrome.js
View File

@ -730,6 +730,7 @@ instance.web.Menu = instance.web.Widget.extend({
var $more = $(QWeb.render('Menu.more')),
$index = this.$element.find('li').eq(maximum_visible_links - 1);
$index.after($more);
//$('.oe_topbar').append($more);
$more.find('.oe_menu_more').append($index.next().nextAll());
}
},