pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] css fixes

Browse Source 
bzr revid: fva@openerp.com-20120927141304-tuubki0zopb38w9f
This commit is contained in:
Frédéric van der Essen
2012-09-27 16:13:04 +02:00
parent 34974f91b0 978759847a
commit f600cadf53
9 changed files with 315 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/lib/jquery.tipsy/tipsy.css
+1 -1
View File
@@ -1,4 +1,4 @@
.tipsy { font-size: 90%; position: absolute; padding: 5px; z-index: 100000; }
.tipsy { font-size: 90%; position: absolute; padding: 5px; z-index: 100000; overflow: hidden;}
.tipsy-inner { background-color: #000; color: #FFF; max-width: 500px; padding: 5px 8px 4px 8px; }
/* Rounded corners */
addons/web/static/src/css/base.css
+143 -117
View File
@@ -546,11 +546,6 @@
font-style: italic;
text-decoration: none;
}
.openerp .oe_form header .oe_tags {
margin: 5px 0 0 5px;
width: 400px;
padding-bottom: 0;
}
.openerp.oe_tooltip {
font-size: 12px;
}
@@ -716,7 +711,7 @@
text-indent: -99999px;
vertical-align: top;
margin-top: 8px;
margin-left: 4px;
margin-left: 3px;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-top: 4px solid #404040;
@@ -967,7 +962,8 @@
}
.openerp .oe_topbar {
width: 100%;
height: 31px;
height: 32px;
background-color: #414141;
background-color: #646060;
background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
background-image: -webkit-linear-gradient(top, #646060, #262626);
@@ -981,16 +977,23 @@
padding: 5px 10px 7px;
line-height: 20px;
height: 20px;
text-decoration: none;
color: #eeeeee;
vertical-align: top;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-webkit-transition: all 0.2s ease-out;
-moz-transition: all 0.2s ease-out;
-ms-transition: all 0.2s ease-out;
-o-transition: all 0.2s ease-out;
transition: all 0.2s ease-out;
}
.openerp .oe_topbar .oe_topbar_item:hover {
background: #303030;
background: rgba(0, 0, 0, 0.2);
text-shadow: black 0px 0px 3px;
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;
-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;
}
.openerp .oe_topbar .oe_topbar_avatar {
width: 24px;
@@ -1040,6 +1043,70 @@
-webkit-box-shadow: none;
box-shadow: none;
}
.openerp .oe_menu {
float: left;
padding: 0;
margin: 0;
font-size: 13px;
}
.openerp .oe_menu > li {
list-style-type: none;
padding: 0;
margin: 0;
float: left;
display: block;
color: #eeeeee;
}
.openerp .oe_menu > li > a {
display: block;
padding: 5px 10px 7px;
line-height: 20px;
height: 20px;
text-decoration: none;
color: #eeeeee;
vertical-align: top;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-webkit-transition: all 0.2s ease-out;
-moz-transition: all 0.2s ease-out;
-ms-transition: all 0.2s ease-out;
-o-transition: all 0.2s ease-out;
transition: all 0.2s ease-out;
}
.openerp .oe_menu > li > a:hover {
background: rgba(0, 0, 0, 0.2);
text-shadow: black 0px 0px 3px;
color: white;
-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;
}
.openerp .oe_menu > li > .oe_active {
background: rgba(0, 0, 0, 0.2);
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;
}
.openerp .oe_user_menu {
float: right;
padding: 0;
margin: 0;
}
.openerp .oe_user_menu li {
list-style-type: none;
float: left;
}
.openerp .oe_user_menu .oe_dropdown_menu {
right: -1px;
}
.openerp .oe_systray > div {
float: left;
padding: 0 4px 0 4px;
}
.openerp .oe_systray {
float: right;
}
.openerp .oe_leftbar {
display: none;
width: 220px;
@@ -1078,102 +1145,6 @@
color: #c81010;
font-style: italic;
}
.openerp .oe_user_menu {
float: right;
padding: 0;
margin: 0;
}
.openerp .oe_user_menu li {
list-style-type: none;
float: left;
}
.openerp .oe_user_menu .oe_dropdown_menu {
right: -1px;
}
.openerp .oe_about {
background-color: white;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=);
-moz-border-radius: 0 0 2px 2px;
-webkit-border-radius: 0 0 2px 2px;
border-radius: 0 0 2px 2px;
}
.openerp .oe_about a {
color: #7c7bad;
}
.openerp .oe_about a:hover {
text-decoration: underline;
}
.openerp .oe_about a:focus {
outline: none;
}
.openerp .oe_about .oe_logo {
margin-left: -6px;
}
.openerp .oe_about .oe_bottom {
position: absolute;
top: 50%;
left: 0;
right: 0;
bottom: 0;
text-shadow: 0 1px 1px #999999;
background-color: #b41616;
background-image: -webkit-gradient(linear, left top, left bottom, from(#b41616), to(#600606));
background-image: -webkit-linear-gradient(top, #b41616, #600606);
background-image: -moz-linear-gradient(top, #b41616, #600606);
background-image: -ms-linear-gradient(top, #b41616, #600606);
background-image: -o-linear-gradient(top, #b41616, #600606);
background-image: linear-gradient(to bottom, #b41616, #600606);
color: #eeeeee;
padding: 0 16px;
-moz-border-radius: 0 0 2px 2px;
-webkit-border-radius: 0 0 2px 2px;
border-radius: 0 0 2px 2px;
}
.openerp .oe_about .oe_bottom a {
color: #eeeeee;
}
.openerp .oe_systray > div {
float: left;
padding: 0 4px 0 4px;
}
.openerp .oe_systray {
float: right;
}
.openerp .oe_menu {
float: left;
padding: 0;
margin: 0;
}
.openerp .oe_menu > li {
list-style-type: none;
padding: 0;
margin: 0;
float: left;
}
.openerp .oe_menu > li > a {
display: block;
padding: 5px 10px 7px;
line-height: 20px;
height: 20px;
color: #eeeeee;
vertical-align: top;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
}
.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 > li > .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_secondary_menu_section {
font-weight: bold;
margin-left: 8px;
@@ -1280,6 +1251,48 @@
border-right: 4px solid transparent;
border-top: 4px solid #4c4c4c;
}
.openerp .oe_about {
background-color: white;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=);
-moz-border-radius: 0 0 2px 2px;
-webkit-border-radius: 0 0 2px 2px;
border-radius: 0 0 2px 2px;
}
.openerp .oe_about a {
color: #7c7bad;
}
.openerp .oe_about a:hover {
text-decoration: underline;
}
.openerp .oe_about a:focus {
outline: none;
}
.openerp .oe_about .oe_logo {
margin-left: -6px;
}
.openerp .oe_about .oe_bottom {
position: absolute;
top: 50%;
left: 0;
right: 0;
bottom: 0;
text-shadow: 0 1px 1px #999999;
background-color: #b41616;
background-image: -webkit-gradient(linear, left top, left bottom, from(#b41616), to(#600606));
background-image: -webkit-linear-gradient(top, #b41616, #600606);
background-image: -moz-linear-gradient(top, #b41616, #600606);
background-image: -ms-linear-gradient(top, #b41616, #600606);
background-image: -o-linear-gradient(top, #b41616, #600606);
background-image: linear-gradient(to bottom, #b41616, #600606);
color: #eeeeee;
padding: 0 16px;
-moz-border-radius: 0 0 2px 2px;
-webkit-border-radius: 0 0 2px 2px;
border-radius: 0 0 2px 2px;
}
.openerp .oe_about .oe_bottom a {
color: #eeeeee;
}
.openerp .oe_application {
width: 100%;
}
@@ -1476,7 +1489,6 @@
height: 100%;
}
.openerp .oe_view_manager_current > .oe_view_manager_header {
border-top: 1px solid #cacaca;
border-bottom: 1px solid #cacaca;
background-color: #fcfcfc;
background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede));
@@ -2019,6 +2031,11 @@
.openerp .oe_form header .oe_form_button {
margin: 3px 2px 1px;
}
.openerp .oe_form header .oe_tags {
margin: 5px 0 0 5px;
width: 400px;
padding-bottom: 0;
}
.openerp .oe_form div.oe_chatter {
min-width: 650px;
max-width: 860px;
@@ -2189,6 +2206,9 @@
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;
@@ -2745,26 +2765,32 @@
width: 100%;
background-color: white;
border-spacing: 0;
color: #4c4c4c;
}
.openerp .oe-treeview-table th {
padding: 10px;
color: #4c4c4c;
font-weight: bold;
background-color: #f0f0f0;
border-bottom: 2px solid #cacaca;
}
.openerp .oe-treeview-table .treeview-tr, .openerp .oe-treeview-table .treeview-td {
.openerp .oe-treeview-table td {
cursor: pointer;
border-right: 1px dotted #afafb6;
vertical-align: top;
vertical-align: middle;
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 {
background-color: #e0e0f8;
}
.openerp .oe-treeview-table .oe-number {
text-align: right !important;
background-color: #e7e7e7;
}
.openerp .oe-treeview-table span {
font-size: 90%;
addons/web/static/src/css/base.sass
+118 -94
View File
@@ -476,12 +476,6 @@ $sheet-max-width: 860px
text-decoration: none
margin-bottom: 1px
// }}}
.oe_form
header
.oe_tags
margin: 5px 0 0 5px
width: 400px
padding-bottom: 0
// Tooltips {{{
&.oe_tooltip
font-size: 12px
@@ -605,7 +599,8 @@ $sheet-max-width: 860px
text-indent: -99999px
vertical-align: top
margin-top: 8px
margin-left: 4px
//margin-left set at 3px to avoid a strange overflow
margin-left: 3px
border-left: 4px solid transparent
border-right: 4px solid transparent
border-top: 4px solid#404040
@@ -797,23 +792,28 @@ $sheet-max-width: 860px
.oe_topbar, .oe_leftbar
display: none
// }}}
// WebClient.topbar {{{
// Top Menu {{{
.oe_topbar
width: 100%
height: 31px
height: 32px
background-color: #414141
@include vertical-gradient(#646060, #262626)
.oe_topbar_item
display: block
padding: 5px 10px 7px
line-height: 20px
height: 20px
text-decoration: none
color: #eee
vertical-align: top
text-shadow: 0 1px 1px rgba(0,0,0,0.2)
&:hover
background: #303030
@include transition(all 0.2s ease-out)
&:hover,
background: rgba(0,0,0,0.2)
text-shadow: black 0px 0px 3px
color: white
@include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
@include box-shadow(0 1px 2px rgba(0,0,0,0.4) inset)
.oe_topbar_avatar
width: 24px
@@ -843,6 +843,59 @@ $sheet-max-width: 860px
@include vertical-gradient(#292929, #191919)
@include box-shadow(none)
// oe menu is the list of the buttons on the left side of the bar.
// So why aren't the buttons oe_topbar_items ? This sad state of affairs
// is a leftover from an uncomplete refactoring when the left and top menu
// were merged. You are welcome to refactor and clean this up
.oe_menu
float: left
padding: 0
margin: 0
font-size: 13px
> li
list-style-type: none
padding: 0
margin: 0
float: left
display: block
color: #eeeeee
> a
display: block
padding: 5px 10px 7px
line-height: 20px
height: 20px
text-decoration: none
color: #eee
vertical-align: top
text-shadow: 0 1px 1px rgba(0,0,0,0.2)
@include transition(all 0.2s ease-out)
&:hover,
background: rgba(0,0,0,0.2)
text-shadow: black 0px 0px 3px
color: white
@include box-shadow(0 1px 2px rgba(0,0,0,0.4) inset)
> .oe_active
background: rgba(0,0,0,0.2)
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
float: right
padding: 0
margin: 0
li
list-style-type: none
float: left
.oe_dropdown_menu
right: -1px
.oe_systray > div
float: left
padding: 0 4px 0 4px
.oe_systray
float: right
// }}}
// Webclient.leftbar {{{
.oe_leftbar
@@ -878,78 +931,8 @@ $sheet-max-width: 860px
color: #c81010
font-style: italic
// }}}
// UserMenu {{{
.oe_user_menu
float: right
padding: 0
margin: 0
li
list-style-type: none
float: left
.oe_dropdown_menu
right: -1px
// }}}
// About openerp {{{
.oe_about
background-color: white
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=)
@include radius(0 0 2px 2px)
a
color: $link-color
&:hover
text-decoration: underline
&:focus
outline: none
.oe_logo
margin-left: -6px
.oe_bottom
position: absolute
top: 50%
left: 0
right: 0
bottom: 0
text-shadow: 0 1px 1px #999999
@include vertical-gradient(#b41616, #600606)
color: #eee
padding: 0 16px
@include radius(0 0 2px 2px)
a
color: #eee
// }}}
// Systray {{{
.oe_systray > div
float: left
padding: 0 4px 0 4px
.oe_systray
float: right
// }}}
// Menu {{{
.oe_menu
float: left
padding: 0
margin: 0
> li
list-style-type: none
padding: 0
margin: 0
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
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)
// Webclient.leftbar items {{{
.oe_secondary_menu_section
font-weight: bold
margin-left: 8px
@@ -1028,6 +1011,34 @@ $sheet-max-width: 860px
border-left: 4px solid transparent
border-right: 4px solid transparent
border-top: 4px solid #4c4c4c
// }}}
// About openerp {{{
.oe_about
background-color: white
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=)
@include radius(0 0 2px 2px)
a
color: $link-color
&:hover
text-decoration: underline
&:focus
outline: none
.oe_logo
margin-left: -6px
.oe_bottom
position: absolute
top: 50%
left: 0
right: 0
bottom: 0
text-shadow: 0 1px 1px #999999
@include vertical-gradient(#b41616, #600606)
color: #eee
padding: 0 16px
@include radius(0 0 2px 2px)
a
color: #eee
// }}}
// ActionManager {{{
.oe_application
@@ -1048,7 +1059,7 @@ $sheet-max-width: 860px
// ViewManager common {{{
.oe_view_manager
.oe_view_manager_body
height: inherit
height: inherit
.oe_view_manager_view_kanban
height: inherit
@@ -1186,7 +1197,6 @@ $sheet-max-width: 860px
.oe_view_manager_current
height: 100%
> .oe_view_manager_header
border-top: 1px solid #cacaca
border-bottom: 1px solid #cacaca
@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)))
@@ -1597,6 +1607,10 @@ $sheet-max-width: 860px
float: right
.oe_form_button
margin: 3px 2px 1px
.oe_tags
margin: 5px 0 0 5px
width: 400px
padding-bottom: 0
div.oe_chatter
min-width: 650px
max-width: $sheet-max-width
@@ -1736,6 +1750,8 @@ $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
@@ -2165,22 +2181,29 @@ $sheet-max-width: 860px
width: 100%
background-color: white
border-spacing: 0
color: #4c4c4c
th
padding: 10px
color: #4c4c4c
font-weight: bold
background-color: #f0f0f0
border-bottom: 2px solid #cacaca
.treeview-tr, .treeview-td
td
cursor: pointer
border-right: 1px dotted $tag-border
vertical-align: top
vertical-align: middle
text-align: left
border-bottom: 1px solid #cfcccc
tr:hover
background-color: #e0e0f8
.oe-number
vertical-align: middle
height: 20px
padding-left: 4px
padding-right: 4px
border-right: 1px solid #e7e7e7
td.oe_number
text-align: right !important
tr
border-bottom: 1px solid #d6d6d6
&:hover
background-color: #e7e7e7
span
font-size: 90%
font-weight: normal
@@ -2192,6 +2215,7 @@ $sheet-max-width: 860px
background-image: url(/web/static/src/img/collapse.gif)
.treeview-tr.oe-treeview-first span, .treeview-td.oe-treeview-first span
margin-left: 16px
// }}}
// Debugging stuff {{{
.oe_layout_debugging
addons/web/static/src/js/view_form.js
+3 -1
View File
@@ -3007,7 +3007,9 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
if (!this.get("effective_readonly")) {
this.$input.val(str.split("\n")[0]);
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 {
var lines = _.escape(str).split("\n");
var link = "";
addons/web/static/src/xml/base.xml
+5 -5
View File
@@ -314,7 +314,7 @@
<t t-name="Menu">
<ul class="oe_menu" t-if="widget.data">
<li t-foreach="widget.data.data.children" t-as="menu">
<t t-call="Menu.secondary.link"/>
<t t-call="Menu.link"/>
</li>
</ul>
</t>
@@ -333,7 +333,7 @@
<t t-esc="menu.name"/>
<!--
Shall the section be still clickable ?
<t t-call="Menu.secondary.link"/>
<t t-call="Menu.link"/>
-->
</div>
<t t-call="Menu.secondary.submenu"/>
@@ -343,13 +343,13 @@
<t t-name="Menu.secondary.submenu">
<ul t-if="menu.children.length" class="oe_secondary_submenu">
<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>-->
<t t-call="Menu.secondary.submenu"/>
</li>
</ul>
</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] : ''}"
t-att-class="menu.children.length ? 'oe_menu_toggler' : 'oe_menu_leaf'"
t-att-data-menu="menu.id"
@@ -592,7 +592,7 @@
<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="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"
t-if="!field.attrs.modifiers.tree_invisible"
addons/web_calendar/static/src/css/web_calendar.css
+9
View File
@@ -1,5 +1,14 @@
.oe_view_manager_view_calendar {
position: relative;
}
.oe_calendar_table {
position: absolute;
left: 0px;
right: 0px;
top: 0px;
border-top: 3px solid #eee;
width:100%;
overflow: hidden;
}
.oe_calendar {
background-color:#eee;
addons/web_calendar/static/src/js/calendar.js
+8 -2
View File
@@ -172,8 +172,7 @@ instance.web_calendar.CalendarView = instance.web.View.extend({
scheduler.init(this.$el.find('.oe_calendar')[0], null, this.mode || 'month');
// Remove hard coded style attributes from dhtmlx scheduler
this.$el.find(".dhx_cal_navline div").removeAttr('style');
scheduler.detachAllEvents();
scheduler.attachEvent('onEventAdded', this.do_create_event);
@@ -184,12 +183,19 @@ instance.web_calendar.CalendarView = instance.web.View.extend({
scheduler.attachEvent('onViewChange', this.on_view_changed);
this.refresh_scheduler();
// Remove hard coded style attributes from dhtmlx scheduler
this.$el.find(".dhx_cal_navline").removeAttr('style');
instance.web.bus.on('resize',this,function(){
self.$el.find(".dhx_cal_navline").removeAttr('style');
});
},
on_view_changed: function(mode, date) {
this.$el.find('.oe_calendar').removeClass('oe_cal_day oe_cal_week oe_cal_month').addClass('oe_cal_' + mode);
if (!date.between(this.range_start, this.range_stop)) {
this.update_range_dates(date);
this.do_ranged_search();
this.$el.find(".dhx_cal_navline div").removeAttr('style');
}
this.ready.resolve();
},
addons/web_kanban/static/src/css/kanban.css
+15 -6
View File
@@ -159,15 +159,24 @@
padding: 10px;
}
.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;
border: none;
border: 1px solid transparent;
display: block;
margin-bottom: 8px;
font-size: 13px;
width: 100%;
-moz-box-shadow: none;
-webkit-box-shadow: none;
-box-shadow: none;
display: block;
margin: 0 0 8px 0;
font-size: 13px;
width: 100%;
}
.openerp .oe_kanban_view .oe_kanban_quick_create input:focus {
border: 1px solid #a6a6fe;
-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 {
padding: 8px;
@@ -200,7 +209,7 @@
}
.openerp .oe_kanban_view .oe_kanban_details .oe_tag {
display: inline-block;
margin: 0 0 2px 0;
margin: 0 2px 2px 0;
}
.openerp .oe_kanban_view .oe_kanban_record {
position: relative;
addons/web_kanban/static/src/css/kanban.sass
+13 -4
View File
@@ -27,6 +27,11 @@
-webkit-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)
-moz-transform: $transform
-webkit-transform: $transform
@@ -167,13 +172,17 @@
width: 200px
padding: 10px
.oe_kanban_quick_create input
@include box-sizing(border-box)
outline: none
border: none
@include box-shadow(none)
border: 1px solid transparent
display: block
margin: 0 0 8px 0
margin-bottom: 8px
font-size: 13px
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 {{{
.oe_kanban_vignette
@@ -199,7 +208,7 @@
margin: 0 0 4px 0
.oe_tag
display: inline-block
margin: 0 0 2px 0
margin: 0 2px 2px 0
.oe_kanban_record
position: relative
display: block