From 881b1ed7cc4396ded4937975be110d1ac59b0fa0 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 13 Sep 2012 12:03:54 +0530 Subject: [PATCH] [REM]remove css to solve confilct bzr revid: vme@tinyerp.com-20120913063354-qtswgf0h9v29hvcl --- addons/board/static/src/css/dashboard.css | 33 ---------------------- addons/board/static/src/css/dashboard.sass | 25 ---------------- 2 files changed, 58 deletions(-) diff --git a/addons/board/static/src/css/dashboard.css b/addons/board/static/src/css/dashboard.css index d4a1e322780..38e224daf42 100644 --- a/addons/board/static/src/css/dashboard.css +++ b/addons/board/static/src/css/dashboard.css @@ -1,36 +1,3 @@ -.openerp .oe_dashboard_layout_1 .oe_dashboard_column.index_0 { - width: 100%; -} -.openerp .oe_dashboard_layout_1 .oe_dashboard_column.index_1, .openerp .oe_dashboard_layout_1 .oe_dashboard_column.index_2 { - display: none; -} -.openerp .oe_dashboard_layout_1-1 .oe_dashboard_column { - width: 50%; -} -.openerp .oe_dashboard_layout_1-1 .oe_dashboard_column.index_2 { - display: none; -} -.openerp .oe_dashboard_layout_1-1-1 .oe_dashboard_column { - width: 33%; -} -.openerp .oe_dashboard_layout_2-1 .oe_dashboard_column.index_0 { - width: 70%; -} -.openerp .oe_dashboard_layout_2-1 .oe_dashboard_column.index_1 { - width: 30%; -} -.openerp .oe_dashboard_layout_2-1 .oe_dashboard_column.index_2 { - display: none; -} -.openerp .oe_dashboard_layout_1-2 .oe_dashboard_column.index_0 { - width: 30%; -} -.openerp .oe_dashboard_layout_1-2 .oe_dashboard_column.index_1 { - width: 70%; -} -.openerp .oe_dashboard_layout_1-2 .oe_dashboard_column.index_2 { - display: none; -} .openerp .oe_dashboard_links { text-align: right; margin: 0 4px 6px 0; diff --git a/addons/board/static/src/css/dashboard.sass b/addons/board/static/src/css/dashboard.sass index b5ef5cde934..6c8d24a4d37 100644 --- a/addons/board/static/src/css/dashboard.sass +++ b/addons/board/static/src/css/dashboard.sass @@ -9,31 +9,6 @@ box-shadow: $bsval .openerp - .oe_dashboard_layout_1 .oe_dashboard_column - &.index_0 - width: 100% - &.index_1, &.index_2 - display: none - .oe_dashboard_layout_1-1 .oe_dashboard_column - width: 50% - &.index_2 - display: none - .oe_dashboard_layout_1-1-1 .oe_dashboard_column - width: 33% - .oe_dashboard_layout_2-1 .oe_dashboard_column - &.index_0 - width: 70% - &.index_1 - width: 30% - &.index_2 - display: none - .oe_dashboard_layout_1-2 .oe_dashboard_column - &.index_0 - width: 30% - &.index_1 - width: 70% - &.index_2 - display: none .oe_dashboard_links text-align: right margin: 0 4px 6px 0