From 2911c24aefb62b6afbb610518bc4abcc9fe1c7d1 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 9 Aug 2012 18:52:08 +0200 Subject: fix view manager header padding when there is only 1 row (eg. In the wall) bzr revid: mit@openerp.com-20120809165208-z70qg2vyz3f6i8cp --- addons/web/static/src/css/base.css | 5 ++++- addons/web/static/src/css/base.sass | 19 +++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index eab9c61acd2..103258d994f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -78,7 +78,7 @@ background: white; /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -1294,6 +1294,9 @@ .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row:last-child td { padding-top: 0; } +.openerp .oe_view_manager table.oe_view_manager_header .oe_header_row:first-child td { + padding-top: 8px; +} .openerp .oe_view_manager table.oe_view_manager_header .oe_view_manager_sidebar { margin: 0px auto; text-align: center; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e0e8a3534dc..3d56fa8034f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -144,10 +144,10 @@ $sheet-max-width: 860px // }}} //Placeholder style{{{ \:-moz-placeholder - color: $facets-border !important + color: $tag-border !important font-style: italic !important \::-webkit-input-placeholder - color: $facets-border !important + color: $tag-border !important font-style: italic !important //}}} // Tag reset {{{ @@ -160,7 +160,7 @@ $sheet-max-width: 860px font-weight: bold background-color: #f0f0f0 th - border-right: 1px dotted $facets-border + border-right: 1px dotted $tag-border &:last-child border-right: none th, td @@ -554,7 +554,7 @@ $sheet-max-width: 860px top: 26px left: 0 z-index: 1 - border: 1px solid $facets-border + border: 1px solid $tag-border background: white padding: 4px 0 min-width: 140px @@ -834,7 +834,7 @@ $sheet-max-width: 860px display: none width: 220px background: #f0eeee - border-right: 1px solid $facets-border + border-right: 1px solid $tag-border text-shadow: 0 1px 1px white padding-bottom: 16px a.oe_logo @@ -1005,6 +1005,9 @@ $sheet-max-width: 860px .oe_header_row:last-child td padding-top: 0 + .oe_header_row:first-child + td + padding-top: 8px .oe_view_manager_sidebar margin: 0px auto text-align: center @@ -1275,7 +1278,7 @@ $sheet-max-width: 860px background-color: white min-width: 100% display: none - border: 1px solid $facets-border + border: 1px solid $tag-border text-align: left @include radius(4px) @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) @@ -1660,7 +1663,7 @@ $sheet-max-width: 860px background: white min-height: 330px padding: 16px - border: 1px solid $facets-border + border: 1px solid $tag-border @include box-shadow(0 0 10px rgba(0,0,0,0.3)) .ui-tabs margin: 0 -16px @@ -2095,7 +2098,7 @@ $sheet-max-width: 860px border-bottom: 2px solid #cacaca .treeview-tr, .treeview-td cursor: pointer - border-right: 1px dotted $facets-border + border-right: 1px dotted $tag-border vertical-align: top text-align: left border-bottom: 1px solid #cfcccc -- cgit v1.2.3 From e5b954cad062fa7ecba6d32e016e322c7c813e75 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 10 Aug 2012 14:49:12 +0200 Subject: chatter padding bzr revid: mit@openerp.com-20120810124912-bg2emb6fabv0xrkx --- addons/web/static/src/css/base.css | 1 + addons/web/static/src/css/base.sass | 1 + 2 files changed, 2 insertions(+) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 103258d994f..68132f0fd1d 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1951,6 +1951,7 @@ min-width: 650px; max-width: 860px; margin: 0 auto; + padding: 16px 0 48px; } .openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator { margin: 25px 0 10px 0; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 3d56fa8034f..b420a237278 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1506,6 +1506,7 @@ $sheet-max-width: 860px min-width: 650px max-width: $sheet-max-width margin: 0 auto + padding: 16px 0 48px div.oe_form_configuration div.oe_horizontal_separator margin: 25px 0 10px 0 -- cgit v1.2.3 From 45660bff5c4421024bd31b21cfc4fa54761baffb Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Mon, 13 Aug 2012 20:29:46 +0200 Subject: Brand new status breadcrum! (TODO: update js for clickable buttons) bzr revid: mit@openerp.com-20120813182946-ep9231bf7bksyvev --- addons/web/static/src/css/base.css | 234 ++++++++++++++++++------------------ addons/web/static/src/css/base.sass | 193 +++++++++++++---------------- 2 files changed, 195 insertions(+), 232 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 68132f0fd1d..f602e6feea2 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -76,6 +76,7 @@ color: #4c4c4c; font-size: 13px; background: white; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image */ @@ -159,7 +160,7 @@ .openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { display: inline-block; border: 1px solid #ababab; - color: #404040; + color: #4c4c4c; margin: 0; padding: 3px 12px; font-size: 13px; @@ -1941,7 +1942,6 @@ background-image: -o-linear-gradient(top, #fcfcfc, #dedede); background-image: linear-gradient(to bottom, #fcfcfc, #dedede); padding: 0 8px; - line-height: 30px; } .openerp .oe_form header ul { display: inline-block; @@ -1963,141 +1963,135 @@ .openerp .oe_form div.oe_form_configuration label { min-width: 150px; } -.openerp ul.oe_form_steps { - height: 30px; - padding: 0; - margin: 0; - text-shadow: 0 1px 1px white; -} -.openerp ul.oe_form_steps img { - vertical-align: top; - margin-left: 8px; +.openerp ul.oe_form_steps, .openerp ul.oe_form_steps_clickable { + display: inline-block; + padding-right: 18px; } -.openerp ul.oe_form_steps li { - border-right: none; - padding: 0; - margin: 0; - float: left; - vertical-align: top; - height: 30px; - padding: 0 0 0 12px; +.openerp ul.oe_form_steps li, .openerp ul.oe_form_steps_clickable li { + display: inline-block; + margin-right: -20px; + background-color: #fcfcfc; + background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); + background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); + background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); + background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); + background-image: -o-linear-gradient(top, #fcfcfc, #dedede); + background-image: linear-gradient(to bottom, #fcfcfc, #dedede); } -.openerp ul.oe_form_steps li:first-child { +.openerp ul.oe_form_steps li:first-child .label, .openerp ul.oe_form_steps_clickable li:first-child .label { border-left: 1px solid #cacaca; + padding-left: 14px; } -.openerp ul.oe_form_steps li:last-child { - margin-right: 12px; - padding-right: 12px; +.openerp ul.oe_form_steps li:last-child, .openerp ul.oe_form_steps_clickable li:last-child { border-right: 1px solid #cacaca; } -.openerp ul.oe_form_steps li a { - color: #4c4c4c; +.openerp ul.oe_form_steps li:last-child .label, .openerp ul.oe_form_steps_clickable li:last-child .label { + padding-right: 14px; } -.openerp ul.oe_form_steps li a:hover { - color: black; -} -.openerp ul.oe_form_steps .oe_form_steps_active { - font-weight: bold; - color: #b33630; +.openerp ul.oe_form_steps li:last-child .arrow, .openerp ul.oe_form_steps_clickable li:last-child .arrow { + display: none; } -.openerp ul.oe_form_steps_clickable { - height: 30px; +.openerp ul.oe_form_steps li .label, .openerp ul.oe_form_steps_clickable li .label { + color: #4c4c4c; + text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede; + padding: 7px; + display: inline-block; + padding-left: 24px; margin: 0; - padding: 0; - text-shadow: 0 1px 1px #cacaca; - box-shadow: 0 0 1px rgba(0, 0, 0, 0.5); - overflow: hidden; -} -.openerp ul.oe_form_steps_clickable li { - border-right: none; - padding: 0 0 0 12px; position: relative; - float: left; - vertical-align: top; - height: 30px; - color: white; + z-index: 10; } -.openerp ul.oe_form_steps_clickable li:after { - content: " "; - width: 0; - height: 0; - border-top: 21px solid transparent; - border-bottom: 21px solid transparent; - border-left: 5px solid #807fb4; - position: absolute; - top: 50%; - margin-top: -21px; - left: 100%; - z-index: 2; -} -.openerp ul.oe_form_steps_clickable li:hover:after { - border-left: 5px solid #807fb4; -} -.openerp ul.oe_form_steps_clickable li:before { - content: " "; - width: 0; - height: 0; - border-top: 21px solid transparent; - border-bottom: 21px solid transparent; - border-left: 5px solid white; - position: absolute; - top: 50%; - margin-top: -21px; - margin-left: 2px; - left: 100%; - z-index: 2; +.openerp ul.oe_form_steps li .arrow, .openerp ul.oe_form_steps_clickable li .arrow { + width: 17px; + display: inline-block; + vertical-align: top; + overflow: hidden; + margin-left: -5px; } -.openerp ul.oe_form_steps_clickable li.oe_form_steps_active { - font-weight: bold; - text-shadow: 0 1px 1px #999999; - box-shadow: inset 0 -1px 1px rgba(0, 0, 0, 0.25), inset 0 1px 1px rgba(255, 255, 255, 0.25); - background-color: #dc5f59; - background: -webkit-linear-gradient(top, #dc5f59, #b33630); +.openerp ul.oe_form_steps li .arrow span, .openerp ul.oe_form_steps_clickable li .arrow span { + position: relative; + z-index: 11; + width: 24px; + height: 24px; + display: inline-block; + margin-left: -12px; + margin-top: 3px; + box-shadow: -1px 1px 2px rgba(255, 255, 255, 0.2), inset -1px 1px 1px rgba(0, 0, 0, 0.2); + background-color: #dedede; + background: -moz-linear-gradient(135deg, #dedede, #fcfcfc); + background: -o-linear-gradient(135deg, #fcfcfc, #dedede); + background: -webkit-gradient(linear, left top, right bottom, from(#fcfcfc), to(#dedede)); + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -moz-transform: rotate(45deg); + -webkit-transform: rotate(45deg); + -o-transform: rotate(45deg); + -ms-transform: rotate(45deg); +} +.openerp ul.oe_form_steps li.oe_active, .openerp ul.oe_form_steps_clickable li.oe_active { + background-color: #729fcf; + background-image: -webkit-gradient(linear, left top, left bottom, from(#729fcf), to(#3465a4)); + background-image: -webkit-linear-gradient(top, #729fcf, #3465a4); + background-image: -moz-linear-gradient(top, #729fcf, #3465a4); + background-image: -ms-linear-gradient(top, #729fcf, #3465a4); + background-image: -o-linear-gradient(top, #729fcf, #3465a4); + background-image: linear-gradient(to bottom, #729fcf, #3465a4); +} +.openerp ul.oe_form_steps li.oe_active .arrow span, .openerp ul.oe_form_steps_clickable li.oe_active .arrow span { + background-color: #3465a4; + background: -moz-linear-gradient(135deg, #3465a4, #729fcf); + background: -o-linear-gradient(135deg, #729fcf, #3465a4); + background: -webkit-gradient(linear, left top, right bottom, from(#729fcf), to(#3465a4)); +} +.openerp ul.oe_form_steps li.oe_active .label, .openerp ul.oe_form_steps_clickable li.oe_active .label { color: white; + text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4; } -.openerp ul.oe_form_steps_clickable li.oe_form_steps_inactive { +.openerp ul.oe_form_steps_clickable li { cursor: pointer; - box-shadow: inset 0 -1px 1px rgba(0, 0, 0, 0.25), inset 0 1px 1px rgba(255, 255, 255, 0.25); - background-color: #adadcf; - background: -webkit-linear-gradient(top, #adadcf, #7c7ba7); -} -.openerp ul.oe_form_steps_clickable li.oe_form_steps_inactive div { - padding: 0 30px 0 0; -} -.openerp ul.oe_form_steps_clickable li.oe_form_steps_inactive:hover { - background: -webkit-linear-gradient(top, #7c7ba7, #adadcf); } -.openerp ul.oe_form_steps_clickable li div { - padding: 0 30px 0 0; -} -.openerp ul.oe_form_steps_clickable li.oe_form_steps_active:after { - content: " "; - display: block; - width: 0; - height: 0; - border-top: 21px solid transparent; - border-bottom: 21px solid transparent; - border-left: 5px solid #b33630; - position: absolute; - top: 50%; - margin-top: -21px; - left: 100%; - z-index: 2; +.openerp ul.oe_form_steps_clickable li:hover { + background-color: #e8e8e8; + background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca)); + background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -moz-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -ms-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -o-linear-gradient(top, #e8e8e8, #cacaca); + background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); +} +.openerp ul.oe_form_steps_clickable li:hover .label { + text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede; +} +.openerp ul.oe_form_steps_clickable li:hover .arrow span { + background-color: #e8e8e8; + background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca)); + background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -moz-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -ms-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -o-linear-gradient(top, #e8e8e8, #cacaca); + background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); +} +.openerp ul.oe_form_steps_clickable li .label { + color: #8a89ba; } -.openerp ul.oe_form_steps_clickable li.oe_form_steps_active:before { - content: " "; - display: block; - width: 0; - height: 0; - border-top: 21px solid transparent; - border-bottom: 21px solid transparent; - border-left: 5px solid white; - position: absolute; - top: 50%; - margin-top: -21px; - margin-left: 2px; - left: 100%; - z-index: 2; +.openerp ul.oe_form_steps_clickable li.oe_active:hover { + background-color: #4c85c2; + background-image: -webkit-gradient(linear, left top, left bottom, from(#4c85c2), to(#284d7d)); + background-image: -webkit-linear-gradient(top, #4c85c2, #284d7d); + background-image: -moz-linear-gradient(top, #4c85c2, #284d7d); + background-image: -ms-linear-gradient(top, #4c85c2, #284d7d); + background-image: -o-linear-gradient(top, #4c85c2, #284d7d); + background-image: linear-gradient(to bottom, #4c85c2, #284d7d); +} +.openerp ul.oe_form_steps_clickable li.oe_active:hover .label { + text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4; +} +.openerp ul.oe_form_steps_clickable li.oe_active:hover .arrow span { + background-color: #284d7d; + background: -moz-linear-gradient(135deg, #284d7d, #4c85c2); + background: -o-linear-gradient(135deg, #4c85c2, #284d7d); + background: -webkit-gradient(linear, left top, right bottom, from(#4c85c2), to(#284d7d)); } .openerp .oe_form .oe_subtotal_footer { width: 1% !important; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index b420a237278..3aee82e274d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -87,6 +87,18 @@ $sheet-max-width: 860px -ms-box-sizing: #{$type}-box box-sizing: #{$type}-box +@mixin skew-gradient($startColor: #555, $endColor: #333) + background-color: $endColor + background: -moz-linear-gradient(135deg, $endColor, $startColor) + background: -o-linear-gradient(135deg, $startColor, $endColor) + background: -webkit-gradient(linear, left top, right bottom, from($startColor), to($endColor)) + +@mixin transform($transform) + -moz-transform: $transform + -webkit-transform: $transform + -o-transform: $transform + -ms-transform: $transform + // Transforms the (readable) text of an inline element into an mmlicons icon, // allows for actual readable text in-code (and in readers?) with iconic looks @mixin text-to-icon($icon-name, $color: #404040) @@ -141,6 +153,7 @@ $sheet-max-width: 860px color: #4c4c4c font-size: 13px background: white + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5) // }}} //Placeholder style{{{ \:-moz-placeholder @@ -195,7 +208,7 @@ $sheet-max-width: 860px a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button display: inline-block border: 1px solid #ababab - color: #404040 + color: #4c4c4c margin: 0 padding: 3px 12px font-size: 13px @@ -1498,7 +1511,7 @@ $sheet-max-width: 860px border-bottom: 1px solid #cacaca @include vertical-gradient(#fcfcfc, #dedede) padding: 0 8px - line-height: 30px + //line-height: 30px ul display: inline-block float: right @@ -1515,122 +1528,78 @@ $sheet-max-width: 860px max-width: 650px label min-width: 150px - ul.oe_form_steps - height: 30px - padding: 0 - margin: 0 - text-shadow: 0 1px 1px white - img - vertical-align: top - margin-left: 8px - li - border-right: none - padding: 0 - margin: 0 - float: left - vertical-align: top - height: 30px - padding: 0 0 0 12px - &:first-child + + + ul.oe_form_steps, ul.oe_form_steps_clickable + display: inline-block + padding-right: 18px + li + display: inline-block + margin-right: -20px + @include vertical-gradient(#fcfcfc, #dedede) + &:first-child .label border-left: 1px solid #cacaca + padding-left: 14px &:last-child - margin-right: 12px - padding-right: 12px border-right: 1px solid #cacaca - a + .label + padding-right: 14px + .arrow + display: none + .label color: #4c4c4c - &:hover - color: black - .oe_form_steps_active - font-weight: bold - color: #b33630 + text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede + padding: 7px + display: inline-block + padding-left: 24px + margin: 0 + position: relative + z-index: 10 + .arrow + width: 17px + display: inline-block + vertical-align: top + overflow: hidden + margin-left: -5px + span + position: relative + z-index: 11 + width: 24px + height: 24px + display: inline-block + margin-left: -12px + margin-top: 3px + box-shadow: -1px 1px 2px rgba(255,255,255,0.2), inset -1px 1px 1px rgba(0,0,0,0.2) + @include skew-gradient(#fcfcfc, #dedede) + @include radius(3px) + @include transform(rotate(45deg)) + li.oe_active + @include vertical-gradient(#729fcf, #3465a4) + .arrow span + @include skew-gradient(#729fcf, #3465a4) + .label + color: white + text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4 + ul.oe_form_steps_clickable - height: 30px - margin: 0 - padding: 0 - text-shadow: 0 1px 1px #cacaca - box-shadow: 0 0 1px rgba(0,0,0,0.5) - overflow: hidden li - border-right: none - padding: 0 0 0 12px - position: relative - float: left - vertical-align: top - height: 30px - color: white - &:after - content: " " - width: 0 - height: 0 - border-top: 21px solid transparent - border-bottom: 21px solid transparent - border-left: 5px solid #807fb4 - position: absolute - top: 50% - margin-top: -21px - left: 100% - z-index: 2 - &:hover:after - border-left: 5px solid #807fb4 - &:before - content: " " - width: 0 - height: 0 - border-top: 21px solid transparent - border-bottom: 21px solid transparent - border-left: 5px solid white - position: absolute - top: 50% - margin-top: -21px - margin-left: 2px - left: 100% - z-index: 2 - &.oe_form_steps_active - font-weight: bold - text-shadow: 0 1px 1px #999999 - box-shadow: inset 0 -1px 1px rgba(0,0,0,0.25), inset 0 1px 1px rgba(255,255,255,0.25) - background-color: #dc5f59 - background: -webkit-linear-gradient(top, #dc5f59, #b33630) - color: white - &.oe_form_steps_inactive - cursor: pointer - box-shadow: inset 0 -1px 1px rgba(0,0,0,0.25), inset 0 1px 1px rgba(255,255,255,0.25) - background-color: #adadcf - background: -webkit-linear-gradient(top, #adadcf, #7c7ba7) - div - padding: 0 30px 0 0 - &.oe_form_steps_inactive:hover - background: -webkit-linear-gradient(top, #7c7ba7, #adadcf) - div - padding: 0 30px 0 0 - &.oe_form_steps_active:after - content: " " - display: block - width: 0 - height: 0 - border-top: 21px solid transparent - border-bottom: 21px solid transparent - border-left: 5px solid #b33630 - position: absolute - top: 50% - margin-top: -21px - left: 100% - z-index: 2 - &.oe_form_steps_active:before - content: " " - display: block - width: 0 - height: 0 - border-top: 21px solid transparent - border-bottom: 21px solid transparent - border-left: 5px solid white - position: absolute - top: 50% - margin-top: -21px - margin-left: 2px - left: 100% - z-index: 2 + cursor: pointer + &:hover + @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%)) + .label + text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede + .arrow span + @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%)) + .label + color: $link-color + li.oe_active + &:hover + @include vertical-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) + .label + text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4 + .arrow span + @include skew-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) + .oe_form .oe_subtotal_footer width: 1% !important td.oe_form_group_cell -- cgit v1.2.3 From 332b118e3e16ae764dface838af6451ad567c433 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 16 Aug 2012 18:38:42 +0200 Subject: fixed configuration view header bzr revid: mit@openerp.com-20120816163842-3g2y0hgmmcdtjzsd --- addons/web/static/src/css/base.css | 8 +++----- addons/web/static/src/css/base.sass | 10 ++++------ 2 files changed, 7 insertions(+), 11 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index f602e6feea2..38d9311c3e2 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1924,12 +1924,10 @@ width: auto; } .openerp .oe_form_nosheet { - margin: 8px; + margin: 16px; } .openerp .oe_form_nosheet > header { - margin-top: -20px; - margin-left: -20px; - margin-right: -20px; + margin: -16px -16px 0 -16px; } .openerp .oe_form header { position: relative; @@ -1941,7 +1939,7 @@ background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); background-image: -o-linear-gradient(top, #fcfcfc, #dedede); background-image: linear-gradient(to bottom, #fcfcfc, #dedede); - padding: 0 8px; + padding: 8px; } .openerp .oe_form header ul { display: inline-block; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 3aee82e274d..ad2b3b87773 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1498,11 +1498,9 @@ $sheet-max-width: 860px .oe_form .oe_form_field_date width: auto .oe_form_nosheet - margin: 8px - .oe_form_nosheet > header - margin-top: -20px - margin-left: -20px - margin-right: -20px + margin: 16px + > header + margin: -16px -16px 0 -16px // }}} // FormView.custom tags and classes {{{ .oe_form @@ -1510,7 +1508,7 @@ $sheet-max-width: 860px position: relative border-bottom: 1px solid #cacaca @include vertical-gradient(#fcfcfc, #dedede) - padding: 0 8px + padding: 8px //line-height: 30px ul display: inline-block -- cgit v1.2.3 From 651b7baf5fc9b143aaba8c53c8cc5929e352dca7 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Fri, 17 Aug 2012 15:57:13 +0200 Subject: [FIX] header padding bzr revid: al@openerp.com-20120817135713-vyvu8scxttsy04rr --- addons/web/static/src/css/base.css | 4 ++-- addons/web/static/src/css/base.sass | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index b9eb6fed93b..87a83b4c70e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -79,7 +79,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -1931,6 +1931,7 @@ } .openerp .oe_form_nosheet > header { margin: -16px -16px 0 -16px; + padding: 8px; } .openerp .oe_form header { position: relative; @@ -1942,7 +1943,6 @@ background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); background-image: -o-linear-gradient(top, #fcfcfc, #dedede); background-image: linear-gradient(to bottom, #fcfcfc, #dedede); - padding: 8px; } .openerp .oe_form header ul { display: inline-block; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index befb68b42db..7055f867b36 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1502,8 +1502,9 @@ $sheet-max-width: 860px width: auto .oe_form_nosheet margin: 16px - > header - margin: -16px -16px 0 -16px + .oe_form_nosheet > header + margin: -16px -16px 0 -16px + padding: 8px // }}} // FormView.custom tags and classes {{{ .oe_form @@ -1511,7 +1512,6 @@ $sheet-max-width: 860px position: relative border-bottom: 1px solid #cacaca @include vertical-gradient(#fcfcfc, #dedede) - padding: 8px //line-height: 30px ul display: inline-block -- cgit v1.2.3 From 86f04a8726eb4a9e838a3a2fe3a0953b45a2fe28 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 17 Aug 2012 16:22:29 +0200 Subject: darker link color and padding fix bzr revid: mit@openerp.com-20120817142229-v8pvwnysx8vpqyl0 --- addons/web/static/src/css/base.css | 32 ++++++++++++++++---------------- addons/web/static/src/css/base.sass | 9 ++++----- 2 files changed, 20 insertions(+), 21 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index b9eb6fed93b..ab74e92ac69 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,4 @@ -@charset "utf-8"; +@charset "UTF-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); @@ -79,7 +79,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -234,7 +234,7 @@ font-size: 13px; } .openerp .ui-widget-content a { - color: #8a89ba; + color: #7c7bad; } .openerp .ui-menu .ui-menu-item { margin: 0 8px 0 0; @@ -336,7 +336,7 @@ border-radius: 0 0 2px 2px; } .openerp.ui-dialog .oe_about a { - color: #8a89ba; + color: #7c7bad; } .openerp.ui-dialog .oe_about a:hover { text-decoration: underline; @@ -547,7 +547,7 @@ -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; - color: #8a89ba; + color: #7c7bad; font-weight: bold; } .openerp .oe_button.oe_link span:hover { @@ -578,7 +578,7 @@ color: #4c4c4c; } .openerp .oe_tag_dark { - background: #8786b7; + background: #7c7bad; color: #eeeeee; } .openerp .oe_tags.oe_inline { @@ -1180,7 +1180,7 @@ .openerp .oe_secondary_menu_section { font-weight: bold; margin-left: 8px; - color: #8a89ba; + color: #7c7bad; } .openerp .oe_secondary_submenu { padding: 2px 0 8px 0; @@ -1202,7 +1202,7 @@ top: 1px; right: 1px; font-size: 10px; - background: #8a89ba; + background: #7c7bad; color: white; padding: 2px 4px; margin: 1px 6px 0 0; @@ -1222,7 +1222,7 @@ padding: 1px 4px; } .openerp .oe_secondary_submenu .oe_active { - background: #8a89ba; + background: #7c7bad; border-top: 1px solid lightGray; border-bottom: 1px solid lightGray; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); @@ -1235,7 +1235,7 @@ } .openerp .oe_secondary_submenu .oe_active .oe_menu_label { background: #eeeeee; - color: #8a89ba; + color: #7c7bad; text-shadow: 0 1px 1px white; -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); @@ -1243,7 +1243,7 @@ } .openerp .oe_secondary_submenu .oe_active .oe_menu_counter { background: #eeeeee; - color: #8a89ba; + color: #7c7bad; } .openerp .oe_secondary_submenu .oe_menu_toggler:before { width: 0; @@ -1273,7 +1273,7 @@ width: 100%; } .openerp .oe_application a { - color: #8a89ba; + color: #7c7bad; } .openerp .oe_application a:hover { text-decoration: underline; @@ -1314,7 +1314,7 @@ float: left; } .openerp .oe_view_manager table.oe_view_manager_header h2 a { - color: #8a89ba; + color: #7c7bad; } .openerp .oe_view_manager table.oe_view_manager_header .oe_button_group { display: inline-block; @@ -1673,7 +1673,7 @@ } .openerp .oe_searchview .oe_searchview_drawer h3 { margin: 8px 4px 4px 12px; - color: #8786b7; + color: #7c7bad; font-size: 13px; } .openerp .oe_searchview .oe_searchview_drawer h4, .openerp .oe_searchview .oe_searchview_drawer h4 * { @@ -1931,6 +1931,7 @@ } .openerp .oe_form_nosheet > header { margin: -16px -16px 0 -16px; + padding: 8px; } .openerp .oe_form header { position: relative; @@ -1942,7 +1943,6 @@ background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); background-image: -o-linear-gradient(top, #fcfcfc, #dedede); background-image: linear-gradient(to bottom, #fcfcfc, #dedede); - padding: 8px; } .openerp .oe_form header ul { display: inline-block; @@ -2074,7 +2074,7 @@ background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); } .openerp ul.oe_form_steps_clickable li .label { - color: #8a89ba; + color: #7c7bad; } .openerp ul.oe_form_steps_clickable li.oe_active:hover { background-color: #4c85c2; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index befb68b42db..6472f7aaacd 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2,13 +2,13 @@ // Variables {{{ $facets-border: #afafb6 -$section-title-color: #8786b7 +$section-title-color: #7C7BAD $tag-bg-light: #f0f0fa -$tag-bg-dark: #8786b7 +$tag-bg-dark: #7C7BAD $tag-border: #afafb6 $tag-border-selected: #a6a6fe $hover-background: #f0f0fa -$link-color: #8a89ba +$link-color: #7C7BAD $sheet-max-width: 860px // }}} // Mixins {{{ @@ -1504,6 +1504,7 @@ $sheet-max-width: 860px margin: 16px > header margin: -16px -16px 0 -16px + padding: 8px // }}} // FormView.custom tags and classes {{{ .oe_form @@ -1511,8 +1512,6 @@ $sheet-max-width: 860px position: relative border-bottom: 1px solid #cacaca @include vertical-gradient(#fcfcfc, #dedede) - padding: 8px - //line-height: 30px ul display: inline-block float: right -- cgit v1.2.3 From 11fcfa2b07d3d92ef48630542e39db926a53ac43 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 17 Aug 2012 16:37:35 +0200 Subject: fix removed a useless line in sass bzr revid: mit@openerp.com-20120817143735-hverq9jb72kn2zdb --- addons/web/static/src/css/base.sass | 1 - 1 file changed, 1 deletion(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 4c190549639..6472f7aaacd 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1512,7 +1512,6 @@ $sheet-max-width: 860px position: relative border-bottom: 1px solid #cacaca @include vertical-gradient(#fcfcfc, #dedede) ->>>>>>> MERGE-SOURCE ul display: inline-block float: right -- cgit v1.2.3 From 65ac532462eeac41222ac1e863752c205bdad90d Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 17 Aug 2012 17:12:29 +0200 Subject: darker purple and config view alignment bzr revid: mit@openerp.com-20120817151229-iuujaaw5aflujgzq --- addons/web/static/src/css/base.css | 40 +++++++++++++++++++++---------------- addons/web/static/src/css/base.sass | 10 +++++++--- 2 files changed, 30 insertions(+), 20 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 87a83b4c70e..81e179c8de9 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,4 @@ -@charset "utf-8"; +@charset "UTF-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); @@ -234,7 +234,7 @@ font-size: 13px; } .openerp .ui-widget-content a { - color: #8a89ba; + color: #7c7bad; } .openerp .ui-menu .ui-menu-item { margin: 0 8px 0 0; @@ -336,7 +336,7 @@ border-radius: 0 0 2px 2px; } .openerp.ui-dialog .oe_about a { - color: #8a89ba; + color: #7c7bad; } .openerp.ui-dialog .oe_about a:hover { text-decoration: underline; @@ -547,7 +547,7 @@ -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; - color: #8a89ba; + color: #7c7bad; font-weight: bold; } .openerp .oe_button.oe_link span:hover { @@ -578,7 +578,7 @@ color: #4c4c4c; } .openerp .oe_tag_dark { - background: #8786b7; + background: #7c7bad; color: #eeeeee; } .openerp .oe_tags.oe_inline { @@ -1180,7 +1180,7 @@ .openerp .oe_secondary_menu_section { font-weight: bold; margin-left: 8px; - color: #8a89ba; + color: #7c7bad; } .openerp .oe_secondary_submenu { padding: 2px 0 8px 0; @@ -1202,7 +1202,7 @@ top: 1px; right: 1px; font-size: 10px; - background: #8a89ba; + background: #7c7bad; color: white; padding: 2px 4px; margin: 1px 6px 0 0; @@ -1222,7 +1222,7 @@ padding: 1px 4px; } .openerp .oe_secondary_submenu .oe_active { - background: #8a89ba; + background: #7c7bad; border-top: 1px solid lightGray; border-bottom: 1px solid lightGray; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); @@ -1235,7 +1235,7 @@ } .openerp .oe_secondary_submenu .oe_active .oe_menu_label { background: #eeeeee; - color: #8a89ba; + color: #7c7bad; text-shadow: 0 1px 1px white; -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); @@ -1243,7 +1243,7 @@ } .openerp .oe_secondary_submenu .oe_active .oe_menu_counter { background: #eeeeee; - color: #8a89ba; + color: #7c7bad; } .openerp .oe_secondary_submenu .oe_menu_toggler:before { width: 0; @@ -1273,7 +1273,7 @@ width: 100%; } .openerp .oe_application a { - color: #8a89ba; + color: #7c7bad; } .openerp .oe_application a:hover { text-decoration: underline; @@ -1314,7 +1314,7 @@ float: left; } .openerp .oe_view_manager table.oe_view_manager_header h2 a { - color: #8a89ba; + color: #7c7bad; } .openerp .oe_view_manager table.oe_view_manager_header .oe_button_group { display: inline-block; @@ -1673,7 +1673,7 @@ } .openerp .oe_searchview .oe_searchview_drawer h3 { margin: 8px 4px 4px 12px; - color: #8786b7; + color: #7c7bad; font-size: 13px; } .openerp .oe_searchview .oe_searchview_drawer h4, .openerp .oe_searchview .oe_searchview_drawer h4 * { @@ -1955,7 +1955,7 @@ padding: 16px 0 48px; } .openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator { - margin: 25px 0 10px 0; + margin: 12px 0 8px 0; } .openerp .oe_form div.oe_form_configuration p { color: #aaaaaa; @@ -1964,6 +1964,12 @@ .openerp .oe_form div.oe_form_configuration label { min-width: 150px; } +.openerp .oe_form div.oe_form_configuration .oe_form_group_cell_label { + padding: 2px 0; +} +.openerp .oe_form div.oe_form_configuration .oe_form_group_cell div div { + padding: 1px 0; +} .openerp ul.oe_form_steps, .openerp ul.oe_form_steps_clickable { display: inline-block; padding-right: 18px; @@ -2074,7 +2080,7 @@ background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); } .openerp ul.oe_form_steps_clickable li .label { - color: #8a89ba; + color: #7c7bad; } .openerp ul.oe_form_steps_clickable li.oe_active:hover { background-color: #4c85c2; @@ -2155,7 +2161,7 @@ .openerp .oe_form td.oe_form_group_cell_label label { line-height: 18px; display: block; - min-width: 120px; + min-width: 160px; } .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { padding-left: 6px; @@ -2187,7 +2193,7 @@ font-weight: bold; font-size: 20px; margin: 8px 0px 8px 0px; - color: #53637e; + color: #7c7bad; } .openerp .oe_horizontal_separator:empty { height: 5px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 6472f7aaacd..3463a25ad79 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1522,12 +1522,16 @@ $sheet-max-width: 860px padding: 16px 0 48px div.oe_form_configuration div.oe_horizontal_separator - margin: 25px 0 10px 0 + margin: 12px 0 8px 0 p color: #aaa max-width: 650px label min-width: 150px + .oe_form_group_cell_label + padding: 2px 0 + .oe_form_group_cell div div + padding: 1px 0 ul.oe_form_steps, ul.oe_form_steps_clickable @@ -1650,7 +1654,7 @@ $sheet-max-width: 860px label line-height: 18px display: block - min-width: 120px + min-width: 160px td.oe_form_group_cell + .oe_form_group_cell padding-left: 6px .oe_form_group @@ -1680,7 +1684,7 @@ $sheet-max-width: 860px font-weight: bold font-size: 20px margin: 8px 0px 8px 0px - color: #53637e + color: $section-title-color .oe_horizontal_separator:empty height: 5px .oe_vertical_separator -- cgit v1.2.3 From fff594348ae8ada571b4e9e7e6a0e16b5c306037 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 17 Aug 2012 17:55:51 +0200 Subject: fixed the 'more' dropdown menu bzr revid: mit@openerp.com-20120817155551-4eq9lumqderd09rl --- addons/web/static/src/css/base.css | 16 ++++------------ addons/web/static/src/css/base.sass | 35 +++++++++++++++-------------------- 2 files changed, 19 insertions(+), 32 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 81e179c8de9..c15a37b26f5 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1032,14 +1032,6 @@ -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; } -.openerp .oe_topbar .oe_topbar_item .oe_active { - background: #303030; - font-weight: bold; - color: white; - -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; -} .openerp .oe_topbar .oe_topbar_avatar { width: 24px; height: 24px; @@ -1150,10 +1142,10 @@ padding: 0; margin: 0; } -.openerp .oe_menu li { +.openerp .oe_menu > li { float: left; } -.openerp .oe_menu a { +.openerp .oe_menu > li > a { display: block; padding: 5px 10px 7px; line-height: 20px; @@ -1162,14 +1154,14 @@ vertical-align: top; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); } -.openerp .oe_menu a:hover { +.openerp .oe_menu > li > a:hover { background: #303030; color: white; -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; } -.openerp .oe_menu .oe_active { +.openerp .oe_menu > li > .oe_active { background: #303030; font-weight: bold; color: white; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 3463a25ad79..db56bdbacfa 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -810,11 +810,6 @@ $sheet-max-width: 860px 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 @@ -902,25 +897,25 @@ $sheet-max-width: 860px float: left padding: 0 margin: 0 - li + > 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 + > 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_active - background: #303030 - 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 -- cgit v1.2.3 From 2501b06ca0dec18c98f2b9d73b64a7b0aebe13e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Mon, 20 Aug 2012 14:22:43 +0200 Subject: [IMP] removed left and top bar from printing bzr revid: fva@openerp.com-20120820122243-z9wtrkpb2ub79enf --- addons/web/static/src/css/base.css | 41 +++++++++++++++++++++---------------- addons/web/static/src/css/base.sass | 4 ++++ 2 files changed, 27 insertions(+), 18 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 87a83b4c70e..2276bb2445e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -64,6 +64,11 @@ } } +@media print { + .oe_topbar, .oe_leftbar, .oe_loading { + display: none !important; + } +} .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -234,7 +239,7 @@ font-size: 13px; } .openerp .ui-widget-content a { - color: #8a89ba; + color: #7c7bad; } .openerp .ui-menu .ui-menu-item { margin: 0 8px 0 0; @@ -336,7 +341,7 @@ border-radius: 0 0 2px 2px; } .openerp.ui-dialog .oe_about a { - color: #8a89ba; + color: #7c7bad; } .openerp.ui-dialog .oe_about a:hover { text-decoration: underline; @@ -547,7 +552,7 @@ -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; - color: #8a89ba; + color: #7c7bad; font-weight: bold; } .openerp .oe_button.oe_link span:hover { @@ -578,7 +583,7 @@ color: #4c4c4c; } .openerp .oe_tag_dark { - background: #8786b7; + background: #7c7bad; color: #eeeeee; } .openerp .oe_tags.oe_inline { @@ -1007,7 +1012,7 @@ .openerp .oe_topbar { width: 100%; height: 31px; - border-top: solid 1px #d3d3d3; + border-top: solid 1px lightgrey; background-color: #646060; background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626)); background-image: -webkit-linear-gradient(top, #646060, #262626); @@ -1180,7 +1185,7 @@ .openerp .oe_secondary_menu_section { font-weight: bold; margin-left: 8px; - color: #8a89ba; + color: #7c7bad; } .openerp .oe_secondary_submenu { padding: 2px 0 8px 0; @@ -1202,11 +1207,11 @@ top: 1px; right: 1px; font-size: 10px; - background: #8a89ba; + background: #7c7bad; color: white; padding: 2px 4px; margin: 1px 6px 0 0; - border: 1px solid lightGray; + border: 1px solid lightgrey; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -1222,9 +1227,9 @@ padding: 1px 4px; } .openerp .oe_secondary_submenu .oe_active { - background: #8a89ba; - border-top: 1px solid lightGray; - border-bottom: 1px solid lightGray; + background: #7c7bad; + border-top: 1px solid lightgrey; + border-bottom: 1px solid lightgrey; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); @@ -1235,7 +1240,7 @@ } .openerp .oe_secondary_submenu .oe_active .oe_menu_label { background: #eeeeee; - color: #8a89ba; + color: #7c7bad; text-shadow: 0 1px 1px white; -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); @@ -1243,7 +1248,7 @@ } .openerp .oe_secondary_submenu .oe_active .oe_menu_counter { background: #eeeeee; - color: #8a89ba; + color: #7c7bad; } .openerp .oe_secondary_submenu .oe_menu_toggler:before { width: 0; @@ -1273,7 +1278,7 @@ width: 100%; } .openerp .oe_application a { - color: #8a89ba; + color: #7c7bad; } .openerp .oe_application a:hover { text-decoration: underline; @@ -1314,7 +1319,7 @@ float: left; } .openerp .oe_view_manager table.oe_view_manager_header h2 a { - color: #8a89ba; + color: #7c7bad; } .openerp .oe_view_manager table.oe_view_manager_header .oe_button_group { display: inline-block; @@ -1673,7 +1678,7 @@ } .openerp .oe_searchview .oe_searchview_drawer h3 { margin: 8px 4px 4px 12px; - color: #8786b7; + color: #7c7bad; font-size: 13px; } .openerp .oe_searchview .oe_searchview_drawer h4, .openerp .oe_searchview .oe_searchview_drawer h4 * { @@ -2074,7 +2079,7 @@ background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); } .openerp ul.oe_form_steps_clickable li .label { - color: #8a89ba; + color: #7c7bad; } .openerp ul.oe_form_steps_clickable li.oe_active:hover { background-color: #4c85c2; @@ -2174,7 +2179,7 @@ } .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { font-size: 80%; - color: darkGreen; + color: darkgreen; vertical-align: top; position: relative; top: -4px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 6472f7aaacd..653adad7813 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -142,6 +142,10 @@ $sheet-max-width: 860px opacity: 1 // }}} +@media print + .oe_topbar, .oe_leftbar, .oe_loading + display: none !important + .openerp.openerp_webclient_container height: 100% position: relative -- cgit v1.2.3 From 6bd1711418b78c3bbbd4304022e5843a3631413b Mon Sep 17 00:00:00 2001 From: "Pinakin Nayi (OpenERP)" Date: Tue, 21 Aug 2012 14:41:23 +0530 Subject: [IMP]widget_html li tag bzr revid: pna@tinyerp.com-20120821091123-rbd47o84ex5aqcot --- addons/web/static/src/css/base.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 2276bb2445e..dca16278ffa 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -148,6 +148,11 @@ .openerp li { list-style-type: none; } + +.openerp .oe_form_field_html li { + list-style-type: disc; +} + .openerp input, .openerp textarea, .openerp select { padding: 2px 4px; border: 1px solid #cccccc; -- cgit v1.2.3 From a70222628b7749f20a6ce2db2f4b6ac47e71c577 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 21 Aug 2012 18:15:17 +0200 Subject: [IMP] added preview_image and size in images bzr revid: nicolas.vanhoren@openerp.com-20120821161517-umnu1465gq809orj --- addons/web/static/src/css/base.css | 4 ++-- addons/web/static/src/css/base.sass | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 269d224bc06..24828e89452 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -505,8 +505,8 @@ margin: 4px; } .openerp .oe_avatar > img { - height: 90px; - max-width: 100px; + max-height: 90px; + max-width: 90px; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index f195015ff1e..176a255a239 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -426,8 +426,8 @@ $sheet-max-width: 860px margin: 4px .oe_avatar > img - height: 90px - max-width: 100px + max-height: 90px + max-width: 90px @include radius(3px) @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3)) border: none -- cgit v1.2.3 From 17768541a07ca47e6b7ae48dc0a5455ef0301d7f Mon Sep 17 00:00:00 2001 From: "Pinakin Nai(OpenERP)" <> Date: Wed, 22 Aug 2012 19:00:35 +0530 Subject: [IMP] Added new stlye to avoid overriding of text in header section bzr revid: pso@tinyerp.com-20120822133035-totgh1ez1omty11r --- addons/web/static/src/css/base.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index dca16278ffa..bd22cce70b2 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -153,6 +153,10 @@ list-style-type: disc; } + .openerp .oe_form_field_html h1,h2 { + line-height:26px; +} + .openerp input, .openerp textarea, .openerp select { padding: 2px 4px; border: 1px solid #cccccc; -- cgit v1.2.3 From dbb9833d689f1da94957e526fd99ab712f4b456e Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 23 Aug 2012 11:45:32 +0200 Subject: fix jquery-ui widget border bzr revid: mit@openerp.com-20120823094532-bluw3pix6dwm1a6i --- addons/web/static/src/css/base.css | 12 +----------- addons/web/static/src/css/base.sass | 10 +--------- 2 files changed, 2 insertions(+), 20 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 9ea94ebdbb0..4f34c050f46 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -454,13 +454,6 @@ -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); } -.openerp ul.oe_flatlist, .openerp ol.oe_flatlist { - margin: 0; - padding: 0; -} -.openerp ul.oe_flatlist li, .openerp ol.oe_flatlist li { - list-style-type: none; -} .openerp .oe_form_dirty .oe_highlight_on_dirty { color: white; background: #dc5f59; @@ -2753,6 +2746,7 @@ div.ui-widget-overlay { -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); margin-top: 4px; + border: 1px solid #afafb6; } .ui-menu .ui-menu-item { width: 100%; @@ -2778,7 +2772,3 @@ div.ui-widget-overlay { -webkit-border-radius: 3px; border-radius: 3px; } - -.ui-widget-content { - border: 1px solid #afafb6; -} diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index b5eae0d7213..4a26ea0d54e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -391,12 +391,6 @@ $sheet-max-width: 860px //@include vertical-gradient(lighten(#dc5f59, 3%), lighten(#b33630, 3%)) @include box-shadow(0 0 1px rgba(0, 0, 0, 0.2)) - ul.oe_flatlist, ol.oe_flatlist - margin: 0 - padding: 0 - li - list-style-type: none - .oe_form_dirty .oe_highlight_on_dirty color: white @@ -2152,6 +2146,7 @@ div.ui-widget-overlay padding: 2px 0 @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) margin-top: 4px + border: 1px solid $tag-border .ui-menu-item width: 100% padding: 0 @@ -2169,8 +2164,5 @@ div.ui-widget-overlay .ui-corner-all @include radius(3px) -.ui-widget-content - border: 1px solid $tag-border - // 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 decab66e70d67e197c406f307baa366327ec105b Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 23 Aug 2012 18:19:53 +0200 Subject: added hover effect to menu counter bzr revid: mit@openerp.com-20120823161953-h5sc0npkpz5drgq1 --- addons/web/static/src/css/base.css | 7 +++++++ addons/web/static/src/css/base.sass | 4 ++++ 2 files changed, 11 insertions(+) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 4f34c050f46..ff90d0050ec 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1206,6 +1206,13 @@ margin: 0px; padding: 1px 4px; } +.openerp .oe_secondary_submenu .oe_menu_counter:hover { + cursor: pointer; + border: 1px solid #c81010; + -moz-box-shadow: 0 0 2px #c81010; + -webkit-box-shadow: 0 0 2px #c81010; + box-shadow: 0 0 2px #c81010; +} .openerp .oe_secondary_submenu .oe_active { background: #7c7bad; border-top: 1px solid lightGray; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 4a26ea0d54e..2bcd5ac5be4 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -945,6 +945,10 @@ $sheet-max-width: 860px text-shadow: 0 1px 1px rgba(0,0,0,0.2) margin: 0px padding: 1px 4px + &:hover + cursor: pointer + border: 1px solid #C81010 + @include box-shadow(0 0 2px #C81010) .oe_active background: $link-color border-top: 1px solid lightGray -- cgit v1.2.3 From e28ec55117cfb6813e52caf571b71ba7a7ab92e5 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 24 Aug 2012 12:44:36 +0200 Subject: [IMP] added oe_semantic_html bzr revid: nicolas.vanhoren@openerp.com-20120824104436-er3w1zdijvcv9j04 --- addons/web/static/src/css/base.css | 21 +++++++++++---------- addons/web/static/src/css/base.sass | 9 +++++++++ 2 files changed, 20 insertions(+), 10 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 30571da3a2a..47ab720b748 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,4 @@ -@charset "UTF-8"; +@charset "utf-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); @@ -148,15 +148,6 @@ .openerp li { list-style-type: none; } - -.openerp .oe_form_field_html li { - list-style-type: disc; -} - - .openerp .oe_form_field_html h1,h2 { - line-height:26px; -} - .openerp input, .openerp textarea, .openerp select { padding: 2px 4px; border: 1px solid #cccccc; @@ -2734,6 +2725,16 @@ float: right; color: #333333; } +.openerp .oe_semantic_html li { + list-style-type: disc; + display: list-item; +} +.openerp .oe_semantic_html ul { + padding-left: 1em; +} +.openerp .oe_semantic_html p { + color: #4c4c4c !important; +} .kitten-mode-activated { background-image: url(http://placekitten.com/g/1365/769); diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 33b33d01701..9b541bdc625 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2128,6 +2128,15 @@ $sheet-max-width: 860px float: right color: #333 // }}} + .oe_semantic_html // a style to use normal html + li + list-style-type: disc + display: list-item + ul + padding-left: 1em + p + color: #4C4C4C !important + // Kitten Mode {{{ .kitten-mode-activated background-image: url(http://placekitten.com/g/1365/769) -- cgit v1.2.3 From 7c334cfb5aadab0f1626886cc3162d649d404b17 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 24 Aug 2012 13:42:04 +0200 Subject: [IMP] Improved css to support semantic html bzr revid: nicolas.vanhoren@openerp.com-20120824114204-i6qprxhwczkkem6z --- addons/web/static/src/css/Makefile | 2 +- addons/web/static/src/css/base.css | 70 ++++++++++++++++++++++++++++++++----- addons/web/static/src/css/base.sass | 30 ++++++++++++---- 3 files changed, 87 insertions(+), 15 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/Makefile b/addons/web/static/src/css/Makefile index eca044497ef..d6b4f4b2fc8 100644 --- a/addons/web/static/src/css/Makefile +++ b/addons/web/static/src/css/Makefile @@ -1,3 +1,3 @@ base.css: base.sass - sass -t expanded base.sass base.css + sass --trace -t expanded base.sass base.css diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 47ab720b748..e9d1fb1c268 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -141,13 +141,6 @@ background-image: -o-linear-gradient(top, #eeeeee, #dedede); background-image: linear-gradient(to bottom, #eeeeee, #dedede); } -.openerp ul, .openerp li, .openerp ol { - margin: 0; - padding: 0; -} -.openerp li { - list-style-type: none; -} .openerp input, .openerp textarea, .openerp select { padding: 2px 4px; border: 1px solid #cccccc; @@ -162,6 +155,13 @@ .openerp h4 { margin: 4px 0; } +.openerp .oe_semantic_html_override ul, .openerp .oe_semantic_html_override li, .openerp .oe_semantic_html_override ol { + margin: 0; + padding: 0; +} +.openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override li li, .openerp .oe_semantic_html_override ol li { + list-style-type: none; +} .openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { display: inline-block; border: 1px solid #ababab; @@ -633,6 +633,18 @@ padding: 0 16px; list-style: none; zoom: 1; + margin: 0; + padding: 0; +} +.openerp .oe_notebook li { + list-style-type: none; +} +.openerp .oe_notebook ul, .openerp .oe_notebook li, .openerp .oe_notebook ol { + margin: 0; + padding: 0; +} +.openerp .oe_notebook ul li, .openerp .oe_notebook li li, .openerp .oe_notebook ol li { + list-style-type: none; } .openerp .oe_notebook.ui-corner-all { -moz-border-radius: 0; @@ -937,6 +949,13 @@ -webkit-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); } +.openerp .oe_login .oe_login_pane ul, .openerp .oe_login .oe_login_pane li, .openerp .oe_login .oe_login_pane ol { + margin: 0; + padding: 0; +} +.openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane li li, .openerp .oe_login .oe_login_pane ol li { + list-style-type: none; +} .openerp .oe_login .oe_login_pane h2 { margin-top: 0; font-size: 18px; @@ -1016,6 +1035,13 @@ background-image: -o-linear-gradient(top, #646060, #262626); background-image: linear-gradient(to bottom, #646060, #262626); } +.openerp .oe_topbar ul, .openerp .oe_topbar li, .openerp .oe_topbar ol { + margin: 0; + padding: 0; +} +.openerp .oe_topbar ul li, .openerp .oe_topbar li li, .openerp .oe_topbar ol li { + list-style-type: none; +} .openerp .oe_topbar .oe_topbar_item { display: block; padding: 5px 10px 7px; @@ -1088,6 +1114,13 @@ text-shadow: 0 1px 1px white; padding-bottom: 16px; } +.openerp .oe_leftbar ul, .openerp .oe_leftbar li, .openerp .oe_leftbar ol { + margin: 0; + padding: 0; +} +.openerp .oe_leftbar ul li, .openerp .oe_leftbar li li, .openerp .oe_leftbar ol li { + list-style-type: none; +} .openerp a.oe_logo { width: 220px; display: block; @@ -1283,6 +1316,13 @@ width: 100%; table-layout: fixed; } +.openerp .oe_view_manager table.oe_view_manager_header ul, .openerp .oe_view_manager table.oe_view_manager_header li, .openerp .oe_view_manager table.oe_view_manager_header ol { + margin: 0; + padding: 0; +} +.openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header li li, .openerp .oe_view_manager table.oe_view_manager_header ol li { + list-style-type: none; +} .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row { clear: both; text-shadow: 0 1px 1px white; @@ -1952,7 +1992,7 @@ .openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator { margin: 12px 0 8px 0; } -.openerp .oe_form div.oe_form_configuration p { +.openerp .oe_form div.oe_form_configuration p, .openerp .oe_form div.oe_form_configuration ul, .openerp .oe_form div.oe_form_configuration ol { color: #aaaaaa; max-width: 650px; } @@ -2401,6 +2441,20 @@ float: right; padding-left: 2px; } +.openerp .oe_form_field_status { + margin: 0; + padding: 0; +} +.openerp .oe_form_field_status ul, .openerp .oe_form_field_status li, .openerp .oe_form_field_status ol { + margin: 0; + padding: 0; +} +.openerp .oe_form_field_status ul li, .openerp .oe_form_field_status li li, .openerp .oe_form_field_status ol li { + list-style-type: none; +} +.openerp .oe_form_field_status li { + list-style-type: none; +} .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { display: none; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 9b541bdc625..60b59a61a46 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -111,6 +111,16 @@ $sheet-max-width: 860px content: $icon-name color: $color +@mixin ul-html-override() + margin: 0 + padding: 0 + li + list-style-type: none + +@mixin semantic-html-override() + ul, li, ol + @include ul-html-override() + // }}} // CSS animation bounces {{{ @-moz-keyframes bounce @@ -194,11 +204,6 @@ $sheet-max-width: 860px @include vertical-gradient(#f0f0fa, #eeeef6) .zebra tbody tr:hover td @include vertical-gradient(#eee, #dedede) - ul, li, ol - margin: 0 - padding: 0 - li - list-style-type: none input, textarea, select padding: 2px 4px border: 1px solid #ccc @@ -208,6 +213,8 @@ $sheet-max-width: 860px vertical-align: middle h4 margin: 4px 0 + .oe_semantic_html_override + @include semantic-html-override // }}} // Button style {{{ a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button @@ -515,6 +522,8 @@ $sheet-max-width: 860px padding: 0 16px list-style: none zoom: 1 + @include ul-html-override + @include semantic-html-override .oe_notebook.ui-corner-all @include radius(0) .oe_notebook:before, .oe_notebook:after @@ -734,6 +743,7 @@ $sheet-max-width: 860px text-align: left @include radius(8px) @include box-shadow(0 0 18px rgba(0, 0, 0, 0.9)) + @include semantic-html-override h2 margin-top: 0 font-size: 18px @@ -799,6 +809,7 @@ $sheet-max-width: 860px height: 31px border-top: solid 1px #d3d3d3 @include vertical-gradient(#646060, #262626) + @include semantic-html-override .oe_topbar_item display: block padding: 5px 10px 7px @@ -849,6 +860,7 @@ $sheet-max-width: 860px border-right: 1px solid $tag-border text-shadow: 0 1px 1px white padding-bottom: 16px + @include semantic-html-override a.oe_logo width: 220px display: block @@ -1009,6 +1021,7 @@ $sheet-max-width: 860px table.oe_view_manager_header width: 100% table-layout: fixed + @include semantic-html-override .oe_header_row //min-height: 26px //line-height: 26px @@ -1521,7 +1534,7 @@ $sheet-max-width: 860px div.oe_form_configuration div.oe_horizontal_separator margin: 12px 0 8px 0 - p + p, ul, ol color: #aaa max-width: 650px label @@ -1856,6 +1869,11 @@ $sheet-max-width: 860px float: right padding-left: 2px // }}} + // FormView.fieldstatus {{{ + .oe_form_field_status + @include semantic-html-override + @include ul-html-override + // }}} // FormView.one2many {{{ .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page -- cgit v1.2.3 From 682168e202451ccd47df5f5042449c90fb3af818 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Mon, 27 Aug 2012 16:03:10 +0200 Subject: [REVERT] Revert hasty commit r.2976 - wreaks havoc on many views by revealing
  • bullets everywhere bzr revid: odo@openerp.com-20120827140310-zzp1kmtulvenuamo --- addons/web/static/src/css/Makefile | 2 +- addons/web/static/src/css/base.css | 70 +++++-------------------------------- addons/web/static/src/css/base.sass | 30 ++++------------ 3 files changed, 15 insertions(+), 87 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/Makefile b/addons/web/static/src/css/Makefile index d6b4f4b2fc8..eca044497ef 100644 --- a/addons/web/static/src/css/Makefile +++ b/addons/web/static/src/css/Makefile @@ -1,3 +1,3 @@ base.css: base.sass - sass --trace -t expanded base.sass base.css + sass -t expanded base.sass base.css diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index eb641d5887e..908d407380c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -141,6 +141,13 @@ background-image: -o-linear-gradient(top, #eeeeee, #dedede); background-image: linear-gradient(to bottom, #eeeeee, #dedede); } +.openerp ul, .openerp li, .openerp ol { + margin: 0; + padding: 0; +} +.openerp li { + list-style-type: none; +} .openerp input, .openerp textarea, .openerp select { padding: 2px 4px; border: 1px solid #cccccc; @@ -155,13 +162,6 @@ .openerp h4 { margin: 4px 0; } -.openerp .oe_semantic_html_override ul, .openerp .oe_semantic_html_override li, .openerp .oe_semantic_html_override ol { - margin: 0; - padding: 0; -} -.openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override li li, .openerp .oe_semantic_html_override ol li { - list-style-type: none; -} .openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { display: inline-block; border: 1px solid #ababab; @@ -626,18 +626,6 @@ padding: 0 16px; list-style: none; zoom: 1; - margin: 0; - padding: 0; -} -.openerp .oe_notebook li { - list-style-type: none; -} -.openerp .oe_notebook ul, .openerp .oe_notebook li, .openerp .oe_notebook ol { - margin: 0; - padding: 0; -} -.openerp .oe_notebook ul li, .openerp .oe_notebook li li, .openerp .oe_notebook ol li { - list-style-type: none; } .openerp .oe_notebook.ui-corner-all { -moz-border-radius: 0; @@ -942,13 +930,6 @@ -webkit-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); } -.openerp .oe_login .oe_login_pane ul, .openerp .oe_login .oe_login_pane li, .openerp .oe_login .oe_login_pane ol { - margin: 0; - padding: 0; -} -.openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane li li, .openerp .oe_login .oe_login_pane ol li { - list-style-type: none; -} .openerp .oe_login .oe_login_pane h2 { margin-top: 0; font-size: 18px; @@ -1028,13 +1009,6 @@ background-image: -o-linear-gradient(top, #646060, #262626); background-image: linear-gradient(to bottom, #646060, #262626); } -.openerp .oe_topbar ul, .openerp .oe_topbar li, .openerp .oe_topbar ol { - margin: 0; - padding: 0; -} -.openerp .oe_topbar ul li, .openerp .oe_topbar li li, .openerp .oe_topbar ol li { - list-style-type: none; -} .openerp .oe_topbar .oe_topbar_item { display: block; padding: 5px 10px 7px; @@ -1107,13 +1081,6 @@ text-shadow: 0 1px 1px white; padding-bottom: 16px; } -.openerp .oe_leftbar ul, .openerp .oe_leftbar li, .openerp .oe_leftbar ol { - margin: 0; - padding: 0; -} -.openerp .oe_leftbar ul li, .openerp .oe_leftbar li li, .openerp .oe_leftbar ol li { - list-style-type: none; -} .openerp a.oe_logo { width: 220px; display: block; @@ -1316,13 +1283,6 @@ width: 100%; table-layout: fixed; } -.openerp .oe_view_manager table.oe_view_manager_header ul, .openerp .oe_view_manager table.oe_view_manager_header li, .openerp .oe_view_manager table.oe_view_manager_header ol { - margin: 0; - padding: 0; -} -.openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header li li, .openerp .oe_view_manager table.oe_view_manager_header ol li { - list-style-type: none; -} .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row { clear: both; text-shadow: 0 1px 1px white; @@ -1992,7 +1952,7 @@ .openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator { margin: 12px 0 8px 0; } -.openerp .oe_form div.oe_form_configuration p, .openerp .oe_form div.oe_form_configuration ul, .openerp .oe_form div.oe_form_configuration ol { +.openerp .oe_form div.oe_form_configuration p { color: #aaaaaa; max-width: 650px; } @@ -2441,20 +2401,6 @@ float: right; padding-left: 2px; } -.openerp .oe_form_field_status { - margin: 0; - padding: 0; -} -.openerp .oe_form_field_status ul, .openerp .oe_form_field_status li, .openerp .oe_form_field_status ol { - margin: 0; - padding: 0; -} -.openerp .oe_form_field_status ul li, .openerp .oe_form_field_status li li, .openerp .oe_form_field_status ol li { - list-style-type: none; -} -.openerp .oe_form_field_status li { - list-style-type: none; -} .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { display: none; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index aa75956f0a1..52d54de3fbb 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -111,16 +111,6 @@ $sheet-max-width: 860px content: $icon-name color: $color -@mixin ul-html-override() - margin: 0 - padding: 0 - li - list-style-type: none - -@mixin semantic-html-override() - ul, li, ol - @include ul-html-override() - // }}} // CSS animation bounces {{{ @-moz-keyframes bounce @@ -204,6 +194,11 @@ $sheet-max-width: 860px @include vertical-gradient(#f0f0fa, #eeeef6) .zebra tbody tr:hover td @include vertical-gradient(#eee, #dedede) + ul, li, ol + margin: 0 + padding: 0 + li + list-style-type: none input, textarea, select padding: 2px 4px border: 1px solid #ccc @@ -213,8 +208,6 @@ $sheet-max-width: 860px vertical-align: middle h4 margin: 4px 0 - .oe_semantic_html_override - @include semantic-html-override // }}} // Button style {{{ a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button @@ -516,8 +509,6 @@ $sheet-max-width: 860px padding: 0 16px list-style: none zoom: 1 - @include ul-html-override - @include semantic-html-override .oe_notebook.ui-corner-all @include radius(0) .oe_notebook:before, .oe_notebook:after @@ -737,7 +728,6 @@ $sheet-max-width: 860px text-align: left @include radius(8px) @include box-shadow(0 0 18px rgba(0, 0, 0, 0.9)) - @include semantic-html-override h2 margin-top: 0 font-size: 18px @@ -803,7 +793,6 @@ $sheet-max-width: 860px height: 31px border-top: solid 1px #d3d3d3 @include vertical-gradient(#646060, #262626) - @include semantic-html-override .oe_topbar_item display: block padding: 5px 10px 7px @@ -854,7 +843,6 @@ $sheet-max-width: 860px border-right: 1px solid $tag-border text-shadow: 0 1px 1px white padding-bottom: 16px - @include semantic-html-override a.oe_logo width: 220px display: block @@ -1019,7 +1007,6 @@ $sheet-max-width: 860px table.oe_view_manager_header width: 100% table-layout: fixed - @include semantic-html-override .oe_header_row //min-height: 26px //line-height: 26px @@ -1532,7 +1519,7 @@ $sheet-max-width: 860px div.oe_form_configuration div.oe_horizontal_separator margin: 12px 0 8px 0 - p, ul, ol + p color: #aaa max-width: 650px label @@ -1867,11 +1854,6 @@ $sheet-max-width: 860px float: right padding-left: 2px // }}} - // FormView.fieldstatus {{{ - .oe_form_field_status - @include semantic-html-override - @include ul-html-override - // }}} // FormView.one2many {{{ .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page -- cgit v1.2.3 From 67ea7a40a440deb6589952934cac986fe24b4091 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 28 Aug 2012 16:29:35 +0200 Subject: [FIX] State widget elements overlapping with dropdowns and menus bzr revid: fme@openerp.com-20120828142935-pdq8zb74f665bznt --- addons/web/static/src/css/base.css | 2 -- addons/web/static/src/css/base.sass | 2 -- 2 files changed, 4 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 908d407380c..02a5c155476 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2001,7 +2001,6 @@ padding-left: 24px; margin: 0; position: relative; - z-index: 10; } .openerp ul.oe_form_steps li .arrow, .openerp ul.oe_form_steps_clickable li .arrow { width: 17px; @@ -2012,7 +2011,6 @@ } .openerp ul.oe_form_steps li .arrow span, .openerp ul.oe_form_steps_clickable li .arrow span { position: relative; - z-index: 11; width: 24px; height: 24px; display: inline-block; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 52d54de3fbb..d3a04be28b8 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1554,7 +1554,6 @@ $sheet-max-width: 860px padding-left: 24px margin: 0 position: relative - z-index: 10 .arrow width: 17px display: inline-block @@ -1563,7 +1562,6 @@ $sheet-max-width: 860px margin-left: -5px span position: relative - z-index: 11 width: 24px height: 24px display: inline-block -- cgit v1.2.3 From ba7aee832d999b940c1139218d6966db660510fe Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 29 Aug 2012 17:37:56 +0200 Subject: [IMP] Support for classnames in m2o autocomplete Also improved readability of code bzr revid: fme@openerp.com-20120829153756-7b3lq5lan6b97chy --- addons/web/static/src/css/base.css | 7 +++++++ addons/web/static/src/css/base.sass | 6 ++++++ 2 files changed, 13 insertions(+) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 02a5c155476..41a1bdf26fd 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2399,6 +2399,13 @@ float: right; padding-left: 2px; } +.openerp.ui-autocomplete li.oe_m2o_dropdown_option a { + font-style: italic; + padding-left: 2em; +} +.openerp.ui-autocomplete li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option { + margin-top: 10px; +} .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { display: none; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index d3a04be28b8..173dd551056 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1851,6 +1851,12 @@ $sheet-max-width: 860px line-height: 14px float: right padding-left: 2px + &.ui-autocomplete + li.oe_m2o_dropdown_option a + font-style: italic + padding-left: 2em + li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option + margin-top: 10px // }}} // FormView.one2many {{{ .oe_form .oe_form_field_one2many > .oe_view_manager -- cgit v1.2.3 From d0261477f833a84201c526cf76ca432b864c4f50 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 29 Aug 2012 21:08:19 +0200 Subject: [IMP] CSS improvement bzr revid: fp@tinyerp.com-20120829190819-gl2q4d0d0xsbh2l3 --- addons/web/static/src/css/base.css | 8 +++++++- addons/web/static/src/css/base.sass | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 41a1bdf26fd..c28c12bf224 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -69,6 +69,7 @@ display: none !important; } } + .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -84,7 +85,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ + */ */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -1949,6 +1950,11 @@ margin: 0 auto; padding: 16px 0 48px; } +.openerp .oe_form .oe_grey { + color: #aaaaaa; + max-width: 650px; + margin: 0 0 10px 0; +} .openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator { margin: 12px 0 8px 0; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 173dd551056..92150ad687b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1516,6 +1516,10 @@ $sheet-max-width: 860px max-width: $sheet-max-width margin: 0 auto padding: 16px 0 48px + .oe_grey + color: #aaa + max-width: 650px + margin: 0 0 10px 0 div.oe_form_configuration div.oe_horizontal_separator margin: 12px 0 8px 0 -- cgit v1.2.3 From 6e943465be4c6df2a356b93e7be8a1da4eb8d74f Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 29 Aug 2012 21:12:43 +0200 Subject: imp_css bzr revid: fp@tinyerp.com-20120829191243-zmgsqb8twjcwzx02 --- addons/web/static/src/css/base.css | 5 +---- addons/web/static/src/css/base.sass | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index c28c12bf224..06a37a54727 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1955,9 +1955,6 @@ max-width: 650px; margin: 0 0 10px 0; } -.openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator { - margin: 12px 0 8px 0; -} .openerp .oe_form div.oe_form_configuration p { color: #aaaaaa; max-width: 650px; @@ -2191,7 +2188,7 @@ .openerp .oe_horizontal_separator { font-weight: bold; font-size: 20px; - margin: 8px 0px 8px 0px; + margin: 15px 0px 10px 0px; color: #7c7bad; } .openerp .oe_horizontal_separator:empty { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 92150ad687b..c238ef6ee07 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1521,8 +1521,6 @@ $sheet-max-width: 860px max-width: 650px margin: 0 0 10px 0 div.oe_form_configuration - div.oe_horizontal_separator - margin: 12px 0 8px 0 p color: #aaa max-width: 650px @@ -1681,7 +1679,7 @@ $sheet-max-width: 860px .oe_horizontal_separator font-weight: bold font-size: 20px - margin: 8px 0px 8px 0px + margin: 15px 0px 10px 0px color: $section-title-color .oe_horizontal_separator:empty height: 5px -- cgit v1.2.3 From 16773839a48cf3dd9997a1343f789b39e0f37d2f Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 30 Aug 2012 15:05:24 +0200 Subject: Styling of group header in listview group by bzr revid: mit@openerp.com-20120830130524-3szsbr80dltbenzm --- addons/web/static/src/css/base.css | 14 +++++++++++--- addons/web/static/src/css/base.sass | 3 +++ 2 files changed, 14 insertions(+), 3 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 06a37a54727..c3552811fd4 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,4 @@ -@charset "utf-8"; +@charset "UTF-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); @@ -69,7 +69,6 @@ display: none !important; } } - .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -85,7 +84,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -2523,6 +2522,15 @@ margin: 0 !important; padding: 0; } +.openerp .oe_list .oe_list_content .oe_group_header { + background-color: #fcfcfc; + background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); + background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); + background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); + background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); + background-image: -o-linear-gradient(top, #fcfcfc, #dedede); + background-image: linear-gradient(to bottom, #fcfcfc, #dedede); +} .openerp .oe_list_content { width: 100%; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c238ef6ee07..0ac0d99def8 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1970,6 +1970,8 @@ $sheet-max-width: 860px position: absolute margin: 0 !important // dammit padding: 0 + .oe_list_content .oe_group_header + @include vertical-gradient(#fcfcfc, #dedede) .oe_list_content width: 100% @@ -2028,6 +2030,7 @@ $sheet-max-width: 860px > tr:nth-child(odd) background-color: #f0f0fa @include vertical-gradient(#f0f0fa, #eeeef6) + > tfoot border-top: 2px solid #cacaca border-bottom: 1px solid #cacaca -- cgit v1.2.3 From 723d2ee1daaf2d709926f0ea1bce6c5ba334285d Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 31 Aug 2012 18:31:53 +0200 Subject: uniformization of avatar box-shadow bzr revid: mit@openerp.com-20120831163153-8515c0vfr6sw09n1 --- addons/web/static/src/css/base.css | 12 ++++++------ addons/web/static/src/css/base.sass | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index c3552811fd4..dcb3fd958f4 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -498,9 +498,9 @@ -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); border: none; } .openerp .oe_avatar + div { @@ -866,9 +866,9 @@ font-family: "Lucida Grande", Helvetica, Verdana, Arial; border: 1px solid #999999; background: whitesmoke; - -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); - -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); - box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); + -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.4); + -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.4); + box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.4); -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 0ac0d99def8..43b8ace724b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -420,7 +420,7 @@ $sheet-max-width: 860px max-height: 90px max-width: 90px @include radius(3px) - @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3)) + @include box-shadow(0 1px 4px rgba(0, 0, 0, 0.4)) border: none .oe_avatar + div margin-left: 5px @@ -687,7 +687,7 @@ $sheet-max-width: 860px font-family: "Lucida Grande", Helvetica, Verdana, Arial border: 1px solid #999999 background: whitesmoke - @include box-shadow(inset 0 1px 4px rgba(0, 0, 0, 0.3)) + @include box-shadow(inset 0 1px 4px rgba(0, 0, 0, 0.4)) @include radius(3px) input margin-bottom: 9px -- cgit v1.2.3 From 972306d0157ca92b57462f3e3735767e5a3618fa Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sun, 2 Sep 2012 14:58:05 +0200 Subject: [IMP] CSS bzr revid: fp@openerp.com-20120902125805-jeivl4whuzzubv7l --- addons/web/static/src/css/base.css | 5 +++-- addons/web/static/src/css/base.sass | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 06a37a54727..5ce814ef011 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -85,7 +85,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -503,6 +503,7 @@ -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); border: none; + margin-bottom: 10px; } .openerp .oe_avatar + div { margin-left: 5px; @@ -2157,7 +2158,7 @@ .openerp .oe_form td.oe_form_group_cell_label label { line-height: 18px; display: block; - min-width: 160px; + min-width: 140px; } .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { padding-left: 6px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c238ef6ee07..f16e369f531 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -422,6 +422,7 @@ $sheet-max-width: 860px @include radius(3px) @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3)) border: none + margin-bottom: 10px .oe_avatar + div margin-left: 5px .oe_image_small > img @@ -1650,7 +1651,7 @@ $sheet-max-width: 860px label line-height: 18px display: block - min-width: 160px + min-width: 140px td.oe_form_group_cell + .oe_form_group_cell padding-left: 6px .oe_form_group -- cgit v1.2.3 From d7a2ea78dc50f17813e2d20712c146a427dece0b Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sun, 2 Sep 2012 15:30:23 +0200 Subject: [IMP] CSS bzr revid: fp@openerp.com-20120902133023-dgdicbx0xnlht2l5 --- addons/web/static/src/css/base.css | 3 +++ addons/web/static/src/css/base.sass | 1 + 2 files changed, 4 insertions(+) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 5ce814ef011..dd168653f03 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -576,6 +576,9 @@ background: #7c7bad; color: #eeeeee; } +.openerp .oe_tags { + margin-bottom: 1px; +} .openerp .oe_tags.oe_inline { min-width: 250px; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index f16e369f531..537988e9c4a 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -476,6 +476,7 @@ $sheet-max-width: 860px .text-core .text-wrap .text-dropdown .text-list .text-suggestion em font-style: italic text-decoration: none + margin-bottom: 1px // }}} // Tooltips {{{ &.oe_tooltip -- cgit v1.2.3 From da86f505acf8b6c906f80933dc733c02ffa84eec Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Mon, 3 Sep 2012 18:40:10 +0200 Subject: Added polish to left menu bzr revid: mit@openerp.com-20120903164010-itzwtaf37c6bas71 --- addons/web/static/src/css/base.css | 33 +++++++++++++++++++++++---------- addons/web/static/src/css/base.sass | 16 ++++++++++------ 2 files changed, 33 insertions(+), 16 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index b1c6348b2ad..e875ff9fab2 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -454,6 +454,9 @@ -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); } +.openerp .oe_background_grey { + background: #eeeeee !important; +} .openerp .oe_form_dirty .oe_highlight_on_dirty { color: white; background: #dc5f59; @@ -1207,24 +1210,31 @@ .openerp .oe_secondary_submenu .oe_menu_counter { float: right; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); - margin: 0px; + margin: 1px; padding: 1px 4px; + border: none; } .openerp .oe_secondary_submenu .oe_menu_counter:hover { cursor: pointer; - border: 1px solid #c81010; - -moz-box-shadow: 0 0 2px #c81010; - -webkit-box-shadow: 0 0 2px #c81010; - box-shadow: 0 0 2px #c81010; + -moz-transform: scale(1.1); + -webkit-transform: scale(1.1); + -o-transform: scale(1.1); + -ms-transform: scale(1.1); } .openerp .oe_secondary_submenu .oe_active { - background: #7c7bad; border-top: 1px solid lightGray; - border-bottom: 1px solid lightGray; + border-bottom: 1px solid #e0e0e0; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); + -moz-box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2); + box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2); + background-color: #7372a7; + background-image: -webkit-gradient(linear, left top, left bottom, from(#7372a7), to(#8281b1)); + background-image: -webkit-linear-gradient(top, #7372a7, #8281b1); + background-image: -moz-linear-gradient(top, #7372a7, #8281b1); + background-image: -ms-linear-gradient(top, #7372a7, #8281b1); + background-image: -o-linear-gradient(top, #7372a7, #8281b1); + background-image: linear-gradient(to bottom, #7372a7, #8281b1); } .openerp .oe_secondary_submenu .oe_active a { color: white; @@ -1240,6 +1250,9 @@ .openerp .oe_secondary_submenu .oe_active .oe_menu_counter { background: #eeeeee; color: #7c7bad; + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2); } .openerp .oe_secondary_submenu .oe_menu_toggler:before { width: 0; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 1b6a1b3d766..637a1975e32 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -390,6 +390,8 @@ $sheet-max-width: 860px @include vertical-gradient(#DF6B66, #BF3A33) //@include vertical-gradient(lighten(#dc5f59, 3%), lighten(#b33630, 3%)) @include box-shadow(0 0 1px rgba(0, 0, 0, 0.2)) + .oe_background_grey + background: #eee !important .oe_form_dirty .oe_highlight_on_dirty @@ -945,18 +947,19 @@ $sheet-max-width: 860px .oe_menu_counter float: right text-shadow: 0 1px 1px rgba(0,0,0,0.2) - margin: 0px + margin: 1px padding: 1px 4px + border: none &:hover cursor: pointer - border: 1px solid #C81010 - @include box-shadow(0 0 2px #C81010) + @include transform(scale(1.1)) .oe_active - background: $link-color border-top: 1px solid lightGray - border-bottom: 1px solid lightGray + border-bottom: 1px solid #e0e0e0 text-shadow: 0 1px 1px rgba(0,0,0,0.2) - @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.2)) + @include box-shadow((inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2))) + //background: $link-color + @include vertical-gradient(darken($link-color, 3%), lighten($link-color, 2%)) a color: white .oe_menu_label @@ -967,6 +970,7 @@ $sheet-max-width: 860px .oe_menu_counter background: #eee color: $link-color + @include box-shadow(inset 0 1px 2px rgba(0, 0, 0, 0.2)) .oe_menu_toggler:before width: 0 height: 0 -- cgit v1.2.3 From b203377994ff51231a632f5b940c14482b9c3206 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 4 Sep 2012 09:41:45 +0200 Subject: [IMP] in list views: hide drag-n-drop handle and trash can with css classes bzr revid: rco@openerp.com-20120904074145-5mefinpkz0pl0qyb --- addons/web/static/src/css/base.css | 9 +++++++-- addons/web/static/src/css/base.sass | 7 +++++++ 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 06a37a54727..d32b0a9f42a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -69,7 +69,6 @@ display: none !important; } } - .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -85,7 +84,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -2638,6 +2637,12 @@ content: "ö"; color: #404040; } +.openerp .oe_list_cannot_edit .oe_list_header_handle, .openerp .oe_list_cannot_edit .oe_list_field_handle { + display: none !important; +} +.openerp .oe_list_cannot_delete .oe_list_header_delete, .openerp .oe_list_cannot_delete .oe_list_record_delete { + display: none !important; +} .openerp .tree_header { background-color: #f0f0f0; border-bottom: 1px solid #cacaca; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c238ef6ee07..8ddf9b56b9f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2050,6 +2050,13 @@ $sheet-max-width: 860px .oe_list_handle @include text-to-icon("ö") + .oe_list_cannot_edit + .oe_list_header_handle, .oe_list_field_handle + display: none !important + .oe_list_cannot_delete + .oe_list_header_delete, .oe_list_record_delete + display: none !important + // }}} // Tree view {{{ .tree_header -- cgit v1.2.3 From 8b98de00e43b2ba0a3df676f0362a9d3d342092b Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 4 Sep 2012 09:49:21 +0200 Subject: [IMP] simplification in list views: merge two css classes bzr revid: rco@openerp.com-20120904074921-ff9pkr64g58ku9n3 --- addons/web/static/src/css/base.css | 2 +- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index d32b0a9f42a..bbee2adfbc4 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2640,7 +2640,7 @@ .openerp .oe_list_cannot_edit .oe_list_header_handle, .openerp .oe_list_cannot_edit .oe_list_field_handle { display: none !important; } -.openerp .oe_list_cannot_delete .oe_list_header_delete, .openerp .oe_list_cannot_delete .oe_list_record_delete { +.openerp .oe_list_cannot_delete .oe_list_record_delete { display: none !important; } .openerp .tree_header { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 8ddf9b56b9f..63c6f3398fa 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2054,7 +2054,7 @@ $sheet-max-width: 860px .oe_list_header_handle, .oe_list_field_handle display: none !important .oe_list_cannot_delete - .oe_list_header_delete, .oe_list_record_delete + .oe_list_record_delete display: none !important // }}} -- cgit v1.2.3 From 9612626dacbaf3a7956a68f8bd7696966430c0ec Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 4 Sep 2012 12:19:16 +0200 Subject: [ADD] Kanban dummy cell click triggers 'add column' button bounce effect bzr revid: fme@openerp.com-20120904101916-wzkxutkcthgyv2fe --- addons/web/static/src/css/base.css | 4 +++- addons/web/static/src/css/base.sass | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index dd168653f03..94cb4d3a007 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -69,7 +69,6 @@ display: none !important; } } - .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -238,6 +237,9 @@ .openerp .ui-widget-content a { color: #7c7bad; } +.openerp .oe_bounce_container { + display: inline-block; +} .openerp.ui-dialog { display: none; padding: 6px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 537988e9c4a..ad5794ab5cf 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -251,6 +251,8 @@ $sheet-max-width: 860px // Jquery ui Overrides {{{ .ui-widget-content a color: $link-color + .oe_bounce_container + display: inline-block // Modal box &.ui-dialog -- cgit v1.2.3 From fd40dcbeff2973c6501db4eb4e752597ef7fcbd2 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 4 Sep 2012 12:11:39 +0200 Subject: [FIX] add minimum height to listview rows matching that of edition row fields Also fix reset of border-radius: none is not a valid value for border-radius, change to 0. bzr revid: xmo@openerp.com-20120904101139-xyl0dskdk6dbdfe1 --- addons/web/static/src/css/base.css | 20 +++++++++++--------- addons/web/static/src/css/base.sass | 12 +++++++----- 2 files changed, 18 insertions(+), 14 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 94cb4d3a007..c20cdf92891 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -523,9 +523,9 @@ padding: 0; margin: 0; background: none; - -moz-border-radius: none; - -webkit-border-radius: none; - border-radius: none; + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; @@ -538,9 +538,9 @@ padding: 0; margin: 0; background: none; - -moz-border-radius: none; - -webkit-border-radius: none; - border-radius: none; + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; @@ -2479,10 +2479,11 @@ height: 27px; } .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea { + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; border: 1px solid #aaaaff; - border-radius: 0px; - margin: 0px; - -webkit-border-radius: 0px; + margin: 0; } .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea { height: 60px; @@ -2582,6 +2583,7 @@ cursor: pointer; } .openerp .oe_list_content > tbody > tr { + height: 27px; border-top: 1px solid #dddddd; } .openerp .oe_list_content > tbody > tr > td.oe_list_field_cell { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index ad5794ab5cf..5f72b7ae548 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -36,7 +36,7 @@ $sheet-max-width: 860px padding: 0 margin: 0 background: none - @include radius(none) + @include radius(0) @include box-shadow(none) @mixin vertical-gradient($startColor: #555, $endColor: #333) @@ -1911,6 +1911,8 @@ $sheet-max-width: 860px background-color: #d2d2ff td.oe_readonly background-color: #eee + + $row-height: 27px .oe_list_editable .oe_list_content td.oe_list_field_cell @@ -1925,12 +1927,11 @@ $sheet-max-width: 860px display: none .oe_form_field input - height: 27px + height: $row-height input, textarea + @include radius(0) border: 1px solid #aaf - border-radius: 0px - margin: 0px - -webkit-border-radius: 0px + margin: 0 textarea height: 60px &.oe_form_field_float,&.oe_form_view_integer @@ -2015,6 +2016,7 @@ $sheet-max-width: 860px > tbody cursor: pointer > tr + height: $row-height border-top: 1px solid #ddd > td.oe_list_field_cell padding: 3px 6px -- cgit v1.2.3 From a613b710e92c09ed0da76fef145ef91a7a041d3d Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Tue, 4 Sep 2012 14:41:17 +0200 Subject: [FIX] Fixed padding in popups. bzr revid: vta@openerp.com-20120904124117-3ilh4ryfu4r0wpqx --- addons/web/static/src/css/base.css | 95 +++++++++-------- addons/web/static/src/css/base.sass | 202 ++++++++++++++++++------------------ 2 files changed, 150 insertions(+), 147 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index dd168653f03..f28e3c6aa0d 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -69,7 +69,6 @@ display: none !important; } } - .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -1933,6 +1932,35 @@ margin: -16px -16px 0 -16px; padding: 8px; } +.openerp .oe_form_sheetbg { + padding: 8px 0; +} +.openerp .oe_form_sheet_width { + min-width: 650px; + max-width: 860px; + margin: 0 auto; +} +.openerp .oe_form_sheet { + background: white; + min-height: 330px; + padding: 16px; +} +.openerp .oe_application .oe_form_sheetbg { + background: url(/web/static/src/img/form_sheetbg.png); + border-bottom: 1px solid #dddddd; +} +.openerp .oe_application .oe_form_sheet { + border: 1px solid #afafb6; + -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); + box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); +} +.openerp .oe_application .oe_form_sheet .ui-tabs { + margin: 0 -16px; +} +.openerp .oe_application .oe_form_sheet .oe_notebook_page { + padding: 0 16px; +} .openerp .oe_form header { position: relative; border-bottom: 1px solid #cacaca; @@ -1972,11 +2000,11 @@ .openerp .oe_form div.oe_form_configuration .oe_form_group_cell div div { padding: 1px 0; } -.openerp ul.oe_form_steps, .openerp ul.oe_form_steps_clickable { +.openerp .oe_form ul.oe_form_steps, .openerp .oe_form ul.oe_form_steps_clickable { display: inline-block; padding-right: 18px; } -.openerp ul.oe_form_steps li, .openerp ul.oe_form_steps_clickable li { +.openerp .oe_form ul.oe_form_steps li, .openerp .oe_form ul.oe_form_steps_clickable li { display: inline-block; margin-right: -20px; background-color: #fcfcfc; @@ -1987,20 +2015,20 @@ background-image: -o-linear-gradient(top, #fcfcfc, #dedede); background-image: linear-gradient(to bottom, #fcfcfc, #dedede); } -.openerp ul.oe_form_steps li:first-child .label, .openerp ul.oe_form_steps_clickable li:first-child .label { +.openerp .oe_form ul.oe_form_steps li:first-child .label, .openerp .oe_form ul.oe_form_steps_clickable li:first-child .label { border-left: 1px solid #cacaca; padding-left: 14px; } -.openerp ul.oe_form_steps li:last-child, .openerp ul.oe_form_steps_clickable li:last-child { +.openerp .oe_form ul.oe_form_steps li:last-child, .openerp .oe_form ul.oe_form_steps_clickable li:last-child { border-right: 1px solid #cacaca; } -.openerp ul.oe_form_steps li:last-child .label, .openerp ul.oe_form_steps_clickable li:last-child .label { +.openerp .oe_form ul.oe_form_steps li:last-child .label, .openerp .oe_form ul.oe_form_steps_clickable li:last-child .label { padding-right: 14px; } -.openerp ul.oe_form_steps li:last-child .arrow, .openerp ul.oe_form_steps_clickable li:last-child .arrow { +.openerp .oe_form ul.oe_form_steps li:last-child .arrow, .openerp .oe_form ul.oe_form_steps_clickable li:last-child .arrow { display: none; } -.openerp ul.oe_form_steps li .label, .openerp ul.oe_form_steps_clickable li .label { +.openerp .oe_form ul.oe_form_steps li .label, .openerp .oe_form ul.oe_form_steps_clickable li .label { color: #4c4c4c; text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede; padding: 7px; @@ -2009,14 +2037,14 @@ margin: 0; position: relative; } -.openerp ul.oe_form_steps li .arrow, .openerp ul.oe_form_steps_clickable li .arrow { +.openerp .oe_form ul.oe_form_steps li .arrow, .openerp .oe_form ul.oe_form_steps_clickable li .arrow { width: 17px; display: inline-block; vertical-align: top; overflow: hidden; margin-left: -5px; } -.openerp ul.oe_form_steps li .arrow span, .openerp ul.oe_form_steps_clickable li .arrow span { +.openerp .oe_form ul.oe_form_steps li .arrow span, .openerp .oe_form ul.oe_form_steps_clickable li .arrow span { position: relative; width: 24px; height: 24px; @@ -2036,7 +2064,7 @@ -o-transform: rotate(45deg); -ms-transform: rotate(45deg); } -.openerp ul.oe_form_steps li.oe_active, .openerp ul.oe_form_steps_clickable li.oe_active { +.openerp .oe_form ul.oe_form_steps li.oe_active, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active { background-color: #729fcf; background-image: -webkit-gradient(linear, left top, left bottom, from(#729fcf), to(#3465a4)); background-image: -webkit-linear-gradient(top, #729fcf, #3465a4); @@ -2045,20 +2073,20 @@ background-image: -o-linear-gradient(top, #729fcf, #3465a4); background-image: linear-gradient(to bottom, #729fcf, #3465a4); } -.openerp ul.oe_form_steps li.oe_active .arrow span, .openerp ul.oe_form_steps_clickable li.oe_active .arrow span { +.openerp .oe_form ul.oe_form_steps li.oe_active .arrow span, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active .arrow span { background-color: #3465a4; background: -moz-linear-gradient(135deg, #3465a4, #729fcf); background: -o-linear-gradient(135deg, #729fcf, #3465a4); background: -webkit-gradient(linear, left top, right bottom, from(#729fcf), to(#3465a4)); } -.openerp ul.oe_form_steps li.oe_active .label, .openerp ul.oe_form_steps_clickable li.oe_active .label { +.openerp .oe_form ul.oe_form_steps li.oe_active .label, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active .label { color: white; text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4; } -.openerp ul.oe_form_steps_clickable li { +.openerp .oe_form ul.oe_form_steps_clickable li { cursor: pointer; } -.openerp ul.oe_form_steps_clickable li:hover { +.openerp .oe_form ul.oe_form_steps_clickable li:hover { background-color: #e8e8e8; background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca)); background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca); @@ -2067,10 +2095,10 @@ background-image: -o-linear-gradient(top, #e8e8e8, #cacaca); background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); } -.openerp ul.oe_form_steps_clickable li:hover .label { +.openerp .oe_form ul.oe_form_steps_clickable li:hover .label { text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede; } -.openerp ul.oe_form_steps_clickable li:hover .arrow span { +.openerp .oe_form ul.oe_form_steps_clickable li:hover .arrow span { background-color: #e8e8e8; background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca)); background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca); @@ -2079,10 +2107,10 @@ background-image: -o-linear-gradient(top, #e8e8e8, #cacaca); background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); } -.openerp ul.oe_form_steps_clickable li .label { +.openerp .oe_form ul.oe_form_steps_clickable li .label { color: #7c7bad; } -.openerp ul.oe_form_steps_clickable li.oe_active:hover { +.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover { background-color: #4c85c2; background-image: -webkit-gradient(linear, left top, left bottom, from(#4c85c2), to(#284d7d)); background-image: -webkit-linear-gradient(top, #4c85c2, #284d7d); @@ -2091,10 +2119,10 @@ background-image: -o-linear-gradient(top, #4c85c2, #284d7d); background-image: linear-gradient(to bottom, #4c85c2, #284d7d); } -.openerp ul.oe_form_steps_clickable li.oe_active:hover .label { +.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover .label { text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4; } -.openerp ul.oe_form_steps_clickable li.oe_active:hover .arrow span { +.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover .arrow span { background-color: #284d7d; background: -moz-linear-gradient(135deg, #284d7d, #4c85c2); background: -o-linear-gradient(135deg, #4c85c2, #284d7d); @@ -2126,31 +2154,6 @@ .openerp .oe_form .oe_subtotal_footer label.oe_form_label_help { font-weight: normal; } -.openerp .oe_application .oe_form_sheetbg { - background: url(/web/static/src/img/form_sheetbg.png); - padding: 8px 0; - border-bottom: 1px solid #dddddd; -} -.openerp .oe_application .oe_form_sheet_width { - min-width: 650px; - max-width: 860px; - margin: 0 auto; -} -.openerp .oe_application .oe_form_sheet { - background: white; - min-height: 330px; - padding: 16px; - border: 1px solid #afafb6; - -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); - -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); - box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); -} -.openerp .oe_application .oe_form_sheet .ui-tabs { - margin: 0 -16px; -} -.openerp .oe_application .oe_form_sheet .oe_notebook_page { - padding: 0 16px; -} .openerp .oe_form .oe_form_button { margin: 2px; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 537988e9c4a..4f231331ff7 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1498,11 +1498,34 @@ $sheet-max-width: 860px display: none !important .oe_form .oe_form_field_date width: auto + // Sheet and padding .oe_form_nosheet margin: 16px > header margin: -16px -16px 0 -16px padding: 8px + .oe_form_sheetbg + padding: 8px 0 + .oe_form_sheet_width + min-width: 650px + max-width: $sheet-max-width + margin: 0 auto + .oe_form_sheet + background: white + min-height: 330px + padding: 16px + // Sheet inline mode + .oe_application + .oe_form_sheetbg + background: url(/web/static/src/img/form_sheetbg.png) + border-bottom: 1px solid #ddd + .oe_form_sheet + border: 1px solid $tag-border + @include box-shadow(0 0 10px rgba(0,0,0,0.3)) + .ui-tabs + margin: 0 -16px + .oe_notebook_page + padding: 0 16px // }}} // FormView.custom tags and classes {{{ .oe_form @@ -1532,115 +1555,92 @@ $sheet-max-width: 860px padding: 2px 0 .oe_form_group_cell div div padding: 1px 0 - - - ul.oe_form_steps, ul.oe_form_steps_clickable - display: inline-block - padding-right: 18px - li + ul.oe_form_steps, ul.oe_form_steps_clickable display: inline-block - margin-right: -20px - @include vertical-gradient(#fcfcfc, #dedede) - &:first-child .label - border-left: 1px solid #cacaca - padding-left: 14px - &:last-child - border-right: 1px solid #cacaca - .label - padding-right: 14px - .arrow - display: none - .label - color: #4c4c4c - text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede - padding: 7px - display: inline-block - padding-left: 24px - margin: 0 - position: relative - .arrow - width: 17px + padding-right: 18px + li display: inline-block - vertical-align: top - overflow: hidden - margin-left: -5px - span + margin-right: -20px + @include vertical-gradient(#fcfcfc, #dedede) + &:first-child .label + border-left: 1px solid #cacaca + padding-left: 14px + &:last-child + border-right: 1px solid #cacaca + .label + padding-right: 14px + .arrow + display: none + .label + color: #4c4c4c + text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede + padding: 7px + display: inline-block + padding-left: 24px + margin: 0 position: relative - width: 24px - height: 24px + .arrow + width: 17px display: inline-block - margin-left: -12px - margin-top: 3px - box-shadow: -1px 1px 2px rgba(255,255,255,0.2), inset -1px 1px 1px rgba(0,0,0,0.2) - @include skew-gradient(#fcfcfc, #dedede) - @include radius(3px) - @include transform(rotate(45deg)) - li.oe_active - @include vertical-gradient(#729fcf, #3465a4) - .arrow span - @include skew-gradient(#729fcf, #3465a4) - .label - color: white - text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4 - - ul.oe_form_steps_clickable - li - cursor: pointer - &:hover - @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%)) - .label - text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede + vertical-align: top + overflow: hidden + margin-left: -5px + span + position: relative + width: 24px + height: 24px + display: inline-block + margin-left: -12px + margin-top: 3px + box-shadow: -1px 1px 2px rgba(255,255,255,0.2), inset -1px 1px 1px rgba(0,0,0,0.2) + @include skew-gradient(#fcfcfc, #dedede) + @include radius(3px) + @include transform(rotate(45deg)) + li.oe_active + @include vertical-gradient(#729fcf, #3465a4) .arrow span + @include skew-gradient(#729fcf, #3465a4) + .label + color: white + text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4 + ul.oe_form_steps_clickable + li + cursor: pointer + &:hover @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%)) - .label - color: $link-color - li.oe_active - &:hover - @include vertical-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) + .label + text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede + .arrow span + @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%)) .label - text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4 - .arrow span - @include skew-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) + color: $link-color + li.oe_active + &:hover + @include vertical-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) + .label + text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4 + .arrow span + @include skew-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) + .oe_subtotal_footer + width: 1% !important + td.oe_form_group_cell + text-align: right + padding: 0 !important + td.oe_form_group_cell_label + border-right: none + .oe_subtotal_footer_separator + width: 108px + border-top: 1px solid #cacaca + font-weight: bold + font-size: 18px + label:after + content: ":" + label.oe_subtotal_footer_separator + font-weight: bold !important + padding: 2px 11px 2px 0px !important + label.oe_form_label_help + font-weight: normal - .oe_form .oe_subtotal_footer - width: 1% !important - td.oe_form_group_cell - text-align: right - padding: 0 !important - td.oe_form_group_cell_label - border-right: none - .oe_subtotal_footer_separator - width: 108px - border-top: 1px solid #cacaca - font-weight: bold - font-size: 18px - label:after - content: ":" - label.oe_subtotal_footer_separator - font-weight: bold !important - padding: 2px 11px 2px 0px !important - label.oe_form_label_help - font-weight: normal - // no sheet in popups - .oe_application - .oe_form_sheetbg - background: url(/web/static/src/img/form_sheetbg.png) - padding: 8px 0 - border-bottom: 1px solid #ddd - .oe_form_sheet_width - min-width: 650px - max-width: $sheet-max-width - margin: 0 auto - .oe_form_sheet - background: white - min-height: 330px - padding: 16px - border: 1px solid $tag-border - @include box-shadow(0 0 10px rgba(0,0,0,0.3)) - .ui-tabs - margin: 0 -16px - .oe_notebook_page - padding: 0 16px // }}} // FormView.group {{{ .oe_form -- cgit v1.2.3 From abdbc220d37ff68312db1b9c43c1ed801b1ad9ec Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 4 Sep 2012 14:49:21 +0200 Subject: [REM] incomplete and unused bounce CSS animation bzr revid: xmo@openerp.com-20120904124921-yur5k231wp8gn7vy --- addons/web/static/src/css/base.css | 49 +++---------------------------------- addons/web/static/src/css/base.sass | 46 ++++++++++++---------------------- 2 files changed, 18 insertions(+), 77 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 25df1334d21..de30642dfd6 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -20,50 +20,6 @@ font-style: normal; } -@-moz-keyframes bounce { - 0% { - -moz-transform: scale(0); - opacity: 0; - } - - 50% { - -moz-transform: scale(1.3); - opacity: 0.4; - } - - 75% { - -moz-transform: scale(0.9); - opacity: 0.7; - } - - 100% { - -moz-transform: scale(1); - opacity: 1; - } -} - -@-webkit-keyframes bounce { - 0% { - -webkit-transform: scale(0); - opacity: 0; - } - - 50% { - -webkit-transform: scale(1.3); - opacity: 0.4; - } - - 75% { - -webkit-transform: scale(0.9); - opacity: 0.7; - } - - 100% { - -webkit-transform: scale(1); - opacity: 1; - } -} - @media print { .oe_topbar, .oe_leftbar, .oe_loading { display: none !important; @@ -2062,10 +2018,11 @@ -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; - -moz-transform: rotate(45deg); -webkit-transform: rotate(45deg); - -o-transform: rotate(45deg); + -moz-transform: rotate(45deg); -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); } .openerp .oe_form ul.oe_form_steps li.oe_active, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active { background-color: #729fcf; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 3c61702a60c..82c8e1a57ab 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -95,10 +95,23 @@ $sheet-max-width: 860px background: -webkit-gradient(linear, left top, right bottom, from($startColor), to($endColor)) @mixin transform($transform) - -moz-transform: $transform -webkit-transform: $transform - -o-transform: $transform + -moz-transform: $transform -ms-transform: $transform + -o-transform: $transform + transform: $transform + +@mixin keyframes($name) + @-webkit-keyframes #{$name} + @content + @-moz-keyframes #{$name} + @content + @-ms-keyframes #{$name} + @content + @-o-keyframes #{$name} + @content + @keyframes #{$name} + @content // Transforms the (readable) text of an inline element into an mmlicons icon, // allows for actual readable text in-code (and in readers?) with iconic looks @@ -112,35 +125,6 @@ $sheet-max-width: 860px color: $color // }}} -// CSS animation bounces {{{ -@-moz-keyframes bounce - 0% - -moz-transform: scale(0) - opacity: 0 - 50% - -moz-transform: scale(1.3) - opacity: 0.4 - 75% - -moz-transform: scale(0.9) - opacity: 0.7 - 100% - -moz-transform: scale(1) - opacity: 1 - -@-webkit-keyframes bounce - 0% - -webkit-transform: scale(0) - opacity: 0 - 50% - -webkit-transform: scale(1.3) - opacity: 0.4 - 75% - -webkit-transform: scale(0.9) - opacity: 0.7 - 100% - -webkit-transform: scale(1) - opacity: 1 -// }}} @media print .oe_topbar, .oe_leftbar, .oe_loading -- cgit v1.2.3 From 09fc23c99ef172dc3e8c8ceeaee40709c5091477 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 4 Sep 2012 15:05:09 +0200 Subject: changed red button style bzr revid: mit@openerp.com-20120904130509-94atd9x6rf3lb0sq --- addons/web/static/src/css/base.css | 88 +++++++++++++++++-------------------- addons/web/static/src/css/base.sass | 33 +++++++------- 2 files changed, 56 insertions(+), 65 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index e875ff9fab2..52e74b7c17e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -419,40 +419,35 @@ background: #dc5f59; } .openerp button.oe_highlight { - background-color: #dc5f59; - background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630)); - background-image: -webkit-linear-gradient(top, #dc5f59, #b33630); - background-image: -moz-linear-gradient(top, #dc5f59, #b33630); - background-image: -ms-linear-gradient(top, #dc5f59, #b33630); - background-image: -o-linear-gradient(top, #dc5f59, #b33630); - background-image: linear-gradient(to bottom, #dc5f59, #b33630); - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; -} -.openerp button.oe_highlight:active { - background-color: #b33630; - background-image: -webkit-gradient(linear, left top, left bottom, from(#b33630), to(#dc5f59)); - background-image: -webkit-linear-gradient(top, #b33630, #dc5f59); - background-image: -moz-linear-gradient(top, #b33630, #dc5f59); - background-image: -ms-linear-gradient(top, #b33630, #dc5f59); - background-image: -o-linear-gradient(top, #b33630, #dc5f59); - background-image: linear-gradient(to bottom, #b33630, #dc5f59); - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; + border: 1px solid #795151; + background-color: #df3f3f; + background-image: -webkit-gradient(linear, left top, left bottom, from(#df3f3f), to(#a21a1a)); + background-image: -webkit-linear-gradient(top, #df3f3f, #a21a1a); + background-image: -moz-linear-gradient(top, #df3f3f, #a21a1a); + background-image: -ms-linear-gradient(top, #df3f3f, #a21a1a); + background-image: -o-linear-gradient(top, #df3f3f, #a21a1a); + background-image: linear-gradient(to bottom, #df3f3f, #a21a1a); + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; } .openerp button.oe_highlight:hover { - background-color: #df6b66; - background-image: -webkit-gradient(linear, left top, left bottom, from(#df6b66), to(#bf3a33)); - background-image: -webkit-linear-gradient(top, #df6b66, #bf3a33); - background-image: -moz-linear-gradient(top, #df6b66, #bf3a33); - background-image: -ms-linear-gradient(top, #df6b66, #bf3a33); - background-image: -o-linear-gradient(top, #df6b66, #bf3a33); - background-image: linear-gradient(to bottom, #df6b66, #bf3a33); - -moz-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); - -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); - box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); + background-color: #e46565; + background-image: -webkit-gradient(linear, left top, left bottom, from(#e46565), to(#b81e1e)); + background-image: -webkit-linear-gradient(top, #e46565, #b81e1e); + background-image: -moz-linear-gradient(top, #e46565, #b81e1e); + background-image: -ms-linear-gradient(top, #e46565, #b81e1e); + background-image: -o-linear-gradient(top, #e46565, #b81e1e); + background-image: linear-gradient(to bottom, #e46565, #b81e1e); +} +.openerp button.oe_highlight:active { + background-color: #ab1b1b; + background-image: -webkit-gradient(linear, left top, left bottom, from(#ab1b1b), to(#e04848)); + background-image: -webkit-linear-gradient(top, #ab1b1b, #e04848); + background-image: -moz-linear-gradient(top, #ab1b1b, #e04848); + background-image: -ms-linear-gradient(top, #ab1b1b, #e04848); + background-image: -o-linear-gradient(top, #ab1b1b, #e04848); + background-image: linear-gradient(to bottom, #ab1b1b, #e04848); } .openerp .oe_background_grey { background: #eeeeee !important; @@ -1223,18 +1218,12 @@ } .openerp .oe_secondary_submenu .oe_active { border-top: 1px solid lightGray; - border-bottom: 1px solid #e0e0e0; + border-bottom: 1px solid #dedede; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); - -moz-box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2); - -webkit-box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2); - box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2); - background-color: #7372a7; - background-image: -webkit-gradient(linear, left top, left bottom, from(#7372a7), to(#8281b1)); - background-image: -webkit-linear-gradient(top, #7372a7, #8281b1); - background-image: -moz-linear-gradient(top, #7372a7, #8281b1); - background-image: -ms-linear-gradient(top, #7372a7, #8281b1); - background-image: -o-linear-gradient(top, #7372a7, #8281b1); - background-image: linear-gradient(to bottom, #7372a7, #8281b1); + -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2); + -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2); + box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2); + background: #7c7bad; } .openerp .oe_secondary_submenu .oe_active a { color: white; @@ -1948,6 +1937,7 @@ .openerp .oe_form header { position: relative; border-bottom: 1px solid #cacaca; + padding-left: 2px; background-color: #fcfcfc; background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); @@ -1960,6 +1950,9 @@ display: inline-block; float: right; } +.openerp .oe_form header .oe_form_button { + margin: 3px 2px; +} .openerp .oe_form div.oe_chatter { min-width: 650px; max-width: 860px; @@ -1979,7 +1972,7 @@ min-width: 150px; } .openerp .oe_form div.oe_form_configuration .oe_form_group_cell_label { - padding: 2px 0; + padding: 1px 0; } .openerp .oe_form div.oe_form_configuration .oe_form_group_cell div div { padding: 1px 0; @@ -2168,7 +2161,7 @@ } .openerp .oe_form td.oe_form_group_cell_label { border-right: 1px solid #dddddd; - padding: 4px 0px 4px 0px; + padding: 2px 0px; } .openerp .oe_form td.oe_form_group_cell_label label { line-height: 18px; @@ -2176,7 +2169,7 @@ min-width: 140px; } .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { - padding-left: 6px; + padding: 2px 0 2px 8px; } .openerp .oe_form .oe_form_group { width: 100%; @@ -2188,7 +2181,7 @@ .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { font-weight: bold; white-space: nowrap; - padding-right: 6px; + padding-right: 8px; } .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { font-size: 80%; @@ -2264,7 +2257,6 @@ width: 100%; display: inline-block; padding: 2px 2px 2px 0px; - line-height: 1em; } .openerp .oe_form .oe_form_field input { margin: 0px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 637a1975e32..975a8103847 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -381,15 +381,13 @@ $sheet-max-width: 860px color: white background: #DC5F59 button.oe_highlight - @include vertical-gradient(#dc5f59, #b33630) - @include box-shadow(none) - button.oe_highlight:active - @include vertical-gradient(#b33630, #dc5f59) - @include box-shadow(none) + border: 1px solid #795151 + @include vertical-gradient(#df3f3f, #a21a1a) + @include box-shadow((0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset)) button.oe_highlight:hover - @include vertical-gradient(#DF6B66, #BF3A33) - //@include vertical-gradient(lighten(#dc5f59, 3%), lighten(#b33630, 3%)) - @include box-shadow(0 0 1px rgba(0, 0, 0, 0.2)) + @include vertical-gradient(lighten(#e04f4f, 5%), lighten(#a21a1a, 5%)) + button.oe_highlight:active + @include vertical-gradient(lighten(#a21a1a, 2%), lighten(#df3f3f, 2%)) .oe_background_grey background: #eee !important @@ -955,11 +953,10 @@ $sheet-max-width: 860px @include transform(scale(1.1)) .oe_active border-top: 1px solid lightGray - border-bottom: 1px solid #e0e0e0 + border-bottom: 1px solid #dedede text-shadow: 0 1px 1px rgba(0,0,0,0.2) - @include box-shadow((inset 0 2px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 2px rgba(0, 0, 0, 0.2))) - //background: $link-color - @include vertical-gradient(darken($link-color, 3%), lighten($link-color, 2%)) + @include box-shadow((inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2))) + background: $link-color a color: white .oe_menu_label @@ -1513,10 +1510,13 @@ $sheet-max-width: 860px header position: relative border-bottom: 1px solid #cacaca + padding-left: 2px @include vertical-gradient(#fcfcfc, #dedede) ul display: inline-block float: right + .oe_form_button + margin: 3px 2px div.oe_chatter min-width: 650px max-width: $sheet-max-width @@ -1533,7 +1533,7 @@ $sheet-max-width: 860px label min-width: 150px .oe_form_group_cell_label - padding: 2px 0 + padding: 1px 0 .oe_form_group_cell div div padding: 1px 0 @@ -1652,13 +1652,13 @@ $sheet-max-width: 860px margin: 2px td.oe_form_group_cell_label border-right: 1px solid #ddd - padding: 4px 0px 4px 0px + padding: 2px 0px label line-height: 18px display: block min-width: 140px td.oe_form_group_cell + .oe_form_group_cell - padding-left: 6px + padding: 2px 0 2px 8px .oe_form_group width: 100% margin: 9px 0 9px 0 @@ -1670,7 +1670,7 @@ $sheet-max-width: 860px .oe_form_label_help[for], .oe_form_label[for] font-weight: bold white-space: nowrap - padding-right: 6px + padding-right: 8px span font-size: 80% color: darkGreen @@ -1733,7 +1733,6 @@ $sheet-max-width: 860px width: 100% display: inline-block padding: 2px 2px 2px 0px - line-height: 1em input margin: 0px input[type="text"], input[type="password"], input[type="file"], select -- cgit v1.2.3 From 7ce2e6ff63e744cc6509ba7360bd75efdeec1457 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 4 Sep 2012 16:34:36 +0200 Subject: fix status glitch on firefox bzr revid: mit@openerp.com-20120904143436-3b11jkrxxxmmtn4s --- addons/web/static/src/css/base.css | 2 +- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 52e74b7c17e..1a1a07d0fb5 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1951,7 +1951,7 @@ float: right; } .openerp .oe_form header .oe_form_button { - margin: 3px 2px; + margin: 3px 2px 1px; } .openerp .oe_form div.oe_chatter { min-width: 650px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 975a8103847..308f32e7daa 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1516,7 +1516,7 @@ $sheet-max-width: 860px display: inline-block float: right .oe_form_button - margin: 3px 2px + margin: 3px 2px 1px div.oe_chatter min-width: 650px max-width: $sheet-max-width -- cgit v1.2.3 From 006ed33ff344784dd84c3458b6cef41f6db4ea7a Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 4 Sep 2012 18:42:41 +0200 Subject: wip bzr revid: nicolas.vanhoren@openerp.com-20120904164241-lrvvsj5i7axni5ng --- addons/web/static/src/css/Makefile | 2 +- addons/web/static/src/css/base.css | 97 ++++++++++++++++++++++++++++++++++--- addons/web/static/src/css/base.sass | 34 ++++++++++--- 3 files changed, 118 insertions(+), 15 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/Makefile b/addons/web/static/src/css/Makefile index eca044497ef..d6b4f4b2fc8 100644 --- a/addons/web/static/src/css/Makefile +++ b/addons/web/static/src/css/Makefile @@ -1,3 +1,3 @@ base.css: base.sass - sass -t expanded base.sass base.css + sass --trace -t expanded base.sass base.css diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index de30642dfd6..09432786ca0 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -97,13 +97,6 @@ background-image: -o-linear-gradient(top, #eeeeee, #dedede); background-image: linear-gradient(to bottom, #eeeeee, #dedede); } -.openerp ul, .openerp li, .openerp ol { - margin: 0; - padding: 0; -} -.openerp li { - list-style-type: none; -} .openerp input, .openerp textarea, .openerp select { padding: 2px 4px; border: 1px solid #cccccc; @@ -118,6 +111,24 @@ .openerp h4 { margin: 4px 0; } +.openerp .oe_semantic_html_override_ul { + margin: 0; + padding: 0; +} +.openerp .oe_semantic_html_override_ul li { + margin: 0; + padding: 0; + list-style-type: none; +} +.openerp .oe_semantic_html_override ul, .openerp .oe_semantic_html_override ol { + margin: 0; + padding: 0; +} +.openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol li { + margin: 0; + padding: 0; + list-style-type: none; +} .openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { display: inline-block; border: 1px solid #ababab; @@ -589,6 +600,22 @@ padding: 0 16px; list-style: none; zoom: 1; + margin: 0; + padding: 0; +} +.openerp .oe_notebook li { + margin: 0; + padding: 0; + list-style-type: none; +} +.openerp .oe_notebook ul, .openerp .oe_notebook ol { + margin: 0; + padding: 0; +} +.openerp .oe_notebook ul li, .openerp .oe_notebook ol li { + margin: 0; + padding: 0; + list-style-type: none; } .openerp .oe_notebook.ui-corner-all { -moz-border-radius: 0; @@ -893,6 +920,15 @@ -webkit-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); } +.openerp .oe_login .oe_login_pane ul, .openerp .oe_login .oe_login_pane ol { + margin: 0; + padding: 0; +} +.openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol li { + margin: 0; + padding: 0; + list-style-type: none; +} .openerp .oe_login .oe_login_pane h2 { margin-top: 0; font-size: 18px; @@ -972,6 +1008,15 @@ background-image: -o-linear-gradient(top, #646060, #262626); background-image: linear-gradient(to bottom, #646060, #262626); } +.openerp .oe_topbar ul, .openerp .oe_topbar ol { + margin: 0; + padding: 0; +} +.openerp .oe_topbar ul li, .openerp .oe_topbar ol li { + margin: 0; + padding: 0; + list-style-type: none; +} .openerp .oe_topbar .oe_topbar_item { display: block; padding: 5px 10px 7px; @@ -1044,6 +1089,15 @@ text-shadow: 0 1px 1px white; padding-bottom: 16px; } +.openerp .oe_leftbar ul, .openerp .oe_leftbar ol { + margin: 0; + padding: 0; +} +.openerp .oe_leftbar ul li, .openerp .oe_leftbar ol li { + margin: 0; + padding: 0; + list-style-type: none; +} .openerp a.oe_logo { width: 220px; display: block; @@ -1246,6 +1300,15 @@ width: 100%; table-layout: fixed; } +.openerp .oe_view_manager table.oe_view_manager_header ul, .openerp .oe_view_manager table.oe_view_manager_header ol { + margin: 0; + padding: 0; +} +.openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol li { + margin: 0; + padding: 0; + list-style-type: none; +} .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row { clear: both; text-shadow: 0 1px 1px white; @@ -1946,7 +2009,7 @@ max-width: 650px; margin: 0 0 10px 0; } -.openerp .oe_form div.oe_form_configuration p { +.openerp .oe_form div.oe_form_configuration p, .openerp .oe_form div.oe_form_configuration ul, .openerp .oe_form div.oe_form_configuration ol { color: #aaaaaa; max-width: 650px; } @@ -2376,6 +2439,24 @@ .openerp.ui-autocomplete li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option { margin-top: 10px; } +.openerp .oe_form_field_status { + margin: 0; + padding: 0; +} +.openerp .oe_form_field_status ul, .openerp .oe_form_field_status ol { + margin: 0; + padding: 0; +} +.openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol li { + margin: 0; + padding: 0; + list-style-type: none; +} +.openerp .oe_form_field_status li { + margin: 0; + padding: 0; + list-style-type: none; +} .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { display: none; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 82c8e1a57ab..40766085008 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -124,6 +124,18 @@ $sheet-max-width: 860px content: $icon-name color: $color +@mixin ul-html-override() + margin: 0 + padding: 0 + li + margin: 0 + padding: 0 + list-style-type: none + +@mixin semantic-html-override() + ul, ol + @include ul-html-override() + // }}} @media print @@ -178,11 +190,6 @@ $sheet-max-width: 860px @include vertical-gradient(#f0f0fa, #eeeef6) .zebra tbody tr:hover td @include vertical-gradient(#eee, #dedede) - ul, li, ol - margin: 0 - padding: 0 - li - list-style-type: none input, textarea, select padding: 2px 4px border: 1px solid #ccc @@ -192,6 +199,10 @@ $sheet-max-width: 860px vertical-align: middle h4 margin: 4px 0 + .oe_semantic_html_override + @include semantic-html-override + .oe_semantic_html_override_ul + @include ul-html-override // }}} // Button style {{{ a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button @@ -497,6 +508,8 @@ $sheet-max-width: 860px padding: 0 16px list-style: none zoom: 1 + @include ul-html-override + @include semantic-html-override .oe_notebook.ui-corner-all @include radius(0) .oe_notebook:before, .oe_notebook:after @@ -716,6 +729,7 @@ $sheet-max-width: 860px text-align: left @include radius(8px) @include box-shadow(0 0 18px rgba(0, 0, 0, 0.9)) + @include semantic-html-override h2 margin-top: 0 font-size: 18px @@ -781,6 +795,7 @@ $sheet-max-width: 860px height: 31px border-top: solid 1px #d3d3d3 @include vertical-gradient(#646060, #262626) + @include semantic-html-override .oe_topbar_item display: block padding: 5px 10px 7px @@ -831,6 +846,7 @@ $sheet-max-width: 860px border-right: 1px solid $tag-border text-shadow: 0 1px 1px white padding-bottom: 16px + @include semantic-html-override a.oe_logo width: 220px display: block @@ -995,6 +1011,7 @@ $sheet-max-width: 860px table.oe_view_manager_header width: 100% table-layout: fixed + @include semantic-html-override .oe_header_row //min-height: 26px //line-height: 26px @@ -1532,7 +1549,7 @@ $sheet-max-width: 860px max-width: 650px margin: 0 0 10px 0 div.oe_form_configuration - p + p, ul, ol color: #aaa max-width: 650px label @@ -1848,6 +1865,11 @@ $sheet-max-width: 860px li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option margin-top: 10px // }}} + // FormView.fieldstatus {{{ + .oe_form_field_status + @include semantic-html-override + @include ul-html-override + // }}} // FormView.one2many {{{ .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page -- cgit v1.2.3 From 7761a0f603e90fa833d6f6c2abdd806d98fd9cc6 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 4 Sep 2012 19:02:47 +0200 Subject: styling tweaks to red buttons bzr revid: mit@openerp.com-20120904170247-fcqvjiy8n46zyf38 --- addons/web/static/src/css/base.css | 28 ++++++++++++++-------------- addons/web/static/src/css/base.sass | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 1a1a07d0fb5..846c62f64b4 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -432,22 +432,22 @@ box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; } .openerp button.oe_highlight:hover { - background-color: #e46565; - background-image: -webkit-gradient(linear, left top, left bottom, from(#e46565), to(#b81e1e)); - background-image: -webkit-linear-gradient(top, #e46565, #b81e1e); - background-image: -moz-linear-gradient(top, #e46565, #b81e1e); - background-image: -ms-linear-gradient(top, #e46565, #b81e1e); - background-image: -o-linear-gradient(top, #e46565, #b81e1e); - background-image: linear-gradient(to bottom, #e46565, #b81e1e); + background-color: #e25858; + background-image: -webkit-gradient(linear, left top, left bottom, from(#e25858), to(#ab1b1b)); + background-image: -webkit-linear-gradient(top, #e25858, #ab1b1b); + background-image: -moz-linear-gradient(top, #e25858, #ab1b1b); + background-image: -ms-linear-gradient(top, #e25858, #ab1b1b); + background-image: -o-linear-gradient(top, #e25858, #ab1b1b); + background-image: linear-gradient(to bottom, #e25858, #ab1b1b); } .openerp button.oe_highlight:active { - background-color: #ab1b1b; - background-image: -webkit-gradient(linear, left top, left bottom, from(#ab1b1b), to(#e04848)); - background-image: -webkit-linear-gradient(top, #ab1b1b, #e04848); - background-image: -moz-linear-gradient(top, #ab1b1b, #e04848); - background-image: -ms-linear-gradient(top, #ab1b1b, #e04848); - background-image: -o-linear-gradient(top, #ab1b1b, #e04848); - background-image: linear-gradient(to bottom, #ab1b1b, #e04848); + background-color: #c52020; + background-image: -webkit-gradient(linear, left top, left bottom, from(#c52020), to(#d22323)); + background-image: -webkit-linear-gradient(top, #c52020, #d22323); + background-image: -moz-linear-gradient(top, #c52020, #d22323); + background-image: -ms-linear-gradient(top, #c52020, #d22323); + background-image: -o-linear-gradient(top, #c52020, #d22323); + background-image: linear-gradient(to bottom, #c52020, #d22323); } .openerp .oe_background_grey { background: #eeeeee !important; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 308f32e7daa..1991052180c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -385,9 +385,9 @@ $sheet-max-width: 860px @include vertical-gradient(#df3f3f, #a21a1a) @include box-shadow((0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset)) button.oe_highlight:hover - @include vertical-gradient(lighten(#e04f4f, 5%), lighten(#a21a1a, 5%)) + @include vertical-gradient(lighten(#e04f4f, 2%), lighten(#a21a1a, 2%)) button.oe_highlight:active - @include vertical-gradient(lighten(#a21a1a, 2%), lighten(#df3f3f, 2%)) + @include vertical-gradient(lighten(#a21a1a, 8%), darken(#df3f3f, 8%)) .oe_background_grey background: #eee !important -- cgit v1.2.3 From a454d6fae3c2fee59ff61720c4ff6e13cbdc8868 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 5 Sep 2012 10:03:53 +0200 Subject: wip bzr revid: nicolas.vanhoren@openerp.com-20120905080353-tquc3r3n27kt452v --- addons/web/static/src/css/base.css | 49 ++++++++++++++++++++++++++++++------- addons/web/static/src/css/base.sass | 7 ++++-- 2 files changed, 45 insertions(+), 11 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 09432786ca0..07467317c7c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -115,18 +115,33 @@ margin: 0; padding: 0; } -.openerp .oe_semantic_html_override_ul li { +.openerp .oe_semantic_html_override_ul ul, .openerp .oe_semantic_html_override_ul ol, .openerp .oe_semantic_html_override_ul li { margin: 0; padding: 0; +} +.openerp .oe_semantic_html_override_ul li { list-style-type: none; } .openerp .oe_semantic_html_override ul, .openerp .oe_semantic_html_override ol { margin: 0; padding: 0; } +.openerp .oe_semantic_html_override ul ul, .openerp .oe_semantic_html_override ul ol, .openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol ul, .openerp .oe_semantic_html_override ol ol, .openerp .oe_semantic_html_override ol li { + margin: 0; + padding: 0; +} .openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol li { + list-style-type: none; +} +.openerp ul.oe_semantic_html_override { + margin: 0; + padding: 0; +} +.openerp ul.oe_semantic_html_override ul, .openerp ul.oe_semantic_html_override ol, .openerp ul.oe_semantic_html_override li { margin: 0; padding: 0; +} +.openerp ul.oe_semantic_html_override li { list-style-type: none; } .openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { @@ -603,18 +618,22 @@ margin: 0; padding: 0; } -.openerp .oe_notebook li { +.openerp .oe_notebook ul, .openerp .oe_notebook ol, .openerp .oe_notebook li { margin: 0; padding: 0; +} +.openerp .oe_notebook li { list-style-type: none; } .openerp .oe_notebook ul, .openerp .oe_notebook ol { margin: 0; padding: 0; } -.openerp .oe_notebook ul li, .openerp .oe_notebook ol li { +.openerp .oe_notebook ul ul, .openerp .oe_notebook ul ol, .openerp .oe_notebook ul li, .openerp .oe_notebook ol ul, .openerp .oe_notebook ol ol, .openerp .oe_notebook ol li { margin: 0; padding: 0; +} +.openerp .oe_notebook ul li, .openerp .oe_notebook ol li { list-style-type: none; } .openerp .oe_notebook.ui-corner-all { @@ -924,9 +943,11 @@ margin: 0; padding: 0; } -.openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol li { +.openerp .oe_login .oe_login_pane ul ul, .openerp .oe_login .oe_login_pane ul ol, .openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol ul, .openerp .oe_login .oe_login_pane ol ol, .openerp .oe_login .oe_login_pane ol li { margin: 0; padding: 0; +} +.openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol li { list-style-type: none; } .openerp .oe_login .oe_login_pane h2 { @@ -1012,9 +1033,11 @@ margin: 0; padding: 0; } -.openerp .oe_topbar ul li, .openerp .oe_topbar ol li { +.openerp .oe_topbar ul ul, .openerp .oe_topbar ul ol, .openerp .oe_topbar ul li, .openerp .oe_topbar ol ul, .openerp .oe_topbar ol ol, .openerp .oe_topbar ol li { margin: 0; padding: 0; +} +.openerp .oe_topbar ul li, .openerp .oe_topbar ol li { list-style-type: none; } .openerp .oe_topbar .oe_topbar_item { @@ -1093,9 +1116,11 @@ margin: 0; padding: 0; } -.openerp .oe_leftbar ul li, .openerp .oe_leftbar ol li { +.openerp .oe_leftbar ul ul, .openerp .oe_leftbar ul ol, .openerp .oe_leftbar ul li, .openerp .oe_leftbar ol ul, .openerp .oe_leftbar ol ol, .openerp .oe_leftbar ol li { margin: 0; padding: 0; +} +.openerp .oe_leftbar ul li, .openerp .oe_leftbar ol li { list-style-type: none; } .openerp a.oe_logo { @@ -1304,9 +1329,11 @@ margin: 0; padding: 0; } -.openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol li { +.openerp .oe_view_manager table.oe_view_manager_header ul ul, .openerp .oe_view_manager table.oe_view_manager_header ul ol, .openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol ul, .openerp .oe_view_manager table.oe_view_manager_header ol ol, .openerp .oe_view_manager table.oe_view_manager_header ol li { margin: 0; padding: 0; +} +.openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol li { list-style-type: none; } .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row { @@ -2447,14 +2474,18 @@ margin: 0; padding: 0; } -.openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol li { +.openerp .oe_form_field_status ul ul, .openerp .oe_form_field_status ul ol, .openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol ul, .openerp .oe_form_field_status ol ol, .openerp .oe_form_field_status ol li { margin: 0; padding: 0; +} +.openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol li { list-style-type: none; } -.openerp .oe_form_field_status li { +.openerp .oe_form_field_status ul, .openerp .oe_form_field_status ol, .openerp .oe_form_field_status li { margin: 0; padding: 0; +} +.openerp .oe_form_field_status li { list-style-type: none; } .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 40766085008..495f88ad282 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -127,9 +127,10 @@ $sheet-max-width: 860px @mixin ul-html-override() margin: 0 padding: 0 - li + ul, ol, li margin: 0 padding: 0 + li list-style-type: none @mixin semantic-html-override() @@ -199,9 +200,11 @@ $sheet-max-width: 860px vertical-align: middle h4 margin: 4px 0 + .oe_semantic_html_override_ul + @include ul-html-override .oe_semantic_html_override @include semantic-html-override - .oe_semantic_html_override_ul + ul.oe_semantic_html_override @include ul-html-override // }}} // Button style {{{ -- cgit v1.2.3 From 509838a440219119b2ce8c7047d34b4c541d1429 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 5 Sep 2012 10:10:19 +0200 Subject: Solved problem with left menu bzr revid: nicolas.vanhoren@openerp.com-20120905081019-o4x9d6v2meiwlfl7 --- addons/web/static/src/css/base.css | 8 ++++---- addons/web/static/src/css/base.sass | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 07467317c7c..a05b1bc25e5 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1215,16 +1215,16 @@ width: 100%; display: inline-block; } -.openerp .oe_secondary_submenu > li { +.openerp .oe_secondary_submenu li { position: relative; - padding: 1px 0 1px 20px; + padding: 1px 0 1px 20px !important; } -.openerp .oe_secondary_submenu > li a { +.openerp .oe_secondary_submenu li a { display: block; color: #4c4c4c; padding: 2px 4px 2px 0; } -.openerp .oe_secondary_submenu > li .oe_menu_label { +.openerp .oe_secondary_submenu li .oe_menu_label { position: absolute; top: 1px; right: 1px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 495f88ad282..438f59df11f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -927,9 +927,9 @@ $sheet-max-width: 860px margin: 0 width: 100% display: inline-block - > li + li position: relative - padding: 1px 0 1px 20px + padding: 1px 0 1px 20px !important a display: block color: #4c4c4c -- cgit v1.2.3 From 88105a043b010870d759f0e16a459ccbeac8741e Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 5 Sep 2012 11:18:59 +0200 Subject: [FIX] small css problem with the "more" menu in form views bzr revid: nicolas.vanhoren@openerp.com-20120905091859-jkequxaxo2qd8cz8 --- addons/web/static/src/css/base.css | 28 ++++++++++------------------ addons/web/static/src/css/base.sass | 13 ++++++++++--- 2 files changed, 20 insertions(+), 21 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index a05b1bc25e5..601133b2e7f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -111,17 +111,6 @@ .openerp h4 { margin: 4px 0; } -.openerp .oe_semantic_html_override_ul { - margin: 0; - padding: 0; -} -.openerp .oe_semantic_html_override_ul ul, .openerp .oe_semantic_html_override_ul ol, .openerp .oe_semantic_html_override_ul li { - margin: 0; - padding: 0; -} -.openerp .oe_semantic_html_override_ul li { - list-style-type: none; -} .openerp .oe_semantic_html_override ul, .openerp .oe_semantic_html_override ol { margin: 0; padding: 0; @@ -1325,16 +1314,15 @@ width: 100%; table-layout: fixed; } -.openerp .oe_view_manager table.oe_view_manager_header ul, .openerp .oe_view_manager table.oe_view_manager_header ol { - margin: 0; - padding: 0; -} -.openerp .oe_view_manager table.oe_view_manager_header ul ul, .openerp .oe_view_manager table.oe_view_manager_header ul ol, .openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol ul, .openerp .oe_view_manager table.oe_view_manager_header ol ol, .openerp .oe_view_manager table.oe_view_manager_header ol li { - margin: 0; +.openerp .oe_view_manager table.oe_view_manager_header ul { padding: 0; + margin-right: 0; + margin-top: 0; + margin-bottom: 0; } -.openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol li { +.openerp .oe_view_manager table.oe_view_manager_header ul li { list-style-type: none; + margin: 0; } .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row { clear: both; @@ -1445,11 +1433,15 @@ color: white; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); } +.openerp .oe_view_manager .oe_view_manager_switch { + margin-left: 8px; +} .openerp .oe_view_manager .oe_view_manager_switch li { text-align: center; width: 24px; height: 24px; line-height: 16px; + padding: 0; } .openerp .oe_view_manager .oe_view_manager_switch li a { position: relative; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 438f59df11f..6ee03494e7d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -200,8 +200,6 @@ $sheet-max-width: 860px vertical-align: middle h4 margin: 4px 0 - .oe_semantic_html_override_ul - @include ul-html-override .oe_semantic_html_override @include semantic-html-override ul.oe_semantic_html_override @@ -1014,7 +1012,14 @@ $sheet-max-width: 860px table.oe_view_manager_header width: 100% table-layout: fixed - @include semantic-html-override + ul + padding: 0 + margin-right: 0 + margin-top: 0 + margin-bottom: 0 + li + list-style-type: none + margin: 0 .oe_header_row //min-height: 26px //line-height: 26px @@ -1099,11 +1104,13 @@ $sheet-max-width: 860px // }}} // ViewManager.switches {{{ .oe_view_manager_switch + margin-left: 8px li text-align: center width: 24px height: 24px line-height: 16px + padding: 0 a position: relative .oe_vm_switch_list:after, .oe_vm_switch_tree:after -- cgit v1.2.3 From dc6b5e92bf742c775eb4228dbae221321f31bedd Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Wed, 5 Sep 2012 13:24:46 +0200 Subject: [FIX] Fixed min-width input[type=text]. bzr revid: vta@openerp.com-20120905112446-yi6eyfde8pa31g0l --- addons/web/static/src/css/base.css | 2 +- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index cb7ecddfa82..226ccbd3513 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2312,7 +2312,7 @@ -ms-box-sizing: border-box; box-sizing: border-box; background: white; - min-width: 70px; + min-width: 60px; color: #1f1f1f; } .openerp .oe_form input[readonly], .openerp .oe_form select[readonly], .openerp .oe_form textarea[readonly], .openerp .oe_form input[disabled], .openerp .oe_form select[disabled] { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 6fb2c8d21c1..13f740f218c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1751,7 +1751,7 @@ $sheet-max-width: 860px input[type="text"], input[type="password"], input[type="file"], select, textarea @include box-sizing(border) background: white - min-width: 70px + min-width: 60px color: #1f1f1f input[readonly], select[readonly], textarea[readonly], input[disabled], select[disabled] background: #E5E5E5 !important -- cgit v1.2.3 From d86d0f51b4ebe6b8509a02eb3c429c583165a300 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 6 Sep 2012 23:55:09 +0200 Subject: [FIX] ulgy grey topbar border bzr revid: al@openerp.com-20120906215509-z6mexulridkcwgjv --- addons/web/static/src/css/base.css | 8 ++++---- addons/web/static/src/css/base.sass | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 03898f25d78..8698fdb9f94 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,4 @@ -@charset "UTF-8"; +@charset "utf-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); @@ -1007,7 +1007,6 @@ .openerp .oe_topbar { width: 100%; height: 31px; - border-top: solid 1px #d3d3d3; background-color: #646060; background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626)); background-image: -webkit-linear-gradient(top, #646060, #262626); @@ -1238,10 +1237,11 @@ } .openerp .oe_secondary_submenu .oe_menu_counter:hover { cursor: pointer; - -moz-transform: scale(1.1); -webkit-transform: scale(1.1); - -o-transform: scale(1.1); + -moz-transform: scale(1.1); -ms-transform: scale(1.1); + -o-transform: scale(1.1); + transform: scale(1.1); } .openerp .oe_secondary_submenu .oe_active { border-top: 1px solid lightGray; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 65146407e54..374f3a6fc4e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -794,7 +794,6 @@ $sheet-max-width: 860px .oe_topbar width: 100% height: 31px - border-top: solid 1px #d3d3d3 @include vertical-gradient(#646060, #262626) @include semantic-html-override .oe_topbar_item -- cgit v1.2.3 From 9fd2332f552867b9b26b798910cfeca505f660ea Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sun, 9 Sep 2012 01:12:08 +0200 Subject: [FIX] viewmanager css for inline view bzr revid: al@openerp.com-20120908231208-9s1bk5ked84vn018 --- addons/web/static/src/css/base.css | 4 ++-- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 8698fdb9f94..73457e2bc19 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1503,10 +1503,10 @@ .openerp .oe_view_manager_current > .oe_view_manager_header .oe_header_row:first-child td { padding-top: 8px; } -.openerp .oe_view_manager_inline { +.openerp .oe_view_manager_inline, .openerp .oe_view_manager_inlineview { height: 100%; } -.openerp .oe_view_manager_inline > .oe_view_manager_header { +.openerp .oe_view_manager_inline > .oe_view_manager_header, .openerp .oe_view_manager_inlineview > .oe_view_manager_header { display: none; } .openerp .oe_popup_form > .oe_formview > .oe_form_pager { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 374f3a6fc4e..5e346b32df2 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1155,7 +1155,7 @@ $sheet-max-width: 860px padding-top: 8px // }}} // ViewManager inline {{{ - .oe_view_manager_inline + .oe_view_manager_inline, .oe_view_manager_inlineview height: 100% > .oe_view_manager_header display: none -- cgit v1.2.3 From 5848e72d421d0c63a0a9bd3b254b6e4aa35d5cb6 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 11 Sep 2012 08:36:07 +0200 Subject: [REM] import from core, moving to module bzr revid: xmo@openerp.com-20120911063607-xvhyjqohptynro30 --- addons/web/static/src/css/base.css | 8 +++++- addons/web/static/src/css/base.sass | 6 +++- addons/web/static/src/css/data_import.css | 46 ------------------------------- 3 files changed, 12 insertions(+), 48 deletions(-) delete mode 100644 addons/web/static/src/css/data_import.css (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 73457e2bc19..f952dd298fd 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2574,10 +2574,13 @@ .openerp .oe_form .oe_form_field_many2many > .oe_list .oe_list_pager_single_page { display: none; } +.openerp .oe_list_buttons .oe_alternative { + visibility: hidden; +} .openerp .oe_list_buttons .oe_list_save, .openerp .oe_list_buttons .oe_list_discard { display: none; } -.openerp .oe_list_buttons.oe_editing .oe_list_add, .openerp .oe_list_buttons.oe_editing .oe_list_button_import { +.openerp .oe_list_buttons.oe_editing .oe_list_add { display: none; } .openerp .oe_list_buttons.oe_editing .oe_list_save { @@ -2586,6 +2589,9 @@ .openerp .oe_list_buttons.oe_editing .oe_list_discard { display: inline; } +.openerp .oe_list_buttons.oe_editing .oe_alternative { + visibility: visible; +} .openerp .oe_list { position: relative; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 5e346b32df2..1f332756cf7 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1971,15 +1971,19 @@ $sheet-max-width: 860px // }}} // ListView {{{ .oe_list_buttons + .oe_alternative + visibility: hidden .oe_list_save, .oe_list_discard display: none &.oe_editing - .oe_list_add, .oe_list_button_import + .oe_list_add display: none .oe_list_save display: inline-block .oe_list_discard display: inline + .oe_alternative + visibility: visible .oe_list position: relative diff --git a/addons/web/static/src/css/data_import.css b/addons/web/static/src/css/data_import.css deleted file mode 100644 index 47cd52aa081..00000000000 --- a/addons/web/static/src/css/data_import.css +++ /dev/null @@ -1,46 +0,0 @@ -.openerp .oe_import_grid { - border: none; - border-collapse: collapse; -} -.openerp .oe_import_grid-header .oe_import_grid-cell { - background: url(../img/gradientlinebg.gif) repeat-x #CCCCCC; - border-bottom: 1px solid #E3E3E3; - font-weight: bold; - text-align: left; -} -.openerp .oe_import_grid-row .oe_import_grid-cell { - border-bottom: 1px solid #E3E3E3; -} - -.openerp .oe_import_no_result .oe_import_result { - display: none; -} -.openerp .oe_import fieldset { - cursor: pointer; -} -.openerp .oe_import fieldset legend:before { - content: '\25BC '; -} -.openerp .oe_import fieldset.oe_closed legend:before { - content: '\25B6 '; -} -.openerp .oe_import fieldset.oe_closed table { - display: none; -} -.openerp .oe_import .separator.horizontal { - font-weight: bold; - border-bottom-width: 1px; - margin: 6px 4px 6px 1px; - height: 20px; -} -.openerp .duplicate_fld{ - background-color:#FF6666; -} -.openerp .select_fld{ - background: none repeat scroll 0 0 white; -} -.openerp .ui-autocomplete { - max-height: 300px; - overflow-y: auto; - padding-right: 20px; -} -- cgit v1.2.3