Paramjit Singh Sahota(OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-improve-sass-2-css-psa into
lp:~openerp-dev/openerp-web/trunk-improve-css-all-browsers.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-improve-sass-2-css-psa/+merge/130029
Hello Sir,
Added code for the sass.
Thankz You,
-PSA.
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-improve-sass-2-css-psa/+merge/130029
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openerp-web/trunk-improve-sass-2-css-psa into
lp:~openerp-dev/openerp-web/trunk-improve-css-all-browsers.
=== added file 'addons/web/static/src/css/base-ie.css'
--- addons/web/static/src/css/base-ie.css 1970-01-01 00:00:00 +0000
+++ addons/web/static/src/css/base-ie.css 2012-10-17 05:40:24 +0000
@@ -0,0 +1,35 @@
+.openerp .oe_form .oe_form_field_selection {
+ width/*\**/:60%\9;
+}
+a:link img {
+ border/*\**/: none\9;
+ text-decoration/*\**/: none\9;
+}
+.openerp input[type=checkbox]{
+ padding/*\**/: 2px 4px\9;
+ border-radius/*\**/: 3px\9;
+ box-shadow/*\**/: inset rgba(0, 0, 0, 0.1);\9;
+ border/*\**/:0px solid #cccccc\9;
+ background: white;
+}
+.openerp .oe_login {
+ background-image/*\**/: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=)\9;
+ text-align/*\**/: center\9;
+ font-size/*\**/: 14px\9;
+ height/*\**/: 600px\9;
+}
+.openerp .oe_form input[type="file"] {
+ width/*\**/: 85px\9;
+}
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {
+ filter/*\**/:none\9;
+}
+.openerp .oe_form_field_text {
+ float/*\**/: left\9;
+}
+.openerp .oe_form_field.oe_tags {
+ float/*\**/: left\9;
+}
+.openerp ul.oe_form_status li .label, .openerp ul.oe_form_status_clickable li .label {
+ padding-bottom/*\**/: 10px\9;
+}
=== renamed file 'addons/web/static/src/css/base-ie.css' => 'addons/web/static/src/css/base-ie.css.moved'
=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css 2012-10-15 09:53:54 +0000
+++ addons/web/static/src/css/base.css 2012-10-17 05:40:24 +0000
@@ -811,11 +811,19 @@
font-size: 14px;
height: 100%;
}
+<<<<<<< TREE
@-moz-document url-prefix() {
.openerp .oe_login {
height: 600px
}
}
+=======
+@-moz-document url-prefix() {
+ .openerp .oe_login {
+ height: 600px;
+ }
+}
+>>>>>>> MERGE-SOURCE
.openerp .oe_login ul, .openerp .oe_login li {
margin: 0;
list-style-type: none;
@@ -1332,6 +1340,10 @@
white-space: nowrap;
text-overflow: ellipsis;
}
+.openerp .oe_application .oe_breadcrumb_item > * {
+ display: inline-block;
+ overflow: hidden;
+}
.openerp .oe_view_manager .oe_view_manager_body {
height: inherit;
}
@@ -1470,11 +1482,20 @@
text-align: center;
list-style-type: none;
}
+<<<<<<< TREE
@-moz-document url-prefix(){
.openerp .oe_view_manager .oe_view_manager_switch li {
line-height: 21px;
}
}
+=======
+@-moz-document url-prefix() {
+ .openerp .oe_view_manager .oe_view_manager_switch li {
+ line-height: 21px;
+ }
+}
+
+>>>>>>> MERGE-SOURCE
.openerp .oe_view_manager .oe_view_manager_switch li a {
position: relative;
}
@@ -2136,7 +2157,11 @@
.openerp .oe_form .oe_form_group {
width: 100%;
margin: 9px 0 9px 0;
+<<<<<<< TREE
float:right;
+=======
+ float: right;
+>>>>>>> MERGE-SOURCE
}
.openerp .oe_form .oe_form_group .oe_form_group_cell.oe_group_right {
padding-left: 20px;
@@ -2196,6 +2221,12 @@
.openerp .oe_form_field_progressbar.ui-progressbar .ui-widget-header {
background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
}
+.openerp .oe_form h1 .oe_form_required {
+ float: left;
+}
+.openerp .oe_form .oe_form_field {
+ display: -moz-stack;
+}
.openerp .oe_form .oe_form_field_text {
width: 100%;
}
@@ -2276,7 +2307,11 @@
}
.openerp .oe_form .oe_form_required input:not([disabled]):not([readonly]), .openerp .oe_form .oe_form_required select:not([disabled]):not([readonly]), .openerp .oe_form .oe_form_required textarea:not([disabled]):not([readonly]) {
background-color: #d2d2ff !important;
+<<<<<<< TREE
width : 100%;
+=======
+ width: 100%;
+>>>>>>> MERGE-SOURCE
}
.openerp .oe_form .oe_form_invalid input, .openerp .oe_form .oe_form_invalid select, .openerp .oe_form .oe_form_invalid textarea {
background-color: #ff6666 !important;
@@ -2606,6 +2641,10 @@
text-align: right;
width: 100%;
}
+.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float input {
+ text-align: right;
+ width: 100%;
+}
.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime > span, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date > span {
width: 100%;
}
=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass 2012-10-15 09:53:54 +0000
+++ addons/web/static/src/css/base.sass 2012-10-17 05:40:24 +0000
@@ -113,7 +113,6 @@
@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
@mixin text-to-icon($icon-name, $color: #404040)
@@ -1066,6 +1065,9 @@
max-width: 7em
white-space: nowrap
text-overflow: ellipsis
+ .oe_breadcrumb_item > *
+ display: inline-block
+ overflow: hidden
// }}}
// ViewManager common {{{
.oe_view_manager
@@ -1686,6 +1688,7 @@
.oe_form_group
width: 100%
margin: 9px 0 9px 0
+ float: right
.oe_form_group_cell.oe_group_right
padding-left: 20px
// }}}
@@ -1738,6 +1741,11 @@
// }}}
// FormView.fields {{{
.oe_form
+ h1
+ .oe_form_required
+ float: left
+ .oe_form_field
+ display: -moz-stack
.oe_form_field_text
width: 100%
.oe_form_field_char input,
@@ -1794,6 +1802,7 @@
.oe_form_required
input:not([disabled]):not([readonly]), select:not([disabled]):not([readonly]), textarea:not([disabled]):not([readonly])
background-color: #D2D2FF !important
+ width : 100%
.oe_form_invalid
input, select, textarea
background-color: #F66 !important
@@ -2050,6 +2059,10 @@
input
text-align: right
width: 100%
+ &.oe_form_field_float
+ input
+ text-align: right
+ width: 100%
&.oe_form_field_datetime,&.oe_form_field_date
> span
width: 100%
=== modified file 'addons/web_calendar/static/src/css/web_calendar.css'
=== modified file 'addons/web_kanban/static/src/css/kanban.css'
--- addons/web_kanban/static/src/css/kanban.css 2012-10-09 11:48:05 +0000
+++ addons/web_kanban/static/src/css/kanban.css 2012-10-17 05:40:24 +0000
@@ -1,11 +1,22 @@
@charset "utf-8";
+<<<<<<< TREE
.openerp .oe_application{
height: 100%;
}
+=======
+.openerp .oe_application {
+ height: 100%;
+}
+
+>>>>>>> MERGE-SOURCE
.openerp .oe_kanban_view {
background: white;
height: inherit;
+<<<<<<< TREE
position:relative;
+=======
+ position: relative;
+>>>>>>> MERGE-SOURCE
}
.openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_dummy_cell {
background: url(/web/static/src/img/form_sheetbg.png);
=== modified file 'addons/web_kanban/static/src/css/kanban.sass'
--- addons/web_kanban/static/src/css/kanban.sass 2012-10-08 12:44:59 +0000
+++ addons/web_kanban/static/src/css/kanban.sass 2012-10-17 05:40:24 +0000
@@ -46,11 +46,14 @@
transition: $transition
// }}}
+.openerp .oe_application
+ height: 100%
.openerp .oe_kanban_view
// KanbanView {{{
//background: url(data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAKElEQVQIHWP8DwTv379nAAFBQUEGhnfv3oHEwADEZgJLIRGMIClkLQCr3x2Htp/lLwAAAABJRU5ErkJggg==)
background: white
height: inherit
+ position: relative
&.oe_kanban_grouped .oe_kanban_dummy_cell
background: url(/web/static/src/img/form_sheetbg.png)
.ui-sortable-placeholder
@@ -150,6 +153,7 @@
color: #666666
.oe_kanban_group_title_vertical
writing-mode: tb-rl
+ -ms-writing-mode: tb
-webkit-transform: rotate(90deg)
-moz-transform: rotate(90deg)
-o-transform: rotate(90deg)
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
