[MERGE] trunk
bzr revid: fme@openerp.com-20120620150851-fi18faps8pp64obh
This commit is contained in:
commit
d2bfcd85a3
|
@ -107,7 +107,7 @@
|
|||
display: inline-block;
|
||||
border: 1px solid #ababab;
|
||||
color: #404040;
|
||||
margin: 0 4px 0 0;
|
||||
margin: 0;
|
||||
padding: 3px 12px;
|
||||
font-size: 13px;
|
||||
text-align: center;
|
||||
|
@ -182,9 +182,6 @@
|
|||
.openerp .ui-menu .ui-menu-item a.ui-state-active {
|
||||
background: #f0f0fa;
|
||||
}
|
||||
.openerp .ui-tabs {
|
||||
margin: 0 -16px;
|
||||
}
|
||||
.openerp .oe_i {
|
||||
font-family: "mnmliconsRegular" !important;
|
||||
font-size: 21px;
|
||||
|
@ -302,7 +299,7 @@
|
|||
}
|
||||
.openerp .oe_notebook {
|
||||
margin: 8px 0;
|
||||
padding: 0 8px;
|
||||
padding: 0 16px;
|
||||
list-style: none;
|
||||
zoom: 1;
|
||||
}
|
||||
|
@ -328,7 +325,6 @@
|
|||
}
|
||||
.openerp .oe_notebook > li {
|
||||
position: relative;
|
||||
margin-bottom: -1px;
|
||||
}
|
||||
.openerp .oe_notebook > li > a {
|
||||
padding: 0 12px;
|
||||
|
@ -1486,28 +1482,13 @@
|
|||
max-width: 700px;
|
||||
font-size: 125%;
|
||||
}
|
||||
.openerp .oe_view_topbar {
|
||||
border-bottom: 1px solid #cacaca;
|
||||
background-color: #fcfcfc;
|
||||
background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede));
|
||||
background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede);
|
||||
background-image: -moz-linear-gradient(top, #fcfcfc, #dedede);
|
||||
background-image: -ms-linear-gradient(top, #fcfcfc, #dedede);
|
||||
background-image: -o-linear-gradient(top, #fcfcfc, #dedede);
|
||||
background-image: linear-gradient(to bottom, #fcfcfc, #dedede);
|
||||
padding: 0 8px;
|
||||
line-height: 30px;
|
||||
.openerp .oe_formview {
|
||||
background: white;
|
||||
}
|
||||
.openerp .oe_form_dropdown_section {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
}
|
||||
.openerp .oe_formview {
|
||||
background: white;
|
||||
}
|
||||
.openerp .oe_form_header {
|
||||
padding: 8px;
|
||||
}
|
||||
.openerp .oe_form_invalid input, .openerp .oe_form_invalid select, .openerp .oe_form_invalid textarea {
|
||||
background-color: #ff6666 !important;
|
||||
border: 1px solid #dd0000 !important;
|
||||
|
@ -1530,6 +1511,19 @@
|
|||
.openerp .oe_form_button_save_dirty:hover {
|
||||
background: #ed6f6a;
|
||||
}
|
||||
.openerp .oe_form_invisible {
|
||||
display: none !important;
|
||||
}
|
||||
.openerp .oe_form_editable .oe_edit_only {
|
||||
display: none !important;
|
||||
}
|
||||
.openerp .oe_form_readonly .oe_edit_only, .openerp .oe_form_readonly .oe_form_field:empty {
|
||||
display: none !important;
|
||||
}
|
||||
.openerp .oe_form_nosheet > *:not(header) {
|
||||
margin-left: 10px !important;
|
||||
margin-right: 10px !important;
|
||||
}
|
||||
.openerp .oe_form header {
|
||||
position: relative;
|
||||
border-bottom: 1px solid #cacaca;
|
||||
|
@ -1552,6 +1546,16 @@
|
|||
max-width: 960px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
.openerp .oe_form_title {
|
||||
width: 55%;
|
||||
}
|
||||
.openerp .oe_form_title:after {
|
||||
content: ".";
|
||||
display: block;
|
||||
height: 0;
|
||||
clear: both;
|
||||
visibility: hidden;
|
||||
}
|
||||
.openerp ul.oe_form_steps {
|
||||
height: 30px;
|
||||
padding: 0;
|
||||
|
@ -1589,6 +1593,29 @@
|
|||
font-weight: bold;
|
||||
color: #b33630;
|
||||
}
|
||||
.openerp .oe_form_subtotal_footer {
|
||||
width: auto;
|
||||
float: right;
|
||||
}
|
||||
.openerp .oe_form_subtotal_footer td.oe_form_group_cell {
|
||||
text-align: right;
|
||||
padding: 0;
|
||||
}
|
||||
.openerp .oe_form_subtotal_footer td.oe_form_group_cell_label {
|
||||
border: none;
|
||||
}
|
||||
.openerp .oe_form_subtotal_footer .oe_form_field {
|
||||
width: auto !important;
|
||||
}
|
||||
.openerp .oe_form_subtotal_footer .oe_form_subtotal_footer_separator {
|
||||
border-top: 1px solid #cacaca;
|
||||
font-size: 120%;
|
||||
font-weight: bold;
|
||||
}
|
||||
.openerp .oe_form_subtotal_footer label.oe_form_subtotal_footer_separator {
|
||||
font-weight: bold !important;
|
||||
padding: 2px 8px 2px 0px !important;
|
||||
}
|
||||
.openerp .oe_application .oe_form_sheetbg {
|
||||
background: url(/web/static/src/img/form_sheetbg.png);
|
||||
padding: 8px 0;
|
||||
|
@ -1608,37 +1635,82 @@
|
|||
-webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
|
||||
box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
|
||||
}
|
||||
.openerp .oe_form .oe_form_subtotal_footer {
|
||||
width: auto;
|
||||
float: right;
|
||||
.openerp .oe_application .oe_form_sheet .ui-tabs {
|
||||
margin: 0 -16px;
|
||||
}
|
||||
.openerp .oe_form .oe_form_subtotal_footer td.oe_form_group_cell {
|
||||
text-align: right;
|
||||
padding: 0;
|
||||
.openerp .oe_application .oe_form_sheet .oe_notebook_page {
|
||||
padding: 0 16px;
|
||||
}
|
||||
.openerp .oe_form .oe_form_subtotal_footer td.oe_form_group_cell_label {
|
||||
border: none;
|
||||
.openerp .oe_form td.oe_form_group_cell_label {
|
||||
border-right: 1px solid #dddddd;
|
||||
padding: 2px 0px 2px 0px;
|
||||
}
|
||||
.openerp .oe_form .oe_form_subtotal_footer .oe_form_field {
|
||||
width: auto !important;
|
||||
.openerp .oe_form td.oe_form_group_cell_label label {
|
||||
line-height: 18px;
|
||||
display: block;
|
||||
min-width: 120px;
|
||||
}
|
||||
.openerp .oe_form .oe_form_subtotal_footer .oe_form_subtotal_footer_separator {
|
||||
border-top: 1px solid #cacaca;
|
||||
font-size: 120%;
|
||||
.openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
|
||||
padding-left: 8px;
|
||||
}
|
||||
.openerp .oe_form .oe_form_group {
|
||||
width: 100%;
|
||||
margin: 4px 0 4px 0;
|
||||
}
|
||||
.openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
|
||||
font-weight: bold;
|
||||
white-space: nowrap;
|
||||
padding-right: 8px;
|
||||
}
|
||||
.openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
|
||||
font-size: 80%;
|
||||
color: darkGreen;
|
||||
vertical-align: top;
|
||||
position: relative;
|
||||
top: -4px;
|
||||
padding: 0 2px;
|
||||
}
|
||||
.openerp .oe_horizontal_border {
|
||||
border-bottom: 1px solid black;
|
||||
}
|
||||
.openerp .oe_horizontal_separator {
|
||||
font-weight: bold;
|
||||
font-size: 20px;
|
||||
margin: 8px 0px 8px 0px;
|
||||
color: #aaaabb;
|
||||
}
|
||||
.openerp .oe_horizontal_separator:empty {
|
||||
height: 5px;
|
||||
}
|
||||
.openerp .oe_vertical_separator {
|
||||
border-left: 1px solid #666666;
|
||||
padding: 0 4px 0 4px;
|
||||
}
|
||||
.openerp .oe_form_field_progressbar {
|
||||
display: inline-block;
|
||||
min-width: 70px;
|
||||
}
|
||||
.openerp .oe_form_field_progressbar.ui-progressbar {
|
||||
height: 22px;
|
||||
font-size: 10px;
|
||||
-webkit-box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
-ms-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
border: 1px solid #999999;
|
||||
-moz-border-radius: 3px;
|
||||
-webkit-border-radius: 3px;
|
||||
border-radius: 3px;
|
||||
background: white;
|
||||
min-width: 50px;
|
||||
}
|
||||
.openerp .oe_form_field_progressbar.ui-progressbar span {
|
||||
position: absolute;
|
||||
margin-left: 10px;
|
||||
font-weight: bold;
|
||||
}
|
||||
.openerp .oe_form .oe_form_subtotal_footer label.oe_form_subtotal_footer_separator {
|
||||
font-weight: bold !important;
|
||||
padding: 2px 8px 2px 0px !important;
|
||||
}
|
||||
.openerp .oe_form_invisible {
|
||||
display: none !important;
|
||||
}
|
||||
.openerp .oe_form_editable .oe_edit_only {
|
||||
display: none !important;
|
||||
}
|
||||
.openerp .oe_form_readonly .oe_edit_only, .openerp .oe_form_readonly .oe_form_field:empty {
|
||||
display: none !important;
|
||||
.openerp .oe_form_field_progressbar.ui-progressbar .ui-widget-header {
|
||||
background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
|
||||
}
|
||||
.openerp .oe_form .oe_form_field_text {
|
||||
width: 100%;
|
||||
|
@ -1668,6 +1740,7 @@
|
|||
height: inherit !important;
|
||||
font-size: inherit;
|
||||
}
|
||||
<<<<<<< TREE
|
||||
.openerp .oe_form_nosheet > *:not(.oe_form_topbar) {
|
||||
margin-left: 10px !important;
|
||||
margin-right: 10px !important;
|
||||
|
@ -1697,6 +1770,8 @@
|
|||
top: -4px;
|
||||
padding: 0 2px;
|
||||
}
|
||||
=======
|
||||
>>>>>>> MERGE-SOURCE
|
||||
.openerp .oe_form .oe_form_field {
|
||||
width: 100%;
|
||||
display: inline-block;
|
||||
|
@ -1718,18 +1793,11 @@
|
|||
.openerp .oe_form .oe_form_field_datetime {
|
||||
width: 11em;
|
||||
}
|
||||
.openerp .oe_form input[type="text"],
|
||||
.openerp .oe_form input[type="password"],
|
||||
.openerp .oe_form input[type="file"],
|
||||
.openerp .oe_form select {
|
||||
.openerp .oe_form input[type="text"], .openerp .oe_form input[type="password"], .openerp .oe_form input[type="file"], .openerp .oe_form select {
|
||||
height: 22px;
|
||||
padding-top: 2px;
|
||||
}
|
||||
.openerp .oe_form input[type="text"],
|
||||
.openerp .oe_form input[type="password"],
|
||||
.openerp .oe_form input[type="file"],
|
||||
.openerp .oe_form select,
|
||||
.openerp .oe_form textarea {
|
||||
.openerp .oe_form input[type="text"], .openerp .oe_form input[type="password"], .openerp .oe_form input[type="file"], .openerp .oe_form select, .openerp .oe_form textarea {
|
||||
-webkit-box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
-ms-box-sizing: border-box;
|
||||
|
@ -1738,11 +1806,7 @@
|
|||
min-width: 70px;
|
||||
color: #1f1f1f;
|
||||
}
|
||||
.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;
|
||||
color: #666666;
|
||||
}
|
||||
|
@ -1757,10 +1821,7 @@
|
|||
-webkit-border-radius: 0px;
|
||||
border-radius: 0px;
|
||||
}
|
||||
.openerp .oe_form .oe_form_field_many2one input,
|
||||
.openerp .oe_form .oe_form_field_binary input,
|
||||
.openerp .oe_form .oe_form_field_binary input,
|
||||
.openerp .oe_form .oe_form_field_url input {
|
||||
.openerp .oe_form .oe_form_field_many2one input, .openerp .oe_form .oe_form_field_binary input, .openerp .oe_form .oe_form_field_binary input, .openerp .oe_form .oe_form_field_url input {
|
||||
border-right: none;
|
||||
-webkit-border-top-right-radius: 0px;
|
||||
-webkit-border-bottom-right-radius: 0px;
|
||||
|
@ -1846,19 +1907,6 @@
|
|||
position: relative;
|
||||
overflow: hidden;
|
||||
}
|
||||
.openerp .oe_form .oe_form_title {
|
||||
width: 55%;
|
||||
}
|
||||
.openerp .oe_form .oe_form_title:after {
|
||||
content: ".";
|
||||
display: block;
|
||||
height: 0;
|
||||
clear: both;
|
||||
visibility: hidden;
|
||||
}
|
||||
.openerp .oe_form .oe_form_group {
|
||||
margin: 5px 0px 5px 0px;
|
||||
}
|
||||
.openerp .oe_hidden_input_file {
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
|
@ -1904,47 +1952,13 @@
|
|||
.openerp .oe_form .oe_form_field_image:hover .oe_form_field_image_controls {
|
||||
display: block;
|
||||
}
|
||||
.openerp .oe_horizontal_border {
|
||||
border-bottom: 1px solid black;
|
||||
.openerp .oe_form_field_many2one td:first-child {
|
||||
position: relative;
|
||||
}
|
||||
.openerp .oe_horizontal_separator {
|
||||
font-weight: bold;
|
||||
font-size: 20px;
|
||||
margin: 20px 0px 10px 0px;
|
||||
color: #aaaabb;
|
||||
}
|
||||
.openerp .oe_horizontal_separator:empty {
|
||||
height: 5px;
|
||||
}
|
||||
.openerp .oe_vertical_separator {
|
||||
border-left: 1px solid #666666;
|
||||
padding: 0 4px 0 4px;
|
||||
}
|
||||
.openerp .oe_form .oe_form_field_progressbar {
|
||||
display: inline-block;
|
||||
min-width: 70px;
|
||||
}
|
||||
.openerp .oe_form .oe_form_field_progressbar.ui-progressbar {
|
||||
height: 22px;
|
||||
font-size: 10px;
|
||||
-webkit-box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
-ms-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
border: 1px solid #999999;
|
||||
-moz-border-radius: 3px;
|
||||
-webkit-border-radius: 3px;
|
||||
border-radius: 3px;
|
||||
background: white;
|
||||
min-width: 50px;
|
||||
}
|
||||
.openerp .oe_form .oe_form_field_progressbar.ui-progressbar span {
|
||||
.openerp .oe_form_field_many2one span.oe-m2o-drop-down-button {
|
||||
position: absolute;
|
||||
margin-left: 10px;
|
||||
font-weight: bold;
|
||||
}
|
||||
.openerp .oe_form .oe_form_field_progressbar.ui-progressbar .ui-widget-header {
|
||||
background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
|
||||
top: 3px;
|
||||
right: 2px;
|
||||
}
|
||||
.openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
|
||||
display: none;
|
||||
|
@ -2153,12 +2167,3 @@
|
|||
.kitten-mode-activated > * {
|
||||
opacity: 0.7;
|
||||
}
|
||||
|
||||
.openerp .oe_form_field_many2one td:first-child {
|
||||
position: relative;
|
||||
}
|
||||
.openerp .oe_form_field_many2one span.oe-m2o-drop-down-button {
|
||||
position: absolute;
|
||||
top: 3px;
|
||||
right: 2px;
|
||||
}
|
||||
|
|
|
@ -148,7 +148,7 @@ $colour4: #8a89ba
|
|||
display: inline-block
|
||||
border: 1px solid #ababab
|
||||
color: #404040
|
||||
margin: 0 4px 0 0
|
||||
margin: 0
|
||||
padding: 3px 12px
|
||||
font-size: 13px
|
||||
text-align: center
|
||||
|
@ -194,8 +194,6 @@ $colour4: #8a89ba
|
|||
width: auto
|
||||
a.ui-state-active
|
||||
background: #f0f0fa
|
||||
.ui-tabs
|
||||
margin: 0 -16px
|
||||
// }}}
|
||||
// Generic classes {{{
|
||||
.oe_i
|
||||
|
@ -270,7 +268,7 @@ $colour4: #8a89ba
|
|||
// Notebook {{{
|
||||
.oe_notebook
|
||||
margin: 8px 0
|
||||
padding: 0 8px
|
||||
padding: 0 16px
|
||||
list-style: none
|
||||
zoom: 1
|
||||
.oe_notebook:before, .oe_notebook:after
|
||||
|
@ -290,7 +288,6 @@ $colour4: #8a89ba
|
|||
border-width: 0 0 1px
|
||||
.oe_notebook > li
|
||||
position: relative
|
||||
margin-bottom: -1px
|
||||
.oe_notebook > li > a
|
||||
padding: 0 12px
|
||||
margin-right: 2px
|
||||
|
@ -400,7 +397,6 @@ $colour4: #8a89ba
|
|||
.oe_sidebar_delete_item
|
||||
display: inline-block
|
||||
// }}}
|
||||
|
||||
// Loading {{{
|
||||
.oe_loading
|
||||
display: none
|
||||
|
@ -1192,20 +1188,13 @@ $colour4: #8a89ba
|
|||
padding: 35px 0px 0px 0px
|
||||
max-width: 700px
|
||||
font-size: 125%
|
||||
.oe_view_topbar
|
||||
border-bottom: 1px solid #cacaca
|
||||
@include vertical-gradient(#fcfcfc, #dedede)
|
||||
padding: 0 8px
|
||||
line-height: 30px
|
||||
// }}}
|
||||
// FormView.body {{{
|
||||
// FormView.base and dynamic tags {{{
|
||||
.oe_formview
|
||||
background: white
|
||||
.oe_form_dropdown_section
|
||||
position: relative
|
||||
display: inline-block
|
||||
.oe_formview
|
||||
background: white
|
||||
.oe_form_header
|
||||
padding: 8px
|
||||
.oe_form_invalid
|
||||
input, select, textarea
|
||||
background-color: #F66 !important
|
||||
|
@ -1218,6 +1207,16 @@ $colour4: #8a89ba
|
|||
font-weight: bold
|
||||
&:hover
|
||||
background: #ED6F6A
|
||||
.oe_form_invisible
|
||||
display: none !important
|
||||
.oe_form_editable .oe_edit_only
|
||||
display: none !important
|
||||
.oe_form_readonly
|
||||
.oe_edit_only, .oe_form_field:empty
|
||||
display: none !important
|
||||
.oe_form_nosheet > *:not(header)
|
||||
margin-left: 10px !important
|
||||
margin-right: 10px !important
|
||||
// }}}
|
||||
// FormView.custom tags and classes {{{
|
||||
.oe_form
|
||||
|
@ -1234,6 +1233,14 @@ $colour4: #8a89ba
|
|||
min-width: 650px
|
||||
max-width: 960px
|
||||
margin: 0 auto
|
||||
.oe_form_title
|
||||
width: 55%
|
||||
.oe_form_title:after
|
||||
content: "."
|
||||
display: block
|
||||
height: 0
|
||||
clear: both
|
||||
visibility: hidden
|
||||
ul.oe_form_steps
|
||||
height: 30px
|
||||
padding: 0
|
||||
|
@ -1263,6 +1270,24 @@ $colour4: #8a89ba
|
|||
.oe_form_steps_active
|
||||
font-weight: bold
|
||||
color: #b33630
|
||||
.oe_form_subtotal_footer
|
||||
width: auto
|
||||
float: right
|
||||
td.oe_form_group_cell
|
||||
text-align: right
|
||||
padding: 0
|
||||
td.oe_form_group_cell_label
|
||||
border: none
|
||||
.oe_form_field
|
||||
width: auto !important
|
||||
.oe_form_subtotal_footer_separator
|
||||
border-top: 1px solid #cacaca
|
||||
font-size: 120%
|
||||
font-weight: bold
|
||||
label.oe_form_subtotal_footer_separator
|
||||
font-weight: bold !important
|
||||
padding: 2px 8px 2px 0px !important
|
||||
// no sheet in popups
|
||||
.oe_application
|
||||
.oe_form_sheetbg
|
||||
background: url(/web/static/src/img/form_sheetbg.png)
|
||||
|
@ -1278,62 +1303,12 @@ $colour4: #8a89ba
|
|||
padding: 16px
|
||||
border: 1px solid #afafb6
|
||||
@include box-shadow(0 0 10px rgba(0,0,0,0.3))
|
||||
.oe_form
|
||||
.oe_form_subtotal_footer
|
||||
width: auto
|
||||
float: right
|
||||
td.oe_form_group_cell
|
||||
text-align: right
|
||||
padding: 0
|
||||
td.oe_form_group_cell_label
|
||||
border: none
|
||||
.oe_form_field
|
||||
width: auto !important
|
||||
.oe_form_subtotal_footer_separator
|
||||
border-top: 1px solid #cacaca
|
||||
font-size: 120%
|
||||
font-weight: bold
|
||||
label.oe_form_subtotal_footer_separator
|
||||
font-weight: bold !important
|
||||
padding: 2px 8px 2px 0px !important
|
||||
.ui-tabs
|
||||
margin: 0 -16px
|
||||
.oe_notebook_page
|
||||
padding: 0 16px
|
||||
// }}}
|
||||
// FormView.layout {{{
|
||||
.oe_form_invisible
|
||||
display: none !important
|
||||
.oe_form_editable .oe_edit_only
|
||||
display: none !important
|
||||
.oe_form_readonly
|
||||
.oe_edit_only, .oe_form_field:empty
|
||||
display: none !important
|
||||
.oe_form
|
||||
.oe_form_field_text
|
||||
width: 100%
|
||||
|
||||
.oe_form_field_char input,
|
||||
.oe_form_field_url input,
|
||||
.oe_form_field_text textarea,
|
||||
.oe_form_field_selection select
|
||||
width: inherit
|
||||
.oe_form_sheet textarea
|
||||
width: 500px
|
||||
.oe_form_field_float input
|
||||
width: 100px
|
||||
|
||||
h1 .oe_form_field_float input
|
||||
width: 140px
|
||||
|
||||
h2 .oe_form_field_float input
|
||||
width: 120px
|
||||
|
||||
h1, h2, h3, h4, h5, h6
|
||||
margin: 0 0 4px 0
|
||||
input
|
||||
height: inherit !important
|
||||
font-size: inherit
|
||||
.oe_form_nosheet > *:not(.oe_form_topbar)
|
||||
margin-left: 10px !important
|
||||
margin-right: 10px !important
|
||||
|
||||
// FormView.group {{{
|
||||
.oe_form
|
||||
td.oe_form_group_cell_label
|
||||
border-right: 1px solid #ddd
|
||||
|
@ -1344,7 +1319,9 @@ $colour4: #8a89ba
|
|||
min-width: 120px
|
||||
td.oe_form_group_cell + .oe_form_group_cell
|
||||
padding-left: 8px
|
||||
|
||||
.oe_form_group
|
||||
width: 100%
|
||||
margin: 4px 0 4px 0
|
||||
// }}}
|
||||
// FormView.label {{{
|
||||
.oe_form
|
||||
|
@ -1360,8 +1337,61 @@ $colour4: #8a89ba
|
|||
top: -4px
|
||||
padding: 0 2px
|
||||
// }}}
|
||||
// FormView.separator {{{
|
||||
.oe_horizontal_border
|
||||
border-bottom: 1px solid black
|
||||
.oe_horizontal_separator
|
||||
font-weight: bold
|
||||
font-size: 20px
|
||||
margin: 8px 0px 8px 0px
|
||||
color: #aab
|
||||
.oe_horizontal_separator:empty
|
||||
height: 5px
|
||||
.oe_vertical_separator
|
||||
border-left: 1px solid #666
|
||||
padding: 0 4px 0 4px
|
||||
// }}}
|
||||
// FormView.progressbar {{{
|
||||
.oe_form_field_progressbar
|
||||
display: inline-block
|
||||
min-width: 70px
|
||||
.oe_form_field_progressbar.ui-progressbar
|
||||
height: 22px
|
||||
font-size: 10px
|
||||
@include box-sizing(border)
|
||||
border: 1px solid #999
|
||||
@include radius(3px)
|
||||
background: white
|
||||
min-width: 50px
|
||||
span
|
||||
position: absolute
|
||||
margin-left: 10px
|
||||
font-weight: bold
|
||||
.ui-widget-header
|
||||
background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x
|
||||
// }}}
|
||||
// FormView.fields {{{
|
||||
.oe_form
|
||||
.oe_form_field_text
|
||||
width: 100%
|
||||
.oe_form_field_char input,
|
||||
.oe_form_field_url input,
|
||||
.oe_form_field_text textarea,
|
||||
.oe_form_field_selection select
|
||||
width: inherit
|
||||
.oe_form_sheet textarea
|
||||
width: 500px
|
||||
.oe_form_field_float input
|
||||
width: 100px
|
||||
h1 .oe_form_field_float input
|
||||
width: 140px
|
||||
h2 .oe_form_field_float input
|
||||
width: 120px
|
||||
h1, h2, h3, h4, h5, h6
|
||||
margin: 0 0 4px 0
|
||||
input
|
||||
height: inherit !important
|
||||
font-size: inherit
|
||||
.oe_form_field
|
||||
width: 100%
|
||||
display: inline-block
|
||||
|
@ -1377,26 +1407,15 @@ $colour4: #8a89ba
|
|||
width: 7em
|
||||
.oe_form_field_datetime
|
||||
width: 11em
|
||||
input[type="text"],
|
||||
input[type="password"],
|
||||
input[type="file"],
|
||||
select
|
||||
input[type="text"], input[type="password"], input[type="file"], select
|
||||
height: 22px
|
||||
padding-top: 2px
|
||||
input[type="text"],
|
||||
input[type="password"],
|
||||
input[type="file"],
|
||||
select,
|
||||
textarea
|
||||
input[type="text"], input[type="password"], input[type="file"], select, textarea
|
||||
@include box-sizing(border)
|
||||
background: white
|
||||
min-width: 70px
|
||||
color: #1f1f1f
|
||||
input[readonly],
|
||||
select[readonly],
|
||||
textarea[readonly],
|
||||
input[disabled],
|
||||
select[disabled]
|
||||
input[readonly], select[readonly], textarea[readonly], input[disabled], select[disabled]
|
||||
background: #E5E5E5 !important
|
||||
color: #666
|
||||
textarea[disabled]
|
||||
|
@ -1405,10 +1424,7 @@ $colour4: #8a89ba
|
|||
padding-left: 8px
|
||||
@include box-shadow(none)
|
||||
@include radius(0px)
|
||||
.oe_form_field_many2one input,
|
||||
.oe_form_field_binary input,
|
||||
.oe_form_field_binary input,
|
||||
.oe_form_field_url input
|
||||
.oe_form_field_many2one input, .oe_form_field_binary input, .oe_form_field_binary input, .oe_form_field_url input
|
||||
border-right: none
|
||||
-webkit-border-top-right-radius: 0px
|
||||
-webkit-border-bottom-right-radius: 0px
|
||||
|
@ -1476,19 +1492,8 @@ $colour4: #8a89ba
|
|||
> div
|
||||
position: relative
|
||||
overflow: hidden
|
||||
|
||||
.oe_form_title
|
||||
width: 55%
|
||||
.oe_form_title:after
|
||||
content: "."
|
||||
display: block
|
||||
height: 0
|
||||
clear: both
|
||||
visibility: hidden
|
||||
.oe_form_group
|
||||
margin: 5px 0px 5px 0px
|
||||
// }}}
|
||||
// FormView.binaryfile {{{
|
||||
// FormView.fields_binary {{{
|
||||
/* http://www.quirksmode.org/dom/inputfile.html
|
||||
* http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
|
||||
*/
|
||||
|
@ -1532,41 +1537,14 @@ $colour4: #8a89ba
|
|||
&:hover .oe_form_field_image_controls
|
||||
display: block
|
||||
// }}}
|
||||
// FormView.separator {{{
|
||||
.oe_horizontal_border
|
||||
border-bottom: 1px solid black
|
||||
.oe_horizontal_separator
|
||||
font-weight: bold
|
||||
font-size: 20px
|
||||
margin: 20px 0px 10px 0px
|
||||
color: #aab
|
||||
.oe_horizontal_separator:empty
|
||||
height: 5px
|
||||
.oe_vertical_separator
|
||||
border-left: 1px solid #666
|
||||
padding: 0 4px 0 4px
|
||||
// }}}
|
||||
// FormView.progressbar {{{
|
||||
.oe_form
|
||||
.oe_form_field_progressbar
|
||||
display: inline-block
|
||||
min-width: 70px
|
||||
.oe_form_field_progressbar.ui-progressbar
|
||||
height: 22px
|
||||
font-size: 10px
|
||||
@include box-sizing(border)
|
||||
border: 1px solid #999
|
||||
@include radius(3px)
|
||||
background: white
|
||||
min-width: 50px
|
||||
|
||||
span
|
||||
position: absolute
|
||||
margin-left: 10px
|
||||
font-weight: bold
|
||||
|
||||
.ui-widget-header
|
||||
background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x
|
||||
// FormView.many2one {{{
|
||||
.oe_form_field_many2one
|
||||
td:first-child
|
||||
position: relative
|
||||
span.oe-m2o-drop-down-button
|
||||
position: absolute
|
||||
top: 3px
|
||||
right: 2px
|
||||
// }}}
|
||||
// FormView.one2many {{{
|
||||
.oe_form .oe_form_field_one2many > .oe_view_manager
|
||||
|
@ -1597,7 +1575,6 @@ $colour4: #8a89ba
|
|||
.oe-listview-content
|
||||
width: 100%
|
||||
td:first-child, th:first-child
|
||||
width: 17px
|
||||
&:after
|
||||
border-width: 0
|
||||
> thead
|
||||
|
@ -1690,7 +1667,6 @@ $colour4: #8a89ba
|
|||
.oe_view_editor tr:hover
|
||||
background-color: #ecebf2
|
||||
// }}}
|
||||
|
||||
// Debugging stuff {{{
|
||||
.oe_layout_debugging
|
||||
.oe_form_group
|
||||
|
@ -1733,16 +1709,6 @@ $colour4: #8a89ba
|
|||
>*
|
||||
opacity: 0.70
|
||||
// }}}
|
||||
// Transitional overrides for old styles {{{
|
||||
.openerp
|
||||
.oe_form_field_many2one
|
||||
td:first-child
|
||||
position: relative
|
||||
span.oe-m2o-drop-down-button
|
||||
position: absolute
|
||||
top: 3px
|
||||
right: 2px
|
||||
// }}}
|
||||
|
||||
// au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
|
||||
// vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:
|
||||
|
|
|
@ -979,7 +979,7 @@
|
|||
</t>
|
||||
</t>
|
||||
<t t-name="FieldReference">
|
||||
<table class="oe_form_field oe_form_field_reference oe_form" border="0" cellpadding="0" cellspacing="0">
|
||||
<table class="oe_form_field oe_form_field_reference" border="0" cellpadding="0" cellspacing="0">
|
||||
<tr>
|
||||
<td t-attf-class="oe_form_frame_cell oe_form_selection">
|
||||
<span t-attf-class="oe_form_view_reference_selection"/>
|
||||
|
@ -1250,7 +1250,7 @@
|
|||
</div>
|
||||
</t>
|
||||
<t t-name="SearchView.add_to_dashboard">
|
||||
<div class="oe_form">
|
||||
<div>
|
||||
<p><b>Select Dashboard to add this filter to:</b></p>
|
||||
<select style="width: 100%; margin-right: 1em;">
|
||||
<option t-foreach="dashboards" t-as="menu" t-att-value="menu.id" t-att-selected="(menu.id == selected_menu_id) || undefined"><t t-esc="menu.name"/></option>
|
||||
|
|
|
@ -16,6 +16,9 @@
|
|||
.openerp .oe_kanban_view .oe_kanban_clear {
|
||||
clear: both;
|
||||
}
|
||||
.openerp .oe_kanban_view .oe_kanban_content div:first-child {
|
||||
margin-right: 12px;
|
||||
}
|
||||
.openerp .oe_kanban_view .oe_kanban_groups {
|
||||
height: inherit;
|
||||
width: 100%;
|
||||
|
|
|
@ -32,6 +32,9 @@
|
|||
float: right
|
||||
.oe_kanban_clear
|
||||
clear: both
|
||||
.oe_kanban_content
|
||||
div:first-child
|
||||
margin-right: 12px
|
||||
// }}}
|
||||
// KanbanGroups {{{
|
||||
.oe_kanban_groups
|
||||
|
|
Loading…
Reference in New Issue