From f51b91c345a884deaf2c70d42c8716b4addc09b1 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 14 Jan 2014 16:12:43 +0100 Subject: [FIX] website: mobile snippets height bzr revid: chm@openerp.com-20140114151243-u1rjzw0exhskukbx --- addons/website/static/src/css/website.css | 11 +++++++++-- addons/website/static/src/css/website.sass | 4 ++++ 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'addons/website/static/src/css') diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index ca59f4c5697..9092b347e1f 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -1,3 +1,4 @@ +@charset "utf-8"; /* THIS CSS FILE IS FOR WEBSITE THEMING CUSTOMIZATION ONLY * * css for editor buttons, openerp widget included in the website and other @@ -334,10 +335,15 @@ ul.nav-stacked > li > a { } /* ---- SNIPPETS --- */ -[data-snippet-id],.colmd,.hr,.blockquote { - overflow: hidden; +[data-snippet-id], .colmd, .hr, .blockquote { + overflow: hidden; } +@media (max-width: 400px) { + [data-snippet-id] { + height: auto !important; + } +} .carousel-inner { height: 100%; } @@ -345,6 +351,7 @@ ul.nav-stacked > li > a { height: 100%; background-size: 100%; } + .carousel .carousel-caption { left: auto; right: auto; diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index ab13d795465..ec7984505f8 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -245,6 +245,10 @@ ul.nav-stacked > li > a [data-snippet-id],.colmd,.hr,.blockquote overflow: hidden +@media (max-width: 400px) + [data-snippet-id] + height: auto !important + .carousel-inner height: 100% .item -- cgit v1.2.3 From dac3058100b29d961908fa40b4e082049ceaab5c Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 14 Jan 2014 17:04:34 +0100 Subject: [IMP] website: This page is under construction bzr revid: chm@openerp.com-20140114160434-wukbj48ope1twhja --- addons/website/static/src/css/editor.css | 11 ++++++++++- addons/website/static/src/css/editor.sass | 6 ++++++ addons/website/static/src/css/website.css | 4 ++-- addons/website/static/src/css/website.sass | 4 ++-- 4 files changed, 20 insertions(+), 5 deletions(-) (limited to 'addons/website/static/src/css') diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index 79fcdb68ce0..11cfad48583 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -103,6 +103,14 @@ top: 2px; } +.oe_structure.oe_empty:empty, [data-oe-type=html]:empty, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child { + background-image: url("/website/static/src/img/edit_here.png") !important; +} + +.oe_structure.oe_empty:empty:before, [data-oe-type=html]:empty:before, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child:before, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child:before { + content: "Press The Top-Left Edit Button" !important; +} + /* ---- EDITOR BAR ---- {{{ */ table.editorbar-panel { cursor: pointer; @@ -433,8 +441,9 @@ ul.oe_menu_editor .disclose { /* ---- SNIPPET MANIPULATOR ---- {{{ */ .resize_editor_busy { - background-color: rgba(0,0,0,0.1); + background-color: rgba(0, 0, 0, 0.3); } + .oe_overlay { display: none; position: absolute; diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 78af810448f..0ea928dba86 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -85,6 +85,12 @@ position: relative !important top: +2px +.oe_structure.oe_empty:empty, [data-oe-type=html]:empty, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child + background-image: url('/website/static/src/img/edit_here.png') !important + +.oe_structure.oe_empty:empty:before, [data-oe-type=html]:empty:before, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child:before, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child:before + content: 'Press The Top-Left Edit Button' !important + // }}} /* ---- EDITOR BAR ---- {{{ */ diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index 9092b347e1f..425fbd17ea6 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -234,7 +234,7 @@ footer { } .oe_structure.oe_empty:empty, [data-oe-type=html]:empty, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child { - background-image: url("/website/static/src/img/edit_here.png"); + background-image: url("/website/static/src/img/under_construction.png"); background-repeat: no-repeat; background-position: center; height: 220px !important; @@ -245,7 +245,7 @@ footer { } .oe_structure.oe_empty:empty:before, [data-oe-type=html]:empty:before, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child:before, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child:before { - content: "Press The Top-Left Edit Button"; + content: "This page is under construction"; text-align: center; display: block; padding-top: 160px; diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index ec7984505f8..cb7a86c3d02 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -154,7 +154,7 @@ footer background-image: url('/website/static/src/img/drag_here.png') .oe_structure.oe_empty:empty, [data-oe-type=html]:empty, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child - background-image: url('/website/static/src/img/edit_here.png') + background-image: url('/website/static/src/img/under_construction.png') background-repeat: no-repeat background-position: center height: 220px !important @@ -163,7 +163,7 @@ footer position: static .oe_structure.oe_empty:empty:before, [data-oe-type=html]:empty:before, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child:before, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child:before - content: 'Press The Top-Left Edit Button' + content: 'This page is under construction' text-align: center display: block padding-top: 160px -- cgit v1.2.3 From 45feba1f864565f01919f37c9411ac71b7c178ae Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 14 Jan 2014 17:29:25 +0100 Subject: [IMP]website_sale: no product message for public users bzr revid: chm@openerp.com-20140114162925-z1gcl5h2rkxb7crx --- addons/website/static/src/css/editor.css | 4 ++++ addons/website/static/src/css/editor.sass | 3 +++ addons/website/static/src/css/website.css | 4 ++++ addons/website/static/src/css/website.sass | 3 +++ 4 files changed, 14 insertions(+) (limited to 'addons/website/static/src/css') diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index 11cfad48583..d786830c8f5 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -81,6 +81,10 @@ outline: none !important; } +.css_editable_display { + display: block !important; +} + .css_non_editable_mode_hidden { display: none; } diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 0ea928dba86..66665252379 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -67,6 +67,9 @@ .oe_editable:focus outline: none !important +.css_editable_display + display: block !important + .css_non_editable_mode_hidden display: none diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index 425fbd17ea6..a047753ebfc 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -258,6 +258,10 @@ footer { content: "Drag Building Blocks Here"; } +.css_editable_display { + display: none; +} + /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */ .navbar .nav > li > p { margin-bottom: 0px; diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index cb7a86c3d02..c509bebce55 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -174,6 +174,9 @@ footer .oe_structure.oe_editable.oe_empty:empty:before, .oe_editable[data-oe-type=html]:empty:before, .oe_structure.oe_editable.oe_empty > .oe_drop_zone.oe_insert:only-child:before, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child:before content: 'Drag Building Blocks Here' +.css_editable_display + display: none + /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */ .navbar .nav > li > p -- cgit v1.2.3