From 7c12d5d200141907e5f3b7492e958c3c8c83b6f5 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 3 Feb 2014 17:03:31 +0100 Subject: [IMP] clearer indication that images are being up/downloaded bzr revid: xmo@openerp.com-20140203160331-04h1erlunelb9kkn --- addons/website/static/src/css/common.sass | 44 +++++++++++++++++++++++++++++++ addons/website/static/src/css/editor.css | 14 +++++++--- addons/website/static/src/css/editor.sass | 13 ++++++--- addons/website/static/src/css/website.css | 1 - 4 files changed, 63 insertions(+), 9 deletions(-) (limited to 'addons/website/static/src/css') diff --git a/addons/website/static/src/css/common.sass b/addons/website/static/src/css/common.sass index 86e1f6655ef..4d5f0673e33 100644 --- a/addons/website/static/src/css/common.sass +++ b/addons/website/static/src/css/common.sass @@ -1,6 +1,7 @@ @import "compass/css3" @import "compass/css3/user-interface" @import "compass/css3/transition" +@import "compass/support" //smartphones, iPhone, portrait 480x320 phones $smart_phone: 320px @@ -23,3 +24,46 @@ $desktop: 1025px @content ::selection @content + +// Lifted from compass-animation +// LICENSED UNDER THE MIT LICENSE (MIT) +// +// Copyright (c) 2012 Eric Meyer +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +@mixin set-experimental-support($moz: false, $webkit: false, $ms: false, $o: false, $khtml: false) + $experimental-support-for-mozilla: $moz + $experimental-support-for-webkit: $webkit + $experimental-support-for-microsoft: $ms + $experimental-support-for-opera: $o + $experimental-support-for-khtml: $khtml + +@mixin with-only-support-for($moz: false, $webkit: false, $ms: false, $o: false, $khtml: false) + // Capture the current state + $original-moz: $experimental-support-for-mozilla + $original-webkit: $experimental-support-for-webkit + $original-o: $experimental-support-for-opera + $original-ms: $experimental-support-for-microsoft + $original-khtml: $experimental-support-for-khtml + + @include set-experimental-support($moz, $webkit, $ms, $o, $khtml) + @content + @include set-experimental-support($original-moz, $original-webkit, $original-ms, $original-o, $original-khtml) + +@mixin keyframes($name) + @-moz-keyframes #{$name} + +with-only-support-for($moz: true) + @content + @-webkit-keyframes #{$name} + +with-only-support-for($webkit: true) + @content + @-o-keyframes #{$name} + +with-only-support-for($o: true) + @content + @keyframes #{$name} + +with-only-support-for + @content diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index 1c54d6f47dd..4fb4496e692 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -195,13 +195,19 @@ ul.oe_menu_editor .disclose { text-align: left; } -.modal.nosave .modal-footer button.save { - display: none; -} -.modal.nosave .modal-footer button.wait { +.modal.nosave .wait { display: inline-block !important; visibility: visible !important; } +.modal.nosave .modal-body .filepicker, .modal.nosave .modal-body .image-preview { + display: none; +} +.modal.nosave .modal-body .wait { + width: 100%; +} +.modal.nosave .modal-footer .save { + display: none; +} .modal .font-icons-icons { font-size: 2em; diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 3abfa4cff05..2e6513f7c1d 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -162,12 +162,17 @@ ul.oe_menu_editor .modal-footer text-align: left -.modal.nosave .modal-footer - button.save - display: none - button.wait +.modal.nosave + .wait display: inline-block !important visibility: visible !important + .modal-body + .filepicker, .image-preview + display: none + .wait + width: 100% + .modal-footer .save + display: none // fontawesome modal .modal diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index 27c74508e7f..6610a98d0f1 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 -- cgit v1.2.3 From 02aff664463dbd4c2d6d4d70541234a55e8fbff4 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 7 Feb 2014 11:48:31 +0100 Subject: [FIX] layout bug, right alignment of blocks incorrect bzr revid: fp@tinyerp.com-20140207104831-s52wrim8r8k7eqox --- addons/website/static/src/css/website.css | 6 ------ addons/website/static/src/css/website.sass | 4 ---- 2 files changed, 10 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 27c74508e7f..39a29be1aab 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 @@ -166,11 +165,6 @@ footer { width: 100%; } -.row { - min-height: 32px; - width: 100%; -} - /* ---- 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") !important; diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 2c5f691fae6..672976e31ae 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -128,10 +128,6 @@ footer float: left width: 100% -.row - min-height: 32px - width: 100% - /* ---- 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 76841f14e4ae1e56516d680bca09b41381d3ee75 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Fri, 7 Feb 2014 14:37:12 +0100 Subject: [FIX] website: snippet: display baner in mobile view; background cover insead of 100%; paralax scrolling bzr revid: chm@openerp.com-20140207133712-srtik2knhwyybgse --- addons/website/static/src/css/website.css | 15 ++++++++------- addons/website/static/src/css/website.sass | 14 ++++++++------ 2 files changed, 16 insertions(+), 13 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 6610a98d0f1..291051a0986 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 @@ -281,12 +282,16 @@ ul.nav-stacked > li > a { } /* ---- SNIPPETS --- */ +.oe_img_bg { + background-size: 100%; +} + [data-snippet-id], .colmd, .hr, .blockquote { overflow: hidden; } @media (max-width: 400px) { - [data-snippet-id] { + [data-snippet-id]:not([data-snippet-id="carousel"]) { height: auto !important; } } @@ -295,7 +300,7 @@ ul.nav-stacked > li > a { } .carousel-inner .item { height: 100%; - background-size: 100%; + background-size: cover; } .carousel .carousel-caption { @@ -365,7 +370,7 @@ div.carousel[data-snippet-id="slider"] .carousel-indicators .active { .parallax { position: relative; - background-size: 100%; + background-size: cover; display: table; width: 100%; min-height: 100px; @@ -445,10 +450,6 @@ div.carousel[data-snippet-id="slider"] .carousel-indicators .active { } /* Misc */ -.oe_img_bg { - background-size: 100%; -} - .texttop { vertical-align: top; } diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 2c5f691fae6..f4c0b338b6a 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -228,19 +228,24 @@ ul.nav-stacked > li > a a color: white + /* ---- SNIPPETS --- */ + +.oe_img_bg + background-size: 100% + [data-snippet-id],.colmd,.hr,.blockquote overflow: hidden @media (max-width: 400px) - [data-snippet-id] + [data-snippet-id]:not([data-snippet-id="carousel"]) height: auto !important .carousel-inner height: 100% .item height: 100% - background-size: 100% + background-size: cover .carousel .carousel-caption left: auto @@ -300,7 +305,7 @@ div.carousel[data-snippet-id="slider"] .parallax position: relative - background-size: 100% + background-size: cover display: table width: 100% min-height: 100px @@ -362,9 +367,6 @@ div.carousel[data-snippet-id="slider"] /* Misc */ -.oe_img_bg - background-size: 100% - .texttop vertical-align: top -- cgit v1.2.3 From 673695fa68ff9fd3a51a9c13866e96e029054bbf Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sat, 8 Feb 2014 13:01:51 +0100 Subject: [IMP] less black snippet border bzr revid: fp@tinyerp.com-20140208120151-l43xf7kamhmmxejr --- addons/website/static/src/css/snippets.css | 2 +- addons/website/static/src/css/snippets.sass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/website/static/src/css') diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css index 00235b3f028..16e85850b2a 100644 --- a/addons/website/static/src/css/snippets.css +++ b/addons/website/static/src/css/snippets.css @@ -223,7 +223,7 @@ -webkit-box-shadow: 0px 0px 0px 1px rgba(255, 255, 255, 0.3), 0px 0px 0px 1px rgba(255, 255, 255, 0.3) inset; -moz-box-shadow: 0px 0px 0px 1px rgba(255, 255, 255, 0.3), 0px 0px 0px 1px rgba(255, 255, 255, 0.3) inset; 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); + border-color: rgba(0, 0, 0, 0.3); } .oe_overlay .oe_handle { display: block !important; diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass index ed9c38731db..7e889763572 100644 --- a/addons/website/static/src/css/snippets.sass +++ b/addons/website/static/src/css/snippets.sass @@ -161,7 +161,7 @@ border-style: dashed 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) + border-color: rgba(0, 0, 0, 0.3) .oe_handle display: block !important pointer-events: auto -- cgit v1.2.3 From d31504171c59a3aa2c596b774d41340acb2cce97 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 11 Feb 2014 09:54:50 +0100 Subject: [IMP] Pantone colors of the year bzr revid: fp@tinyerp.com-20140211085450-ny3pgidw5nobjc5x --- addons/website/static/src/css/website.css | 8 ++++---- addons/website/static/src/css/website.sass | 8 ++++---- 2 files changed, 8 insertions(+), 8 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 80e223eed00..317d9193d94 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -399,7 +399,7 @@ div.carousel[data-snippet-id="slider"] .carousel-indicators .active { } .oe_green { - background-color: #51d466; + background-color: #169c78; color: white; } .oe_green .text-muted { @@ -407,7 +407,7 @@ div.carousel[data-snippet-id="slider"] .carousel-indicators .active { } .oe_blue_light { - background-color: #4791d2; + background-color: #41b6ab; color: white; } .oe_blue_light .text-muted { @@ -420,7 +420,7 @@ div.carousel[data-snippet-id="slider"] .carousel-indicators .active { } .oe_orange { - background-color: #e67e22; + background-color: #f05442; color: white; } .oe_orange .text-muted { @@ -436,7 +436,7 @@ div.carousel[data-snippet-id="slider"] .carousel-indicators .active { } .oe_red { - background-color: #f75353; + background-color: #9c1b31; color: white; } .oe_red .text-muted { diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index cea00027315..2390464bfa7 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -328,13 +328,13 @@ div.carousel[data-snippet-id="slider"] color: white .oe_green - background-color: #51d466 + background-color: #169C78 color: white .text-muted color: #ddd .oe_blue_light - background-color: #4791d2 + background-color: #41b6ab color: white .text-muted color: #ddd @@ -344,7 +344,7 @@ div.carousel[data-snippet-id="slider"] color: white .oe_orange - background-color: #e67e22 + background-color: #f05442 color: white .text-muted color: #ddd @@ -356,7 +356,7 @@ div.carousel[data-snippet-id="slider"] color: #ddd .oe_red - background-color: #f75353 + background-color: #9C1b31 color: white .text-muted color: #ddd -- cgit v1.2.3