summaryrefslogtreecommitdiff
path: root/addons/web/static/src/css
diff options
context:
space:
mode:
authorjke-openerp <jke@openerp.com>2014-01-27 18:24:14 +0100
committerjke-openerp <jke@openerp.com>2014-01-27 18:24:14 +0100
commit9f8bd865dc313339474db4ca0806f02f6e63039f (patch)
tree0d5a89530fb96eae9840c3979c19355ab73174d0 /addons/web/static/src/css
parentf4e33da924ae41ff88d1531d4f2cbe550e14fa88 (diff)
[IMP] Fix css with header of no_form, Fix css for Entypo lin height, Fix js positionning for search no_result, allow click on + in kanban when no_result (ask of fp)
bzr revid: jke@openerp.com-20140127172414-qftefwct3zbgfvrt
Diffstat (limited to 'addons/web/static/src/css')
-rw-r--r--addons/web/static/src/css/base.css39
-rw-r--r--addons/web/static/src/css/base.sass18
2 files changed, 32 insertions, 25 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index ea57a7b8bdb..3220d6a10c2 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");
@@ -349,6 +349,7 @@
font-family: "entypoRegular" !important;
font-size: 34px;
font-weight: 300 !important;
+ line-height: 100%;
}
.openerp .oe_left {
float: left;
@@ -658,10 +659,6 @@
display: block;
color: gray;
}
-.openerp .ui-tabs .oe_notebook.ui-tabs-nav li.ui-tabs-active {
- border-bottom: none;
- padding-bottom: 1px;
-}
.openerp .oe_notebook > li.ui-tabs-active > a {
color: #4c4c4c;
}
@@ -687,6 +684,10 @@
background-color: #eeeeee;
border-color: #eeeeee #eeeeee #dddddd;
}
+.openerp .ui-tabs .oe_notebook.ui-tabs-nav li.ui-tabs-active {
+ border-bottom: none;
+ padding-bottom: 1px;
+}
.openerp .oe_notebook > li.ui-state-active > a, .openerp .oe_notebook > li.ui-state-active > a:hover {
background-color: white;
border: 1px solid #dddddd;
@@ -2022,8 +2023,21 @@
.openerp .oe_application .oe_form_sheet .oe_notebook_page {
padding: 0 16px;
}
+.openerp .oe_form > :not(.oe_form_nosheet) header {
+ padding-left: 2px;
+}
+.openerp .oe_form > :not(.oe_form_nosheet) header ul {
+ display: inline-block;
+ float: right;
+}
+.openerp .oe_form > :not(.oe_form_nosheet) header .oe_button {
+ margin: 3px 2px 1px;
+ float: left;
+}
+.openerp .oe_form > :not(.oe_form_nosheet) header .oe_button:first-child {
+ margin-left: 6px;
+}
.openerp .oe_form header {
- position: relative;
border-bottom: 1px solid #cacaca;
padding-left: 2px;
background-color: #ededed;
@@ -2037,17 +2051,6 @@
.openerp .oe_form header > span {
margin-left: 4px;
}
-.openerp .oe_form header ul {
- display: inline-block;
- float: right;
-}
-.openerp .oe_form header .oe_button {
- margin: 3px 2px 1px;
- float: left;
-}
-.openerp .oe_form header .oe_button:first-child {
- margin-left: 6px;
-}
.openerp .oe_form header .oe_tags {
margin: 5px 0 0 5px;
width: 400px;
@@ -2150,7 +2153,7 @@
}
.openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
font-size: 80%;
- color: darkgreen;
+ color: darkGreen;
vertical-align: top;
position: relative;
top: -4px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index b280c8209a4..9f1b000704a 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -369,6 +369,7 @@ $sheet-padding: 16px
font-family: "entypoRegular" !important
font-size: 34px
font-weight: 300 !important
+ line-height: 100%
.oe_left
float: left
margin-right: 8px
@@ -1639,13 +1640,8 @@ $sheet-padding: 16px
padding: 0 16px
// }}}
// FormView.header {{{
- .oe_form header
- position: relative
- border-bottom: 1px solid #cacaca
+ .oe_form > :not(.oe_form_nosheet) header
padding-left: 2px
- @include vertical-gradient(#fcfcfc, #dedede)
- > span
- margin-left: 4px
ul
display: inline-block
float: right
@@ -1654,6 +1650,14 @@ $sheet-padding: 16px
float: left
&:first-child
margin-left: 6px
+
+ .oe_form header
+ border-bottom: 1px solid #cacaca
+ padding-left: 2px
+ @include vertical-gradient(#fcfcfc, #dedede)
+ > span
+ margin-left: 4px
+
// }}}
// FormView.custom tags and classes {{{
.oe_form
@@ -1981,7 +1985,7 @@ $sheet-padding: 16px
.oe_e
position: relative
top: -1px
- left: -9px
+ left: -9px
input.oe_form_binary_file
display: inline-block
margin-left: -85px