summaryrefslogtreecommitdiff
path: root/addons/web
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2013-06-05 12:52:40 +0200
committerXavier Morel <xmo@openerp.com>2013-06-05 12:52:40 +0200
commita0fbd674c96a2e09add489342eafada2afdbc190 (patch)
tree5d4628ab71f1bb905d556ade6f7b1b8188adec90 /addons/web
parentbdcb5531286ab84c8ad470fa0e068f0b70d663ff (diff)
[FIX] search view layout in case of very long facet value
* don't fix facet height so the facet content correctly "grows" all of the facet and thus the surrounding view * hard-code the heights of the view-level controls (clear and open drawer) to avoid both overly large hitbox and their moving outside of the top-right corner * add some margins on the facets container to avoid overlaps between top-level search controls and facet activable elements lp bug: https://launchpad.net/bugs/1123704 fixed bzr revid: xmo@openerp.com-20130605105240-h9o03ol7l8dti1yn
Diffstat (limited to 'addons/web')
-rw-r--r--addons/web/static/src/css/base.css13
-rw-r--r--addons/web/static/src/css/base.sass9
2 files changed, 10 insertions, 12 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 4c1a9ff65bd..cfc60fe0661 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1269,7 +1269,7 @@
color: white;
padding: 2px 4px;
margin: 1px 6px 0 0;
- border: 1px solid lightgrey;
+ border: 1px solid lightGray;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
@@ -1301,7 +1301,7 @@
transform: scale(1.1);
}
.openerp .oe_secondary_submenu .oe_active {
- border-top: 1px solid lightgrey;
+ border-top: 1px solid lightGray;
border-bottom: 1px solid #dedede;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
@@ -1669,14 +1669,14 @@
top: 0;
right: 18px;
width: 15px;
- height: 100%;
+ height: 24px;
background: url(../img/search_reset.gif) center center no-repeat;
}
.openerp .oe_searchview .oe_searchview_unfold_drawer {
position: absolute;
top: 0;
right: 0;
- height: 100%;
+ height: 24px;
padding: 0 7px 0 4px;
color: #cccccc;
cursor: pointer;
@@ -1725,7 +1725,7 @@
}
.openerp .oe_searchview .oe_searchview_facets {
min-height: 22px;
- margin-left: 15px;
+ margin: 0 35px 0 15px;
}
.openerp .oe_searchview .oe_searchview_facets * {
vertical-align: top;
@@ -1733,7 +1733,6 @@
line-height: 17px;
}
.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet {
- height: 18px;
margin: 1px 0;
font-size: 11px;
}
@@ -2284,7 +2283,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 88566b02d38..38758216a50 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1335,13 +1335,13 @@ $sheet-padding: 16px
top: 0
right: 18px
width: 15px
- height: 100%
+ height: 24px
background: url(../img/search_reset.gif) center center no-repeat
.oe_searchview_unfold_drawer
position: absolute
top: 0
right: 0
- height: 100%
+ height: 24px
padding: 0 7px 0 4px
color: #ccc
cursor: pointer
@@ -1374,13 +1374,12 @@ $sheet-padding: 16px
.oe_searchview_facets
min-height: 22px
- margin-left: 15px
+ margin: 0 35px 0 15px
*
vertical-align: top
display: inline-block
line-height: 17px
.oe_searchview_facet
- height: 18px
margin: 1px 0
font-size: 11px
&:focus
@@ -1402,7 +1401,7 @@ $sheet-padding: 16px
border-color: $tag-border-selected
@include box-shadow(0 0 3px 1px $tag-border-selected)
.oe_facet_values
- background: #f0f0fa
+ background: $tag-bg-light
@include radius(0 3px 3px 0)
.oe_facet_category, .oe_facet_value
height: 18px