From 9ad05c699bf634ca6ee0800ac96638529433aae0 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Mon, 8 Aug 2011 16:46:16 +0530 Subject: [IMP]Implement shortcut functionality. bzr revid: vme@tinyerp.com-20110808111616-2qi3d6hfebix0uho --- addons/base/static/src/css/base.css | 54 +++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'addons/base/static/src/css') diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css index 7f670be071f..15e8979a985 100644 --- a/addons/base/static/src/css/base.css +++ b/addons/base/static/src/css/base.css @@ -1180,3 +1180,57 @@ background: linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* W3C */ -webkit-box-shadow: none; box-shadow: none; } +/* Shortcuts*/ +#shortcut_add_remove { + height: 20px; + padding: 0; + width: 24px; + cursor: pointer; + display: inline; /*IE7 */ + display: inline-block; +} +.shortcut-add { + background: url(../img/add-shortcut.png) no-repeat; + background-position: bottom; +} +.shortcut-remove{ + background: url(../img/remove-shortcut.png) no-repeat; + background-position: bottom; +} +/* ================ */ +#shortcuts { + position: absolute; + + margin: 0; + padding: 6px 5px; + top: 37px; + left: 197px; + right: 0; + height: 17px; + line-height: 1.2; +} +#shortcuts ul { + display: block; + overflow: hidden; + list-style: none; + white-space: nowrap; + padding: 0; + margin: 0; +} +#shortcuts li { + cursor: pointer; + display: -moz-inline-stack; + display: inline-block; + display: inline; /*IE7 */ + color: #fff; + text-align: center; + border-left: 1px solid #909090; + padding-left: 4px; + font-size: 90%; + font-weight: normal; +} +#shortcuts li:first-child, +#shortcuts li.first { + border-left: none; + padding-left: 0; +} -- cgit v1.2.3 From f17f4bbd481ec40b66a122a8c694675994e19603 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Fri, 12 Aug 2011 12:42:48 +0530 Subject: [IMP]checked that shortcut are from either ir.ui.menu or it is tree view bzr revid: vme@tinyerp.com-20110812071248-y9oqa8t1wx61xciu --- addons/base/static/src/css/base.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/base/static/src/css') diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css index 15e8979a985..b99dcd5a077 100644 --- a/addons/base/static/src/css/base.css +++ b/addons/base/static/src/css/base.css @@ -1190,11 +1190,11 @@ background: linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* W3C */ display: inline-block; } .shortcut-add { - background: url(../img/add-shortcut.png) no-repeat; + background: url(/base/static/src/img/add-shortcut.png) no-repeat; background-position: bottom; } .shortcut-remove{ - background: url(../img/remove-shortcut.png) no-repeat; + background: url(/base/static/src/img/remove-shortcut.png) no-repeat; background-position: bottom; } /* ================ */ -- cgit v1.2.3 From b1e8671583108397dc95c185bb281b69947f4295 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 16 Aug 2011 12:26:20 +0200 Subject: [IMP] remove some dead code, simplify shortcuts template, replace shortcut id by class bzr revid: xmo@openerp.com-20110816102620-b7zodiqoi91rz0m1 --- addons/base/static/src/css/base.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'addons/base/static/src/css') diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css index b99dcd5a077..2b85cedd6a9 100644 --- a/addons/base/static/src/css/base.css +++ b/addons/base/static/src/css/base.css @@ -1198,7 +1198,7 @@ background: linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* W3C */ background-position: bottom; } /* ================ */ -#shortcuts { +.oe-shortcuts { position: absolute; margin: 0; @@ -1209,7 +1209,7 @@ background: linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* W3C */ height: 17px; line-height: 1.2; } -#shortcuts ul { +.oe-shortcuts ul { display: block; overflow: hidden; list-style: none; @@ -1217,7 +1217,7 @@ background: linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* W3C */ padding: 0; margin: 0; } -#shortcuts li { +.oe-shortcuts li { cursor: pointer; display: -moz-inline-stack; display: inline-block; @@ -1229,8 +1229,8 @@ background: linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* W3C */ font-size: 90%; font-weight: normal; } -#shortcuts li:first-child, -#shortcuts li.first { +.oe-shortcuts li:first-child, +.oe-shortcuts li.first { border-left: none; padding-left: 0; } -- cgit v1.2.3 From 1d5f8506c8aa1677a13b89509a5f0d4903db085a Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 16 Aug 2011 14:35:10 +0200 Subject: [IMP] cleanup shortcuts toggle code bzr revid: xmo@openerp.com-20110816123510-gcx0dk8b2sgox5oi --- addons/base/static/src/css/base.css | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'addons/base/static/src/css') diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css index 2b85cedd6a9..11fa3015f01 100644 --- a/addons/base/static/src/css/base.css +++ b/addons/base/static/src/css/base.css @@ -1181,21 +1181,17 @@ background: linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* W3C */ box-shadow: none; } /* Shortcuts*/ -#shortcut_add_remove { +.oe-shortcut-toggle { height: 20px; padding: 0; width: 24px; cursor: pointer; display: inline; /*IE7 */ display: inline-block; + background: url(/base/static/src/img/add-shortcut.png) no-repeat bottom; } -.shortcut-add { - background: url(/base/static/src/img/add-shortcut.png) no-repeat; - background-position: bottom; -} -.shortcut-remove{ - background: url(/base/static/src/img/remove-shortcut.png) no-repeat; - background-position: bottom; +.oe-shortcut-remove{ + background: url(/base/static/src/img/remove-shortcut.png) no-repeat bottom; } /* ================ */ .oe-shortcuts { -- cgit v1.2.3 From c30f8b0d8830de4d587db30e097a5e4f81dcdc90 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 16 Aug 2011 16:08:24 +0200 Subject: [IMP] CSS: fix position of shortcut-toggle-star and padding on the sides of the actual shortcuts bzr revid: xmo@openerp.com-20110816140824-abeamy4qqpkoserz --- addons/base/static/src/css/base.css | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'addons/base/static/src/css') diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css index 11fa3015f01..d08076fcf7f 100644 --- a/addons/base/static/src/css/base.css +++ b/addons/base/static/src/css/base.css @@ -1186,9 +1186,9 @@ background: linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* W3C */ padding: 0; width: 24px; cursor: pointer; - display: inline; /*IE7 */ - display: inline-block; + display: block; background: url(/base/static/src/img/add-shortcut.png) no-repeat bottom; + float: left; } .oe-shortcut-remove{ background: url(/base/static/src/img/remove-shortcut.png) no-repeat bottom; @@ -1221,12 +1221,11 @@ background: linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* W3C */ color: #fff; text-align: center; border-left: 1px solid #909090; - padding-left: 4px; + padding: 4px; font-size: 90%; font-weight: normal; } -.oe-shortcuts li:first-child, -.oe-shortcuts li.first { +.oe-shortcuts li:first-child { border-left: none; padding-left: 0; } -- cgit v1.2.3