From 375e440c2efc5dfd623885677154f06c323d8421 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 19 Dec 2013 10:33:29 +0100 Subject: [PATCH] [ADD] Markers for vim bzr revid: fme@openerp.com-20131219093329-s5oumfhwyw0pevfy --- addons/website/static/src/css/editor.css | 24 +++++----- addons/website/static/src/css/editor.sass | 54 ++++++++++++++++------- 2 files changed, 52 insertions(+), 26 deletions(-) diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index 3e0e46ebc45..b58efd236e5 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -1,4 +1,4 @@ -/* ---- CKEditor Minimal Reset ---- */ +/* ---- CKEditor Minimal Reset ---- {{{ */ .navbar.navbar-inverse .cke_chrome { border: none; } @@ -28,7 +28,7 @@ box-shadow: none; } -/* ---- OpenERP Style ---- */ +/* ---- OpenERP Style ---- {{{ */ .oe_website_editorbar { position: fixed; top: 0; @@ -103,7 +103,7 @@ top: 2px; } -/* ---- EDITOR BAR ---- */ +/* ---- EDITOR BAR ---- {{{ */ table.editorbar-panel { cursor: pointer; width: 100%; @@ -115,6 +115,7 @@ table.editorbar-panel td.selected { background-color: #b1c9d9; } +/* ---- TRANSLATIONS ---- {{{ */ .oe_translate_or { color: white; padding: 0 0 0 1em; @@ -145,6 +146,7 @@ table.editorbar-panel td.selected { background: #ffffb6; } +/* ---- MENU ---- {{{ */ div.oe_menu_buttons { top: -8px; right: -8px; @@ -171,7 +173,7 @@ ul.oe_menu_editor .disclose { display: none; } -/* ---- RTE ---- */ +/* ---- RTE ---- {{{ */ .oe_editable .btn, .btn.oe_editable { -webkit-user-select: auto; -moz-user-select: auto; @@ -233,7 +235,7 @@ ul.oe_menu_editor .disclose { z-index: 1000; } -/* ---- SNIPPET EDITOR ---- */ +/* ---- SNIPPET EDITOR ---- {{{ */ #oe_snippets { position: fixed; left: 0px; @@ -367,7 +369,7 @@ ul.oe_menu_editor .disclose { 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; height: 48px; @@ -428,7 +430,7 @@ ul.oe_menu_editor .disclose { padding-top: 12px; } -/* ---- SNIPPET MANIPULATOR ---- */ +/* ---- SNIPPET MANIPULATOR ---- {{{ */ .oe_overlay { display: none; position: absolute; @@ -598,7 +600,7 @@ ul.oe_menu_editor .disclose { cursor: move !important; } -/* ---- MOBILE PREVIEW ---- */ +/* ---- MOBILE PREVIEW ---- {{{ */ .oe_mobile_preview.modal .modal-content { height: 660px; background-color: black; @@ -654,7 +656,7 @@ ul.oe_menu_editor .disclose { background-color: black; } -/* ---- SEO TOOLS ---- */ +/* ---- SEO TOOLS ---- {{{ */ .oe_seo_configuration .modal-dialog { width: 80%; } @@ -673,7 +675,7 @@ ul.oe_menu_editor .disclose { border-radius: 0.4em; } -/* ---- ACE EDITOR ---- */ +/* ---- ACE EDITOR ---- {{{ */ .oe_ace_view_editor { position: fixed; right: 0; @@ -720,7 +722,7 @@ ul.oe_menu_editor .disclose { opacity: 0; } -/* ---- EDITOR TOUR ---- */ +/* ---- EDITOR TOUR ---- {{{ */ div.tour-backdrop { z-index: 2009; } 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: