From 0da2dd7d5fbbe7d67d04a96317e4dcde7db972f3 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 10 Apr 2012 12:08:16 +0200 Subject: [PATCH] pager css fix bzr revid: al@openerp.com-20120410100816-c8qcogm0e429953j --- addons/web/static/src/css/base.css | 20 ++------------------ addons/web/static/src/css/base.sass | 16 ++-------------- addons/web/static/src/xml/base.xml | 4 ++-- 3 files changed, 6 insertions(+), 34 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index ba2de0e0e85..12b078a17ba 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -931,6 +931,7 @@ height: 24px; line-height: 24px; padding: 0 8px; + display: inline-block; } .openerp2 .oe_pager_group { height: 24px; @@ -938,6 +939,7 @@ padding: 0 8px; display: inline-block; border: 1px solid #ababab; + cursor: pointer; -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; @@ -958,13 +960,6 @@ .openerp2 .oe_pager_group a:hover { text-decoration: none; } -.openerp2 .oe_pager_group button { - height: 24px; - padding: 0; - background: transparent; - border: 0 none; - overflow: visible; -} .openerp2 .oe_pager_group .active { background: #999999; -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; @@ -975,17 +970,6 @@ color: white; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); } -.openerp2 .oe_pager_group .oe_view_manager_buttons { - padding-right: 8px; - float: left; - margin-right: 12px; -} -.openerp2 .oe_pager_group .oe_view_manager_sidebar { - display: inline-block; -} -.openerp2 .oe_pager_group .oe_view_manager_pager { - float: right; -} .openerp2 .oe_view_manager_switch li { padding-left: 1px; text-align: center; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 957d436db31..b65f7982ac3 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -733,12 +733,14 @@ $colour4: #8a89ba height: 24px line-height: 24px padding: 0 8px + display: inline-block .oe_pager_group height: 24px line-height: 24px padding: 0 8px display: inline-block border: 1px solid #ababab + cursor: pointer @include radius(5px) li height: 24px @@ -752,26 +754,12 @@ $colour4: #8a89ba color: #4c4c4c &:hover text-decoration: none - button - height: 24px - padding: 0 - background: transparent - border: 0 none - overflow: visible .active background: #999 @include box-shadow(0 1px 4px rgba(0,0,0,0.3) inset) a color: #fff text-shadow: 0 1px 2px rgba(0,0,0,0.4) - .oe_view_manager_buttons - padding-right: 8px - float: left - margin-right: 12px - .oe_view_manager_sidebar - display: inline-block - .oe_view_manager_pager - float: right // }}} // ViewManager.switches {{{ .oe_view_manager_switch diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 27118a194e6..5077adf6b63 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -477,9 +477,9 @@ - +
- +