From aa63c564629e6f3ecb72f1d8039e353158a1754d Mon Sep 17 00:00:00 2001 From: "chm@openerp.com" <> Date: Wed, 26 Mar 2014 15:16:29 +0100 Subject: [IMP] website editor: add style button on image bzr revid: chm@openerp.com-20140326141629-diz4rk0789no7yyl --- addons/website/static/src/css/editor.sass | 3 ++- 1 file changed, 2 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 4571dcd257e..c0f946e0f6f 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -259,7 +259,8 @@ $attachment-border-color: #848490 outline: 1px solid red !important background-color: #ffd9dd !important -.hover-edition-button +.hover-edition + display: inline-block position: absolute top: 0 left: 0 -- cgit v1.2.3 From c15e5b5163de3310b4ffe9f486df79ecbe80e445 Mon Sep 17 00:00:00 2001 From: "chm@openerp.com" <> Date: Thu, 27 Mar 2014 11:51:03 +0100 Subject: [WIP] website media editor bzr revid: chm@openerp.com-20140327105103-r4laze34bf0z62o2 --- 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 c0f946e0f6f..4543fce4500 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -266,6 +266,12 @@ $attachment-border-color: #848490 left: 0 // This z-index is due to .navbar of bootstrap z-index: 1000 +.preview-container + height: 100px + > * + max-height: 100px + margin: 0 auto + display: block // fontawesome .cke_editable .fa -- cgit v1.2.3 From c8d0175e61df8cc4abaf359b84a3453b4142cc10 Mon Sep 17 00:00:00 2001 From: "chm@openerp.com" <> Date: Thu, 27 Mar 2014 17:03:24 +0100 Subject: [IMP] website media editor: change template bzr revid: chm@openerp.com-20140327160324-yb1cwpsgqymxsf83 --- addons/website/static/src/css/editor.sass | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 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 4543fce4500..50f9b3e815e 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -150,7 +150,7 @@ ul.oe_menu_editor +user-select(auto) cursor: text !important -.modal-dialog.select-image +.modal-dialog.select-media width: 80% .modal .existing-attachments @@ -232,6 +232,10 @@ $attachment-border-color: #848490 border-top: none border-left: none +border-bottom-right-radius(8px) + &.media_selected + > i, > img + border-width: 5px + border-color: rgb(0, 248, 248) // wrapper positioned relatively for drag&drop widget which is disabled below. // Breaks completely horribly crazy products listing page, so take it out. @@ -264,14 +268,17 @@ $attachment-border-color: #848490 position: absolute top: 0 left: 0 - // This z-index is due to .navbar of bootstrap - z-index: 1000 + // This z-index is due to .navbar of bootstrap & jQuery-transfo + z-index: 1001 .preview-container + text-align: center + line-height: 100px height: 100px > * max-height: 100px + line-height: 100px margin: 0 auto - display: block + display: inline-block // fontawesome .cke_editable .fa -- cgit v1.2.3 From e289e23298fc91e675f0a7686d3a769ff53663fb Mon Sep 17 00:00:00 2001 From: "chm@openerp.com" <> Date: Thu, 27 Mar 2014 18:14:17 +0100 Subject: [WIP] website media editor bzr revid: chm@openerp.com-20140327171417-nz2cd8tn2dmmljge --- 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 50f9b3e815e..f3aeb492883 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -284,6 +284,9 @@ $attachment-border-color: #848490 .cke_editable .fa cursor: pointer +.img-responsive + text-align: center + // }}} /* ---- MOBILE PREVIEW ---- {{{ */ -- cgit v1.2.3 From 31269ba52fafb2238b027b3c42e81acbaacfd9d4 Mon Sep 17 00:00:00 2001 From: "chm@openerp.com" <> Date: Fri, 28 Mar 2014 15:16:19 +0100 Subject: [IMP] website: media editor doubleclick for video and begin to use snippet builder bzr revid: chm@openerp.com-20140328141619-x9okgixai2v5dekr --- 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 f3aeb492883..7a9c59d8167 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -77,6 +77,9 @@ .cke_editable .css_editable_mode_hidden display: none +.cke_editable .css_editable_mode_display + display: block !important + .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 -- cgit v1.2.3 From cdf4636dcefc3e2fd659774b43f72c5a3c75fa61 Mon Sep 17 00:00:00 2001 From: "chm@openerp.com" <> Date: Mon, 7 Apr 2014 10:17:51 +0200 Subject: [IMP] website: media editor: remove previous and next button for picto bzr revid: chm@openerp.com-20140407081751-upxilacnt4szk4s6 --- 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 7a9c59d8167..fb80fa47277 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -182,7 +182,7 @@ ul.oe_menu_editor .modal .font-icons-icons font-size: 2em - max-height: 6em + max-height: 9em overflow: auto .font-icons-icon -- cgit v1.2.3