From 4e8c4781db904b175d46e80fca30f15a7d3f54e0 Mon Sep 17 00:00:00 2001 From: Victor Dubiniuk Date: Thu, 14 Nov 2013 00:01:08 +0300 Subject: [PATCH] Do not reset styles with dojo --- css/3rdparty/webodf/dojo-app.css | 2 +- css/style.css | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/css/3rdparty/webodf/dojo-app.css b/css/3rdparty/webodf/dojo-app.css index a30426bf..ee1c0f30 100644 --- a/css/3rdparty/webodf/dojo-app.css +++ b/css/3rdparty/webodf/dojo-app.css @@ -6,7 +6,7 @@ * It is highly, highly recommended that you develop your CSS using Stylus: http://learnboost.github.com/stylus/. */ -@import '../../../js/3rdparty/resources/dojo/resources/dojo.css'; +/* @import '../../../js/3rdparty/resources/dojo/resources/dojo.css'; */ @import '../../../js/3rdparty/resources/dijit/themes/claro/claro.css'; @import '../../../js/3rdparty/resources/dojox/layout/resources/ExpandoPane.css'; @import '../../../js/3rdparty/resources/dojox/widget/ColorPicker/ColorPicker.css'; diff --git a/css/style.css b/css/style.css index c9c73b1d..f72224e2 100755 --- a/css/style.css +++ b/css/style.css @@ -239,3 +239,9 @@ editinfo > div.editInfoMarker { editinfo > div.editInfoMarker:hover { } + +/* part of dojo.css */ +.dojoTabular {border-collapse: collapse; border-spacing: 0; border: 1px solid #ccc; margin: 0 1.5em;} +.dojoTabular th {text-align: center; font-weight: bold;} +.dojoTabular thead,.dojoTabular tfoot {background-color: #efefef; border: 1px solid #ccc; border-width: 1px 0;} +.dojoTabular th,.dojoTabular td {padding: 0.25em 0.5em;} \ No newline at end of file