From bda0a4fa366de2ca208712910051462fd333fe40 Mon Sep 17 00:00:00 2001 From: ddm Date: Tue, 27 Aug 2013 09:04:35 +0200 Subject: SEO configurator mockup bzr revid: ddm@openerp.com-20130827070435-bqrhg887ynz1f6ys --- addons/website/static/src/css/editor.sass | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'addons/website/static/src/css/editor.sass') diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 29621f95e4b..16ff37371ff 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -194,7 +194,7 @@ $mobile_preview_background: #000000 $mobile_preview_border: #1A1A1A -$mobile_preview_close: #E00101 +$icon_close: #E00101 #mobile-preview.modal height: 660px background-color: $mobile_preview_background @@ -233,5 +233,15 @@ $mobile_preview_close: #E00101 color: lightgrey opacity: 1 .close:hover - color: $mobile_preview_close + color: $icon_close opacity: 1 + +.oe_seo_configuration + input + width: inherit + textarea + width: inherit + ul + list-style: none + .oe_remove + color: $icon_close -- cgit v1.2.3 From f880ce9ae7057628ded1337bab31f7dbff1bad90 Mon Sep 17 00:00:00 2001 From: ddm Date: Tue, 27 Aug 2013 09:48:16 +0200 Subject: Code cleanup bzr revid: ddm@openerp.com-20130827074816-1kuvpbz6vubhel68 --- addons/website/static/src/css/editor.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/website/static/src/css/editor.sass') diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 16ff37371ff..87e8715e931 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -195,7 +195,7 @@ $mobile_preview_background: #000000 $mobile_preview_border: #1A1A1A $icon_close: #E00101 -#mobile-preview.modal +.oe_mobile_preview.modal height: 660px background-color: $mobile_preview_background border: 2px solid -- cgit v1.2.3 From 5ddbdeac96ab3bb4acb339ff5a36368e047abcef Mon Sep 17 00:00:00 2001 From: ddm Date: Tue, 27 Aug 2013 11:32:37 +0200 Subject: SEO keywords list mockup bzr revid: ddm@openerp.com-20130827093237-v13oihsyhadl92w3 --- addons/website/static/src/css/editor.sass | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'addons/website/static/src/css/editor.sass') diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 87e8715e931..571722d6466 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -245,3 +245,9 @@ $icon_close: #E00101 list-style: none .oe_remove color: $icon_close + +.oe_seo_keywords_list + width: 35em + li + float: left + width: 10em \ No newline at end of file -- cgit v1.2.3 From be165dbb7a32a1990dcd151c4bb2e66ab3be91f1 Mon Sep 17 00:00:00 2001 From: ddm Date: Tue, 27 Aug 2013 13:35:50 +0200 Subject: SEO tools visual cleanup bzr revid: ddm@openerp.com-20130827113550-xi8r0qs8oz2uu990 --- addons/website/static/src/css/editor.sass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/website/static/src/css/editor.sass') diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 571722d6466..c75946d7c6b 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -247,7 +247,7 @@ $icon_close: #E00101 color: $icon_close .oe_seo_keywords_list - width: 35em + width: 39em li float: left - width: 10em \ No newline at end of file + width: 12em \ No newline at end of file -- cgit v1.2.3 From 59819fac142e0a53e8c8ca06a8cb38d6b7dd8b59 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 27 Aug 2013 15:04:56 +0200 Subject: [IMP] cleaned CKEditor, minimal CSS change bzr revid: fp@tinyerp.com-20130827130456-c3u40tesfalapj7z --- addons/website/static/src/css/editor.sass | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'addons/website/static/src/css/editor.sass') diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index c75946d7c6b..031b27a10db 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -1,5 +1,22 @@ @charset "utf-8" +/* ---- CKEditor Minimal Reset ---- */ + +.navbar.navbar-inverse .cke_chrome + border: none + +.navbar.navbar-inverse .cke_inner + background: transparent + +.navbar.navbar-inverse .cke_top + background: transparent + border: none + box-shadow: none + -webkit-box-shadow: none + -moz-box-shadow: none + +/* ---- OpenERP Style ---- */ + .oe_hidden display: none !important @@ -250,4 +267,4 @@ $icon_close: #E00101 width: 39em li float: left - width: 12em \ No newline at end of file + width: 12em -- cgit v1.2.3 From fcd97879e3cd57a15f91db81ff88da7c6c114b98 Mon Sep 17 00:00:00 2001 From: ddm Date: Tue, 27 Aug 2013 16:12:35 +0200 Subject: Improve SEO tools CSS across themes bzr revid: ddm@openerp.com-20130827141235-wfrx21hqem1v076b --- addons/website/static/src/css/editor.sass | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'addons/website/static/src/css/editor.sass') diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 031b27a10db..330686d4bf0 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -203,12 +203,14 @@ .oe_handle.nw,.oe_handle.w,.oe_handle.sw left: 0px -/* ---- MOBILE PREVIEW ---- */ +/* ---- MODAL DIALOGS ---- */ .oe_stop_scrolling height: 100% overflow: hidden +/* ---- MOBILE PREVIEW ---- */ + $mobile_preview_background: #000000 $mobile_preview_border: #1A1A1A $icon_close: #E00101 @@ -247,24 +249,27 @@ $icon_close: #E00101 .oe_mobile_preview_header .close - color: lightgrey + color: $mobile_preview_border opacity: 1 .close:hover color: $icon_close opacity: 1 +/* ---- SEO TOOLS ---- */ + +$remove_color: $icon_close .oe_seo_configuration input - width: inherit + width: 90% textarea - width: inherit + width: 90% ul list-style: none .oe_remove - color: $icon_close + color: $remove_color .oe_seo_keywords_list - width: 39em + width: 80% li float: left - width: 12em + width: 15em -- cgit v1.2.3 From eb039323d27820bc64f7b42c490d60f570588b62 Mon Sep 17 00:00:00 2001 From: ddm Date: Tue, 27 Aug 2013 16:13:40 +0200 Subject: OOps bzr revid: ddm@openerp.com-20130827141340-3ll60as5zpzp6l3v --- addons/website/static/src/css/editor.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/website/static/src/css/editor.sass') diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 330686d4bf0..1b2dae40f56 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -249,7 +249,7 @@ $icon_close: #E00101 .oe_mobile_preview_header .close - color: $mobile_preview_border + color: lightgrey opacity: 1 .close:hover color: $icon_close -- cgit v1.2.3 From 3c9f07d244cb88efede8dd27c4786a90fea9932e Mon Sep 17 00:00:00 2001 From: ddm Date: Wed, 28 Aug 2013 15:55:58 +0200 Subject: SEO: keyword suggest mockup bzr revid: ddm@openerp.com-20130828135558-w4ysgixr6l7n45b5 --- addons/website/static/src/css/editor.sass | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'addons/website/static/src/css/editor.sass') diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 1b2dae40f56..74885a380ee 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -259,6 +259,10 @@ $icon_close: #E00101 $remove_color: $icon_close .oe_seo_configuration + min-width: 42em + .modal-body + max-height: inherit + min-height: 27em input width: 90% textarea @@ -269,7 +273,8 @@ $remove_color: $icon_close color: $remove_color .oe_seo_keywords_list - width: 80% + width: 100% + margin: 0.1em li float: left - width: 15em + width: 19em -- cgit v1.2.3 From bc5c8a082894b824d3d9a83010b082031b07690a Mon Sep 17 00:00:00 2001 From: ddm Date: Thu, 29 Aug 2013 18:39:52 +0200 Subject: SEO screen based on mockup (partial) bzr revid: ddm@openerp.com-20130829163952-v41gi10q7ths1elt --- addons/website/static/src/css/editor.sass | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'addons/website/static/src/css/editor.sass') diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 74885a380ee..c32fcbc1c44 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -259,22 +259,24 @@ $icon_close: #E00101 $remove_color: $icon_close .oe_seo_configuration - min-width: 42em + &.modal + width: 100% + left: 0 + margin-left: 0 + top: 0!important + margin-top: 0!important + height: 100% .modal-body - max-height: inherit - min-height: 27em - input - width: 90% - textarea - width: 90% + max-height: 100% + height: 100% ul list-style: none .oe_remove color: $remove_color .oe_seo_keywords_list - width: 100% - margin: 0.1em - li + &.container + margin: 0.1em + .oe_seo_keyword float: left - width: 19em + padding-right: 0.5em -- cgit v1.2.3 From ccc3465dec7b4289b659caeb9db248d706b82690 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 30 Aug 2013 09:09:06 +0200 Subject: [IMP] bootstrap 3: oe_hidden -> hide bzr revid: fp@tinyerp.com-20130830070906-f9gr24iq95oz6bp2 --- addons/website/static/src/css/editor.sass | 3 --- 1 file changed, 3 deletions(-) (limited to 'addons/website/static/src/css/editor.sass') diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index c32fcbc1c44..d74fb57234b 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -17,9 +17,6 @@ /* ---- OpenERP Style ---- */ -.oe_hidden - display: none !important - .oe_website_editorbar position: fixed top: 0 -- cgit v1.2.3 From 3db7d635c00ea31454ad2d96872318b8cc36ad57 Mon Sep 17 00:00:00 2001 From: ddm Date: Fri, 30 Aug 2013 13:21:24 +0200 Subject: Mobile preview + SEO: Bootstrap 3 bzr revid: ddm@openerp.com-20130830112124-ht5wnngxa8fwlrdh --- addons/website/static/src/css/editor.sass | 92 +++++++++++++------------------ 1 file changed, 37 insertions(+), 55 deletions(-) (limited to 'addons/website/static/src/css/editor.sass') diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index d74fb57234b..dadf36a7cd4 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -200,72 +200,54 @@ .oe_handle.nw,.oe_handle.w,.oe_handle.sw left: 0px -/* ---- MODAL DIALOGS ---- */ - -.oe_stop_scrolling - height: 100% - overflow: hidden - /* ---- MOBILE PREVIEW ---- */ $mobile_preview_background: #000000 $mobile_preview_border: #1A1A1A $icon_close: #E00101 -.oe_mobile_preview.modal - height: 660px - background-color: $mobile_preview_background - border: 2px solid - border-radius: 10px - border-color: $mobile_preview_border - margin: auto - top: 0 - left: 0 - bottom: 0 - right: 0 - max-width: 330px - .modal-header - background-color: $mobile_preview_background - border-bottom: 0 - border-top-left-radius: 10px - border-top-right-radius: 10px - .oe_mobile_preview_title - color: $mobile_preview_border - .modal-body +.oe_mobile_preview + &.modal .modal-content + height: 660px background-color: $mobile_preview_background - max-height: 600px - padding: 0 - margin: 0 - .modal-footer - background-color: $mobile_preview_background - -.oe_mobile_viewport - width: 320px - height: 568px - padding: 5px - border: none - -.oe_mobile_preview_header - .close - color: lightgrey - opacity: 1 - .close:hover - color: $icon_close - opacity: 1 + border: 2px solid + border-radius: 10px + border-color: $mobile_preview_border + margin: auto + top: 0 + left: 0 + bottom: 0 + right: 0 + max-width: 330px + .modal-header + background-color: $mobile_preview_background + border-bottom: 0 + border-top-left-radius: 10px + border-top-right-radius: 10px + .modal-title + color: $mobile_preview_border + .close + color: lightgrey + opacity: 1 + .close:hover + color: $icon_close + opacity: 1 + .modal-body + background-color: $mobile_preview_background + max-height: 600px + padding: 0 + margin: 0 + .oe_mobile_viewport + width: 320px + height: 568px + padding: 5px + border: none + .modal-footer + background-color: $mobile_preview_background /* ---- SEO TOOLS ---- */ $remove_color: $icon_close .oe_seo_configuration - &.modal - width: 100% - left: 0 - margin-left: 0 - top: 0!important - margin-top: 0!important - height: 100% - .modal-body - max-height: 100% - height: 100% ul list-style: none .oe_remove -- cgit v1.2.3 From 8b0f006398b2c53b5d582b6b07d229987886fb6c Mon Sep 17 00:00:00 2001 From: ddm Date: Fri, 30 Aug 2013 15:19:52 +0200 Subject: Mobile preview & SEO: more Bootstrap 3 fixes bzr revid: ddm@openerp.com-20130830131952-fmmnhvawlrbekxay --- addons/website/static/src/css/editor.sass | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'addons/website/static/src/css/editor.sass') diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index dadf36a7cd4..4f38f52c463 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -203,7 +203,7 @@ /* ---- MOBILE PREVIEW ---- */ $mobile_preview_background: #000000 -$mobile_preview_border: #1A1A1A +$mobile_preview_border: #1C1F1F $icon_close: #E00101 .oe_mobile_preview &.modal .modal-content @@ -248,14 +248,13 @@ $icon_close: #E00101 $remove_color: $icon_close .oe_seo_configuration - ul - list-style: none - .oe_remove - color: $remove_color - -.oe_seo_keywords_list - &.container - margin: 0.1em - .oe_seo_keyword - float: left - padding-right: 0.5em + .modal-dialog + width: 80% + .oe_seo_keywords_list + &.container + margin: 0.1em + .oe_seo_keyword + float: left + padding-right: 0.5em + .oe_remove + color: $remove_color -- cgit v1.2.3 From f50b273ae12493e227806670d9a866b6be162551 Mon Sep 17 00:00:00 2001 From: ddm Date: Mon, 2 Sep 2013 11:37:55 +0200 Subject: SEO dialog (without save) bzr revid: ddm@openerp.com-20130902093755-05wins912upe47qj --- addons/website/static/src/css/editor.sass | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'addons/website/static/src/css/editor.sass') diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 4f38f52c463..8672c40439c 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -250,11 +250,5 @@ $remove_color: $icon_close .oe_seo_configuration .modal-dialog width: 80% - .oe_seo_keywords_list - &.container - margin: 0.1em - .oe_seo_keyword - float: left - padding-right: 0.5em - .oe_remove - color: $remove_color + .oe_remove + color: $remove_color -- cgit v1.2.3 From e44332e5f7a50302cb1698a3ba8395d242e4d11b Mon Sep 17 00:00:00 2001 From: ddm Date: Mon, 2 Sep 2013 15:39:23 +0200 Subject: SEO bugfixes bzr revid: ddm@openerp.com-20130902133923-hhzfe0gv4t6usd22 --- addons/website/static/src/css/editor.sass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'addons/website/static/src/css/editor.sass') diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 8672c40439c..662268c6227 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -252,3 +252,5 @@ $remove_color: $icon_close width: 80% .oe_remove color: $remove_color + .oe_seo_suggestion + cursor: pointer -- cgit v1.2.3 From 653ad4de24c62ba12b0f21e310f933b8f1166647 Mon Sep 17 00:00:00 2001 From: ddm Date: Tue, 3 Sep 2013 16:51:32 +0200 Subject: SEO refactoring bzr revid: ddm@openerp.com-20130903145132-5uppe457x0x19a42 --- addons/website/static/src/css/editor.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/website/static/src/css/editor.sass') diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 662268c6227..321cc2b3501 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -253,4 +253,4 @@ $remove_color: $icon_close .oe_remove color: $remove_color .oe_seo_suggestion - cursor: pointer + cursor: pointer \ No newline at end of file -- cgit v1.2.3 From 7704ce7e03b0fb6d27f24873739190a10086d26d Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 4 Sep 2013 10:49:58 +0200 Subject: [IMP] website_sale: add product in website bzr revid: chm@openerp.com-20130904084958-6rq5xu0xjwzcv399 --- addons/website/static/src/css/editor.sass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'addons/website/static/src/css/editor.sass') diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 321cc2b3501..dd6e2f29146 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -58,6 +58,9 @@ .oe_editable:focus outline: none !important +.css_non_editable_mode_hidden: + display: none + .oe_carousel_options cursor: pointer position: absolute -- cgit v1.2.3 From 20e0db456f005faf165e5dfa44bfb0f567e7e44e Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 4 Sep 2013 16:01:38 +0200 Subject: [IMP] wwebsite: add option background and style in snippets carousel bzr revid: chm@openerp.com-20130904140138-tvt640suoiln13fx --- addons/website/static/src/css/editor.sass | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'addons/website/static/src/css/editor.sass') diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index dd6e2f29146..e68ce289526 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -67,6 +67,11 @@ white-space: nowrap z-index: 1 display: none + > * + display: inline-block !important + vertical-align: middle !important + position: relative !important + top: +2px; /* ---- SNIPPET EDITOR ---- */ -- cgit v1.2.3 From c68f584988f7ebf35f430b1b4d6e2f5e627343f1 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 5 Sep 2013 10:20:42 +0200 Subject: [FIX] website: sass & css bzr revid: chm@openerp.com-20130905082042-6n359n6ot5wntk0k --- addons/website/static/src/css/editor.sass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/website/static/src/css/editor.sass') diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index e68ce289526..ec009b64ec2 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -58,7 +58,7 @@ .oe_editable:focus outline: none !important -.css_non_editable_mode_hidden: +.css_non_editable_mode_hidden display: none .oe_carousel_options @@ -71,7 +71,7 @@ display: inline-block !important vertical-align: middle !important position: relative !important - top: +2px; + top: +2px /* ---- SNIPPET EDITOR ---- */ -- cgit v1.2.3