odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] [REM] incomplete and unused bounce CSS animation 

bzr revid: odo@openerp.com-20120904132206-m1pt0ytlinqk3nvw
bzr revid: odo@openerp.com-20120904132256-rbqw49dsc32z76sw
This commit is contained in:
Xavier Morel 2012-09-04 15:22:56 +02:00 committed by Olivier Dony
parent 7f1a3872f5 abdbc220d3
commit 9ec0ce8868
2 changed files with 169 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
addons/web/static/src/css/base.css
View File

@ -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;
@ -1935,6 +1891,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;
@ -1974,11 +1959,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;
@ -1989,20 +1974,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;
@ -2011,14 +1996,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;
@ -2033,12 +2018,13 @@
-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 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);
@ -2047,20 +2033,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);
@ -2069,10 +2055,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);
@ -2081,10 +2067,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);
@ -2093,10 +2079,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);
@ -2128,31 +2114,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;
}

250
addons/web/static/src/css/base.sass
View File

@ -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
@ -1500,11 +1484,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
@ -1534,115 +1541,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
padding-right: 18px
li
display: inline-block
padding-left: 24px
margin: 0
position: relative
.arrow
width: 17px
display: inline-block
vertical-align: top
overflow: hidden
margin-left: -5px
span
position: relative
width: 24px
height: 24px
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
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
padding-left: 24px
margin: 0
position: relative
.arrow
width: 17px
display: inline-block
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