From d97d58f5db12f17b723bc9f1cb71b924470efc11 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sun, 8 Sep 2013 23:01:39 +0200 Subject: [PATCH] [IMP] structure in snippets bzr revid: fp@openerp.com-20130908210139-3wsl86ij3yd5udqz --- addons/website/static/src/css/editor.css | 14 +- addons/website/static/src/css/editor.sass | 11 +- addons/website/views/views.xml | 253 +++++++++++++++------- 3 files changed, 189 insertions(+), 89 deletions(-) diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index df098f28353..1e751f861c9 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -1,3 +1,4 @@ +@charset "utf-8"; /* ---- CKEditor Minimal Reset ---- */ .navbar.navbar-inverse .cke_chrome { border: none; @@ -105,13 +106,18 @@ table.editorbar-panel td.selected { left: 0px; right: 0px; bottom: 0px; - max-height: 280px; - min-height: 140px; background: #282828; box-shadow: 0px 10px 10px -10px black inset; overflow-y: auto; z-index: 100; } +.oe_snippets .nav-pills { + padding: 3px 8px; + background: #444444; +} +.oe_snippets .nav-pills > li > a { + padding: 2px 10px !important; +} .oe_snippet { display: inline-block; @@ -120,10 +126,10 @@ table.editorbar-panel td.selected { width: 120px; height: 120px; border-radius: 3px; - margin: 10px; + margin: 8px; margin-right: 0px; position: relative; - box-shadow: 0px 3px 10px rgba(0, 0, 0, 0.2); + box-shadow: 0px 3px 8px rgba(0, 0, 0, 0.2); overflow: hidden; -webkit-user-select: none; user-select: none; diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 2da2b4bbeeb..135523cc1c2 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -98,12 +98,15 @@ table.editorbar-panel left: 0px right: 0px bottom: 0px - max-height: 280px - min-height: 140px background: rgb(40,40,40) box-shadow: 0px 10px 10px -10px black inset overflow-y: auto z-index: 100 + .nav-pills + padding: 3px 8px + background: #444 + > li > a + padding: 2px 10px !important .oe_snippet display: inline-block @@ -112,10 +115,10 @@ table.editorbar-panel width: 120px height: 120px border-radius: 3px - margin: 10px + margin: 8px margin-right: 0px position: relative - box-shadow: 0px 3px 10px rgba(0,0,0,0.2) + box-shadow: 0px 3px 8px rgba(0,0,0,0.2) overflow: hidden -webkit-user-select: none user-select: none diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml index 90de96e1541..6fabb6f2945 100644 --- a/addons/website/views/views.xml +++ b/addons/website/views/views.xml @@ -196,8 +196,8 @@
-

Welcome To Your New Homepage,

-

where everything can be customized

+

Your Company Slogan

+

Your company subheader slogan

@@ -229,7 +229,8 @@
-

Ut enim ad minim veniam

+

Ut enim ad minim veniam

+

Ut enim veniam

@@ -419,90 +420,180 @@