From 8b95683d205ec0fdcddf6c466abbfe89b4a00971 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 10 May 2012 12:35:13 +0200 Subject: [PATCH] [FIX] Fix some css, remove useless classes bzr revid: fme@openerp.com-20120510103513-ejjeab5g3s6tr4tc --- addons/web/static/src/css/base.css | 64 ++++++++++--------- addons/web/static/src/css/base.sass | 43 +++++++------ addons/web/static/src/js/view_editor.js | 6 +- .../web/static/src/js/view_list_editable.js | 2 +- addons/web/static/src/xml/base.xml | 18 +++--- 5 files changed, 70 insertions(+), 63 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 0c67cec1f6c..dddf52fd811 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1785,24 +1785,16 @@ .openerp .oe-listview-content { width: 100%; } -.openerp .oe-listview-content td, .openerp .oe-listview-content th { - padding: 3px 6px; - line-height: 18px; -} -.openerp .oe-listview-content td button, .openerp .oe-listview-content th button { - border: none; - background: transparent; - padding: 0; - -moz-box-shadow: none; - -webkit-box-shadow: none; - -box-shadow: none; -} -.openerp .oe-listview-content thead { +.openerp .oe-listview-content > thead { border-bottom: 2px solid #cacaca; background: #eeeeee; vertical-align: top; } -.openerp .oe-listview-content thead th:after { +.openerp .oe-listview-content > thead td, .openerp .oe-listview-content > thead th { + padding: 3px 6px; + line-height: 18px; +} +.openerp .oe-listview-content > thead th:after { content: ""; float: right; margin-top: 7px; @@ -1811,12 +1803,12 @@ border-color: black transparent; visibility: hidden; } -.openerp .oe-listview-content thead th.sortup:after { +.openerp .oe-listview-content > thead th.sortup:after { visibility: visible; filter: alpha(opacity=60); opacity: 0.6; } -.openerp .oe-listview-content thead th.sortdown:after { +.openerp .oe-listview-content > thead th.sortdown:after { border-bottom: none; border-left: 4px solid transparent; border-right: 4px solid transparent; @@ -1828,14 +1820,35 @@ filter: alpha(opacity=60); opacity: 0.6; } -.openerp .oe-listview-content tbody { +.openerp .oe-listview-content > tbody { cursor: pointer; background: white; } -.openerp .oe-listview-content tbody tr { +.openerp .oe-listview-content > tbody > tr { border-top: 1px solid #dddddd; } -.openerp .oe-listview-content tbody tr:nth-child(odd) { +.openerp .oe-listview-content > tbody > tr > td, .openerp .oe-listview-content > tbody > tr > th { + padding: 3px 6px; + line-height: 18px; +} +.openerp .oe-listview-content > tbody > tr > td > button, .openerp .oe-listview-content > tbody > tr > th > button { + border: none; + background: transparent; + padding: 0; + -moz-box-shadow: none; + -webkit-box-shadow: none; + -box-shadow: none; +} +.openerp .oe-listview-content > tbody > tr > td.oe_list_checkbox:first-child, .openerp .oe-listview-content > tbody > tr th.oe_list_checkbox:first-child { + width: 17px; +} +.openerp .oe-listview-content > tbody > tr > td.oe_list_checkbox:first-child:after, .openerp .oe-listview-content > tbody > tr th.oe_list_checkbox:first-child:after { + border-width: 0; +} +.openerp .oe-listview-content > tbody > tr > td.oe-number { + text-align: right !important; +} +.openerp .oe-listview-content > tbody > tr:nth-child(odd) { background-color: #f0f0fa; background-color: #f0f0fa; background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); @@ -1845,13 +1858,13 @@ background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6); background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6); } -.openerp .oe-listview-content tfoot { +.openerp .oe-listview-content > tfoot { border-top: 2px solid #cacaca; border-bottom: 1px solid #cacaca; background: #eeeeee; font-weight: bold; } -.openerp .oe-listview-content tbody tr:hover td, .openerp .oe-listview-content tbody tr:hover th { +.openerp .oe-listview-content > tbody tr:hover td, .openerp .oe-listview-content tbody tr:hover th { background-color: #eeeeee; background-image: -webkit-gradient(linear, left top, left bottom, from(#eeeeee), to(#dedede)); background-image: -webkit-linear-gradient(top, #eeeeee, #dedede); @@ -1860,15 +1873,6 @@ background-image: -o-linear-gradient(top, #eeeeee, #dedede); background-image: linear-gradient(to bottom, #eeeeee, #dedede); } -.openerp .oe-listview-content td.oe_list_checkbox:first-child, .openerp .oe-listview-content th.oe_list_checkbox:first-child { - width: 17px; -} -.openerp .oe-listview-content td.oe_list_checkbox:first-child:after, .openerp .oe-listview-content th.oe_list_checkbox:first-child:after { - border-width: 0; -} -.openerp .oe-listview-content td.oe-number { - text-align: right !important; -} .openerp .oe-listview-content .numeric { text-align: right; width: 82px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 1304f9b4850..0a1eb7c9d3d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1482,18 +1482,13 @@ $colour4: #8a89ba // ListView {{{ .oe-listview-content width: 100% - td, th - padding: 3px 6px - line-height: 18px - button - border: none - background: transparent - padding: 0 - @include box-shadow(none) - thead + > thead border-bottom: 2px solid #cacaca background: #eee vertical-align: top + td, th + padding: 3px 6px + line-height: 18px th:after content: "" float: right @@ -1522,29 +1517,37 @@ $colour4: #8a89ba // visibility: visible // @include box-shadow(none) // @include opacity(0.6) - tbody + > tbody cursor: pointer background: white - tr + > tr border-top: 1px solid #ddd - tr:nth-child(odd) + > td, > th + padding: 3px 6px + line-height: 18px + > button + border: none + background: transparent + padding: 0 + @include box-shadow(none) + > td.oe_list_checkbox:first-child, th.oe_list_checkbox:first-child + width: 17px + &:after + border-width: 0 + > td.oe-number + text-align: right !important + > tr:nth-child(odd) background-color: #f0f0fa @include vertical-gradient(#f0f0fa, #eeeef6) - tfoot + > tfoot border-top: 2px solid #cacaca border-bottom: 1px solid #cacaca background: #eee font-weight: bold - tbody tr:hover td, tbody tr:hover th + > tbody tr:hover td, tbody tr:hover th @include vertical-gradient(#eee, #dedede) - td.oe_list_checkbox:first-child, th.oe_list_checkbox:first-child - width: 17px - &:after - border-width: 0 - td.oe-number - text-align: right !important .numeric text-align: right width: 82px diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 6a14c0ef7f9..f169887cc54 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -98,7 +98,7 @@ instance.web.ViewEditor = instance.web.OldWidget.extend({ var view_widget = [{'name': 'view_name', 'string':'View Name', 'type': 'char', 'required': true, 'value' : this.model + '.custom_' + Math.round(Math.random() * 1000)}, {'name': 'view_type', 'string': 'View Type', 'type': 'selection', 'required': true, 'value': 'Form', 'selection': [['',''],['tree', 'Tree'],['form', 'Form'],['graph', 'Graph'],['calendar', 'Calender']]}, {'name': 'proirity', 'string': 'Priority', 'type': 'float', 'required': true, 'value':'16'}]; - this.create_view_dialog.$element.append('
'); + this.create_view_dialog.$element.append('
'); this.create_view_widget = []; _.each(view_widget, function(widget) { var type_widget = new (self.property.get_any([widget.type])) (self.create_view_dialog, widget); @@ -877,7 +877,7 @@ instance.web.ViewEditor = instance.web.OldWidget.extend({ 'fonts' : {'name':'fonts', 'string': 'fonts', 'type': 'char'}, }; var arch_val = self.get_object_by_id(this.one_object.clicked_tr_id,this.one_object['main_object'], []); - this.edit_node_dialog.$element.append('
'); + this.edit_node_dialog.$element.append('
'); this.edit_widget = []; self.ready = $.when(self.on_groups(properties)).then(function () { _PROPERTIES_ATTRIBUTES['groups']['selection'] = self.groups; @@ -963,7 +963,7 @@ instance.web.ViewEditor = instance.web.OldWidget.extend({ {text: _t("Cancel"), click: function() { self.add_node_dialog.close(); }} ] }).open(); - this.add_node_dialog.$element.append('
'); + this.add_node_dialog.$element.append('
'); var table_selector = self.add_node_dialog.$element.find('table[id=rec_table] tbody'); _.each(render_list, function(node) { type_widget = new (self.property.get_any([node.type])) (self.add_node_dialog, node); diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js index a03b02a916d..c918012e60d 100644 --- a/addons/web/static/src/js/view_list_editable.js +++ b/addons/web/static/src/js/view_list_editable.js @@ -204,7 +204,7 @@ openerp.web.list_editable = function (instance) { var $new_row = $('', { id: _.uniqueId('oe-editable-row-'), 'data-id': record_id, - 'class': row ? $(row).attr('class') : '' + ' oe_forms', + 'class': (row ? $(row).attr('class') : '') + ' oe_form', click: function (e) {e.stopPropagation();} }) .delegate('button.oe-edit-row-save', 'click', function () { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 48a2f0b3089..aa88e861819 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -125,7 +125,7 @@
  • Password
  • Back to Login
    • -
    + @@ -165,7 +165,7 @@
    CREATE DATABASE
    -
    + @@ -190,7 +190,7 @@
    DROP DATABASE
    -
    + @@ -216,7 +216,7 @@
    -
    + @@ -238,7 +238,7 @@
    RESTORE DATABASE
    -
    + @@ -374,7 +374,7 @@ - +
    CHANGE MASTER PASSWORD
    @@ -723,7 +723,7 @@ - +
    @@ -1040,7 +1040,7 @@ -
    +
    @@ -1314,7 +1314,7 @@ -
    +

    Select Dashboard to add this filter to: