From 3a3f7fbc1537b9f3be18bd5dec3c8ba46b8ce67d Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 18 Nov 2013 10:58:59 +0100 Subject: [FIX] menu css: narrower selector for icon-home in order to avoid children propagation bzr revid: fme@openerp.com-20131118095859-jizw6limr2b67xyt --- 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 918714ea92f..3896ced8648 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -132,7 +132,7 @@ div.oe_menu_buttons ul.oe_menu_editor .icon-home display: none - > li:first-child .icon-home + > li:first-child > div > span > .icon-home display: block .oe_menu_placeholder outline: 1px dashed #4183C4 -- cgit v1.2.3 From aa2208f580d1b189b9cf2d79cea72b4694f0da3d Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 20 Nov 2013 13:44:51 +0100 Subject: [IMP] sass/compass use in website.sass bzr revid: xmo@openerp.com-20131120124451-25m26kao051x6tam --- addons/website/static/src/css/editor.sass | 21 ++------------------- 1 file changed, 2 insertions(+), 19 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 3896ced8648..ea7bbb1480a 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -1,19 +1,6 @@ @charset "utf-8" -@import "compass/css3" -@import "compass/css3/user-interface" -@import "compass/css3/transition" - -//smartphones, iPhone, portrait 480x320 phones -$smart_phone: 320px -//portrait e-readers (Nook/Kindle), smaller tablets @ 600 or @ 640 wide.*/ -$small-tablet: 481px -//portrait tablets, portrait iPad, landscape e-readers, landscape 800x480 or 854x480 phones -$portrait-tablet: 641px -//tablet, landscape iPad, lo-res laptops ands desktops -$tablet: 961px -//big landscape tablets, laptops, and desktops -$desktop: 1025px +@import "common" /* ---- CKEditor Minimal Reset ---- */ @@ -303,7 +290,7 @@ ul.oe_menu_editor position: relative margin: 0px -24px !important &.oe_overlay - border-radius: 3px + +border-radius(3px) //@include background-image( repeating-linear-gradient(45deg, rgba(255,255,255,.1) ,rgba(255,255,255,.1) 35px, rgba(0,0,0,.1) 35px, rgba(0,0,0,.1) 75px)) //background-size: 100px 100px background: rgba(153, 0, 255,.5) @@ -507,10 +494,6 @@ $editorbar_height: 30px // TODO Fix => might break with themes $navbar_height: 51px -@mixin editor-font - font-size: 14px - font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace - line-height: normal .oe_ace_view_editor position: fixed top: $navbar_height -- cgit v1.2.3 From 20a0119ed630b4375723f0b74f4e9ae7c2bc75d4 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 28 Nov 2013 15:36:46 +0100 Subject: [IMP] website: hide publish/edit button on editable mode bzr revid: chm@openerp.com-20131128143646-fl3okv6wisqio8xq --- 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 ea7bbb1480a..1e35c352374 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -70,6 +70,9 @@ .css_non_editable_mode_hidden display: none +.cke_editable .css_editable_mode_hidden + display: none + .oe_carousel_options cursor: pointer position: absolute -- cgit v1.2.3 From 78dedf2dff12fa659fc864bbf699c9c468022db2 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 3 Dec 2013 11:04:49 +0100 Subject: [IMP] website snippet: icones goto parent snippet, clean css, unactive snippet when click outside bzr revid: chm@openerp.com-20131203100449-7ups314ffru0kobh --- addons/website/static/src/css/editor.sass | 108 ++++++++++++++++-------------- 1 file changed, 57 insertions(+), 51 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 1e35c352374..2c775be3b04 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -331,37 +331,66 @@ ul.oe_menu_editor border-width: 1px +box-shadow(0px 0px 0px 1px rgba(255,255,255,0.3), 0px 0px 0px 1px rgba(255,255,255,0.3) inset) border-color: rgba(0, 0, 0, 0.5) - .oe_handle - display: block !important - pointer-events: auto - &:before - position: relative - top: 50% - left: 50% - display: block - background: rgba(255, 255, 255, 1) - border: solid 1px rgba(0, 0, 0, .2) - +border-radius(5px) - width: 18px - height: 18px - margin: -9px - padding-left: 1px - font-size: 14px - line-height: 14px - font-family: FontAwesome - color: rgba(0,0,0,.5) - @include transition(background 100ms linear) - &:hover:before - background: rgba(0, 0, 0, .5) - color: #fff - +box-shadow(0 0 5px 3px rgba(255,255,255,.7)) - .oe_handle.e:before + .oe_handle + display: block !important + pointer-events: auto + position: absolute + top: 50% + left: 50% + +box-sizing(border-box) + width: 12px + height: 12px + margin: -2px + &:before + position: relative + top: 50% + left: 50% + display: block + background: rgba(255, 255, 255, 1) + border: solid 1px rgba(0, 0, 0, .2) + +border-radius(5px) + width: 18px + height: 18px + margin: -9px + padding-left: 1px + font-size: 14px + line-height: 14px + font-family: FontAwesome + color: rgba(0,0,0,.5) + @include transition(background 100ms linear) + &:hover:before + background: rgba(0, 0, 0, .5) + color: #fff + +box-shadow(0 0 5px 3px rgba(255,255,255,.7)) + .oe_handle.e + left: auto + top: 2px + height: 100% + right: -4px + cursor: w-resize + &:before content: "\F061" - .oe_handle.s:before + .oe_handle.s + top: auto + left: 2px + width: 100% + bottom: -4px + cursor: n-resize + &:before content: "\F063" - .oe_handle.w:before + .oe_handle.w + top: 2px + height: 100% + left: -4px + cursor: e-resize + &:before content: "\F060" - .oe_handle.n:before + .oe_handle.n + left: 2px + width: 100% + top: -4px + cursor: s-resize + &:before content: "\F062" .icon.btn @@ -395,29 +424,6 @@ ul.oe_menu_editor height: 8px margin: -4px -.oe_handle.n - left: 2px - width: 100% - top: 0px - cursor: s-resize -.oe_handle.e - left: auto - top: 2px - height: 100% - right: 0px - cursor: w-resize -.oe_handle.s - top: auto - left: 2px - width: 100% - bottom: 0px - cursor: n-resize -.oe_handle.w - top: 2px - height: 100% - left: 0px - cursor: e-resize - .s-resize-important, .s-resize-important * cursor: s-resize !important .n-resize-important, .n-resize-important * -- cgit v1.2.3 From 950f7495b597cc685c23641d6b52b5eceef83a74 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 3 Dec 2013 11:21:58 +0100 Subject: [IMP] remove pager buttons instead of disabling them if no previous/next page bzr revid: xmo@openerp.com-20131203102158-j9w9gkceyzec6ats --- 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 2c775be3b04..cb0876d4212 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -161,6 +161,9 @@ ul.oe_menu_editor display: inline-block !important visibility: visible !important +.existing-attachments .pager .disabled + display: none + // wrapper positioned relatively for drag&drop widget which is disabled below. // Breaks completely horribly crazy products listing page, so take it out. .cke_widget_wrapper -- cgit v1.2.3 From 9a3eb7963601e019aa02a0e8628984f445a8cebb Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 3 Dec 2013 14:51:56 +0100 Subject: [FIX] new fa icons for menu bzr revid: fme@openerp.com-20131203135156-vflspcfkitv667wv --- 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 cb0876d4212..b44b7c6a4e9 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -120,9 +120,9 @@ div.oe_menu_buttons right: -8px ul.oe_menu_editor - .icon-home + .fa-home display: none - > li:first-child > div > span > .icon-home + > li:first-child > div > span > .fa-home display: block .oe_menu_placeholder outline: 1px dashed #4183C4 -- cgit v1.2.3 From b79e56d1af9a2d9e10631df79c4325ea7d0854e1 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 4 Dec 2013 11:52:12 +0100 Subject: [IMP] clarity of links edition According to user tests, users have a hard time finding out how to edit links. Thus, add same system as image edition (a small button appearing when hovering the element). Extract and unify these two to avoid redundancies between handlings as they are broadly similar (only details such as label, positioning and size of button relative to the element being hovered really change, the lifecycle itself is the same). The main setup still isn't very clean, there might be a better way to do it. bzr revid: xmo@openerp.com-20131204105212-u0a49nbvwilgtfst --- 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 b44b7c6a4e9..7de48fdc611 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -181,6 +181,12 @@ ul.oe_menu_editor outline: 1px solid red !important background-color: #ffd9dd !important +.hover-edition-button + position: absolute + top: 0 + left: 0 + z-index: 42 + /* ---- SNIPPET EDITOR ---- */ #oe_snippets -- cgit v1.2.3 From 04045c369931ea0c4359ddff0196c163dc5e6db5 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 4 Dec 2013 17:28:05 +0100 Subject: [IMP] use ckeditor 4.3 final feature to disable widget draghandle entirely instead of relying on CSS bzr revid: xmo@openerp.com-20131204162805-rikk5kbbx304tol6 --- 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 7de48fdc611..885b1c9372c 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -168,9 +168,6 @@ ul.oe_menu_editor // Breaks completely horribly crazy products listing page, so take it out. .cke_widget_wrapper position: static !important -// "remove" drag & drop of CKE widgets -.cke_widget_drag_handler_container - display: none !important // prevent inline widgets from entirely disappearing when their (textual) // content is removed .cke_widget_editable:empty:after -- cgit v1.2.3 From b0c4ae43ac6ddcfc59d9dccf90aeee01409a664f Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 11 Dec 2013 16:36:46 +0100 Subject: [FIX] My humble participation to the great World War Z-index bzr revid: fme@openerp.com-20131211153646-an990cc99t08f534 --- 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 885b1c9372c..d40ef97755e 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -182,7 +182,8 @@ ul.oe_menu_editor position: absolute top: 0 left: 0 - z-index: 42 + // This z-index is due to .navbar of bootstrap + z-index: 1000 /* ---- SNIPPET EDITOR ---- */ -- cgit v1.2.3 From 083e88167e5c376a9559e6c38fd3af193266ff2f Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 11 Dec 2013 17:33:05 +0100 Subject: [IMP] website: save (button) or discard (link), on left in modal bzr revid: chm@openerp.com-20131211163305-5qwltn11k2ph179o --- 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 d40ef97755e..c2bc7a43dfa 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -154,6 +154,9 @@ ul.oe_menu_editor .modal .image-preview margin-bottom: 0.5em +.modal-footer + text-align: left + .modal.nosave .modal-footer button.save display: none -- cgit v1.2.3 From f6eb40fc90802526161d051ddef7dd1582324f16 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 17 Dec 2013 11:47:02 +0100 Subject: [FIX] enable user-selection on editable buttons (when the button itself is editable, not just in an editable section) bzr revid: xmo@openerp.com-20131217104702-jell0imowvzjlasl --- 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 c2bc7a43dfa..38b1d9f3436 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -141,8 +141,8 @@ ul.oe_menu_editor // bootstrap makes .btn elements unselectable -> RTE double-click can't know // about them either -.oe_editable .btn - @include user-select(auto) +.oe_editable .btn, .btn.oe_editable + +user-select(auto) .modal-dialog.select-image width: 80% -- cgit v1.2.3 From 90a9e522f3190a314fca289066943f312cd637f3 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 18 Dec 2013 12:49:01 +0100 Subject: [ADD] placeholder support on t-field A placeholder is looked up: 1. in the field's options ("placeholder") 2. on the t-field node itself (@placeholder) 3. on the field's column (.placeholder) The first one found is used as the @placeholder of the resulting node (in-HTML), and displayed when the field is empty and unfocused. If no placeholder is found, an empty field just gets a small padding in order to be easier to see & focus. bzr revid: xmo@openerp.com-20131218114901-xi3ye11x5pysq2a2 --- addons/website/static/src/css/editor.sass | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 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 38b1d9f3436..ff62f416d8d 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -171,11 +171,20 @@ ul.oe_menu_editor // Breaks completely horribly crazy products listing page, so take it out. .cke_widget_wrapper position: static !important + // prevent inline widgets from entirely disappearing when their (textual) // content is removed -.cke_widget_editable:empty:after - content: " " - white-space: pre-wrap +.cke_widget_editable + // basic config + &:empty:after + opacity: 0.3 + white-space: pre-wrap + // no @placeholder -> just add some padding + &:not([placeholder]):empty::after + content: " " + // with placeholder and when not (yet) focused -> display placeholder + &[placeholder]:not(:focus):empty::after + content: attr(placeholder) .oe_carlos_danger outline: 1px solid red !important -- cgit v1.2.3 From 9abcc28884688bd251c5a9de77b3afda11dcec90 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 18 Dec 2013 18:39:15 +0100 Subject: [IMP] Set EditorBar height programmatically bzr revid: fme@openerp.com-20131218173915-ds5jeyfypbaefrqf --- addons/website/static/src/css/editor.sass | 7 +++---- 1 file changed, 3 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 ff62f416d8d..031dd85c9f5 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -203,7 +203,7 @@ ul.oe_menu_editor position: fixed left: 0px right: 0px - top: 51px + // top property is set programmatically background: rgb(40,40,40) +box-shadow(0px 10px 10px -10px black inset) z-index: 1010 @@ -520,11 +520,10 @@ $highlighted_text_color: #ffffff $editorbar_height: 30px // TODO Fix => might break with themes -$navbar_height: 51px .oe_ace_view_editor position: fixed - top: $navbar_height + // top property is set programmatically right: 0 z-index: 1000 height: 100% @@ -546,7 +545,7 @@ $navbar_height: 51px position: absolute top: $editorbar_height right: 0 - bottom: $navbar_height + // bottom property is set programmatically left: 0 .ace_gutter cursor: ew-resize -- cgit v1.2.3 From 375e440c2efc5dfd623885677154f06c323d8421 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 19 Dec 2013 10:33:29 +0100 Subject: [ADD] Markers for vim bzr revid: fme@openerp.com-20131219093329-s5oumfhwyw0pevfy --- addons/website/static/src/css/editor.sass | 54 ++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 15 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 031dd85c9f5..e6beac3e35a 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -1,8 +1,6 @@ -@charset "utf-8" - @import "common" -/* ---- CKEditor Minimal Reset ---- */ +/* ---- CKEditor Minimal Reset ---- {{{ */ .navbar.navbar-inverse .cke_chrome border: none @@ -26,7 +24,9 @@ border: none +box-shadow(none) -/* ---- OpenERP Style ---- */ +// }}} + +/* ---- OpenERP Style ---- {{{ */ .oe_website_editorbar position: fixed @@ -85,7 +85,9 @@ position: relative !important top: +2px -/* ---- EDITOR BAR ---- */ +// }}} + +/* ---- EDITOR BAR ---- {{{ */ table.editorbar-panel cursor: pointer @@ -95,7 +97,10 @@ table.editorbar-panel td.selected background-color: #b1c9d9 -// ---- TRANSLATIONS ---- {{{ +// }}} + +/* ---- TRANSLATIONS ---- {{{ */ + .oe_translate_or color: white padding: 0 0 0 1em @@ -112,9 +117,11 @@ table.editorbar-panel padding: 0 10px .oe_translatable_todo background: rgb(255, 255, 182) + // }}} -// -------- MENU -------- {{{ +/* ---- MENU ---- {{{ */ + div.oe_menu_buttons top: -8px right: -8px @@ -137,7 +144,7 @@ ul.oe_menu_editor // }}} -/* ---- RTE ---- */ +/* ---- RTE ---- {{{ */ // bootstrap makes .btn elements unselectable -> RTE double-click can't know // about them either @@ -197,7 +204,9 @@ ul.oe_menu_editor // This z-index is due to .navbar of bootstrap z-index: 1000 -/* ---- SNIPPET EDITOR ---- */ +// }}} + +/* ---- SNIPPET EDITOR ---- {{{ */ #oe_snippets position: fixed @@ -286,7 +295,9 @@ ul.oe_menu_editor #oe_snippets .oe_snippet_thumbnail @include background(#747474, radial-gradient(rgba(0,0,0,0.25),rgba(0,0,0,0.4))) -/* ---- SNIPPETS DROP ZONES ---- */ +// }}}} + +/* ---- SNIPPETS DROP ZONES ---- {{{ */ .oe_drop_zone.oe_insert display: block @@ -333,7 +344,9 @@ ul.oe_menu_editor margin-bottom: 32px padding-top: 12px -/* ---- SNIPPET MANIPULATOR ---- */ +// }}} + +/* ---- SNIPPET MANIPULATOR ---- {{{ */ .oe_overlay display: none @@ -454,8 +467,9 @@ ul.oe_menu_editor .move-important, .move-important * cursor: move !important +// }}} -/* ---- MOBILE PREVIEW ---- */ +/* ---- MOBILE PREVIEW ---- {{{ */ $mobile_preview_background: #000000 $mobile_preview_border: #1C1F1F @@ -498,7 +512,9 @@ $icon_close: #E00101 .modal-footer background-color: $mobile_preview_background -/* ---- SEO TOOLS ---- */ +// }}} + +/* ---- SEO TOOLS ---- {{{ */ $remove_color: $icon_close $in_title_color: #5cb85c @@ -516,7 +532,9 @@ $highlighted_text_color: #ffffff padding: .2em .4em .2em .5em +border-radius(.4em) -/* ---- ACE EDITOR ---- */ +// }}} + +/* ---- ACE EDITOR ---- {{{ */ $editorbar_height: 30px // TODO Fix => might break with themes @@ -555,9 +573,15 @@ $editorbar_height: 30px z-index: -1000 +opacity(0) -/* ---- EDITOR TOUR ---- */ +// }}} + +/* ---- EDITOR TOUR ---- {{{ */ + div.tour-backdrop z-index: 2009 .popover.tour z-index: 2010 + +// }}} + // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: -- cgit v1.2.3 From af1e65ffdb72c709b7c1dc0fad825178e278ef56 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 19 Dec 2013 10:34:10 +0100 Subject: [IMP] Use cursor: text for editable .btn's bzr revid: fme@openerp.com-20131219093410-lgr1f54nehaz9fk0 --- addons/website/static/src/css/editor.sass | 1 + 1 file changed, 1 insertion(+) (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 e6beac3e35a..6cc590bf6b2 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -150,6 +150,7 @@ ul.oe_menu_editor // about them either .oe_editable .btn, .btn.oe_editable +user-select(auto) + cursor: text !important .modal-dialog.select-image width: 80% -- cgit v1.2.3