Merge from mit-trunk
bzr revid: mit@openerp.com-20120821164605-qqtege5nvs07ehpg
This commit is contained in:
commit
190518cbdc
|
@ -234,21 +234,9 @@
|
|||
cursor: default;
|
||||
text-shadow: 0 1px 1px white !important;
|
||||
}
|
||||
.openerp .ui-widget {
|
||||
font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
|
||||
font-size: 13px;
|
||||
}
|
||||
.openerp .ui-widget-content a {
|
||||
color: #7c7bad;
|
||||
}
|
||||
.openerp .ui-menu .ui-menu-item {
|
||||
margin: 0 8px 0 0;
|
||||
padding: 0 0 0 12px;
|
||||
width: auto;
|
||||
}
|
||||
.openerp .ui-menu .ui-menu-item a.ui-state-active {
|
||||
background: #f0f0fa;
|
||||
}
|
||||
.openerp.ui-dialog {
|
||||
display: none;
|
||||
padding: 6px;
|
||||
|
@ -466,6 +454,13 @@
|
|||
-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;
|
||||
|
@ -1012,7 +1007,7 @@
|
|||
.openerp .oe_topbar {
|
||||
width: 100%;
|
||||
height: 31px;
|
||||
border-top: solid 1px lightgrey;
|
||||
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);
|
||||
|
@ -1203,7 +1198,7 @@
|
|||
color: white;
|
||||
padding: 2px 4px;
|
||||
margin: 1px 6px 0 0;
|
||||
border: 1px solid lightgrey;
|
||||
border: 1px solid lightGray;
|
||||
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
|
||||
-moz-border-radius: 4px;
|
||||
-webkit-border-radius: 4px;
|
||||
|
@ -1220,8 +1215,8 @@
|
|||
}
|
||||
.openerp .oe_secondary_submenu .oe_active {
|
||||
background: #7c7bad;
|
||||
border-top: 1px solid lightgrey;
|
||||
border-bottom: 1px solid lightgrey;
|
||||
border-top: 1px solid lightGray;
|
||||
border-bottom: 1px solid lightGray;
|
||||
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);
|
||||
|
@ -1313,6 +1308,9 @@
|
|||
.openerp .oe_view_manager table.oe_view_manager_header h2 a {
|
||||
color: #7c7bad;
|
||||
}
|
||||
.openerp .oe_view_manager table.oe_view_manager_header .oe_dropdown_menu {
|
||||
line-height: normal;
|
||||
}
|
||||
.openerp .oe_view_manager table.oe_view_manager_header .oe_button_group {
|
||||
display: inline-block;
|
||||
border: 1px solid #ababab;
|
||||
|
@ -2177,7 +2175,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;
|
||||
|
@ -2742,3 +2740,45 @@ div.ui-widget-overlay {
|
|||
filter: alpha(opacity=30);
|
||||
opacity: 0.3;
|
||||
}
|
||||
|
||||
.ui-widget {
|
||||
font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
|
||||
color: #4c4c4c;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.ui-menu {
|
||||
padding: 2px 0;
|
||||
-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);
|
||||
margin-top: 4px;
|
||||
}
|
||||
.ui-menu .ui-menu-item {
|
||||
width: 100%;
|
||||
padding: 0;
|
||||
}
|
||||
.ui-menu .ui-menu-item a {
|
||||
padding: 1px 16px;
|
||||
}
|
||||
.ui-menu .ui-menu-item a.ui-corner-all {
|
||||
-moz-border-radius: 0;
|
||||
-webkit-border-radius: 0;
|
||||
border-radius: 0;
|
||||
}
|
||||
.ui-menu .ui-menu-item a.ui-state-active {
|
||||
background: #f0f0fa;
|
||||
}
|
||||
.ui-menu .ui-menu-item a.ui-state-hover, .ui-menu .ui-menu-item a.ui-state-active {
|
||||
background: #7c7bad;
|
||||
}
|
||||
|
||||
.ui-corner-all {
|
||||
-moz-border-radius: 3px;
|
||||
-webkit-border-radius: 3px;
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
.ui-widget-content {
|
||||
border: 1px solid #afafb6;
|
||||
}
|
||||
|
|
|
@ -249,18 +249,8 @@ $sheet-max-width: 860px
|
|||
text-shadow: 0 1px 1px #fff !important
|
||||
// }}}
|
||||
// Jquery ui Overrides {{{
|
||||
.ui-widget
|
||||
font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif
|
||||
font-size: 13px
|
||||
.ui-widget-content a
|
||||
color: $link-color
|
||||
.ui-menu
|
||||
.ui-menu-item
|
||||
margin: 0 8px 0 0
|
||||
padding: 0 0 0 12px
|
||||
width: auto
|
||||
a.ui-state-active
|
||||
background: #f0f0fa
|
||||
|
||||
// Modal box
|
||||
&.ui-dialog
|
||||
|
@ -400,6 +390,13 @@ $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))
|
||||
|
||||
ul.oe_flatlist, ol.oe_flatlist
|
||||
margin: 0
|
||||
padding: 0
|
||||
li
|
||||
list-style-type: none
|
||||
|
||||
.oe_form_dirty
|
||||
.oe_highlight_on_dirty
|
||||
color: white
|
||||
|
@ -1034,6 +1031,8 @@ $sheet-max-width: 860px
|
|||
float: left
|
||||
a
|
||||
color: $link-color
|
||||
.oe_dropdown_menu
|
||||
line-height: normal
|
||||
.oe_button_group
|
||||
display: inline-block
|
||||
border: 1px solid #ababab
|
||||
|
@ -2139,10 +2138,39 @@ $sheet-max-width: 860px
|
|||
|
||||
// }}}
|
||||
|
||||
// The jQuery-ui overlay is outside the .openerp div, please don't add indentation !!!
|
||||
// The jQuery-ui overlay and Autocomplete are outside the .openerp div, please don't add indentation !!!
|
||||
div.ui-widget-overlay
|
||||
background: black
|
||||
@include opacity(0.3)
|
||||
|
||||
.ui-widget
|
||||
font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif
|
||||
color: #4c4c4c
|
||||
font-size: 13px
|
||||
|
||||
.ui-menu
|
||||
padding: 2px 0
|
||||
@include box-shadow(0 1px 4px rgba(0,0,0,0.3))
|
||||
margin-top: 4px
|
||||
.ui-menu-item
|
||||
width: 100%
|
||||
padding: 0
|
||||
a
|
||||
padding: 1px 16px
|
||||
a.ui-corner-all
|
||||
@include radius(0)
|
||||
a.ui-state-active
|
||||
background: #f0f0fa
|
||||
.ui-menu-item a.ui-state-hover, .ui-menu-item a.ui-state-active
|
||||
background: $tag-bg-dark
|
||||
//color: #4c4c4c
|
||||
//@include vertical-gradient(#f0f0fa, #eeeef6)
|
||||
|
||||
.ui-corner-all
|
||||
@include radius(3px)
|
||||
|
||||
.ui-widget-content
|
||||
border: 1px solid $tag-border
|
||||
|
||||
// au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
|
||||
// vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
@charset "utf-8";
|
||||
.openerp .oe_kanban_view {
|
||||
height: inherit;
|
||||
}
|
||||
|
@ -10,6 +9,15 @@
|
|||
visibility: visible !important;
|
||||
height: 60px !important;
|
||||
}
|
||||
.openerp .oe_kanban_view .ui-sortable-helper {
|
||||
-moz-box-shadow: 0 1px 20px rgba(0, 0, 0, 0.9);
|
||||
-webkit-box-shadow: 0 1px 20px rgba(0, 0, 0, 0.9);
|
||||
-box-shadow: 0 1px 20px rgba(0, 0, 0, 0.9);
|
||||
-moz-transform: rotate(3deg);
|
||||
-webkit-transform: rotate(3deg);
|
||||
-o-transform: rotate(3deg);
|
||||
-ms-transform: rotate(3deg);
|
||||
}
|
||||
.openerp .oe_kanban_view .oe_kanban_left {
|
||||
float: left;
|
||||
}
|
||||
|
@ -342,9 +350,10 @@
|
|||
margin-bottom: 0;
|
||||
}
|
||||
.openerp .oe_kanban_view .oe_kanban_card:hover {
|
||||
-moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
|
||||
-webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
|
||||
-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
|
||||
border: 1px solid #7c7bad;
|
||||
-moz-box-shadow: 0 0 4px #7c7bad;
|
||||
-webkit-box-shadow: 0 0 4px #7c7bad;
|
||||
-box-shadow: 0 0 4px #7c7bad;
|
||||
}
|
||||
.openerp .oe_kanban_view .oe_kanban_card:hover .oe_dropdown_kanban > span {
|
||||
visibility: visible;
|
||||
|
|
|
@ -26,6 +26,12 @@
|
|||
-moz-box-shadow: $bsval
|
||||
-webkit-box-shadow: $bsval
|
||||
-box-shadow: $bsval
|
||||
|
||||
@mixin transform($transform)
|
||||
-moz-transform: $transform
|
||||
-webkit-transform: $transform
|
||||
-o-transform: $transform
|
||||
-ms-transform: $transform
|
||||
// }}}
|
||||
|
||||
.openerp .oe_kanban_view
|
||||
|
@ -38,6 +44,9 @@
|
|||
border: 1px dotted black
|
||||
visibility: visible !important
|
||||
height: 60px !important
|
||||
.ui-sortable-helper
|
||||
@include box-shadow(0 1px 20px rgba(0, 0, 0, 0.9))
|
||||
@include transform(rotate(3deg))
|
||||
.oe_kanban_left
|
||||
float: left
|
||||
.oe_kanban_right
|
||||
|
@ -304,7 +313,8 @@
|
|||
&:last-child
|
||||
margin-bottom: 0
|
||||
&:hover
|
||||
@include box-shadow(0 0 3px rgba(0,0,0,0.6))
|
||||
border: 1px solid #7C7BAD
|
||||
@include box-shadow(0 0 4px #7C7BAD)
|
||||
.oe_dropdown_kanban > span
|
||||
visibility: visible
|
||||
h3
|
||||
|
|
Loading…
Reference in New Issue