summaryrefslogtreecommitdiff
path: root/addons/web/static/src/css
diff options
context:
space:
mode:
Diffstat (limited to 'addons/web/static/src/css')
-rw-r--r--addons/web/static/src/css/base.css84
-rw-r--r--addons/web/static/src/css/base.sass90
2 files changed, 95 insertions, 79 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 916e4ffe9ba..8534927def1 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");
@@ -79,7 +79,7 @@
vertical-align: top;
}
.openerp .oe_title {
- width: 50%;
+ width: 38%;
float: left;
}
.openerp .oe_title:after {
@@ -314,56 +314,58 @@
.openerp .oe_form_dirty button.oe_highlight_on_dirty:hover {
background: #ed6f6a;
}
-.openerp .oe_button_box {
- width: 400px;
- text-align: left;
-}
-.openerp .oe_button_box .oe_stat_button:hover {
- background: #7c7bad;
- color: white;
-}
-.openerp .oe_button_box .oe_stat_button:hover .fa {
- color: white;
-}
-.openerp .oe_button_box .oe_stat_button {
+.openerp .oe_stat_button {
font-weight: normal;
- display: inline-table;
- width: 33% !important;
- height: 42px;
+ width: 132px !important;
+ height: 40px;
+ color: #666666;
margin: 0px -1px -1px 0px;
padding: 0;
- color: #666666;
border: 1px solid #dddddd;
border-radius: 0;
box-shadow: none;
background: white;
}
-.openerp .oe_button_box .oe_stat_button > div {
+.openerp .oe_stat_button > div {
display: table-cell;
vertical-align: middle;
text-align: left;
padding: 0;
line-height: 120%;
}
-.openerp .oe_button_box .oe_stat_button .stat_button_icon {
+.openerp .oe_stat_button .stat_button_icon {
color: #7c7bad;
font-size: 24px;
padding: 0px 3px;
width: 37px;
text-align: center;
}
-.openerp .oe_button_box .oe_stat_button .oe_form_field_percent_pie {
+.openerp .oe_stat_button .oe_form_field_percent_pie {
width: 42px;
}
-.openerp .oe_button_box .oe_stat_button .oe_form_field_bar_chart {
+.openerp .oe_stat_button .oe_form_field_bar_chart {
width: 42px;
}
-.openerp .oe_button_box .oe_stat_button svg {
+.openerp .oe_stat_button svg {
width: 38px;
height: 38px;
display: inline;
vertical-align: middle;
}
+.openerp .oe_stat_button:hover {
+ background: #7c7bad;
+ color: white;
+}
+.openerp .oe_stat_button:hover .fa {
+ color: white;
+}
+.openerp .oe_button_box {
+ width: 400px;
+ text-align: right;
+}
+.openerp .oe_button_box .oe_stat_button {
+ display: inline-table;
+}
.openerp .oe_avatar > img {
max-height: 90px;
max-width: 90px;
@@ -720,7 +722,7 @@
border-bottom-left-radius: 8px;
}
.openerp .oe_notification {
- z-index: 1050;
+ z-index: 1500;
}
.openerp .oe_webclient_timezone_notification a {
color: white;
@@ -2742,13 +2744,15 @@
padding: 3px 6px;
white-space: pre-line;
}
-.openerp .oe_list_content > tbody > tr > td > button.btn_img, .openerp .oe_list_content > tbody > tr > th > button.btn_img {
+.openerp .oe_list_content > tbody > tr > td > button, .openerp .oe_list_content > tbody > tr > th > button {
border: none;
background: transparent;
padding: 0;
- -moz-box-shadow: none;
- -webkit-box-shadow: none;
- box-shadow: none;
+}
+.openerp .oe_list_content > tbody > tr > td > button.btn_txt, .openerp .oe_list_content > tbody > tr > th > button.btn_txt {
+ border: 1px solid rgba(0, 0, 0, 0.4);
+ background: #e3e3e3;
+ padding: 3px 12px;
}
.openerp .oe_list_content > tbody > tr > td.oe_list_checkbox:first-child, .openerp .oe_list_content > tbody > tr th.oe_list_checkbox:first-child {
width: 17px;
@@ -3293,11 +3297,6 @@ body.oe_single_form .oe_single_form_container {
overflow: hidden !important;
}
}
-.ui-icon {
- width: 18px;
- height: 18px;
-}
-
.tooltip {
padding: 0;
margin: 0;
@@ -3307,8 +3306,6 @@ body.oe_single_form .oe_single_form_container {
background: white;
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
background-color: transparent;
- /*We need a greater z-index in order for tooltip to go over bootstrap modal z-index*/
- z-index: 1500;
}
.tooltip .tooltip-inner {
text-align: left !important;
@@ -3345,6 +3342,12 @@ body.oe_single_form .oe_single_form_container {
.tooltip .tooltip-inner .oe_tooltip_message {
max-width: 310px;
}
+
+.ui-icon {
+ width: 18px;
+ height: 18px;
+}
+
.modal .modal-header button.close {
border: none;
background: none;
@@ -3355,12 +3358,17 @@ body.oe_single_form .oe_single_form_container {
.modal .modal-footer {
text-align: left;
}
-.modal .oe_act_window.modal-body{
+.modal .oe_button {
+ margin: 0 4px 0 0;
+}
+.modal .oe_act_window.modal-body {
padding: 0;
}
-.modal .oe_button{
- margin: 0 4px 0 0;
+
+.ui-datepicker {
+ z-index: 1500 !important;
}
+
input[type="radio"], input[type="checkbox"] {
margin-right: 4px;
margin-left: 4px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index d83b09bc897..f1a92f44288 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -190,7 +190,7 @@ $sheet-padding: 16px
td
vertical-align: top
.oe_title
- width: 50%
+ width: 38%
float: left
.oe_title:after
content: "."
@@ -330,47 +330,48 @@ $sheet-padding: 16px
@include box-shadow(none)
&:hover
background: #ED6F6A
+ .oe_stat_button
+ font-weight: normal
+ width: 132px !important
+ height: 40px
+ color: #666
+ margin: 0px -1px -1px 0px
+ padding: 0
+ border: 1px solid #dddddd
+ border-radius: 0
+ box-shadow: none
+ background: white
+ > div
+ display: table-cell
+ vertical-align: middle
+ text-align: left
+ padding: 0
+ line-height: 120%
+ .stat_button_icon
+ color: #7C7BAD
+ font-size: 24px
+ padding: 0px 3px
+ width: 37px
+ text-align: center
+ .oe_form_field_percent_pie
+ width: 42px
+ .oe_form_field_bar_chart
+ width: 42px
+ svg
+ width: 38px
+ height: 38px
+ display: inline
+ vertical-align: middle
+ .oe_stat_button:hover
+ background: #7c7bad
+ color: white
+ .fa
+ color: white
.oe_button_box
width: 400px
- text-align: left
- .oe_stat_button:hover
- background: #7c7bad
- color: white
- .fa
- color: white
+ text-align: right
.oe_stat_button
- font-weight: normal
display: inline-table
- width: 33% !important
- height: 42px
- margin: 0px -1px -1px 0px
- padding: 0
- color: #666
- border: 1px solid #dddddd
- border-radius: 0
- box-shadow: none
- background: white
- > div
- display: table-cell
- vertical-align: middle
- text-align: left
- padding: 0
- line-height: 120%
- .stat_button_icon
- color: #7C7BAD
- font-size: 24px
- padding: 0px 3px
- width: 37px
- text-align: center
- .oe_form_field_percent_pie
- width: 42px
- .oe_form_field_bar_chart
- width: 42px
- svg
- width: 38px
- height: 38px
- display: inline
- vertical-align: middle
.oe_avatar
> img
max-height: 90px
@@ -639,7 +640,8 @@ $sheet-padding: 16px
// }}}
// Notifications {{{
.oe_notification
- z-index: 1050
+ z-index: 1500
+
.oe_webclient_timezone_notification
a
color: white
@@ -2220,11 +2222,14 @@ $sheet-padding: 16px
padding: 3px 6px
white-space: pre-line
> td, > th
- > button.btn_img
+ > button
border: none
background: transparent
padding: 0
- @include box-shadow(none)
+ > button.btn_txt
+ border: 1px solid rgba(0,0,0,0.4)
+ background: #e3e3e3
+ padding: 3px 12px
> td.oe_list_checkbox:first-child, th.oe_list_checkbox:first-child
width: 17px
&:after
@@ -2736,6 +2741,9 @@ body.oe_single_form
.oe_act_window.modal-body
padding: 0
+.ui-datepicker
+ z-index: 1500 !important
+
input[type="radio"], input[type="checkbox"]
margin-right: 4px
margin-left: 4px