summaryrefslogtreecommitdiff
path: root/addons/web/static/src/css
diff options
context:
space:
mode:
authorChristophe Simonis <chs@openerp.com>2012-09-05 15:31:10 +0200
committerChristophe Simonis <chs@openerp.com>2012-09-05 15:31:10 +0200
commit5bd23d30f514b5a971ed241ce33b1d47f5808638 (patch)
treef8e68a6b24bffd0b7104536283a2ebe178140119 /addons/web/static/src/css
parent522fb2e4b9fdf46abed3b5ca8ba43758b22253a1 (diff)
parent80daa1b9565b2521d9b784878cbf81aca068a200 (diff)
merge upstream
bzr revid: chs@openerp.com-20120905133110-p11de3hgocaoc5b2
Diffstat (limited to 'addons/web/static/src/css')
-rw-r--r--addons/web/static/src/css/base.css285
-rw-r--r--addons/web/static/src/css/base.sass313
2 files changed, 324 insertions, 274 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index eb641d5887e..226ccbd3513 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -20,50 +20,6 @@
font-style: normal;
}
-@-moz-keyframes bounce {
- 0% {
- -moz-transform: scale(0);
- opacity: 0;
- }
-
- 50% {
- -moz-transform: scale(1.3);
- opacity: 0.4;
- }
-
- 75% {
- -moz-transform: scale(0.9);
- opacity: 0.7;
- }
-
- 100% {
- -moz-transform: scale(1);
- opacity: 1;
- }
-}
-
-@-webkit-keyframes bounce {
- 0% {
- -webkit-transform: scale(0);
- opacity: 0;
- }
-
- 50% {
- -webkit-transform: scale(1.3);
- opacity: 0.4;
- }
-
- 75% {
- -webkit-transform: scale(0.9);
- opacity: 0.7;
- }
-
- 100% {
- -webkit-transform: scale(1);
- opacity: 1;
- }
-}
-
@media print {
.oe_topbar, .oe_leftbar, .oe_loading {
display: none !important;
@@ -155,11 +111,26 @@
.openerp h4 {
margin: 4px 0;
}
-.openerp .oe_semantic_html_override ul, .openerp .oe_semantic_html_override li, .openerp .oe_semantic_html_override ol {
+.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 li li, .openerp .oe_semantic_html_override ol li {
+.openerp .oe_semantic_html_override ul ul, .openerp .oe_semantic_html_override ul ol, .openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol ul, .openerp .oe_semantic_html_override ol ol, .openerp .oe_semantic_html_override ol li {
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol li {
+ list-style-type: none;
+}
+.openerp ul.oe_semantic_html_override {
+ margin: 0;
+ padding: 0;
+}
+.openerp ul.oe_semantic_html_override ul, .openerp ul.oe_semantic_html_override ol, .openerp ul.oe_semantic_html_override li {
+ margin: 0;
+ padding: 0;
+}
+.openerp ul.oe_semantic_html_override li {
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 {
@@ -237,6 +208,9 @@
.openerp .ui-widget-content a {
color: #7c7bad;
}
+.openerp .oe_bounce_container {
+ display: inline-block;
+}
.openerp.ui-dialog {
display: none;
padding: 6px;
@@ -502,6 +476,7 @@
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
border: none;
+ margin-bottom: 10px;
}
.openerp .oe_avatar + div {
margin-left: 5px;
@@ -519,9 +494,9 @@
padding: 0;
margin: 0;
background: none;
- -moz-border-radius: none;
- -webkit-border-radius: none;
- border-radius: none;
+ -moz-border-radius: 0;
+ -webkit-border-radius: 0;
+ border-radius: 0;
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
@@ -534,9 +509,9 @@
padding: 0;
margin: 0;
background: none;
- -moz-border-radius: none;
- -webkit-border-radius: none;
- border-radius: none;
+ -moz-border-radius: 0;
+ -webkit-border-radius: 0;
+ border-radius: 0;
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
@@ -574,6 +549,9 @@
background: #7c7bad;
color: #eeeeee;
}
+.openerp .oe_tags {
+ margin-bottom: 1px;
+}
.openerp .oe_tags.oe_inline {
min-width: 250px;
}
@@ -629,14 +607,22 @@
margin: 0;
padding: 0;
}
+.openerp .oe_notebook ul, .openerp .oe_notebook ol, .openerp .oe_notebook li {
+ margin: 0;
+ padding: 0;
+}
.openerp .oe_notebook li {
list-style-type: none;
}
-.openerp .oe_notebook ul, .openerp .oe_notebook li, .openerp .oe_notebook ol {
+.openerp .oe_notebook ul, .openerp .oe_notebook ol {
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_notebook ul ul, .openerp .oe_notebook ul ol, .openerp .oe_notebook ul li, .openerp .oe_notebook ol ul, .openerp .oe_notebook ol ol, .openerp .oe_notebook ol li {
margin: 0;
padding: 0;
}
-.openerp .oe_notebook ul li, .openerp .oe_notebook li li, .openerp .oe_notebook ol li {
+.openerp .oe_notebook ul li, .openerp .oe_notebook ol li {
list-style-type: none;
}
.openerp .oe_notebook.ui-corner-all {
@@ -942,11 +928,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 li, .openerp .oe_login .oe_login_pane ol {
+.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 li li, .openerp .oe_login .oe_login_pane ol li {
+.openerp .oe_login .oe_login_pane ul ul, .openerp .oe_login .oe_login_pane ul ol, .openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol ul, .openerp .oe_login .oe_login_pane ol ol, .openerp .oe_login .oe_login_pane ol li {
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol li {
list-style-type: none;
}
.openerp .oe_login .oe_login_pane h2 {
@@ -1028,11 +1018,15 @@
background-image: -o-linear-gradient(top, #646060, #262626);
background-image: linear-gradient(to bottom, #646060, #262626);
}
-.openerp .oe_topbar ul, .openerp .oe_topbar li, .openerp .oe_topbar ol {
+.openerp .oe_topbar ul, .openerp .oe_topbar ol {
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_topbar ul ul, .openerp .oe_topbar ul ol, .openerp .oe_topbar ul li, .openerp .oe_topbar ol ul, .openerp .oe_topbar ol ol, .openerp .oe_topbar ol li {
margin: 0;
padding: 0;
}
-.openerp .oe_topbar ul li, .openerp .oe_topbar li li, .openerp .oe_topbar ol li {
+.openerp .oe_topbar ul li, .openerp .oe_topbar ol li {
list-style-type: none;
}
.openerp .oe_topbar .oe_topbar_item {
@@ -1107,11 +1101,15 @@
text-shadow: 0 1px 1px white;
padding-bottom: 16px;
}
-.openerp .oe_leftbar ul, .openerp .oe_leftbar li, .openerp .oe_leftbar ol {
+.openerp .oe_leftbar ul, .openerp .oe_leftbar ol {
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_leftbar ul ul, .openerp .oe_leftbar ul ol, .openerp .oe_leftbar ul li, .openerp .oe_leftbar ol ul, .openerp .oe_leftbar ol ol, .openerp .oe_leftbar ol li {
margin: 0;
padding: 0;
}
-.openerp .oe_leftbar ul li, .openerp .oe_leftbar li li, .openerp .oe_leftbar ol li {
+.openerp .oe_leftbar ul li, .openerp .oe_leftbar ol li {
list-style-type: none;
}
.openerp a.oe_logo {
@@ -1206,16 +1204,16 @@
width: 100%;
display: inline-block;
}
-.openerp .oe_secondary_submenu > li {
+.openerp .oe_secondary_submenu li {
position: relative;
- padding: 1px 0 1px 20px;
+ padding: 1px 0 1px 20px !important;
}
-.openerp .oe_secondary_submenu > li a {
+.openerp .oe_secondary_submenu li a {
display: block;
color: #4c4c4c;
padding: 2px 4px 2px 0;
}
-.openerp .oe_secondary_submenu > li .oe_menu_label {
+.openerp .oe_secondary_submenu li .oe_menu_label {
position: absolute;
top: 1px;
right: 1px;
@@ -1316,12 +1314,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 li, .openerp .oe_view_manager table.oe_view_manager_header ol {
- margin: 0;
+.openerp .oe_view_manager table.oe_view_manager_header ul {
padding: 0;
+ margin-right: 0;
+ margin-top: 0;
+ margin-bottom: 0;
}
-.openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header li li, .openerp .oe_view_manager table.oe_view_manager_header ol li {
+.openerp .oe_view_manager table.oe_view_manager_header ul li {
list-style-type: none;
+ margin: 0;
}
.openerp .oe_view_manager table.oe_view_manager_header .oe_header_row {
clear: both;
@@ -1432,11 +1433,15 @@
color: white;
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
}
+.openerp .oe_view_manager .oe_view_manager_switch {
+ margin-left: 8px;
+}
.openerp .oe_view_manager .oe_view_manager_switch li {
text-align: center;
width: 24px;
height: 24px;
line-height: 16px;
+ padding: 0;
}
.openerp .oe_view_manager .oe_view_manager_switch li a {
position: relative;
@@ -1968,6 +1973,35 @@
margin: -16px -16px 0 -16px;
padding: 8px;
}
+.openerp .oe_form_sheetbg {
+ padding: 8px 0;
+}
+.openerp .oe_form_sheet_width {
+ min-width: 650px;
+ max-width: 860px;
+ margin: 0 auto;
+}
+.openerp .oe_form_sheet {
+ background: white;
+ min-height: 330px;
+ padding: 16px;
+}
+.openerp .oe_application .oe_form_sheetbg {
+ background: url(/web/static/src/img/form_sheetbg.png);
+ border-bottom: 1px solid #dddddd;
+}
+.openerp .oe_application .oe_form_sheet {
+ border: 1px solid #afafb6;
+ -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
+ -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_application .oe_form_sheet .ui-tabs {
+ margin: 0 -16px;
+}
+.openerp .oe_application .oe_form_sheet .oe_notebook_page {
+ padding: 0 16px;
+}
.openerp .oe_form header {
position: relative;
border-bottom: 1px solid #cacaca;
@@ -1989,8 +2023,10 @@
margin: 0 auto;
padding: 16px 0 48px;
}
-.openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator {
- margin: 12px 0 8px 0;
+.openerp .oe_form .oe_grey {
+ color: #aaaaaa;
+ max-width: 650px;
+ margin: 0 0 10px 0;
}
.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;
@@ -2005,11 +2041,11 @@
.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 {
+.openerp .oe_form ul.oe_form_steps, .openerp .oe_form ul.oe_form_steps_clickable {
display: inline-block;
padding-right: 18px;
}
-.openerp ul.oe_form_steps li, .openerp ul.oe_form_steps_clickable li {
+.openerp .oe_form ul.oe_form_steps li, .openerp .oe_form ul.oe_form_steps_clickable li {
display: inline-block;
margin-right: -20px;
background-color: #fcfcfc;
@@ -2020,20 +2056,20 @@
background-image: -o-linear-gradient(top, #fcfcfc, #dedede);
background-image: linear-gradient(to bottom, #fcfcfc, #dedede);
}
-.openerp ul.oe_form_steps li:first-child .label, .openerp ul.oe_form_steps_clickable li:first-child .label {
+.openerp .oe_form ul.oe_form_steps li:first-child .label, .openerp .oe_form ul.oe_form_steps_clickable li:first-child .label {
border-left: 1px solid #cacaca;
padding-left: 14px;
}
-.openerp ul.oe_form_steps li:last-child, .openerp ul.oe_form_steps_clickable li:last-child {
+.openerp .oe_form ul.oe_form_steps li:last-child, .openerp .oe_form ul.oe_form_steps_clickable li:last-child {
border-right: 1px solid #cacaca;
}
-.openerp ul.oe_form_steps li:last-child .label, .openerp ul.oe_form_steps_clickable li:last-child .label {
+.openerp .oe_form ul.oe_form_steps li:last-child .label, .openerp .oe_form ul.oe_form_steps_clickable li:last-child .label {
padding-right: 14px;
}
-.openerp ul.oe_form_steps li:last-child .arrow, .openerp ul.oe_form_steps_clickable li:last-child .arrow {
+.openerp .oe_form ul.oe_form_steps li:last-child .arrow, .openerp .oe_form ul.oe_form_steps_clickable li:last-child .arrow {
display: none;
}
-.openerp ul.oe_form_steps li .label, .openerp ul.oe_form_steps_clickable li .label {
+.openerp .oe_form ul.oe_form_steps li .label, .openerp .oe_form ul.oe_form_steps_clickable li .label {
color: #4c4c4c;
text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede;
padding: 7px;
@@ -2041,18 +2077,16 @@
padding-left: 24px;
margin: 0;
position: relative;
- z-index: 10;
}
-.openerp ul.oe_form_steps li .arrow, .openerp ul.oe_form_steps_clickable li .arrow {
+.openerp .oe_form ul.oe_form_steps li .arrow, .openerp .oe_form ul.oe_form_steps_clickable li .arrow {
width: 17px;
display: inline-block;
vertical-align: top;
overflow: hidden;
margin-left: -5px;
}
-.openerp ul.oe_form_steps li .arrow span, .openerp ul.oe_form_steps_clickable li .arrow span {
+.openerp .oe_form ul.oe_form_steps li .arrow span, .openerp .oe_form ul.oe_form_steps_clickable li .arrow span {
position: relative;
- z-index: 11;
width: 24px;
height: 24px;
display: inline-block;
@@ -2066,12 +2100,13 @@
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
- -moz-transform: rotate(45deg);
-webkit-transform: rotate(45deg);
- -o-transform: rotate(45deg);
+ -moz-transform: rotate(45deg);
-ms-transform: rotate(45deg);
+ -o-transform: rotate(45deg);
+ transform: rotate(45deg);
}
-.openerp ul.oe_form_steps li.oe_active, .openerp ul.oe_form_steps_clickable li.oe_active {
+.openerp .oe_form ul.oe_form_steps li.oe_active, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active {
background-color: #729fcf;
background-image: -webkit-gradient(linear, left top, left bottom, from(#729fcf), to(#3465a4));
background-image: -webkit-linear-gradient(top, #729fcf, #3465a4);
@@ -2080,20 +2115,20 @@
background-image: -o-linear-gradient(top, #729fcf, #3465a4);
background-image: linear-gradient(to bottom, #729fcf, #3465a4);
}
-.openerp ul.oe_form_steps li.oe_active .arrow span, .openerp ul.oe_form_steps_clickable li.oe_active .arrow span {
+.openerp .oe_form ul.oe_form_steps li.oe_active .arrow span, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active .arrow span {
background-color: #3465a4;
background: -moz-linear-gradient(135deg, #3465a4, #729fcf);
background: -o-linear-gradient(135deg, #729fcf, #3465a4);
background: -webkit-gradient(linear, left top, right bottom, from(#729fcf), to(#3465a4));
}
-.openerp ul.oe_form_steps li.oe_active .label, .openerp ul.oe_form_steps_clickable li.oe_active .label {
+.openerp .oe_form ul.oe_form_steps li.oe_active .label, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active .label {
color: white;
text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4;
}
-.openerp ul.oe_form_steps_clickable li {
+.openerp .oe_form ul.oe_form_steps_clickable li {
cursor: pointer;
}
-.openerp ul.oe_form_steps_clickable li:hover {
+.openerp .oe_form ul.oe_form_steps_clickable li:hover {
background-color: #e8e8e8;
background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca));
background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca);
@@ -2102,10 +2137,10 @@
background-image: -o-linear-gradient(top, #e8e8e8, #cacaca);
background-image: linear-gradient(to bottom, #e8e8e8, #cacaca);
}
-.openerp ul.oe_form_steps_clickable li:hover .label {
+.openerp .oe_form ul.oe_form_steps_clickable li:hover .label {
text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede;
}
-.openerp ul.oe_form_steps_clickable li:hover .arrow span {
+.openerp .oe_form ul.oe_form_steps_clickable li:hover .arrow span {
background-color: #e8e8e8;
background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca));
background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca);
@@ -2114,10 +2149,10 @@
background-image: -o-linear-gradient(top, #e8e8e8, #cacaca);
background-image: linear-gradient(to bottom, #e8e8e8, #cacaca);
}
-.openerp ul.oe_form_steps_clickable li .label {
+.openerp .oe_form ul.oe_form_steps_clickable li .label {
color: #7c7bad;
}
-.openerp ul.oe_form_steps_clickable li.oe_active:hover {
+.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover {
background-color: #4c85c2;
background-image: -webkit-gradient(linear, left top, left bottom, from(#4c85c2), to(#284d7d));
background-image: -webkit-linear-gradient(top, #4c85c2, #284d7d);
@@ -2126,10 +2161,10 @@
background-image: -o-linear-gradient(top, #4c85c2, #284d7d);
background-image: linear-gradient(to bottom, #4c85c2, #284d7d);
}
-.openerp ul.oe_form_steps_clickable li.oe_active:hover .label {
+.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover .label {
text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4;
}
-.openerp ul.oe_form_steps_clickable li.oe_active:hover .arrow span {
+.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover .arrow span {
background-color: #284d7d;
background: -moz-linear-gradient(135deg, #284d7d, #4c85c2);
background: -o-linear-gradient(135deg, #4c85c2, #284d7d);
@@ -2161,31 +2196,6 @@
.openerp .oe_form .oe_subtotal_footer label.oe_form_label_help {
font-weight: normal;
}
-.openerp .oe_application .oe_form_sheetbg {
- background: url(/web/static/src/img/form_sheetbg.png);
- padding: 8px 0;
- border-bottom: 1px solid #dddddd;
-}
-.openerp .oe_application .oe_form_sheet_width {
- min-width: 650px;
- max-width: 860px;
- margin: 0 auto;
-}
-.openerp .oe_application .oe_form_sheet {
- background: white;
- min-height: 330px;
- padding: 16px;
- border: 1px solid #afafb6;
- -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
- -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_application .oe_form_sheet .ui-tabs {
- margin: 0 -16px;
-}
-.openerp .oe_application .oe_form_sheet .oe_notebook_page {
- padding: 0 16px;
-}
.openerp .oe_form .oe_form_button {
margin: 2px;
}
@@ -2196,7 +2206,7 @@
.openerp .oe_form td.oe_form_group_cell_label label {
line-height: 18px;
display: block;
- min-width: 160px;
+ min-width: 140px;
}
.openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
padding-left: 6px;
@@ -2227,7 +2237,7 @@
.openerp .oe_horizontal_separator {
font-weight: bold;
font-size: 20px;
- margin: 8px 0px 8px 0px;
+ margin: 15px 0px 10px 0px;
color: #7c7bad;
}
.openerp .oe_horizontal_separator:empty {
@@ -2302,7 +2312,7 @@
-ms-box-sizing: border-box;
box-sizing: border-box;
background: white;
- min-width: 70px;
+ min-width: 60px;
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] {
@@ -2441,17 +2451,32 @@
float: right;
padding-left: 2px;
}
+.openerp.ui-autocomplete li.oe_m2o_dropdown_option a {
+ font-style: italic;
+ padding-left: 2em;
+}
+.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 li, .openerp .oe_form_field_status ol {
+.openerp .oe_form_field_status ul, .openerp .oe_form_field_status ol {
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_form_field_status ul ul, .openerp .oe_form_field_status ul ol, .openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol ul, .openerp .oe_form_field_status ol ol, .openerp .oe_form_field_status ol li {
margin: 0;
padding: 0;
}
-.openerp .oe_form_field_status ul li, .openerp .oe_form_field_status li li, .openerp .oe_form_field_status ol li {
+.openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol li {
list-style-type: none;
}
+.openerp .oe_form_field_status ul, .openerp .oe_form_field_status ol, .openerp .oe_form_field_status li {
+ margin: 0;
+ padding: 0;
+}
.openerp .oe_form_field_status li {
list-style-type: none;
}
@@ -2519,10 +2544,11 @@
height: 27px;
}
.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea {
+ -moz-border-radius: 0;
+ -webkit-border-radius: 0;
+ border-radius: 0;
border: 1px solid #aaaaff;
- border-radius: 0px;
- margin: 0px;
- -webkit-border-radius: 0px;
+ margin: 0;
}
.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea {
height: 60px;
@@ -2622,6 +2648,7 @@
cursor: pointer;
}
.openerp .oe_list_content > tbody > tr {
+ height: 27px;
border-top: 1px solid #dddddd;
}
.openerp .oe_list_content > tbody > tr > td.oe_list_field_cell {
@@ -2684,6 +2711,12 @@
content: "ö";
color: #404040;
}
+.openerp .oe_list_cannot_edit .oe_list_header_handle, .openerp .oe_list_cannot_edit .oe_list_field_handle {
+ display: none !important;
+}
+.openerp .oe_list_cannot_delete .oe_list_record_delete {
+ display: none !important;
+}
.openerp .tree_header {
background-color: #f0f0f0;
border-bottom: 1px solid #cacaca;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index aa75956f0a1..13f740f218c 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -36,7 +36,7 @@ $sheet-max-width: 860px
padding: 0
margin: 0
background: none
- @include radius(none)
+ @include radius(0)
@include box-shadow(none)
@mixin vertical-gradient($startColor: #555, $endColor: #333)
@@ -95,10 +95,23 @@ $sheet-max-width: 860px
background: -webkit-gradient(linear, left top, right bottom, from($startColor), to($endColor))
@mixin transform($transform)
- -moz-transform: $transform
-webkit-transform: $transform
- -o-transform: $transform
+ -moz-transform: $transform
-ms-transform: $transform
+ -o-transform: $transform
+ transform: $transform
+
+@mixin keyframes($name)
+ @-webkit-keyframes #{$name}
+ @content
+ @-moz-keyframes #{$name}
+ @content
+ @-ms-keyframes #{$name}
+ @content
+ @-o-keyframes #{$name}
+ @content
+ @keyframes #{$name}
+ @content
// Transforms the (readable) text of an inline element into an mmlicons icon,
// allows for actual readable text in-code (and in readers?) with iconic looks
@@ -114,43 +127,17 @@ $sheet-max-width: 860px
@mixin ul-html-override()
margin: 0
padding: 0
+ ul, ol, li
+ margin: 0
+ padding: 0
li
list-style-type: none
@mixin semantic-html-override()
- ul, li, ol
+ ul, ol
@include ul-html-override()
// }}}
-// CSS animation bounces {{{
-@-moz-keyframes bounce
- 0%
- -moz-transform: scale(0)
- opacity: 0
- 50%
- -moz-transform: scale(1.3)
- opacity: 0.4
- 75%
- -moz-transform: scale(0.9)
- opacity: 0.7
- 100%
- -moz-transform: scale(1)
- opacity: 1
-
-@-webkit-keyframes bounce
- 0%
- -webkit-transform: scale(0)
- opacity: 0
- 50%
- -webkit-transform: scale(1.3)
- opacity: 0.4
- 75%
- -webkit-transform: scale(0.9)
- opacity: 0.7
- 100%
- -webkit-transform: scale(1)
- opacity: 1
-// }}}
@media print
.oe_topbar, .oe_leftbar, .oe_loading
@@ -215,6 +202,8 @@ $sheet-max-width: 860px
margin: 4px 0
.oe_semantic_html_override
@include semantic-html-override
+ ul.oe_semantic_html_override
+ @include ul-html-override
// }}}
// Button style {{{
a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button
@@ -258,6 +247,8 @@ $sheet-max-width: 860px
// Jquery ui Overrides {{{
.ui-widget-content a
color: $link-color
+ .oe_bounce_container
+ display: inline-block
// Modal box
&.ui-dialog
@@ -429,6 +420,7 @@ $sheet-max-width: 860px
@include radius(3px)
@include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3))
border: none
+ margin-bottom: 10px
.oe_avatar + div
margin-left: 5px
.oe_image_small > img
@@ -482,6 +474,7 @@ $sheet-max-width: 860px
.text-core .text-wrap .text-dropdown .text-list .text-suggestion em
font-style: italic
text-decoration: none
+ margin-bottom: 1px
// }}}
// Tooltips {{{
&.oe_tooltip
@@ -932,9 +925,9 @@ $sheet-max-width: 860px
margin: 0
width: 100%
display: inline-block
- > li
+ li
position: relative
- padding: 1px 0 1px 20px
+ padding: 1px 0 1px 20px !important
a
display: block
color: #4c4c4c
@@ -1019,7 +1012,14 @@ $sheet-max-width: 860px
table.oe_view_manager_header
width: 100%
table-layout: fixed
- @include semantic-html-override
+ ul
+ padding: 0
+ margin-right: 0
+ margin-top: 0
+ margin-bottom: 0
+ li
+ list-style-type: none
+ margin: 0
.oe_header_row
//min-height: 26px
//line-height: 26px
@@ -1104,11 +1104,13 @@ $sheet-max-width: 860px
// }}}
// ViewManager.switches {{{
.oe_view_manager_switch
+ margin-left: 8px
li
text-align: center
width: 24px
height: 24px
line-height: 16px
+ padding: 0
a
position: relative
.oe_vm_switch_list:after, .oe_vm_switch_tree:after
@@ -1509,11 +1511,34 @@ $sheet-max-width: 860px
display: none !important
.oe_form .oe_form_field_date
width: auto
+ // Sheet and padding
.oe_form_nosheet
margin: 16px
> header
margin: -16px -16px 0 -16px
padding: 8px
+ .oe_form_sheetbg
+ padding: 8px 0
+ .oe_form_sheet_width
+ min-width: 650px
+ max-width: $sheet-max-width
+ margin: 0 auto
+ .oe_form_sheet
+ background: white
+ min-height: 330px
+ padding: 16px
+ // Sheet inline mode
+ .oe_application
+ .oe_form_sheetbg
+ background: url(/web/static/src/img/form_sheetbg.png)
+ border-bottom: 1px solid #ddd
+ .oe_form_sheet
+ border: 1px solid $tag-border
+ @include box-shadow(0 0 10px rgba(0,0,0,0.3))
+ .ui-tabs
+ margin: 0 -16px
+ .oe_notebook_page
+ padding: 0 16px
// }}}
// FormView.custom tags and classes {{{
.oe_form
@@ -1529,9 +1554,11 @@ $sheet-max-width: 860px
max-width: $sheet-max-width
margin: 0 auto
padding: 16px 0 48px
+ .oe_grey
+ color: #aaa
+ max-width: 650px
+ margin: 0 0 10px 0
div.oe_form_configuration
- div.oe_horizontal_separator
- margin: 12px 0 8px 0
p, ul, ol
color: #aaa
max-width: 650px
@@ -1541,117 +1568,92 @@ $sheet-max-width: 860px
padding: 2px 0
.oe_form_group_cell div div
padding: 1px 0
-
-
- ul.oe_form_steps, ul.oe_form_steps_clickable
- display: inline-block
- padding-right: 18px
- li
+ ul.oe_form_steps, ul.oe_form_steps_clickable
display: inline-block
- margin-right: -20px
- @include vertical-gradient(#fcfcfc, #dedede)
- &:first-child .label
- border-left: 1px solid #cacaca
- padding-left: 14px
- &:last-child
- border-right: 1px solid #cacaca
- .label
- padding-right: 14px
- .arrow
- display: none
- .label
- color: #4c4c4c
- text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede
- padding: 7px
- display: inline-block
- padding-left: 24px
- margin: 0
- position: relative
- z-index: 10
- .arrow
- width: 17px
+ padding-right: 18px
+ li
display: inline-block
- vertical-align: top
- overflow: hidden
- margin-left: -5px
- span
+ margin-right: -20px
+ @include vertical-gradient(#fcfcfc, #dedede)
+ &:first-child .label
+ border-left: 1px solid #cacaca
+ padding-left: 14px
+ &:last-child
+ border-right: 1px solid #cacaca
+ .label
+ padding-right: 14px
+ .arrow
+ display: none
+ .label
+ color: #4c4c4c
+ text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede
+ padding: 7px
+ display: inline-block
+ padding-left: 24px
+ margin: 0
position: relative
- z-index: 11
- width: 24px
- height: 24px
+ .arrow
+ width: 17px
display: inline-block
- margin-left: -12px
- margin-top: 3px
- box-shadow: -1px 1px 2px rgba(255,255,255,0.2), inset -1px 1px 1px rgba(0,0,0,0.2)
- @include skew-gradient(#fcfcfc, #dedede)
- @include radius(3px)
- @include transform(rotate(45deg))
- li.oe_active
- @include vertical-gradient(#729fcf, #3465a4)
- .arrow span
- @include skew-gradient(#729fcf, #3465a4)
- .label
- color: white
- text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4
-
- ul.oe_form_steps_clickable
- li
- cursor: pointer
- &:hover
- @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%))
- .label
- text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede
+ vertical-align: top
+ overflow: hidden
+ margin-left: -5px
+ span
+ position: relative
+ width: 24px
+ height: 24px
+ display: inline-block
+ margin-left: -12px
+ margin-top: 3px
+ box-shadow: -1px 1px 2px rgba(255,255,255,0.2), inset -1px 1px 1px rgba(0,0,0,0.2)
+ @include skew-gradient(#fcfcfc, #dedede)
+ @include radius(3px)
+ @include transform(rotate(45deg))
+ li.oe_active
+ @include vertical-gradient(#729fcf, #3465a4)
.arrow span
+ @include skew-gradient(#729fcf, #3465a4)
+ .label
+ color: white
+ text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4
+ ul.oe_form_steps_clickable
+ li
+ cursor: pointer
+ &:hover
@include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%))
- .label
- color: $link-color
- li.oe_active
- &:hover
- @include vertical-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%))
+ .label
+ text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede
+ .arrow span
+ @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%))
.label
- text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4
- .arrow span
- @include skew-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%))
+ color: $link-color
+ li.oe_active
+ &:hover
+ @include vertical-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%))
+ .label
+ text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4
+ .arrow span
+ @include skew-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%))
+ .oe_subtotal_footer
+ width: 1% !important
+ td.oe_form_group_cell
+ text-align: right
+ padding: 0 !important
+ td.oe_form_group_cell_label
+ border-right: none
+ .oe_subtotal_footer_separator
+ width: 108px
+ 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 11px 2px 0px !important
+ label.oe_form_label_help
+ font-weight: normal
- .oe_form .oe_subtotal_footer
- width: 1% !important
- td.oe_form_group_cell
- text-align: right
- padding: 0 !important
- td.oe_form_group_cell_label
- border-right: none
- .oe_subtotal_footer_separator
- width: 108px
- 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 11px 2px 0px !important
- label.oe_form_label_help
- font-weight: normal
- // no sheet in popups
- .oe_application
- .oe_form_sheetbg
- background: url(/web/static/src/img/form_sheetbg.png)
- padding: 8px 0
- border-bottom: 1px solid #ddd
- .oe_form_sheet_width
- min-width: 650px
- max-width: $sheet-max-width
- margin: 0 auto
- .oe_form_sheet
- background: white
- min-height: 330px
- padding: 16px
- border: 1px solid $tag-border
- @include box-shadow(0 0 10px rgba(0,0,0,0.3))
- .ui-tabs
- margin: 0 -16px
- .oe_notebook_page
- padding: 0 16px
// }}}
// FormView.group {{{
.oe_form
@@ -1663,7 +1665,7 @@ $sheet-max-width: 860px
label
line-height: 18px
display: block
- min-width: 160px
+ min-width: 140px
td.oe_form_group_cell + .oe_form_group_cell
padding-left: 6px
.oe_form_group
@@ -1692,7 +1694,7 @@ $sheet-max-width: 860px
.oe_horizontal_separator
font-weight: bold
font-size: 20px
- margin: 8px 0px 8px 0px
+ margin: 15px 0px 10px 0px
color: $section-title-color
.oe_horizontal_separator:empty
height: 5px
@@ -1749,7 +1751,7 @@ $sheet-max-width: 860px
input[type="text"], input[type="password"], input[type="file"], select, textarea
@include box-sizing(border)
background: white
- min-width: 70px
+ min-width: 60px
color: #1f1f1f
input[readonly], select[readonly], textarea[readonly], input[disabled], select[disabled]
background: #E5E5E5 !important
@@ -1866,6 +1868,12 @@ $sheet-max-width: 860px
line-height: 14px
float: right
padding-left: 2px
+ &.ui-autocomplete
+ li.oe_m2o_dropdown_option a
+ font-style: italic
+ padding-left: 2em
+ li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option
+ margin-top: 10px
// }}}
// FormView.fieldstatus {{{
.oe_form_field_status
@@ -1919,6 +1927,8 @@ $sheet-max-width: 860px
background-color: #d2d2ff
td.oe_readonly
background-color: #eee
+
+ $row-height: 27px
.oe_list_editable
.oe_list_content
td.oe_list_field_cell
@@ -1933,12 +1943,11 @@ $sheet-max-width: 860px
display: none
.oe_form_field
input
- height: 27px
+ height: $row-height
input, textarea
+ @include radius(0)
border: 1px solid #aaf
- border-radius: 0px
- margin: 0px
- -webkit-border-radius: 0px
+ margin: 0
textarea
height: 60px
&.oe_form_field_float,&.oe_form_view_integer
@@ -2023,6 +2032,7 @@ $sheet-max-width: 860px
> tbody
cursor: pointer
> tr
+ height: $row-height
border-top: 1px solid #ddd
> td.oe_list_field_cell
padding: 3px 6px
@@ -2062,6 +2072,13 @@ $sheet-max-width: 860px
.oe_list_handle
@include text-to-icon("ö")
+ .oe_list_cannot_edit
+ .oe_list_header_handle, .oe_list_field_handle
+ display: none !important
+ .oe_list_cannot_delete
+ .oe_list_record_delete
+ display: none !important
+
// }}}
// Tree view {{{
.tree_header