From cd4afee17e77d5d5de8dc27f7dbe56be6d8fe7a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 11 Apr 2014 15:29:39 +0200 Subject: [CLEAN] website_forum: cleaning before merging - cleaned models - cleaned controllers: lots of cleaning, rewriting, simplfiication + updated in views - added an override of the contact widget, to be able to display partner-related stuff about karma and badges - some css tweaking - badges cleaning bzr revid: tde@openerp.com-20140411132939-bmvyc9bqpqpkk843 --- addons/website_forum/static/src/css/Makefile | 7 +++++-- addons/website_forum/static/src/css/website_forum.css | 15 ++++++--------- addons/website_forum/static/src/css/website_forum.sass | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'addons/website_forum/static/src/css') diff --git a/addons/website_forum/static/src/css/Makefile b/addons/website_forum/static/src/css/Makefile index 867a1fedb38..ceee4ae3f7a 100644 --- a/addons/website_forum/static/src/css/Makefile +++ b/addons/website_forum/static/src/css/Makefile @@ -1,2 +1,5 @@ -sass: - sass --compass --unix-newlines -t expanded website_forum.sass:website_forum.css +all: website_forum.css +%.css: %.sass + sass -t expanded --compass --unix-newlines $< $@ +watch: + sass -t expanded --compass --unix-newlines --watch .:. diff --git a/addons/website_forum/static/src/css/website_forum.css b/addons/website_forum/static/src/css/website_forum.css index 6548e8d01b1..e83242c1484 100644 --- a/addons/website_forum/static/src/css/website_forum.css +++ b/addons/website_forum/static/src/css/website_forum.css @@ -1,17 +1,16 @@ .box { padding-left: 8px; padding-right: 8px; + margin-left: 4px; + margin-right: 4px; border-radius: 4px; + min-width: 80px; } .box span { font-size: 200%; font-weight: bold; } -.question div.pull-left { - margin-right: 14px; - min-width: 80px; -} .question .question-name { font-size: 150%; } @@ -64,13 +63,11 @@ a.no-decoration { } .oe_comment_grey { - -moz-box-shadow: 0px 4px 6px 2px #eeeeee; - -webkit-box-shadow: 0px 4px 6px 2px #eeeeee; - box-shadow: 0px 4px 6px 2px #eeeeee; + color: whitesmoke; } -.forum_user_flag { - max-width: 25px; +.country_flag { + max-height: 16px; display: inline-block; margin-left: 2px; } diff --git a/addons/website_forum/static/src/css/website_forum.sass b/addons/website_forum/static/src/css/website_forum.sass index 555250bd6f3..d3c239b7dc4 100644 --- a/addons/website_forum/static/src/css/website_forum.sass +++ b/addons/website_forum/static/src/css/website_forum.sass @@ -1,15 +1,15 @@ .box padding-left: 8px padding-right: 8px + margin-left: 4px + margin-right: 4px border-radius: 4px + min-width: 80px span font-size: 200% font-weight: bold .question - div.pull-left - margin-right: 14px - min-width: 80px .question-name font-size: 150% @@ -52,8 +52,8 @@ a.no-decoration .oe_comment_grey color: #f5f5f5 -.forum_user_flag - max-width: 25px +.country_flag + max-height: 16px display: inline-block margin-left: 2px -- cgit v1.2.3