From 5b50ea85d7051563492066dd7e5c65c48422713e Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Mon, 21 Oct 2013 16:11:22 +0530 Subject: [IMP]Improved typo. Css of address. put if condition before value. Removed strong from description. Improved code for search. bzr revid: bth@tinyerp.com-20131021104122-jsbra3e8f2efwbxu --- addons/website/static/src/css/website.css | 8 ++++++++ addons/website/static/src/css/website.sass | 7 +++++++ 2 files changed, 15 insertions(+) (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 c851c7e43f6..93ede5035ae 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -440,3 +440,11 @@ a[data-publish][data-publish='on']:hover .css_published { ::selection { background: rgba(150, 150, 220, 0.3); } + +.texttop { + vertical-align: top; +} +table.well tr th { + text-align: right; + padding-right: 10px; +} diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 4d9a6ae01c0..d5e991bfe2d 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -335,3 +335,10 @@ a[data-publish] ::selection background: rgba(150, 150, 220, 0.3) + +.texttop + vertical-align: top + +table.well tr th + text-align: right + padding-right: 10px -- cgit v1.2.3 From 736c57d8f83be4f6281e5921bc229d70c8dd9acb Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Wed, 30 Oct 2013 13:01:05 +0530 Subject: [IMP]Add css and dependency to fix error. bzr revid: bth@tinyerp.com-20131030073105-99f5dsh0qh2w2baa --- addons/website/static/src/css/website.css | 4 ++++ addons/website/static/src/css/website.sass | 9 ++++++--- 2 files changed, 10 insertions(+), 3 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 93ede5035ae..866d35e8d81 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -448,3 +448,7 @@ table.well tr th { text-align: right; padding-right: 10px; } + +table.well tr td span { + padding-right: 5px; +} diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index d5e991bfe2d..752d32cc9ec 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -339,6 +339,9 @@ a[data-publish] .texttop vertical-align: top -table.well tr th - text-align: right - padding-right: 10px +table.well tr + th + text-align: right + padding-right: 10px + td + padding-right: 5px -- cgit v1.2.3 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.css | 2 +- addons/website/static/src/css/editor.sass | 2 +- 2 files changed, 2 insertions(+), 2 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 823a1d30f81..8aada166018 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -150,7 +150,7 @@ div.oe_menu_buttons { ul.oe_menu_editor .icon-home { display: none; } -ul.oe_menu_editor > li:first-child .icon-home { +ul.oe_menu_editor > li:first-child > div > span > .icon-home { display: block; } ul.oe_menu_editor .oe_menu_placeholder { 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 6b10be15b245e05adac2a54f0321305c6d5076d9 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 20 Nov 2013 12:52:50 +0100 Subject: [IMP] website snippet: add group for styles snippets, add custom picture with style snippet, mouseover and mouseout preview, fix dark css class in demo data bzr revid: chm@openerp.com-20131120115250-etqv5ofqguze0zsj --- addons/website/static/src/css/website.css | 151 +++++++++++++++++------------ addons/website/static/src/css/website.sass | 140 ++++++++++++++------------ 2 files changed, 167 insertions(+), 124 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 99ba04e2a96..41c04e6b702 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -257,6 +257,73 @@ footer { margin-bottom: 0px; } +/* ---- HOMEPAGE THEME CUSTOMIZATION ---- */ +.nav-hierarchy { + padding-left: 16px; +} + +#themes-list .well { + padding: 0 0 20px 0; +} + +/* -- Hack for removing double scrollbar from mobile preview -- */ +div#mobile-preview.modal { + overflow: hidden; + overflow-y: hidden; +} + +ul.nav-stacked > li > a { + padding: 2px 15px; +} + +#customize-menu .dropdown-header { + text-transform: uppercase; +} + +/* ---- PUBLISH ---- */ +.css_unpublish, .css_publish { + display: none; +} + +.css_published .css_unpublish, .css_unpublished .css_publish { + display: block; +} + +[data-publish='off'] { + opacity: 0.5; +} + +/* ---- END of PUBLISH ---- */ +::selection { + background: rgba(150, 150, 220, 0.3); +} + +.logo-img { + width: 220px; +} + +.oe_demo { + position: relative; +} +.oe_demo img { + width: 100%; +} +.oe_demo div { + position: absolute; + left: 0; + background-color: rgba(0, 0, 0, 0.4); + opacity: 0.85; + bottom: 0px; + width: 100%; + padding: 7px; + color: white; + font-weight: bold; +} +.oe_demo div a { + color: white; +} + +/* ---- SNIPPETS --- */ .carousel-inner .item { height: 100%; background-size: 100%; @@ -331,23 +398,6 @@ footer { right: 10px; } -/* ---- HOMEPAGE THEME CUSTOMIZATION ---- */ -.dark { - background: #eff8f8; - background: rgba(100, 200, 200, 0.14); - -webkit-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset; - -moz-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset; - box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset; -} - -.nav-hierarchy { - padding-left: 16px; -} - -#themes-list .well { - padding: 0 0 20px 0; -} - /* Parallax Theme */ .parallax_quote { background: url("/website/static/src/img/parallax/quote.png") center center no-repeat fixed; @@ -374,59 +424,32 @@ footer { height: 450px; } -/* -- Hack for removing double scrollbar from mobile preview -- */ -div#mobile-preview.modal { - overflow: hidden; - overflow-y: hidden; -} - -ul.nav-stacked > li > a { - padding: 2px 15px; -} - -#customize-menu .dropdown-header { - text-transform: uppercase; -} - -/* ---- PUBLISH ---- */ -.css_unpublish, .css_publish { - display: none; -} - -.css_published .css_unpublish, .css_unpublished .css_publish { - display: block; +/* Background */ +.oe_dark { + background: #eff8f8; + background: rgba(100, 200, 200, 0.14); + -webkit-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset; + -moz-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset; + box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset; + background-image: none !important; } -[data-publish='off'] { - opacity: 0.5; +.oe_black { + background-color: rgba(0, 0, 0, 0.9); + background-image: none !important; } -/* ---- END of PUBLISH ---- */ -::selection { - background: rgba(150, 150, 220, 0.3); +.oe_green { + background-color: rgba(0, 128, 0, 0.8); + background-image: none !important; } -.logo-img { - width: 220px; +.oe_red { + background-color: rgba(255, 0, 0, 0.8); + background-image: none !important; } -.oe_demo { - position: relative; -} -.oe_demo img { - width: 100%; -} -.oe_demo div { - position: absolute; - left: 0; - background-color: rgba(0, 0, 0, 0.4); - opacity: 0.85; - bottom: 0px; - width: 100%; - padding: 7px; - color: white; - font-weight: bold; -} -.oe_demo div a { - color: white; +.oe_custom_bg { + height: 100%; + background-size: 100%; } diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index f947a163a28..cd1c99dda27 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -186,6 +186,65 @@ footer // .nav > li a // display: block +/* ---- HOMEPAGE THEME CUSTOMIZATION ---- */ + +.nav-hierarchy + padding-left: 16px + +#themes-list .well + padding: 0 0 20px 0 + +/* -- Hack for removing double scrollbar from mobile preview -- */ +div#mobile-preview.modal + overflow: hidden + overflow-y: hidden + +ul.nav-stacked > li > a + padding: 2px 15px + +#customize-menu .dropdown-header + text-transform: uppercase + +/* ---- PUBLISH ---- */ +.css_unpublish, .css_publish + display: none +.css_published .css_unpublish, .css_unpublished .css_publish + display: block + +[data-publish='off'] + opacity: 0.5 + +/* ---- END of PUBLISH ---- */ + + + +::selection + background: rgba(150, 150, 220, 0.3) + +.logo-img + width: 220px + + +.oe_demo + position: relative + img + width: 100% + div + position: absolute + left: 0 + background-color: rgba(0,0,0,0.4) + opacity: 0.85 + bottom: 0px + width: 100% + padding: 7px + color: white + font-weight: bold + a + color: white + + +/* ---- SNIPPETS --- */ + .carousel-inner .item height: 100% background-size: 100% @@ -249,20 +308,6 @@ footer &.right span right: 10px -/* ---- HOMEPAGE THEME CUSTOMIZATION ---- */ - -.dark - background: #eff8f8 - background: rgba(100, 200, 200, 0.14) - -webkit-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset - -moz-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset - box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset - -.nav-hierarchy - padding-left: 16px - -#themes-list .well - padding: 0 0 20px 0 /* Parallax Theme */ @@ -284,50 +329,25 @@ footer height: 300px &.oe_big height: 450px -/* -- Hack for removing double scrollbar from mobile preview -- */ -div#mobile-preview.modal - overflow: hidden - overflow-y: hidden - -ul.nav-stacked > li > a - padding: 2px 15px - -#customize-menu .dropdown-header - text-transform: uppercase - -/* ---- PUBLISH ---- */ -.css_unpublish, .css_publish - display: none -.css_published .css_unpublish, .css_unpublished .css_publish - display: block - -[data-publish='off'] - opacity: 0.5 - -/* ---- END of PUBLISH ---- */ - - -::selection - background: rgba(150, 150, 220, 0.3) - -.logo-img - width: 220px - - -.oe_demo - position: relative - img - width: 100% - div - position: absolute - left: 0 - background-color: rgba(0,0,0,0.4) - opacity: 0.85 - bottom: 0px - width: 100% - padding: 7px - color: white - font-weight: bold - a - color: white +/* Background */ + +.oe_dark + background: #eff8f8 + background: rgba(100, 200, 200, 0.14) + -webkit-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset + -moz-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset + box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset + background-image: none !important +.oe_black + background-color: rgba(0, 0, 0, 0.9) + background-image: none !important +.oe_green + background-color: rgba(0, 128, 0, 0.8) + background-image: none !important +.oe_red + background-color: rgba(255, 0, 0, 0.8) + background-image: none !important +.oe_custom_bg + height: 100% + background-size: 100% -- 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/common.css | 0 addons/website/static/src/css/common.sass | 25 +++++++++++++++++++++++++ addons/website/static/src/css/editor.css | 5 ++++- addons/website/static/src/css/editor.sass | 21 ++------------------- addons/website/static/src/css/website.css | 10 ++++++++-- addons/website/static/src/css/website.sass | 25 ++++++++----------------- 6 files changed, 47 insertions(+), 39 deletions(-) create mode 100644 addons/website/static/src/css/common.css create mode 100644 addons/website/static/src/css/common.sass (limited to 'addons/website/static/src/css') diff --git a/addons/website/static/src/css/common.css b/addons/website/static/src/css/common.css new file mode 100644 index 00000000000..e69de29bb2d diff --git a/addons/website/static/src/css/common.sass b/addons/website/static/src/css/common.sass new file mode 100644 index 00000000000..86e1f6655ef --- /dev/null +++ b/addons/website/static/src/css/common.sass @@ -0,0 +1,25 @@ +@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 + +@mixin editor-font + font-size: 14px + font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace + line-height: normal + +@mixin selection() + ::-moz-selection + @content + ::selection + @content diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index 8aada166018..7a71740671b 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -1,4 +1,3 @@ -@charset "utf-8"; /* ---- CKEditor Minimal Reset ---- */ .navbar.navbar-inverse .cke_chrome { border: none; @@ -380,6 +379,10 @@ ul.oe_menu_editor .disclose { margin: 0px -24px !important; } .oe_drop_zone.oe_insert.oe_overlay { + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + -ms-border-radius: 3px; + -o-border-radius: 3px; border-radius: 3px; background: rgba(153, 0, 255, 0.5); } 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 diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index 41c04e6b702..68e40e9118b 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -1,4 +1,3 @@ -@charset "utf-8"; /* THIS CSS FILE IS FOR WEBSITE THEMING CUSTOMIZATION ONLY * * css for editor buttons, openerp widget included in the website and other @@ -192,6 +191,8 @@ h1.text-muted, h2.text-muted, h3.text-muted { /* ----- BOOTSTRAP HACK FOR STICKY FOOTER ----- */ html, body, #wrapwrap { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; box-sizing: border-box; height: 100%; } @@ -290,10 +291,15 @@ ul.nav-stacked > li > a { } [data-publish='off'] { + filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50); opacity: 0.5; } /* ---- END of PUBLISH ---- */ +::-moz-selection { + background: rgba(150, 150, 220, 0.3); +} + ::selection { background: rgba(150, 150, 220, 0.3); } @@ -428,10 +434,10 @@ ul.nav-stacked > li > a { .oe_dark { background: #eff8f8; background: rgba(100, 200, 200, 0.14); + background-image: none !important; -webkit-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset; -moz-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset; box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset; - background-image: none !important; } .oe_black { diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index cd1c99dda27..ec992256d6e 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -1,5 +1,7 @@ @charset "utf-8" +@import "common" + /* * THIS CSS FILE IS FOR WEBSITE THEMING CUSTOMIZATION ONLY * @@ -103,14 +105,8 @@ /* Extra Styles */ img.shadow - -webkit-border-radius: 3px - -moz-border-radius: 3px - -ms-border-radius: 3px - -o-border-radius: 3px - border-radius: 3px - -webkit-box-shadow: 0px 3px 8px rgba(0, 0, 0, 0.2) - -moz-box-shadow: 0px 3px 8px rgba(0, 0, 0, 0.2) - box-shadow: 0px 3px 8px rgba(0, 0, 0, 0.2) + +border-radius(3px) + +box-shadow(0px 3px 8px rgba(0, 0, 0, 0.2)) margin: 0 auto h1.text-muted, h2.text-muted, h3.text-muted @@ -124,7 +120,7 @@ h1.text-muted, h2.text-muted, h3.text-muted /* ----- BOOTSTRAP HACK FOR STICKY FOOTER ----- */ html,body, #wrapwrap - box-sizing: border-box + +box-sizing(border-box) height: 100% #wrapwrap @@ -212,13 +208,11 @@ ul.nav-stacked > li > a display: block [data-publish='off'] - opacity: 0.5 + +opacity(0.5) /* ---- END of PUBLISH ---- */ - - -::selection +@include selection background: rgba(150, 150, 220, 0.3) .logo-img @@ -242,7 +236,6 @@ ul.nav-stacked > li > a a color: white - /* ---- SNIPPETS --- */ .carousel-inner .item @@ -335,10 +328,8 @@ ul.nav-stacked > li > a .oe_dark background: #eff8f8 background: rgba(100, 200, 200, 0.14) - -webkit-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset - -moz-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset - box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset background-image: none !important + +box-shadow(0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset) .oe_black background-color: rgba(0, 0, 0, 0.9) background-image: none !important -- cgit v1.2.3 From 31f64313c033b346530980f3d84f5a2cc5fe71c4 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 21 Nov 2013 13:34:39 +0100 Subject: [IMP] website snippet: create website.snippet.StyleEditor to add styles with html class and other logical process into snippet options bzr revid: chm@openerp.com-20131121123439-wvvcdegvc1bornux --- addons/website/static/src/css/website.css | 7 ++----- addons/website/static/src/css/website.sass | 8 ++------ 2 files changed, 4 insertions(+), 11 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 68e40e9118b..f10cb6f52e0 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 @@ -434,7 +435,6 @@ ul.nav-stacked > li > a { .oe_dark { background: #eff8f8; background: rgba(100, 200, 200, 0.14); - background-image: none !important; -webkit-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset; -moz-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset; box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset; @@ -442,20 +442,17 @@ ul.nav-stacked > li > a { .oe_black { background-color: rgba(0, 0, 0, 0.9); - background-image: none !important; } .oe_green { background-color: rgba(0, 128, 0, 0.8); - background-image: none !important; } .oe_red { background-color: rgba(255, 0, 0, 0.8); - background-image: none !important; } -.oe_custom_bg { +.oe_img_bg { height: 100%; background-size: 100%; } diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index ec992256d6e..932f46a1912 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -328,17 +328,13 @@ ul.nav-stacked > li > a .oe_dark background: #eff8f8 background: rgba(100, 200, 200, 0.14) - background-image: none !important +box-shadow(0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset) .oe_black background-color: rgba(0, 0, 0, 0.9) - background-image: none !important .oe_green background-color: rgba(0, 128, 0, 0.8) - background-image: none !important .oe_red background-color: rgba(255, 0, 0, 0.8) - background-image: none !important -.oe_custom_bg +.oe_img_bg height: 100% - background-size: 100% + background-size: 100% \ No newline at end of file -- cgit v1.2.3 From d1d1754ff47d4d60d45cbb58d3486e06fac2c17b Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 27 Nov 2013 17:59:14 +0100 Subject: [FIX] website snippet: background of quotes slider bzr revid: chm@openerp.com-20131127165914-i4tgbj1fi1q2dqin --- addons/website/static/src/css/website.css | 2 +- addons/website/static/src/css/website.sass | 2 +- 2 files changed, 2 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 f10cb6f52e0..b5c176ee173 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -407,7 +407,7 @@ ul.nav-stacked > li > a { /* Parallax Theme */ .parallax_quote { - background: url("/website/static/src/img/parallax/quote.png") center center no-repeat fixed; + background: center center no-repeat fixed; background-size: contain; } .parallax_quote .carousel-indicators li { diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 932f46a1912..fc309da3281 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -305,7 +305,7 @@ ul.nav-stacked > li > a /* Parallax Theme */ .parallax_quote - background: url('/website/static/src/img/parallax/quote.png') center center no-repeat fixed + background: center center no-repeat fixed background-size: contain .carousel-indicators li -- 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.css | 5 +++++ addons/website/static/src/css/editor.sass | 3 +++ 2 files changed, 8 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 7a71740671b..f05db4c88b8 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; @@ -85,6 +86,10 @@ display: none; } +.cke_editable .css_editable_mode_hidden { + display: none; +} + .oe_carousel_options { cursor: pointer; position: absolute; 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 9a399dfb9461acfb6ebe53779aed1012421f2846 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Fri, 29 Nov 2013 17:00:45 +0100 Subject: [FIX] website snippets: quote, quotes slider, parallax bzr revid: chm@openerp.com-20131129160045-527o2i6unyyymr6e --- addons/website/static/src/css/website.css | 13 ++++++++++--- addons/website/static/src/css/website.sass | 7 ++++++- 2 files changed, 16 insertions(+), 4 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 c7fa9cadf85..71f030a8bec 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -254,6 +254,13 @@ footer { content: "Drag Building Blocks Here"; } +.oe_structure.oe_editable [data-snippet-id]:empty { + background: rgba(255, 0, 0, 0.1); +} +.oe_structure.oe_editable [data-snippet-id]:empty:before { + content: "Please Edit This Empty Block"; +} + /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */ .navbar .nav > li > p { margin-bottom: 0px; @@ -406,14 +413,14 @@ ul.nav-stacked > li > a { } /* Parallax Theme */ -.parallax_quote { +.parallax_quote, [data-snippet-id="slider"] { background: center center no-repeat fixed; background-size: contain; } -.parallax_quote .carousel-indicators li { +.parallax_quote .carousel-indicators li, [data-snippet-id="slider"] .carousel-indicators li { border: 1px solid grey; } -.parallax_quote .carousel-indicators .active { +.parallax_quote .carousel-indicators .active, [data-snippet-id="slider"] .carousel-indicators .active { background-color: grey; } diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index faa17d01968..157fd19148c 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -171,6 +171,11 @@ 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' +.oe_structure.oe_editable [data-snippet-id]:empty + background: rgba(255,0,0,0.1) + &:before + content: 'Please Edit This Empty Block' + /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */ .navbar .nav > li > p @@ -304,7 +309,7 @@ ul.nav-stacked > li > a /* Parallax Theme */ -.parallax_quote +.parallax_quote, [data-snippet-id="slider"] background: center center no-repeat fixed background-size: contain .carousel-indicators -- cgit v1.2.3 From c1f306dd969c16ec5ebe57833353d11fb20d3b94 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 2 Dec 2013 13:45:04 +0100 Subject: [WIP] website: add website_button widget in backend to publish and go back to the website. (need bootstrap 3 for layout) bzr revid: chm@openerp.com-20131202124504-78zvm5t0p1hpsn53 --- addons/website/static/src/css/website.backend.css | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 addons/website/static/src/css/website.backend.css (limited to 'addons/website/static/src/css') diff --git a/addons/website/static/src/css/website.backend.css b/addons/website/static/src/css/website.backend.css new file mode 100644 index 00000000000..e6601788bcc --- /dev/null +++ b/addons/website/static/src/css/website.backend.css @@ -0,0 +1,6 @@ +.oe_WidgetWebsiteButton .btn-danger .oe_publish { + display: none; +} +.oe_WidgetWebsiteButton .btn-success .oe_unpublish { + display: none; +} \ No newline at end of file -- 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.css | 79 ++++++++++++---------- addons/website/static/src/css/editor.sass | 108 ++++++++++++++++-------------- 2 files changed, 99 insertions(+), 88 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 f05db4c88b8..6da7eb01a04 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -441,11 +441,20 @@ ul.oe_menu_editor .disclose { 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_overlay.oe_active .oe_handle { +.oe_overlay .oe_handle { display: block !important; pointer-events: auto; + position: absolute; + top: 50%; + left: 50%; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + width: 12px; + height: 12px; + margin: -2px; } -.oe_overlay.oe_active .oe_handle:before { +.oe_overlay .oe_handle:before { position: relative; top: 50%; left: 50%; @@ -470,23 +479,49 @@ ul.oe_menu_editor .disclose { -o-transition: background 100ms linear; transition: background 100ms linear; } -.oe_overlay.oe_active .oe_handle:hover:before { +.oe_overlay .oe_handle:hover:before { background: rgba(0, 0, 0, 0.5); color: white; -webkit-box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7); -moz-box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7); box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7); } -.oe_overlay.oe_active .oe_handle.e:before { +.oe_overlay .oe_handle.e { + left: auto; + top: 2px; + height: 100%; + right: -4px; + cursor: w-resize; +} +.oe_overlay .oe_handle.e:before { content: "\F061"; } -.oe_overlay.oe_active .oe_handle.s:before { +.oe_overlay .oe_handle.s { + top: auto; + left: 2px; + width: 100%; + bottom: -4px; + cursor: n-resize; +} +.oe_overlay .oe_handle.s:before { content: "\F063"; } -.oe_overlay.oe_active .oe_handle.w:before { +.oe_overlay .oe_handle.w { + top: 2px; + height: 100%; + left: -4px; + cursor: e-resize; +} +.oe_overlay .oe_handle.w:before { content: "\F060"; } -.oe_overlay.oe_active .oe_handle.n:before { +.oe_overlay .oe_handle.n { + left: 2px; + width: 100%; + top: -4px; + cursor: s-resize; +} +.oe_overlay .oe_handle.n:before { content: "\F062"; } .oe_overlay .icon.btn { @@ -528,36 +563,6 @@ ul.oe_menu_editor .disclose { 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; } 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.css | 5 ++++- addons/website/static/src/css/editor.sass | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) (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 6da7eb01a04..f8034b52c49 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -1,4 +1,3 @@ -@charset "utf-8"; /* ---- CKEditor Minimal Reset ---- */ .navbar.navbar-inverse .cke_chrome { border: none; @@ -199,6 +198,10 @@ ul.oe_menu_editor .disclose { visibility: visible !important; } +.existing-attachments .pager .disabled { + display: none; +} + .cke_widget_wrapper { position: static !important; } 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 a65449c331d037b781859d3bf9971de5a07ec556 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 3 Dec 2013 12:11:13 +0100 Subject: [FIX] website snippet: column bzr revid: chm@openerp.com-20131203111113-r9yxhjjhvv5isi9t --- addons/website/static/src/css/website.css | 7 ------- addons/website/static/src/css/website.sass | 5 ----- 2 files changed, 12 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 71f030a8bec..14ff1d76734 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -254,13 +254,6 @@ footer { content: "Drag Building Blocks Here"; } -.oe_structure.oe_editable [data-snippet-id]:empty { - background: rgba(255, 0, 0, 0.1); -} -.oe_structure.oe_editable [data-snippet-id]:empty:before { - content: "Please Edit This Empty Block"; -} - /* ---- 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 157fd19148c..70d523078e0 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -171,11 +171,6 @@ 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' -.oe_structure.oe_editable [data-snippet-id]:empty - background: rgba(255,0,0,0.1) - &:before - content: 'Please Edit This Empty Block' - /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */ .navbar .nav > li > p -- cgit v1.2.3 From 7f44fe2f6a7258168bc687d0149e671817d35f76 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 3 Dec 2013 12:21:34 +0100 Subject: [FIX] website snippet: background height=100% bzr revid: chm@openerp.com-20131203112134-q1pk4eujckgy5vgw --- addons/website/static/src/css/website.css | 1 - addons/website/static/src/css/website.sass | 1 - 2 files changed, 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 14ff1d76734..78de8be5803 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -453,7 +453,6 @@ ul.nav-stacked > li > a { } .oe_img_bg { - height: 100%; background-size: 100%; } diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 70d523078e0..a559efdca75 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -336,7 +336,6 @@ ul.nav-stacked > li > a .oe_red background-color: rgba(255, 0, 0, 0.8) .oe_img_bg - height: 100% background-size: 100% .texttop -- 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.css | 5 +++-- addons/website/static/src/css/editor.sass | 4 ++-- 2 files changed, 5 insertions(+), 4 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 f8034b52c49..c2ac33008ef 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; @@ -150,10 +151,10 @@ div.oe_menu_buttons { right: -8px; } -ul.oe_menu_editor .icon-home { +ul.oe_menu_editor .fa-home { display: none; } -ul.oe_menu_editor > li:first-child > div > span > .icon-home { +ul.oe_menu_editor > li:first-child > div > span > .fa-home { display: block; } ul.oe_menu_editor .oe_menu_placeholder { 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.css | 8 +++++++- addons/website/static/src/css/editor.sass | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-) (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 c2ac33008ef..487306be5dc 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -1,4 +1,3 @@ -@charset "utf-8"; /* ---- CKEditor Minimal Reset ---- */ .navbar.navbar-inverse .cke_chrome { border: none; @@ -221,6 +220,13 @@ ul.oe_menu_editor .disclose { background-color: #ffd9dd !important; } +.hover-edition-button { + position: absolute; + top: 0; + left: 0; + z-index: 42; +} + /* ---- SNIPPET EDITOR ---- */ #oe_snippets { position: fixed; 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 16a544fc6f5f2afe1b94359af6331eb58f197438 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 4 Dec 2013 12:54:24 +0100 Subject: [FIX] website snippet: usabillity bzr revid: chm@openerp.com-20131204115424-p083i2nt5bbc43s6 --- addons/website/static/src/css/website.css | 22 +++++++++++++--------- addons/website/static/src/css/website.sass | 17 +++++++++++------ 2 files changed, 24 insertions(+), 15 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 78de8be5803..d62a3b9b371 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -406,29 +406,33 @@ ul.nav-stacked > li > a { } /* Parallax Theme */ -.parallax_quote, [data-snippet-id="slider"] { - background: center center no-repeat fixed; - background-size: contain; -} -.parallax_quote .carousel-indicators li, [data-snippet-id="slider"] .carousel-indicators li { +div.carousel[data-snippet-id="slider"] .carousel-indicators li { border: 1px solid grey; } -.parallax_quote .carousel-indicators .active, [data-snippet-id="slider"] .carousel-indicators .active { +div.carousel[data-snippet-id="slider"] .carousel-indicators .active { background-color: grey; } .parallax { position: relative; background-size: 100%; + display: table; + width: 100%; + min-height: 100px; } .parallax.oe_small { - height: 200px; + min-height: 200px; } .parallax.oe_medium { - height: 300px; + min-height: 300px; } .parallax.oe_big { - height: 450px; + min-height: 450px; +} +.parallax > div { + display: table-cell; + vertical-align: middle; + padding: 32px 0; } /* Background */ diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index a559efdca75..8329ef09070 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -304,9 +304,7 @@ ul.nav-stacked > li > a /* Parallax Theme */ -.parallax_quote, [data-snippet-id="slider"] - background: center center no-repeat fixed - background-size: contain +div.carousel[data-snippet-id="slider"] .carousel-indicators li border: 1px solid grey @@ -316,12 +314,19 @@ ul.nav-stacked > li > a .parallax position: relative background-size: 100% + display: table + width: 100% + min-height: 100px &.oe_small - height: 200px + min-height: 200px &.oe_medium - height: 300px + min-height: 300px &.oe_big - height: 450px + min-height: 450px + > div + display: table-cell + vertical-align: middle + padding: 32px 0 /* Background */ -- 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') 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 a1ecb6923b8673f9f4e00f4e27e0a6a12491edd8 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 5 Dec 2013 12:39:08 +0100 Subject: [ADD] saving of oddly localized/formatted stuff bzr revid: xmo@openerp.com-20131205113908-9tr575ejn7hanhi7 --- addons/website/static/src/css/editor.css | 4 ---- 1 file changed, 4 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 487306be5dc..eaf1fdbe96b 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -206,10 +206,6 @@ ul.oe_menu_editor .disclose { position: static !important; } -.cke_widget_drag_handler_container { - display: none !important; -} - .cke_widget_editable:empty:after { content: " "; white-space: pre-wrap; -- cgit v1.2.3 From d0b813a0165b840f9fc45b0e0f647341e7c7b750 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Fri, 6 Dec 2013 14:30:03 +0100 Subject: [IMP] fix website_hr_recruitment, website_event, and create contact qweb widget bzr revid: chm@openerp.com-20131206133003-to4lbgoynvviifq5 --- addons/website/static/src/css/website.css | 7 +++++++ addons/website/static/src/css/website.sass | 6 ++++++ 2 files changed, 13 insertions(+) (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 d62a3b9b371..5d0f452863f 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -496,3 +496,10 @@ table.well tr td { .oe_demo div a { color: white; } + +address .fa.fa-mobile-phone { + margin: 0 3px 0 2px; +} +address .fa.fa-file-text-o { + margin-right: 1px; +} diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 8329ef09070..a08aee8cfd1 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -372,3 +372,9 @@ table.well tr font-weight: bold a color: white + +address + .fa.fa-mobile-phone + margin: 0 3px 0 2px + .fa.fa-file-text-o + margin-right: 1px -- cgit v1.2.3 From bdc2caab613bfc08a30c3a9ab478d53dec87b094 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 10 Dec 2013 11:32:53 +0100 Subject: [FIX] website: publish function not clear bzr revid: chm@openerp.com-20131210103253-j1n7cqufivh7ng09 --- addons/website/static/src/css/website.css | 6 +++--- addons/website/static/src/css/website.sass | 10 ++++++---- 2 files changed, 9 insertions(+), 7 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 5d0f452863f..9a6541882ba 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -283,12 +283,12 @@ ul.nav-stacked > li > a { } /* ---- PUBLISH ---- */ -.css_unpublish, .css_publish { +.css_published .btn-danger, .css_published .css_publish { display: none; } -.css_published .css_unpublish, .css_unpublished .css_publish { - display: block; +.css_unpublished .btn-success, .css_unpublished .css_unpublish { + display: none; } [data-publish='off'] { diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index a08aee8cfd1..d498cdbb402 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -202,10 +202,12 @@ ul.nav-stacked > li > a text-transform: uppercase /* ---- PUBLISH ---- */ -.css_unpublish, .css_publish - display: none -.css_published .css_unpublish, .css_unpublished .css_publish - display: block +.css_published + .btn-danger, .css_publish + display: none +.css_unpublished + .btn-success, .css_unpublish + display: none [data-publish='off'] +opacity(0.5) -- cgit v1.2.3 From 6e229fa852d57ac1d30f5a48b6c82299af5e4536 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 10 Dec 2013 11:56:37 +0100 Subject: [FIX] website: bad css (+remove a wrong js line) bzr revid: chm@openerp.com-20131210105637-uebvqry67urydl0n --- addons/website/static/src/css/website.css | 3 +-- addons/website/static/src/css/website.sass | 3 +-- 2 files changed, 2 insertions(+), 4 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 9a6541882ba..6cf3cd9874f 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -199,12 +199,11 @@ html, body, #wrapwrap { } #wrapwrap { - display: table; width: 100%; } header, #wrap, footer { - display: table-row; + margin: 0 auto; } footer { diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index d498cdbb402..fb905fd78a4 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -124,11 +124,10 @@ html,body, #wrapwrap height: 100% #wrapwrap - display: table width: 100% header, #wrap, footer - display: table-row + margin: 0 auto footer height: 100% -- cgit v1.2.3 From 3421edaf949df041a94a311e469c8c224e8dbb6a Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 10 Dec 2013 13:08:57 +0100 Subject: [IMP] website: clean css code for banner bzr revid: chm@openerp.com-20131210120857-ii53g67n42sha51b --- addons/website/static/src/css/website.css | 31 ++++++++++++------------------ addons/website/static/src/css/website.sass | 30 +++++++++++------------------ 2 files changed, 23 insertions(+), 38 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 6cf3cd9874f..c3cb83b4b54 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -344,30 +344,27 @@ ul.nav-stacked > li > a { .carousel.oe_big .carousel-inner { height: 450px; } +.carousel .carousel-caption { + left: auto; + right: auto; + bottom: 10%; + text-align: left; + padding: 20px; + background: rgba(0, 0, 0, 0.4); +} .carousel .carousel-caption h1, .carousel .carousel-caption h2, .carousel .carousel-caption h3 { margin-top: 10px; margin-bottom: 10px; } .carousel .carousel-image { - right: 10%; + right: 50%; left: 50%; top: 5%; bottom: 5%; position: absolute; - text-align: center; -} -.carousel .carousel-image img { - height: 100%; + max-height: 90%; margin: 0 auto; } -.carousel .item.text_image .carousel-caption { - left: auto; - right: auto; - bottom: 10%; - text-align: left; - padding: 20px; - background: rgba(0, 0, 0, 0.4); -} .carousel .item.text_only .carousel-image { display: none !important; } @@ -375,18 +372,14 @@ ul.nav-stacked > li > a { left: 10%; right: 10%; top: 10%; + bottom: auto; text-align: center; + background: transparent; } .carousel .item.image_text .carousel-caption { - left: auto; - text-align: left; right: 10%; - bottom: 10%; - padding: 20px; - background: rgba(0, 0, 0, 0.4); } .carousel .item.image_text .carousel-image { - right: 50%; left: 10%; } .carousel .carousel-control { diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index fb905fd78a4..a8c461476a2 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -251,27 +251,23 @@ ul.nav-stacked > li > a &.oe_big .carousel-inner height: 450px .carousel-caption + left: auto + right: auto + bottom: 10% + text-align: left + padding: 20px + background: rgba(0, 0, 0, 0.4) h1, h2, h3 margin-top: 10px margin-bottom: 10px .carousel-image - right: 10% + right: 50% left: 50% top: 5% bottom: 5% position: absolute - text-align: center - img - height: 100% - margin: 0 auto - .item.text_image - .carousel-caption - left: auto - right: auto - bottom: 10% - text-align: left - padding: 20px - background: rgba(0, 0, 0, 0.4) + max-height: 90% + margin: 0 auto .item.text_only .carousel-image display: none !important @@ -279,17 +275,13 @@ ul.nav-stacked > li > a left: 10% right: 10% top: 10% + bottom: auto text-align: center + background: transparent .item.image_text .carousel-caption - left: auto - text-align: left right: 10% - bottom: 10% - padding: 20px - background: rgba(0, 0, 0, 0.4) .carousel-image - right: 50% left: 10% .carousel-control cursor: pointer -- cgit v1.2.3 From bbecbabb746ea51ae013b5203b7977c513612c98 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 10 Dec 2013 13:54:15 +0100 Subject: [FIX] website: Can't duplicate a snippet of type quote bzr revid: chm@openerp.com-20131210125415-tur8ibjjejyyb1ne --- addons/website/static/src/css/website.css | 4 ++++ addons/website/static/src/css/website.sass | 3 +++ 2 files changed, 7 insertions(+) (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 c3cb83b4b54..78c51dd9907 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -223,6 +223,10 @@ footer { width: 100%; } +.row { + min-height: 32px; +} + /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */ .oe_structure.oe_editable.oe_empty:empty, .oe_editable[data-oe-type=html]:empty, .oe_structure.oe_editable.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/drag_here.png"); diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index a8c461476a2..4a79b7b4a97 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -144,6 +144,9 @@ footer float: left width: 100% +.row + min-height: 32px + /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */ .oe_structure.oe_editable.oe_empty:empty, .oe_editable[data-oe-type=html]:empty, .oe_structure.oe_editable.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child -- cgit v1.2.3 From 2733f9b2871395ed19358cab0df0def26fa88313 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 11 Dec 2013 16:25:14 +0100 Subject: [FIX] website: t-field widget monetary layout bzr revid: chm@openerp.com-20131211152514-4s0fmnqri4l4ekkt --- addons/website/static/src/css/website.css | 4 ++++ addons/website/static/src/css/website.sass | 3 +++ 2 files changed, 7 insertions(+) (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 78c51dd9907..8f5b72fd31a 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -499,3 +499,7 @@ address .fa.fa-mobile-phone { address .fa.fa-file-text-o { margin-right: 1px; } + +span[data-oe-type="monetary"] { + white-space: nowrap; +} diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 4a79b7b4a97..9b1d1957066 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -374,3 +374,6 @@ address margin: 0 3px 0 2px .fa.fa-file-text-o margin-right: 1px + +span[data-oe-type="monetary"] + white-space: nowrap \ No newline at end of file -- 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.css | 2 +- addons/website/static/src/css/editor.sass | 3 ++- 2 files changed, 3 insertions(+), 2 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 eaf1fdbe96b..18ac7a828d7 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -220,7 +220,7 @@ ul.oe_menu_editor .disclose { position: absolute; top: 0; left: 0; - z-index: 42; + z-index: 1000; } /* ---- SNIPPET EDITOR ---- */ 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.css | 5 +++++ addons/website/static/src/css/editor.sass | 3 +++ 2 files changed, 8 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 18ac7a828d7..af5519cae2c 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; @@ -190,6 +191,10 @@ ul.oe_menu_editor .disclose { margin-bottom: 0.5em; } +.modal-footer { + text-align: left; +} + .modal.nosave .modal-footer button.save { display: none; } 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 bc749910f24e6d0e901efcbd0cd46ee2a860c229 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 13 Dec 2013 22:37:59 +0100 Subject: [IMP] Revert bad change in CSS, for height of footer bzr revid: fp@tinyerp.com-20131213213759-fz3yjc79o09jmjw2 --- addons/website/static/src/css/website.css | 3 ++- addons/website/static/src/css/website.sass | 3 ++- 2 files changed, 4 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 8f5b72fd31a..3c57d1bf69f 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -199,11 +199,12 @@ html, body, #wrapwrap { } #wrapwrap { + display: table; width: 100%; } header, #wrap, footer { - margin: 0 auto; + display: table-row; } footer { diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 9b1d1957066..eeac3ce2eb5 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -124,10 +124,11 @@ html,body, #wrapwrap height: 100% #wrapwrap + display: table width: 100% header, #wrap, footer - margin: 0 auto + display: table-row footer height: 100% -- cgit v1.2.3 From 3aaa0c10fe59f11cd3604c8e837d6bdb215d11b7 Mon Sep 17 00:00:00 2001 From: Max Mumford Date: Mon, 16 Dec 2013 17:06:54 +0100 Subject: [ADD]
tag around content for easy replacing, and CSS changes to maintain current UI bzr revid: mmu@openerp.com-20131216160654-s75kx9xr2yutq5fg --- addons/website/static/src/css/website.css | 2 +- addons/website/static/src/css/website.sass | 2 +- 2 files changed, 2 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 3c57d1bf69f..4d75ef6ef51 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -203,7 +203,7 @@ html, body, #wrapwrap { width: 100%; } -header, #wrap, footer { +header, main, footer { display: table-row; } diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index eeac3ce2eb5..babeee577a7 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -127,7 +127,7 @@ html,body, #wrapwrap display: table width: 100% -header, #wrap, footer +header, main, footer display: table-row footer -- 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.css | 3 +-- addons/website/static/src/css/editor.sass | 4 ++-- 2 files changed, 3 insertions(+), 4 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 af5519cae2c..e40d6996850 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -1,4 +1,3 @@ -@charset "utf-8"; /* ---- CKEditor Minimal Reset ---- */ .navbar.navbar-inverse .cke_chrome { border: none; @@ -173,7 +172,7 @@ ul.oe_menu_editor .disclose { } /* ---- RTE ---- */ -.oe_editable .btn { +.oe_editable .btn, .btn.oe_editable { -webkit-user-select: auto; -moz-user-select: auto; user-select: auto; 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 1434a5aae91b207cb4e7fe64c8ec45dd00a10a72 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 17 Dec 2013 14:46:00 +0100 Subject: [IMP] allow to reset broken views in the 500 error page bzr revid: fme@openerp.com-20131217134600-v0i170n9gw7752vj --- addons/website/static/src/css/website.css | 51 +++++++++++++++++++++++++++++- addons/website/static/src/css/website.sass | 33 ++++++++++++++++++- 2 files changed, 82 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 4d75ef6ef51..bf261cf905a 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -1,4 +1,3 @@ -@charset "utf-8"; /* THIS CSS FILE IS FOR WEBSITE THEMING CUSTOMIZATION ONLY * * css for editor buttons, openerp widget included in the website and other @@ -504,3 +503,53 @@ address .fa.fa-file-text-o { span[data-oe-type="monetary"] { white-space: nowrap; } + +.oe_template_fallback { + -webkit-column-count: 3; + -moz-column-count: 3; + -ms-column-count: 3; + -o-column-count: 3; + column-count: 3; +} + +.bs-callout { + margin: 20px 0; + padding: 20px; + border-left: 3px solid #eeeeee; +} + +.bs-callout h4 { + margin-top: 0; + margin-bottom: 5px; +} + +.bs-callout p:last-child { + margin-bottom: 0; +} + +.bs-callout-danger { + background-color: #fdf7f7; + border-color: #eed3d7; +} + +.bs-callout-danger h4 { + color: #b94a48; +} + +.bs-callout-warning { + background-color: #faf8f0; + border-color: #faebcc; +} + +.bs-callout-warning h4 { + color: #8a6d3b; +} + +.bs-callout-info { + background-color: #f4f8fa; + border-color: #bce8f1; +} + +.bs-callout-info h4 { + color: #34789a; +} diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index babeee577a7..ccd11d3396f 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -377,4 +377,35 @@ address margin-right: 1px span[data-oe-type="monetary"] - white-space: nowrap \ No newline at end of file + white-space: nowrap + +.oe_template_fallback + @include column-count(3) + +// ---- Callouts from bootstrap doc ---- {{{ +.bs-callout + margin: 20px 0 + padding: 20px + border-left: 3px solid #eee +.bs-callout h4 + margin-top: 0 + margin-bottom: 5px +.bs-callout p:last-child + margin-bottom: 0 + +.bs-callout-danger + background-color: #fdf7f7 + border-color: #eed3d7 +.bs-callout-danger h4 + color: #b94a48 +.bs-callout-warning + background-color: #faf8f0 + border-color: #faebcc +.bs-callout-warning h4 + color: #8a6d3b +.bs-callout-info + background-color: #f4f8fa + border-color: #bce8f1 +.bs-callout-info h4 + color: #34789a +// }}} -- 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.css | 8 +++++++- addons/website/static/src/css/editor.sass | 15 ++++++++++++--- 2 files changed, 19 insertions(+), 4 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 e40d6996850..e21bfc1fbe8 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -211,9 +211,15 @@ ul.oe_menu_editor .disclose { } .cke_widget_editable:empty:after { - content: " "; + opacity: 0.3; white-space: pre-wrap; } +.cke_widget_editable:not([placeholder]):empty::after { + content: " "; +} +.cke_widget_editable[placeholder]:not(:focus):empty::after { + content: attr(placeholder); +} .oe_carlos_danger { outline: 1px solid red !important; 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.css | 3 --- addons/website/static/src/css/editor.sass | 7 +++---- 2 files changed, 3 insertions(+), 7 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 e21bfc1fbe8..3e0e46ebc45 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -238,7 +238,6 @@ ul.oe_menu_editor .disclose { position: fixed; left: 0px; right: 0px; - top: 51px; background: #282828; -webkit-box-shadow: 0px 10px 10px -10px black inset; -moz-box-shadow: 0px 10px 10px -10px black inset; @@ -677,7 +676,6 @@ ul.oe_menu_editor .disclose { /* ---- ACE EDITOR ---- */ .oe_ace_view_editor { position: fixed; - top: 51px; right: 0; z-index: 1000; height: 100%; @@ -707,7 +705,6 @@ ul.oe_menu_editor .disclose { position: absolute; top: 30px; right: 0; - bottom: 51px; left: 0; } .oe_ace_view_editor .ace_editor .ace_gutter { 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.css | 24 +++++++------- addons/website/static/src/css/editor.sass | 54 ++++++++++++++++++++++--------- 2 files changed, 52 insertions(+), 26 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 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: -- 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.css | 1 + addons/website/static/src/css/editor.sass | 1 + 2 files changed, 2 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 b58efd236e5..b784177fd1c 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -178,6 +178,7 @@ ul.oe_menu_editor .disclose { -webkit-user-select: auto; -moz-user-select: auto; user-select: auto; + cursor: text !important; } .modal-dialog.select-image { 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