summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinh Tran <mit@openerp.com>2012-07-17 16:47:33 +0200
committerMinh Tran <mit@openerp.com>2012-07-17 16:47:33 +0200
commit7bc0699330ba6f477c14b5f5c366ea564ac17c6d (patch)
tree825340bc141790546314fd001fa53072bbd22643
parent7083b59bdb055c4854fab7639d50680e8a6b4f73 (diff)
various improvements
bzr revid: mit@openerp.com-20120717144733-jxlf113kuwga98ug
-rw-r--r--addons/web/static/src/css/base.css26
-rw-r--r--addons/web/static/src/css/base.sass19
-rw-r--r--addons/web/static/src/xml/base.xml4
-rw-r--r--addons/web_kanban/static/src/css/kanban.css6
-rw-r--r--addons/web_kanban/static/src/css/kanban.sass17
5 files changed, 33 insertions, 39 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index c48ab0e3012..0a3d24d41f4 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -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");
@@ -34,7 +34,7 @@
background: white;
/* http://www.quirksmode.org/dom/inputfile.html
* http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
- */ */
+ */
}
.openerp a {
text-decoration: none;
@@ -234,14 +234,13 @@
.openerp.ui-dialog .ui-dialog-buttonpane {
border-top: 1px solid #e0e0e0;
background: #f5f7f9;
- padding: 8px;
margin: 0;
-moz-border-radius: 0 0 2px 2px;
-webkit-border-radius: 0 0 2px 2px;
border-radius: 0 0 2px 2px;
}
.openerp.ui-dialog .ui-dialog-buttonpane button {
- margin-left: 8px;
+ margin: 0;
}
.openerp.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
float: left;
@@ -1855,9 +1854,12 @@
font-weight: bold;
font-size: 18px;
}
+.openerp .oe_form .oe_subtotal_footer label:after {
+ content: ":";
+}
.openerp .oe_form .oe_subtotal_footer label.oe_subtotal_footer_separator {
font-weight: bold !important;
- padding: 2px 8px 2px 0px !important;
+ padding: 2px 11px 2px 0px !important;
}
.openerp .oe_form .oe_subtotal_footer label.oe_form_label_help {
font-weight: normal;
@@ -2061,15 +2063,6 @@
.openerp .oe_form .oe_form_field_with_button.oe_no_button > .oe_button {
display: none;
}
-.openerp .oe_form .oe_form_field_with_button:not(.oe_no_button) input {
- border-right: none;
- -webkit-border-top-right-radius: 0px;
- -webkit-border-bottom-right-radius: 0px;
- -moz-border-radius-topright: 0px;
- -moz-border-radius-bottomright: 0px;
- border-top-right-radius: 0px;
- border-bottom-right-radius: 0px;
-}
.openerp .oe_form .oe_form_field_with_button:not(.oe_no_button) > .oe_button {
float: right;
-moz-border-radius: 0;
@@ -2148,9 +2141,12 @@
}
.openerp .oe_form_field_many2one span.oe_m2o_drop_down_button {
position: absolute;
- top: 1px;
+ top: 2px;
right: 0px;
}
+.openerp .oe_form_field_many2one .oe_m2o_cm_button {
+ line-height: 14px;
+}
.openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
display: none;
}
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 8a2c510ec42..fb67945a02d 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -232,11 +232,10 @@ $sheet-max-width: 860px
.ui-dialog-buttonpane
border-top: 1px solid #e0e0e0
background: #f5f7f9
- padding: 8px
margin: 0
@include radius(0 0 2px 2px)
button
- margin-left: 8px
+ margin: 0
.ui-dialog-buttonset
float: left
.ui-dialog-titlebar-close
@@ -1444,9 +1443,11 @@ $sheet-max-width: 860px
border-top: 1px solid #cacaca
font-weight: bold
font-size: 18px
+ label:after
+ content: ":"
label.oe_subtotal_footer_separator
font-weight: bold !important
- padding: 2px 8px 2px 0px !important
+ padding: 2px 11px 2px 0px !important
label.oe_form_label_help
font-weight: normal
// no sheet in popups
@@ -1610,14 +1611,6 @@ $sheet-max-width: 860px
.oe_form_field_with_button.oe_no_button > .oe_button
display: none
.oe_form_field_with_button:not(.oe_no_button)
- input
- border-right: none
- -webkit-border-top-right-radius: 0px
- -webkit-border-bottom-right-radius: 0px
- -moz-border-radius-topright: 0px
- -moz-border-radius-bottomright: 0px
- border-top-right-radius: 0px
- border-bottom-right-radius: 0px
> .oe_button
float: right
@include radius(0)
@@ -1691,8 +1684,10 @@ $sheet-max-width: 860px
position: relative
span.oe_m2o_drop_down_button
position: absolute
- top: 1px
+ top: 2px
right: 0px
+ .oe_m2o_cm_button
+ line-height: 14px
// }}}
// FormView.one2many {{{
.oe_form .oe_form_field_one2many > .oe_view_manager
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 2d9caa43bbd..0ade5dd4d89 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -945,9 +945,7 @@
<span class="oe_form_field oe_form_field_many2one oe_form_field_with_button" t-att-style="widget.node.attrs.style">
<a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri"/>
<t t-if="!widget.get('effective_readonly')">
- <button class="oe_button oe_m2o_cm_button" title="Open Resource">
- <img t-att-src='_s + "/web/static/src/img/icons/terp-folder-yellow.png"'/>
- </button>
+ <a href="#" class="oe_m2o_cm_button oe_e oe_right">/</a>
<div>
<input type="text"
t-att-id="widget.id_for_label"
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index bfb10793b77..868fa9783fd 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -1,6 +1,5 @@
-@charset "utf-8";
.openerp .oe_kanban_view {
- background: url(data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAKElEQVQIHWP8DwTv379nAAFBQUEGhnfv3oHEwADEZgJLIRGMIClkLQCr3x2Htp/lLwAAAABJRU5ErkJggg==);
+ background: url(/web/static/src/img/form_sheetbg.png);
height: inherit;
}
.openerp .oe_kanban_view .ui-sortable-placeholder {
@@ -239,6 +238,9 @@
.openerp .oe_kanban_view .oe_kanban_grouped .oe_kanban_show_more .oe_button {
width: 100%;
}
+.openerp .oe_kanban_view .oe_kanban_ungrouped {
+ background: white;
+}
.openerp .oe_kanban_view .oe_kanban_ungrouped .oe_kanban_record {
float: left;
padding: 2px;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 6a601ec9988..fb5bdc9dcbb 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -21,7 +21,8 @@
.openerp .oe_kanban_view
// KanbanView {{{
- background: url(data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAKElEQVQIHWP8DwTv379nAAFBQUEGhnfv3oHEwADEZgJLIRGMIClkLQCr3x2Htp/lLwAAAABJRU5ErkJggg==)
+ //background: url(data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAKElEQVQIHWP8DwTv379nAAFBQUEGhnfv3oHEwADEZgJLIRGMIClkLQCr3x2Htp/lLwAAAABJRU5ErkJggg==)
+ background: url(/web/static/src/img/form_sheetbg.png)
height: inherit
.ui-sortable-placeholder
border: 1px dotted black
@@ -214,12 +215,14 @@
text-align: center
.oe_kanban_grouped .oe_kanban_show_more .oe_button
width: 100%
- .oe_kanban_ungrouped .oe_kanban_record
- float: left
- padding: 2px
- box-sizing: border-box
- -moz-box-sizing: border-box
- -webkit-box-sizing: border-box
+ .oe_kanban_ungrouped
+ background: white
+ .oe_kanban_record
+ float: left
+ padding: 2px
+ box-sizing: border-box
+ -moz-box-sizing: border-box
+ -webkit-box-sizing: border-box
.oe_kanban_action_button
height: 22px
margin: 0