From 373a26290cb2b2c1966d457d8c60ee538420aaeb Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Tue, 27 Aug 2013 16:53:18 +0530 Subject: [IMP]Improved header,customized menu,added vertical divider class and html formating. bzr revid: bth@tinyerp.com-20130827112318-kzt0xt2u49zzgfy2 --- addons/website/static/src/css/website.sass | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'addons/website/static/src/css/website.sass') diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 8b885c548d1..1eb60a70067 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -122,4 +122,22 @@ header.navbar-fixed-top .dark background: rgb(239, 248, 248) - +.carousel-control + top: 40% + left: 15px + width: 40px + height: 40px + margin-top: -20px + font-size: 60px + line-height: 30px + background: #222222 + border: 3px solid #ffffff + -webkit-border-radius: 23px + -moz-border-radius: 23px + border-radius: 23px + +.divider-vertical + height: 50px + margin: 0 9px + border-right: 1px solid #222222 + border-left: 1px solid #111111 \ No newline at end of file -- cgit v1.2.3 From 9fec35ae879c2b88dab87be21f915c41808ed9b6 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Tue, 27 Aug 2013 18:13:11 +0530 Subject: [IMP]Improved css for header. bzr revid: bth@tinyerp.com-20130827124311-h5w7qvv6s8naxgcc --- addons/website/static/src/css/website.sass | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'addons/website/static/src/css/website.sass') diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 1eb60a70067..ef6dc5d9ba6 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -136,8 +136,12 @@ header.navbar-fixed-top -moz-border-radius: 23px border-radius: 23px -.divider-vertical - height: 50px - margin: 0 9px - border-right: 1px solid #222222 - border-left: 1px solid #111111 \ No newline at end of file +header + margin-bottom: 0px + min-height: 40px + .collapse ul + margin-top: 5px + +.navbar-nav >li >a + padding:10px 15px 10px + \ No newline at end of file -- cgit v1.2.3 From 1f118d0ed8e755c28e4772e2f884f0a811981eb2 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Tue, 27 Aug 2013 18:54:39 +0530 Subject: [IMP]Improved website_mail module and removed dependency from website_contract. bzr revid: bth@tinyerp.com-20130827132439-77uo7dgacx3xhyv0 --- addons/website/static/src/css/website.sass | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'addons/website/static/src/css/website.sass') diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index ef6dc5d9ba6..4a87ab5c1d5 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -144,4 +144,13 @@ header .navbar-nav >li >a padding:10px 15px 10px - \ No newline at end of file + ++/* -- Hack for nav header -- */ +.nav > li.nav-header + display: block + font-size: 11px + font-weight: bold + line-height: 20px + color: #999999 + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5) + text-transform: uppercase -- cgit v1.2.3 From 52bed3d79004191e1a2749098686d930acad3a40 Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Thu, 29 Aug 2013 16:35:38 +0530 Subject: [IMP] Fixed the double scrollbar issue in mobile preview and added sass for css where not added and added nav-pills in menu for proper display. bzr revid: psa@tinyerp.com-20130829110538-pamnb7d6xcnu7jug --- addons/website/static/src/css/website.sass | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'addons/website/static/src/css/website.sass') diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 4a87ab5c1d5..b92e3b46c40 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -154,3 +154,29 @@ header color: #999999 text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5) text-transform: uppercase + +.navbar-inverse .divider-vertical + height: 40px + margin: 0 9px + border-right: 1px solid #ffffff + border-left: 1px solid #f2f2f2 + +.navbar-nav .divider-vertical + border-right-color: #222 + border-left-color: #080808 + +.navbar-inverse + background-image: -moz-linear-gradient(top, #222, #080808) + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222), to(#080808)) + background-image: -webkit-linear-gradient(top, #222, #080808) + background-image: -o-linear-gradient(top, #222, #080808) + background-image: linear-gradient(to bottom, #222, #080808) + background-repeat: repeat-x + +.navbar-default + border: 1px solid #d4d4d4 + +/* -- Hack for removing double scrollbar from mobile preview -- */ +.modal + overflow: hidden + overflow-y: hidden -- cgit v1.2.3 From 32d8c05842721696f3c141e5f8dbfa6eedee3775 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Thu, 29 Aug 2013 17:02:30 +0530 Subject: [IMP]Improved css and add class. bzr revid: bth@tinyerp.com-20130829113230-lv9ljwjeynfrwxgg --- addons/website/static/src/css/website.sass | 34 ++++++++++++++++-------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'addons/website/static/src/css/website.sass') diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index b92e3b46c40..6bae29cc345 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -145,7 +145,7 @@ header .navbar-nav >li >a padding:10px 15px 10px -+/* -- Hack for nav header -- */ +/* -- Hack for nav header -- */ .nav > li.nav-header display: block font-size: 11px @@ -156,27 +156,29 @@ header text-transform: uppercase .navbar-inverse .divider-vertical - height: 40px - margin: 0 9px - border-right: 1px solid #ffffff - border-left: 1px solid #f2f2f2 + height: 40px + margin: 0 9px + border-right: 1px solid #ffffff + border-left: 1px solid #f2f2f2 .navbar-nav .divider-vertical - border-right-color: #222 - border-left-color: #080808 + border-right-color: #222 + border-left-color: #080808 .navbar-inverse - background-image: -moz-linear-gradient(top, #222, #080808) - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222), to(#080808)) - background-image: -webkit-linear-gradient(top, #222, #080808) - background-image: -o-linear-gradient(top, #222, #080808) - background-image: linear-gradient(to bottom, #222, #080808) - background-repeat: repeat-x + background-image: -moz-linear-gradient(top, #222, #080808) + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222), to(#080808)) + background-image: -webkit-linear-gradient(top, #222, #080808) + background-image: -o-linear-gradient(top, #222, #080808) + background-image: linear-gradient(to bottom, #222, #080808) + background-repeat: repeat-x .navbar-default - border: 1px solid #d4d4d4 + border: 1px solid #d4d4d4 /* -- Hack for removing double scrollbar from mobile preview -- */ .modal - overflow: hidden - overflow-y: hidden + overflow: hidden + overflow-y: hidden +ul.nav-stacked>li>a + padding: 2px 15px \ No newline at end of file -- cgit v1.2.3 From 497c7addad4c6ef6aa961408d1053a9bffb84d1f Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Thu, 29 Aug 2013 17:52:22 +0530 Subject: [IMP] Removed inline css for hierarchy and added a global css for that. bzr revid: psa@tinyerp.com-20130829122222-h60648t5v28tmt90 --- addons/website/static/src/css/website.sass | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'addons/website/static/src/css/website.sass') diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 6bae29cc345..4dfb2177ce5 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -155,6 +155,12 @@ header text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5) text-transform: uppercase +ul.nav-stacked>li>a + padding: 2px 15px + +.nav.nav-hierarchy + padding-left: 16px + .navbar-inverse .divider-vertical height: 40px margin: 0 9px -- cgit v1.2.3 From 441284b0c52b149d6294c657e4a7d04466ac19c3 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Thu, 29 Aug 2013 18:27:34 +0530 Subject: [IMP]Formatting and add navbar class and css for navbar header. bzr revid: bth@tinyerp.com-20130829125734-9w879j3gp1osn0tb --- addons/website/static/src/css/website.sass | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'addons/website/static/src/css/website.sass') diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 4dfb2177ce5..d8eb40da030 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -141,9 +141,11 @@ header min-height: 40px .collapse ul margin-top: 5px + > .navbar + margin-bottom: 0px .navbar-nav >li >a - padding:10px 15px 10px + padding:10px 15px 10px /* -- Hack for nav header -- */ .nav > li.nav-header @@ -156,10 +158,10 @@ header text-transform: uppercase ul.nav-stacked>li>a - padding: 2px 15px + padding: 2px 15px .nav.nav-hierarchy - padding-left: 16px + padding-left: 16px .navbar-inverse .divider-vertical height: 40px -- cgit v1.2.3 From e65068e64a7553d7e220f36f3e6441ad7fcf1682 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Thu, 29 Aug 2013 18:59:46 +0530 Subject: [IMP]Dropdown Header in capital letter. bzr revid: bth@tinyerp.com-20130829132946-pk1ig2mfpkps1qhn --- addons/website/static/src/css/website.sass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'addons/website/static/src/css/website.sass') diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index d8eb40da030..f8b8bab8efc 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -189,4 +189,6 @@ ul.nav-stacked>li>a overflow: hidden overflow-y: hidden ul.nav-stacked>li>a - padding: 2px 15px \ No newline at end of file + padding: 2px 15px +.dropdown-header + text-transform: uppercase \ No newline at end of file -- cgit v1.2.3 From 707c345437fb8508e9b87c83746df0a7b2379141 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 30 Aug 2013 01:05:33 +0200 Subject: [IMP] bootswatch theme switcher bzr revid: fp@openerp.com-20130829230533-glpg1nez53tqsgbb --- addons/website/static/src/css/website.sass | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'addons/website/static/src/css/website.sass') diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 8c7b4ad8e1d..faa9434a5e5 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -62,19 +62,6 @@ &.grid-align-bottom > [class*="col-md"] vertical-align: bottom -/* Table with two collumns aligned on the center */ -.table-equalized - width: 100% - td:first-child - width: 50% - text-align: right - padding-right: 1em - vertical-align: bottom - td:last-child - width: 50% - text-align: left - vertical-align: bottom - /* ----- BOOTSTRAP HACK FOR STICKY FOOTER ----- */ html,body @@ -153,9 +140,6 @@ div#wrap background-image: linear-gradient(to bottom, #222, #080808) background-repeat: repeat-x -.navbar-default - border: 1px solid #d4d4d4 - /* -- Hack for removing double scrollbar from mobile preview -- */ .modal overflow: hidden -- cgit v1.2.3 From 75f8fe3d1bdece074fac3b6d077cf5be056d2ce0 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 30 Aug 2013 12:48:38 +0200 Subject: [IMP] backround independant theme bzr revid: fp@tinyerp.com-20130830104838-1ryj7uv1trtgp3jr --- addons/website/static/src/css/website.sass | 52 +++++++----------------------- 1 file changed, 12 insertions(+), 40 deletions(-) (limited to 'addons/website/static/src/css/website.sass') diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index faa9434a5e5..e9a5953f1b8 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -80,9 +80,10 @@ html,body footer box-sizing: border-box height: 380px - background: rgb(239, 248, 248) // rgb(221, 235, 227) + background: rgb(239, 248, 248) padding-top: 48px padding-bottom: 48px + background: rgba(100, 200, 200, 0.1) /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */ @@ -90,11 +91,11 @@ footer .navbar .nav > li > p margin-bottom: 0px -.navbar .nav > li a - text-shadow: none +// .navbar .nav > li a +// text-shadow: none -.nav > li a - display: block +// .nav > li a +// display: block #myCarousel .item color: white @@ -102,51 +103,22 @@ footer /* ---- HOMEPAGE THEME CUSTOMIZATION ---- */ .dark - background: rgb(239, 248, 248) + background: #eff8f8 + background: rgba(100, 200, 200, 0.1) /* Hacks to remove */ div#wrap .carousel top: -20px -/* -- Hack for nav header -- */ -.nav > li.nav-header - display: block - font-size: 11px - font-weight: bold - line-height: 20px - color: #999999 - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5) - text-transform: uppercase - -.nav.nav-hierarchy - padding-left: 16px - -.navbar-inverse .divider-vertical - height: 40px - margin: 0 9px - border-right: 1px solid #ffffff - border-left: 1px solid #f2f2f2 - -.navbar-nav .divider-vertical - border-right-color: #222 - border-left-color: #080808 - -.navbar-inverse - background-image: -moz-linear-gradient(top, #222, #080808) - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222), to(#080808)) - background-image: -webkit-linear-gradient(top, #222, #080808) - background-image: -o-linear-gradient(top, #222, #080808) - background-image: linear-gradient(to bottom, #222, #080808) - background-repeat: repeat-x - /* -- Hack for removing double scrollbar from mobile preview -- */ -.modal +div#mobile-preview.modal overflow: hidden overflow-y: hidden ul.nav-stacked > li > a padding: 2px 15px -.dropdown-header - text-transform: uppercase +#customize-menu + .dropdown-header + text-transform: uppercase -- cgit v1.2.3 From 6569463f67f62f6109a465b41b773c3555fc2ee0 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 30 Aug 2013 17:01:26 +0200 Subject: [IMP] Flex Footer bzr revid: fp@tinyerp.com-20130830150126-y0qgjwf5sy3fxwdj --- addons/website/static/src/css/website.sass | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'addons/website/static/src/css/website.sass') diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index e9a5953f1b8..b10de0d5cf5 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -65,26 +65,25 @@ /* ----- BOOTSTRAP HACK FOR STICKY FOOTER ----- */ html,body - height: 100% box-sizing: border-box - position: relative - -#wrap - min-height: 100% - height: auto !important height: 100% - margin: 0 auto -300px - padding: 0 0 364px - box-sizing: border-box + +body + display: table + width: 100% + +header, #wrap, footer + display: table-row footer + height: 100% box-sizing: border-box - height: 380px background: rgb(239, 248, 248) - padding-top: 48px - padding-bottom: 48px background: rgba(100, 200, 200, 0.1) +#footer_container + padding-top: 24px + padding-bottom: 12px /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */ -- cgit v1.2.3 From 5f2b77d6c021b8f73e1dd370163372cdca60f1a6 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sat, 31 Aug 2013 11:01:12 +0200 Subject: [IMP] small html/css improvements bzr revid: fp@openerp.com-20130831090112-3omb9popd0099m5u --- addons/website/static/src/css/website.sass | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'addons/website/static/src/css/website.sass') diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index b10de0d5cf5..c0777f024d2 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -74,10 +74,9 @@ body header, #wrap, footer display: table-row - + footer height: 100% - box-sizing: border-box background: rgb(239, 248, 248) background: rgba(100, 200, 200, 0.1) @@ -104,8 +103,13 @@ footer .dark background: #eff8f8 background: rgba(100, 200, 200, 0.1) + -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 -/* Hacks to remove */ div#wrap .carousel top: -20px -- cgit v1.2.3 From d95305b7a433113cb33e58010a6718cc7504fcf0 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 2 Sep 2013 16:14:54 +0200 Subject: [IMP] website: publish button layout bzr revid: chm@openerp.com-20130902141454-z3rec943y5tjcg92 --- addons/website/static/src/css/website.sass | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'addons/website/static/src/css/website.sass') diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index c0777f024d2..65e530e6ed9 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -125,3 +125,22 @@ ul.nav-stacked > li > a #customize-menu .dropdown-header text-transform: uppercase + +/* ---- PUBLISH BUTTON ---- */ +a + &.css_unpublish + .css_unpublish + display: none + &:hover + .css_unpublish + display: inline + .css_publish + display: none + &.css_publish + .css_publish + display: none + &:hover + .css_publish + display: inline + .css_unpublish + display: none -- cgit v1.2.3 From 1fbf4c63499a8ab11dfd7c6774ac8f46076b02c7 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 3 Sep 2013 12:41:15 +0200 Subject: [IMP] website: publisher with css for activated and disabled bzr revid: chm@openerp.com-20130903104115-9yukaqh0teh45ipf --- addons/website/static/src/css/website.sass | 46 +++++++++++++++++++----------- 1 file changed, 30 insertions(+), 16 deletions(-) (limited to 'addons/website/static/src/css/website.sass') diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 65e530e6ed9..b5468a4b0e8 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -126,21 +126,35 @@ ul.nav-stacked > li > a .dropdown-header text-transform: uppercase -/* ---- PUBLISH BUTTON ---- */ -a - &.css_unpublish - .css_unpublish +/* ---- PUBLISH ---- */ +a[data-publish] + text-decoration: none !important + z-index: 2 + .label + padding: 5px 8px + .css_unpublish, .css_publish, .css_unpublished, .css_published + display: none + &[data-publish='off'] + .css_unpublished, &:hover .css_publish + display: inline + &:hover .css_unpublished display: none - &:hover - .css_unpublish - display: inline - .css_publish - display: none - &.css_publish - .css_publish + &[data-publish='on'] + .css_published, &:hover .css_unpublish + display: inline + &:hover .css_published display: none - &:hover - .css_publish - display: inline - .css_unpublish - display: none + +[data-publish='off']:not(a) + >:not([data-publish]) + opacity: 0.5 +[data-publish]:not(a) + position: relative + overflow: visible + >[data-publish] + position: absolute + right: -6px + top: -10px + display: none + &:hover > [data-publish] + display: block \ No newline at end of file -- cgit v1.2.3