From 4ba2f5dbd97d221c082e6d1eebd3e29d70c707d2 Mon Sep 17 00:00:00 2001 From: Athou Date: Sun, 2 Jun 2013 19:44:25 +0200 Subject: [PATCH] moving some code around --- src/main/java/com/commafeed/backend/feeds/FeedUtils.java | 8 ++++---- src/main/webapp/sass/components/_entry-list.scss | 7 ++++++- .../webapp/vendor/bootstrap/bootstrap.no-icons.min.css | 1 - 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/commafeed/backend/feeds/FeedUtils.java b/src/main/java/com/commafeed/backend/feeds/FeedUtils.java index fb7ac8a4..5cff969d 100644 --- a/src/main/java/com/commafeed/backend/feeds/FeedUtils.java +++ b/src/main/java/com/commafeed/backend/feeds/FeedUtils.java @@ -65,10 +65,10 @@ public class FeedUtils { "sub", "sup", "table", "tbody", "td", "tfoot", "th", "thead", "tr", "u", "ul"); - whitelist.addAttributes("div", "dir"); - whitelist.addAttributes("pre", "dir"); - whitelist.addAttributes("code", "dir"); - whitelist.addAttributes("table", "dir"); + whitelist.addAttributes("div", "dir"); + whitelist.addAttributes("pre", "dir"); + whitelist.addAttributes("code", "dir"); + whitelist.addAttributes("table", "dir"); whitelist.addAttributes("a", "href", "title"); whitelist.addAttributes("blockquote", "cite"); whitelist.addAttributes("col", "span", "width"); diff --git a/src/main/webapp/sass/components/_entry-list.scss b/src/main/webapp/sass/components/_entry-list.scss index 57ddc892..0aaa14c6 100644 --- a/src/main/webapp/sass/components/_entry-list.scss +++ b/src/main/webapp/sass/components/_entry-list.scss @@ -15,10 +15,15 @@ padding-left: 25px; } -.rtl .entry-header, .rtl .entry-body-content, .rtl.entry-name { +.rtl .entry-header,.rtl .entry-body-content,.rtl.entry-name { direction: rtl; } +.rtl ul,.rtl ol { + padding: 0; + margin: 0 25px 10px 0px; +} + #feed-accordion .entry { border-bottom: 1px solid #CCCCCC; } diff --git a/src/main/webapp/vendor/bootstrap/bootstrap.no-icons.min.css b/src/main/webapp/vendor/bootstrap/bootstrap.no-icons.min.css index cd945bb3..2193839c 100644 --- a/src/main/webapp/vendor/bootstrap/bootstrap.no-icons.min.css +++ b/src/main/webapp/vendor/bootstrap/bootstrap.no-icons.min.css @@ -144,7 +144,6 @@ h3 small{font-size:14px;} h4 small{font-size:14px;} .page-header{padding-bottom:9px;margin:20px 0 30px;border-bottom:1px solid #eeeeee;} ul,ol{padding:0;margin:0 0 10px 25px;} -.rtl ul, .rtl ol{padding:0;margin:0 25px 10px 0px;} ul ul,ul ol,ol ol,ol ul{margin-bottom:0;} li{line-height:20px;} ul.unstyled,ol.unstyled{margin-left:0;list-style:none;}