diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 886f6852a56..b03921107cf 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -10,6 +10,133 @@ .openerp2 a { text-decoration: none; } +.openerp2 a.button:link, .openerp2 a.button:visited, .openerp2 button, .openerp2 input[type='submit'] { + display: inline-block; + border: 1px solid #ababab; + color: #404040; + margin: 0; + padding: 4px 12px; + font-size: 13px; + text-align: center; + background-color: #efefef; + background-image: -webkit-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8)); + background-image: -webkit-linear-gradient(top, #efefef, #d8d8d8); + background-image: -moz-linear-gradient(top, #efefef, #d8d8d8); + background-image: -ms-linear-gradient(top, #efefef, #d8d8d8); + background-image: -o-linear-gradient(top, #efefef, #d8d8d8); + background-image: linear-gradient(to bottom, #efefef, #d8d8d8); + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; + -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); + -webkit-font-smoothing: antialiased; + outline: none; +} +.openerp2 a.button:hover, .openerp2 button:hover, .openerp2 input[type='submit']:hover { + background-color: #f6f6f6; + background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3)); + background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3); + background-image: -moz-linear-gradient(top, #f6f6f6, #e3e3e3); + background-image: -ms-linear-gradient(top, #f6f6f6, #e3e3e3); + background-image: -o-linear-gradient(top, #f6f6f6, #e3e3e3); + background-image: linear-gradient(to bottom, #f6f6f6, #e3e3e3); + cursor: pointer; +} +.openerp2 a.button:focus, .openerp2 button:focus, .openerp2 input[type='submit']:focus { + border: 1px solid #80bfff; + background-color: #f6f6f6; + background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3)); + background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3); + background-image: -moz-linear-gradient(top, #f6f6f6, #e3e3e3); + background-image: -ms-linear-gradient(top, #f6f6f6, #e3e3e3); + background-image: -o-linear-gradient(top, #f6f6f6, #e3e3e3); + background-image: linear-gradient(to bottom, #f6f6f6, #e3e3e3); + -moz-box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; + -webkit-box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; + -box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; +} +.openerp2 a.button:active, .openerp2 a.button.active, .openerp2 button:active, .openerp2 button.active, .openerp2 input[type='submit']:active, .openerp2 input[type='submit'].active { + background: #e3e3e3; + background: -moz-linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f; + background: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6)) #1b468f; + background: linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f; + -moz-box-shadow: none; + -webkit-box-shadow: none; + -box-shadow: none; +} +.openerp2 a.button.disabled, .openerp2 button:disabled, .openerp2 input[type='submit']:disabled { + background: #efefef !important; + border: 1px solid #d1d1d1 !important; + -moz-box-shadow: none !important; + -webkit-box-shadow: none !important; + -box-shadow: none !important; + color: #aaaaaa !important; + cursor: default; + text-shadow: 0 1px 1px white !important; +} +.openerp2 button.primary { + color: white; + 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; +} +.openerp2 button.primary: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); +} +.openerp2 button.primary: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; +} +.openerp2 button.following { + color: white; + width: 90px; + background-color: #8a89ba; + background-image: -webkit-gradient(linear, left top, left bottom, from(#8a89ba), to(#807fb4)); + background-image: -webkit-linear-gradient(top, #8a89ba, #807fb4); + background-image: -moz-linear-gradient(top, #8a89ba, #807fb4); + background-image: -ms-linear-gradient(top, #8a89ba, #807fb4); + background-image: -o-linear-gradient(top, #8a89ba, #807fb4); + background-image: linear-gradient(to bottom, #8a89ba, #807fb4); +} +.openerp2 button.unfollow { + display: none; + color: white; + width: 90px; + 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); +} .openerp2 .oe_left { float: left; } @@ -88,10 +215,85 @@ .openerp2 .oe_topbar .oe_topbar_avatar { vertical-align: top; } -.openerp2 .oe_main { - width: 100%; - height: 100%; - border-spacing: 0px; +.openerp2 .oe_user_menu { + float: right; + padding: 0; + margin: 0; +} +.openerp2 .oe_user_menu li { + list-style-type: none; + float: left; +} +.openerp2 .oe_user_menu .oe_dropdown { + position: relative; +} +.openerp2 .oe_user_menu .oe_dropdown_toggle:after { + width: 0; + height: 0; + display: inline-block; + content: "&darr"; + text-indent: -99999px; + vertical-align: top; + margin-top: 8px; + margin-left: 4px; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid white; + filter: alpha(opacity=50); + opacity: 0.5; +} +.openerp2 .oe_user_menu .oe_dropdown_options { + float: left; + background: #333333; + background: rgba(37, 37, 37, 0.9); + display: none; + position: absolute; + top: 32px; + right: -1px; + border: 0; + z-index: 900; + margin-left: 0; + margin-right: 0; + padding: 6px 0; + zoom: 1; + border-color: #999999; + border-color: rgba(0, 0, 0, 0.2); + border-style: solid; + border-width: 0 1px 1px; + -moz-border-radius: 0 0 6px 6px; + -webkit-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); + -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); + -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; +} +.openerp2 .oe_user_menu .oe_dropdown_options li { + float: none; + display: block; + background-color: none; +} +.openerp2 .oe_user_menu .oe_dropdown_options li a { + display: block; + padding: 4px 15px; + clear: both; + font-weight: normal; + line-height: 18px; + color: #eeeeee; +} +.openerp2 .oe_user_menu .oe_dropdown_options li a:hover { + background-color: #292929; + background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919)); + background-image: -webkit-linear-gradient(top, #292929, #191919); + background-image: -moz-linear-gradient(top, #292929, #191919); + background-image: -ms-linear-gradient(top, #292929, #191919); + background-image: -o-linear-gradient(top, #292929, #191919); + background-image: linear-gradient(to bottom, #292929, #191919); + -moz-box-shadow: none; + -webkit-box-shadow: none; + -box-shadow: none; } .openerp2 .oe_leftbar { width: 221px; @@ -128,12 +330,6 @@ color: #c81010; font-style: italic; } -.openerp2 .oe_application a { - color: #8a89ba; -} -.openerp2 .oe_application a:hover { - text-decoration: underline; -} .openerp2 .oe_menu { float: left; padding: 0; @@ -268,93 +464,91 @@ border-right: 4px solid transparent; border-top: 4px solid #4c4c4c; } -.openerp2 .oe_dropdown { - position: relative; +.openerp2 .oe_main { + width: 100%; + height: 100%; + border-spacing: 0px; } -.openerp2 .oe_dropdown_toggle:after { - width: 0; - height: 0; - display: inline-block; - content: "&darr"; - text-indent: -99999px; - vertical-align: top; - margin-top: 8px; - margin-left: 4px; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid white; - filter: alpha(opacity=50); - opacity: 0.5; +.openerp2 .oe_application a { + color: #8a89ba; } -.openerp2 .oe_user_menu { - float: right; - padding: 0; - margin: 0; +.openerp2 .oe_application a:hover { + text-decoration: underline; } -.openerp2 .oe_user_menu li { - list-style-type: none; - float: left; -} -.openerp2 .oe_user_menu .oe_dropdown_options { - float: left; - background: #333333; - background: rgba(37, 37, 37, 0.9); - display: none; - position: absolute; - top: 32px; - right: -1px; - border: 0; - z-index: 900; - margin-left: 0; - margin-right: 0; - padding: 6px 0; - zoom: 1; - border-color: #999999; - border-color: rgba(0, 0, 0, 0.2); - border-style: solid; - border-width: 0 1px 1px; - -moz-border-radius: 0 0 6px 6px; - -webkit-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); - -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); - -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} -.openerp2 .oe_user_menu .oe_dropdown_options li { - float: none; - display: block; - background-color: none; -} -.openerp2 .oe_user_menu .oe_dropdown_options li a { - display: block; - padding: 4px 15px; - clear: both; - font-weight: normal; - line-height: 18px; - color: #eeeeee; -} -.openerp2 .oe_user_menu .oe_dropdown_options li a:hover { - background-color: #292929; - background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919)); - background-image: -webkit-linear-gradient(top, #292929, #191919); - background-image: -moz-linear-gradient(top, #292929, #191919); - background-image: -ms-linear-gradient(top, #292929, #191919); - background-image: -o-linear-gradient(top, #292929, #191919); - background-image: linear-gradient(to bottom, #292929, #191919); - -moz-box-shadow: none; - -webkit-box-shadow: none; - -box-shadow: none; -} -.openerp2 .oe_form_page { +.openerp2 .oe_form_form { border: 1px solid black; margin: 5%; padding: 10px; } -.openerp2 .oe_form_status { - background: #cccccc; +.openerp2 .oe_form_topbar { + border-bottom: 1px solid #cacaca; + 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); + padding: 0 8px; + line-height: 30px; +} +.openerp2 .oe_form_topbar button { + font-size: 12px; + height: 24px; + line-height: 24px; + vertical-align: top; + padding: 0 10px; + margin: 3px 0; +} +.openerp2 .oe_form_topbar button span.i { + line-height: 20px; + height: 24px; +} +.openerp2 .oe_form_topbar ul { + height: 30px; + padding: 0; + margin: 0; + text-shadow: 0 1px 1px white; + border-left: 1px solid #cacaca; + border-right: 1px solid #cacaca; +} +.openerp2 .oe_form_topbar ul li { + padding: 0; + margin: 0; + list-style-type: none; + float: left; + vertical-align: top; + border-right: 1px solid #cacaca; + height: 30px; + padding: 0 12px; +} +.openerp2 .oe_form_topbar ul li:first-child { + border-left: 1px solid #cacaca; +} +.openerp2 .oe_form_topbar ul li a { + color: #4c4c4c; +} +.openerp2 .oe_form_topbar ul li a:hover { + color: black; +} +.openerp2 .oe_form_topbar .oe_form_steps img { + margin: 0 8px; + vertical-align: top; +} +.openerp2 .oe_form_topbar .oe_form_steps li { + border-right: none; + padding: 0; +} +.openerp2 .oe_form_topbar .oe_form_steps li:first-child { + margin-left: 12px; + border-left: none; +} +.openerp2 .oe_form_topbar .oe_form_steps li:last-child { + margin-right: 12px; +} +.openerp2 .oe_form_topbar .oe_form_steps_active { + font-weight: bold; + color: #b33630; } .openerp2 .oe_form_group_cell .oe_form_button { width: 100%; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 389c88006f7..7e2ae5441e3 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -49,7 +49,7 @@ $colour4: #8a89ba // }}} .openerp2 - // Common styles {{{ + // Global style {{{ padding: 0 margin: 0 font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif @@ -60,6 +60,73 @@ $colour4: #8a89ba a text-decoration: none + + // buttons + a.button:link, a.button:visited, button, input[type='submit'] + display: inline-block + border: 1px solid #ababab + color: #404040 + margin: 0 + padding: 4px 12px + font-size: 13px + text-align: center + @include vertical-gradient(#efefef, #d8d8d8) + @include radius(3px) + @include box-shadow((0 1px 2px rgba(0, 0, 0, .1), 0 1px 1px rgba(255, 255, 255, .8) inset)) + text-shadow: 0 1px 1px rgba(255, 255, 255, .5) + -webkit-font-smoothing: antialiased + outline: none + + a.button:hover, button:hover, input[type='submit']:hover + @include vertical-gradient(#f6f6f6, #e3e3e3) + cursor: pointer + + a.button:focus, button:focus, input[type='submit']:focus + border: 1px solid #80bfff + @include vertical-gradient(#f6f6f6, #e3e3e3) + @include box-shadow((0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, .8) inset)) + + a.button:active, a.button.active, button:active, button.active, input[type='submit']:active, input[type='submit'].active + background: #e3e3e3 + background: -moz-linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f + background: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6)) #1b468f + background: linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f + @include box-shadow(none) + + a.button.disabled, button:disabled, input[type='submit']:disabled + background: #efefef !important + border: 1px solid #d1d1d1 !important + @include box-shadow(none !important) + color: #aaa !important + cursor: default + text-shadow: 0 1px 1px #fff !important + + button.primary + color: white + @include vertical-gradient(#dc5f59, #b33630) + @include box-shadow(none) + + button.primary:hover + @include vertical-gradient(lighten(#dc5f59, 3%), lighten(#b33630, 3%)) + @include box-shadow(0 0 1px rgba(0,0,0,0.2)) + + button.primary:active + @include vertical-gradient(#b33630, #dc5f59) + @include box-shadow(none) + + button.following + color: white + width: 90px + @include vertical-gradient($colour4, darken($colour4, 3%)) + + button.unfollow + display: none + color: white + width: 90px + @include vertical-gradient(#dc5f59, #b33630) + + + // }}} // Generic classes {{{ .oe_left @@ -125,11 +192,66 @@ $colour4: #8a89ba .oe_topbar_avatar vertical-align: top // }}} - // Main {{{ - .oe_main - width: 100% - height: 100% - border-spacing: 0px + // TopBarUserMenu {{{ + .oe_user_menu + float: right + padding: 0 + margin: 0 + li + list-style-type: none + float: left + .oe_dropdown + position: relative + + .oe_dropdown_toggle:after + width: 0 + height: 0 + display: inline-block + content: "&darr" + text-indent: -99999px + vertical-align: top + margin-top: 8px + margin-left: 4px + border-left: 4px solid transparent + border-right: 4px solid transparent + border-top: 4px solid white + @include opacity(0.5) + + .oe_dropdown_options + float: left + background: #333 + background: rgba(37,37,37,0.9) + display: none + position: absolute + top: 32px + right: -1px + border: 0 + z-index: 900 + margin-left: 0 + margin-right: 0 + padding: 6px 0 + zoom: 1 + border-color: #999 + border-color: rgba(0, 0, 0, 0.2) + border-style: solid + border-width: 0 1px 1px + @include radius(0 0 6px 6px) + @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) + @include background-clip() + li + float: none + display: block + background-color: none + a + display: block + padding: 4px 15px + clear: both + font-weight: normal + line-height: 18px + color: #eee + &:hover + @include vertical-gradient(#292929, #191919) + @include box-shadow(none) // }}} // Leftbar {{{ .oe_leftbar @@ -162,13 +284,6 @@ $colour4: #8a89ba color: #c81010 font-style: italic // }}} - // Application {{{ - .oe_application - a - color: $colour4 - &:hover - text-decoration: underline - // }}} // Menu {{{ .oe_menu float: left @@ -273,75 +388,77 @@ $colour4: #8a89ba border-right: 4px solid transparent border-top: 4px solid #4c4c4c // }}} - // UserMenu {{{ - .oe_dropdown - position: relative - - .oe_dropdown_toggle:after - width: 0 - height: 0 - display: inline-block - content: "&darr" - text-indent: -99999px - vertical-align: top - margin-top: 8px - margin-left: 4px - border-left: 4px solid transparent - border-right: 4px solid transparent - border-top: 4px solid white - @include opacity(0.5) - - .oe_user_menu - float: right - padding: 0 - margin: 0 - li - list-style-type: none - float: left - - .oe_dropdown_options - float: left - background: #333 - background: rgba(37,37,37,0.9) - display: none - position: absolute - top: 32px - right: -1px - border: 0 - z-index: 900 - margin-left: 0 - margin-right: 0 - padding: 6px 0 - zoom: 1 - border-color: #999 - border-color: rgba(0, 0, 0, 0.2) - border-style: solid - border-width: 0 1px 1px - @include radius(0 0 6px 6px) - @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) - @include background-clip() - li - float: none - display: block - background-color: none - a - display: block - padding: 4px 15px - clear: both - font-weight: normal - line-height: 18px - color: #eee - &:hover - @include vertical-gradient(#292929, #191919) - @include box-shadow(none) + // Main {{{ + .oe_main + width: 100% + height: 100% + border-spacing: 0px + // }}} + // Application to rename into action {{{ + .oe_application + a + color: $colour4 + &:hover + text-decoration: underline // }}} // FormView Layout {{{ - .oe_form_page + .oe_form_form border: 1px solid black margin: 5% padding: 10px - .oe_form_status - background: #ccc + .oe_form_topbar + border-bottom: 1px solid #cacaca + @include vertical-gradient(#fcfcfc, #dedede) + padding: 0 8px + line-height: 30px + button + font-size: 12px + height: 24px + line-height: 24px + vertical-align: top + padding: 0 10px + margin: 3px 0 + span.i + line-height: 20px + height: 24px + ul + height: 30px + padding: 0 + margin: 0 + text-shadow: 0 1px 1px white + border-left: 1px solid #cacaca + border-right: 1px solid #cacaca + li + padding: 0 + margin: 0 + list-style-type: none + float: left + vertical-align: top + border-right: 1px solid #cacaca + height: 30px + padding: 0 12px + &:first-child + border-left: 1px solid #cacaca + a + color: #4c4c4c + &:hover + color: black + .oe_form_steps + img + margin: 0 8px + vertical-align: top + li + border-right: none + padding: 0 + &:first-child + margin-left: 12px + border-left: none + &:last-child + margin-right: 12px + .oe_form_steps_active + font-weight: bold + color: #b33630 + .oe_form_group_cell .oe_form_button width: 100% @@ -361,11 +478,15 @@ $colour4: #8a89ba display: block .oe_layout_debug_cell display: none + + + // }}} // FormView Widgets {{{ .oe_form_label_help[for], .oe_form_label[for] white-space: nowrap // }}} + // Transitional overrides for old styles {{{ .openerp .oe_form_field_many2one diff --git a/addons/web/static/src/css/base_old.css b/addons/web/static/src/css/base_old.css index fb3139cf19b..d1435da9a48 100644 --- a/addons/web/static/src/css/base_old.css +++ b/addons/web/static/src/css/base_old.css @@ -14,7 +14,6 @@ .openerp .view-manager-main-content { width: 100%; - padding: 0 8px 8px 8px; } .openerp .oe_form_group_cell .view-manager-main-content { @@ -1939,106 +1938,6 @@ ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after { background-position: 0px -21px; } -/* Buttons */ -.openerp .oe_button:link, -.openerp .oe_button:visited, -.openerp .oe_button { - display: inline-block; - border: 1px solid #ababab; - color: #404040; - font-size: 12px; - padding: 3px 10px; - text-align: center; - -o-background-size: 100% 100%; - -moz-background-size: 100% 100%; - -webkit-background-size: auto auto !important; - background-size: 100% 100%; - background: #d8d8d8 none; - background: none, -webkit-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8)); - background: none, -webkit-linear-gradient(#efefef, #d8d8d8); - background: none, -moz-linear-gradient(#efefef, #d8d8d8); - background: none, -o-linear-gradient(top, #efefef, #d8d8d8); - background: none, -khtml-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8)); - background: -ms-linear-gradient(top, #efefef, #d8d8d8); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#efefef', endColorstr='#d8d8d8',GradientType=0 ); - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - -o-border-radius: 3px; - -ms-border-radius: 3px; - border-radius: 3px; - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; - -o-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); - -webkit-font-smoothing: antialiased; - outline: none; -} - -.openerp .oe_button:hover { - -o-background-size: 100% 100%; - -moz-background-size: 100% 100%; - -webkit-background-size: auto auto !important; - background-size: 100% 100%; - background: #e3e3e3 none; - background: none, -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3)); - background: none, -webkit-linear-gradient(#f6f6f6, #e3e3e3); - background: none, -moz-linear-gradient(#f6f6f6, #e3e3e3); - background: none, -o-linear-gradient(top, #f6f6f6, #e3e3e3); - background: none, -khtml-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3)); - background: -ms-linear-gradient(top, #f6f6f6, #e3e3e3); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f6f6f6', endColorstr='#e3e3e3',GradientType=0 ); - cursor: pointer; -} - -.openerp .oe_button:focus { - border: 1px solid #80bfff; - -o-background-size: 100% 100%; - -moz-background-size: 100% 100%; - -webkit-background-size: auto auto !important; - background-size: 100% 100%; - background: #e3e3e3, none; - background: none, -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3)); - background: none, -webkit-linear-gradient(#f6f6f6, #e3e3e3); - background: none, -moz-linear-gradient(#f6f6f6, #e3e3e3); - background: none, -o-linear-gradient(top, #f6f6f6, #e3e3e3); - background: none, -khtml-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3)); - background: -ms-linear-gradient(top, #f6f6f6, #e3e3e3); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f6f6f6', endColorstr='#e3e3e3',GradientType=0 ); - -moz-box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; - -webkit-box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; - -o-box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; - box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; -} - -.openerp .oe_button:active, -.openerp .oe_button.active { - background: #e3e3e3; - background: -moz-linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f; - background: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6)) #1b468f; - background: linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f; - background: -ms-linear-gradient(top, #e3e3e3, #f6f6f6); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e3e3e3', endColorstr='#f6f6f6',GradientType=0 ); - -moz-box-shadow: none, 0 0 0 transparent; - -webkit-box-shadow: none, 0 0 0 transparent; - -o-box-shadow: none, 0 0 0 transparent; - box-shadow: none, 0 0 0 transparent; -} - -.openerp .oe_button.disabled, -.openerp .oe_button:disabled { - background: #efefef !important; - border: 1px solid #d1d1d1 !important; - font-size: 12px; - padding: 3px 10px; - -moz-box-shadow: none !important, 0 0 0 transparent; - -webkit-box-shadow: none !important, 0 0 0 transparent; - -o-box-shadow: none !important, 0 0 0 transparent; - box-shadow: none !important, 0 0 0 transparent; - color: #aaaaaa !important; - cursor: default; - text-shadow: 0 1px 1px white !important; -} .openerp select.oe_search-view-filters-management { font-style: oblique; diff --git a/addons/web/static/src/img/form_steps.png b/addons/web/static/src/img/form_steps.png new file mode 100644 index 00000000000..0485c5977aa Binary files /dev/null and b/addons/web/static/src/img/form_steps.png differ diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index dc4f9387649..1065072cdab 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -840,7 +840,7 @@ -
+
@@ -1135,6 +1135,17 @@
+ + + @@ -1832,16 +1843,6 @@

- - -