From 10e55d570197d27b78bdbb3502df3a5e85edfe18 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 22 Feb 2012 15:23:23 +0100 Subject: [ADD] Minh's sass playground bzr revid: fme@openerp.com-20120222142323-mg2z3kndzm29xisg --- addons/web/static/src/css/base.sass | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 addons/web/static/src/css/base.sass (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass new file mode 100644 index 00000000000..dcb078e8903 --- /dev/null +++ b/addons/web/static/src/css/base.sass @@ -0,0 +1,3 @@ +// vim:tabstop=4:shiftwidth=4:softtabstop=4 +.openerp2 + // Minh's playground. -- cgit v1.2.3 From 865ffbd4cc0a8cd16f3b0e17f7a2b28e6408262b Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 23 Feb 2012 14:55:03 +0100 Subject: [BREAK] Prepare main div container for new layout bzr revid: fme@openerp.com-20120223135503-e89bnthvhbv2z58a --- addons/web/static/src/css/base.sass | 46 ++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index dcb078e8903..51e11840bf9 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1,3 +1,47 @@ -// vim:tabstop=4:shiftwidth=4:softtabstop=4 +// Mixins {{{ +@mixin vertical-gradient($startColor: #555, $endColor: #333) + background: $startColor + background: -moz-linear-gradient($startColor, $endColor) + background: -webkit-gradient(linear, left top, left bottom, from($startColor), to($endColor)) + background: -webkit-linear-gradient($startColor, $endColor) + +@mixin radial-gradient($gradient) + background-position: center center + background-image: radial-gradient($gradient) + background-image: -moz-radial-gradient($gradient) + background-image: -webkit-radial-gradient(circle, $gradient) + +@mixin radius($radius: 5px) + -moz-border-radius: $radius + -webkit-border-radius: $radius + border-radius: $radius + +@mixin box-shadow($bsval: 0px 1px 4px #777) + -moz-box-shadow: $bsval + -webkit-box-shadow: $bsval + -box-shadow: $bsval + +@mixin transition($transval: (border linear 0.2s, box-shadow linear 0.2s)) + -webkit-transition: $transval + -moz-transition: $transval + -ms-transition: $transval + -o-transition: $transval + transition: $transval + +@mixin opacity($opacity: .5) + filter: alpha(opacity=$opacity * 100) + -khtml-opacity: $opacity + -moz-opacity: $opacity + opacity: $opacity + +@mixin background-clip($clip: padding-box) + -webkit-background-clip: $clip + -moz-background-clip: $clip + background-clip: $clip +// }}} + .openerp2 // Minh's playground. + +// au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers > "%:p:r.css" +// vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: -- cgit v1.2.3 From a90d466ccbb23f8bc00c6fb5bcb1ce86adbdae68 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 23 Feb 2012 16:02:30 +0100 Subject: [ADD] Add styles for new main menu bzr revid: fme@openerp.com-20120223150230-n935rq8bv65a6gbj --- addons/web/static/src/css/base.sass | 95 ++++++++++++++++++++++++++++++++++++- 1 file changed, 94 insertions(+), 1 deletion(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 51e11840bf9..090c0ac822f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -41,7 +41,100 @@ // }}} .openerp2 - // Minh's playground. + // Common styles {{{ + padding: 0 + margin: 0 + font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif + color: #4c4c4c + font-size: 13px + background: white + position: relative + + a + color: #4c4c4c + text-decoration: none + // }}} + + // WebClient {{{ + .oe_webclient + position: absolute + top: 0 + bottom: 0 + left: 0 + right: 0 + // }}} + + // Topbar {{{ + .oe_topbar + width: 100% + height: 31px + border-top: solid 1px #d3d3d3 + border-bottom: solid 1px black + @include vertical-gradient(#646060, #262626) + + .oe_topbar_item + float: left + li + float: left + a + display: block + padding: 5px 10px 7px + line-height: 20px + height: 20px + color: #eee + vertical-align: top + text-shadow: 0 1px 1px rgba(0,0,0,0.2) + &:hover + background: #303030 + color: white + @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) + .oe_active + background: #303030 + font-weight: bold + color: white + @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) + + .oe_topbar_avatar + width: 24px + height: 24px + margin: -2px 2px 0 0 + @include radius(4px) + // }}} + + // Menu {{{ + .oe_menu + float: left + padding: 0 + margin: 0 + li + list-style-type: none + float: left + a + display: block + padding: 5px 10px 7px + line-height: 20px + height: 20px + color: #eee + vertical-align: top + text-shadow: 0 1px 1px rgba(0,0,0,0.2) + &:hover + background: #303030 + color: white + @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) + .oe_active + background: #303030 + font-weight: bold + color: white + @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) + // }}} + +.openerp + // Transitional overrides for old styles {{{ + .oe-shortcuts + position: static + #oe_header + clear: both + // }}} // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers > "%:p:r.css" // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: -- cgit v1.2.3 From b64f4c6875b099aa780c5cfd15bfcacec88c2003 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 23 Feb 2012 18:44:39 +0100 Subject: [ADD] Added dropdown menu. bzr revid: fme@openerp.com-20120223174439-nlyeqjobi230e7xx --- addons/web/static/src/css/base.sass | 65 +++++++++++++++++++++++++++++++++++-- 1 file changed, 63 insertions(+), 2 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 090c0ac822f..ab144a5ceec 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -51,7 +51,6 @@ position: relative a - color: #4c4c4c text-decoration: none // }}} @@ -73,7 +72,6 @@ @include vertical-gradient(#646060, #262626) .oe_topbar_item - float: left li float: left a @@ -128,6 +126,69 @@ @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) // }}} + // DropDown Menu {{{ + .oe_dropdown_menu + float: right + padding: 0 + margin: 0 + li + list-style-type: none + float: left + .oe_dropdown + position: relative + + .dropdown-toggle:after + width: 0 + height: 0 + display: inline-block + content: "&darr" + text-indent: -99999px + vertical-align: top + margin-top: 8px + margin-left: 4px + border-left: 4px solid transparent + border-right: 4px solid transparent + border-top: 4px solid white + @include opacity(0.5) + + .oe_dropdown_options + float: left + background: #333 + background: rgba(37,37,37,0.9) + display: none + position: absolute + top: 32px + right: -1px + border: 0 + z-index: 900 + width: 160px + margin-left: 0 + margin-right: 0 + padding: 6px 0 + zoom: 1 + border-color: #999 + border-color: rgba(0, 0, 0, 0.2) + border-style: solid + border-width: 0 1px 1px + @include radius(0 0 6px 6px) + @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) + @include background-clip() + li + float: none + display: block + background-color: none + a + display: block + padding: 4px 15px + clear: both + font-weight: normal + line-height: 18px + color: #eee + &:hover + @include vertical-gradient(#292929, #191919) + @include box-shadow(none) + // }}} + .openerp // Transitional overrides for old styles {{{ .oe-shortcuts -- cgit v1.2.3 From e91dee1e97d5b7f371ee2ab86c77d4067d6e4af9 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 27 Feb 2012 14:45:31 +0100 Subject: [ADD] Added shortcut to dropdown menu. Completely removed old Header bzr revid: fme@openerp.com-20120227134531-uf646x2w13zqsslz --- addons/web/static/src/css/base.sass | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index ab144a5ceec..c2a66db333e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -97,6 +97,8 @@ height: 24px margin: -2px 2px 0 0 @include radius(4px) + .oe_topbar_avatar + vertical-align: top // }}} // Menu {{{ @@ -161,7 +163,6 @@ right: -1px border: 0 z-index: 900 - width: 160px margin-left: 0 margin-right: 0 padding: 6px 0 @@ -191,10 +192,6 @@ .openerp // Transitional overrides for old styles {{{ - .oe-shortcuts - position: static - #oe_header - clear: both // }}} // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers > "%:p:r.css" -- cgit v1.2.3 From 2d03b80c7dcb5d65973a0ea383df72416dbb66ac Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 28 Feb 2012 14:41:21 +0100 Subject: [IMP] New menus bzr revid: fme@openerp.com-20120228134121-bxs33qrpevrfkctp --- addons/web/static/src/css/base.sass | 92 +++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c2a66db333e..c1df1b61226 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1,3 +1,8 @@ +// Variables {{{ +$colour4: #8a89ba +//$colour4: #d14836 +// }}} + // Mixins {{{ @mixin vertical-gradient($startColor: #555, $endColor: #333) background: $startColor @@ -61,6 +66,13 @@ bottom: 0 left: 0 right: 0 + + .oe_application + position: absolute + top: 32px + bottom: 0 + left: 206px + right: 0 // }}} // Topbar {{{ @@ -101,6 +113,22 @@ vertical-align: top // }}} + // Leftbar {{{ + .oe_leftbar + width: 205px + height: 100% + background: #f0eeee + border-right: 1px solid #afafb6 + overflow: auto + text-shadow: 0 1px 1px white + + .oe_footer + position: absolute + width: 205px + text-align: center + bottom: 8px + // }}} + // Menu {{{ .oe_menu float: left @@ -126,6 +154,70 @@ font-weight: bold color: white @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset) + .oe_secondary_menu_section + font-weight: bold + margin-left: 8px + color: $colour4 + .oe_secondary_submenu + padding: 2px 0 8px 0 + margin: 0 + width: 100% + display: inline-block + li + position: relative + padding: 1px 0 1px 16px + list-style-type: none + a + display: block + color: #4c4c4c + padding: 2px 4px 2px 0 + .oe_menu_label + position: absolute + top: 1px + right: 1px + font-size: 10px + background: $colour4 + color: white + padding: 2px 4px + margin: 1px 6px 0 0 + border: 1px solid lightGray + text-shadow: 0 1px 1px rgba(0,0,0,0.2) + @include radius(4px) + @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.2)) + .oe_active + background: $colour4 + border-top: 1px solid lightGray + border-bottom: 1px solid lightGray + text-shadow: 0 1px 1px rgba(0,0,0,0.2) + @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.2)) + a + color: white + .oe_menu_label + background: #eee + color: $colour4 + text-shadow: 0 1px 1px white + @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.2)) + .oe_menu_toggler:before + width: 0 + height: 0 + display: inline-block + content: "&darr" + text-indent: -99999px + vertical-align: top + margin-left: -8px + margin-top: 4px + margin-right: 4px + border-top: 4px solid transparent + border-bottom: 4px solid transparent + border-left: 4px solid #4c4c4c + @include opacity(0.5) + .oe_menu_opened:before + margin-top: 6px + margin-left: -12px + margin-right: 4px + border-left: 4px solid transparent + border-right: 4px solid transparent + border-top: 4px solid #4c4c4c // }}} // DropDown Menu {{{ -- cgit v1.2.3 From 32cd30b7f5f87ae1e8684070ef89f1c1a0ded9e5 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 28 Feb 2012 15:26:41 +0100 Subject: [ADD] Added new logo and footer bzr revid: fme@openerp.com-20120228142641-p4qsssmutq30r0z3 --- addons/web/static/src/css/base.sass | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c1df1b61226..f62841896bd 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -127,6 +127,28 @@ $colour4: #8a89ba width: 205px text-align: center bottom: 8px + a.oe_logo + display: block + text-align: center + height: 70px + line-height: 70px + img + height: 40px + width: 157px + margin: 14px 0 + .oe_footer + position: absolute + width: 205px + text-align: center + bottom: 8px + a + font-weight: 800 + font-family: serif + font-size: 16px + color: black + span + color: #c81010 + font-style: italic // }}} // Menu {{{ @@ -231,7 +253,7 @@ $colour4: #8a89ba .oe_dropdown position: relative - .dropdown-toggle:after + .oe_dropdown_toggle:after width: 0 height: 0 display: inline-block -- cgit v1.2.3 From c7809cafe795e2e29f5e1605691028f2c0159860 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 29 Feb 2012 15:15:27 +0100 Subject: [IMP] Renamed DropDownMenu to UserMenu bzr revid: fme@openerp.com-20120229141527-tuhkt0isveefy2kp --- addons/web/static/src/css/base.sass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index f62841896bd..10c6a1ad038 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -242,8 +242,8 @@ $colour4: #8a89ba border-top: 4px solid #4c4c4c // }}} - // DropDown Menu {{{ - .oe_dropdown_menu + // UserMenu {{{ + .oe_user_menu float: right padding: 0 margin: 0 -- cgit v1.2.3 From 71c94be053fe84cdde22da8e7bf016d825665151 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 29 Feb 2012 16:55:26 +0100 Subject: [ADD] Added systray zone in webclient bzr revid: fme@openerp.com-20120229155526-14gpto9k1qtcl1m8 --- addons/web/static/src/css/base.sass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 10c6a1ad038..19fed7c1fe5 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -83,6 +83,8 @@ $colour4: #8a89ba border-bottom: solid 1px black @include vertical-gradient(#646060, #262626) + .oe_systray + float: right .oe_topbar_item li float: left -- cgit v1.2.3 From f48d255e1c23d29fe667cf3ea4a1ce3e16434f78 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 29 Feb 2012 18:51:35 +0100 Subject: [ADD] Add styling to Systray bzr revid: fme@openerp.com-20120229175135-op7lllco1nzdr2z1 --- addons/web/static/src/css/base.sass | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 19fed7c1fe5..cfb8178de12 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -85,6 +85,10 @@ $colour4: #8a89ba .oe_systray float: right + .oe_systray > div + float: left + padding: 0 4px 0 4px + .oe_topbar_item li float: left -- cgit v1.2.3 From dbcac346d66012b9615ff2697ebb60dcea245d02 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 7 Mar 2012 10:12:54 +0100 Subject: [IMP] simplify opacity mixin, add missing variants to vertical and radial gradients bzr revid: xmo@openerp.com-20120307091254-x9kg0ua1twbjmxp9 --- addons/web/static/src/css/base.sass | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index cfb8178de12..92b8101f2b7 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -5,16 +5,21 @@ $colour4: #8a89ba // Mixins {{{ @mixin vertical-gradient($startColor: #555, $endColor: #333) - background: $startColor - background: -moz-linear-gradient($startColor, $endColor) - background: -webkit-gradient(linear, left top, left bottom, from($startColor), to($endColor)) - background: -webkit-linear-gradient($startColor, $endColor) + background-color: $startColor + background-image: -webkit-gradient(linear, left top, left bottom, from($startColor), to($endColor)) /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient(top, $startColor, $endColor) /* Chrome 10+, Saf5.1+, iOS 5+ */ + background-image: -moz-linear-gradient(top, $startColor, $endColor) /* FF3.6 */ + background-image: -ms-linear-gradient(top, $startColor, $endColor) /* IE10 */ + background-image: -o-linear-gradient(top, $startColor, $endColor) /* Opera 11.10+ */ + background-image: linear-gradient(to bottom, $startColor, $endColor) + @mixin radial-gradient($gradient) background-position: center center - background-image: radial-gradient($gradient) - background-image: -moz-radial-gradient($gradient) background-image: -webkit-radial-gradient(circle, $gradient) + background-image: -moz-radial-gradient($gradient) + background-image: -ms-radial-gradient($gradient) + background-image: radial-gradient($gradient) @mixin radius($radius: 5px) -moz-border-radius: $radius @@ -35,8 +40,6 @@ $colour4: #8a89ba @mixin opacity($opacity: .5) filter: alpha(opacity=$opacity * 100) - -khtml-opacity: $opacity - -moz-opacity: $opacity opacity: $opacity @mixin background-clip($clip: padding-box) -- cgit v1.2.3 From b06d76c51f69c0c3352de53bf78390027321bcaa Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Wed, 7 Mar 2012 17:05:12 +0100 Subject: Added CSS for fullscreen mode (eg. for the point of sale) bzr revid: mit@openerp.com-20120307160512-fziwyn40i45dgxap --- addons/web/static/src/css/base.sass | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 92b8101f2b7..56a735c98fd 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -78,6 +78,15 @@ $colour4: #8a89ba right: 0 // }}} + // Fullscreen mode {{{ + .oe_content_full_screen + .oe_application + top: 0 + left: 0 + .topbar, .leftbar + display: none + // }} + // Topbar {{{ .oe_topbar width: 100% -- cgit v1.2.3