From 38605eefdd10591f22ec6e1145924755bd22fefa Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 27 Sep 2014 15:41:49 +0200 Subject: more css shifting --- view/css/bootstrap-red.css | 12 ------------ view/css/conversation.css | 4 ---- view/theme/redbasic/css/style.css | 17 +++++++++++++++++ 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index ba4cc08b0..21d6781f5 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -1,17 +1,5 @@ /* override some bootstrap settings */ -h1, h2 { - font-size: 1.583em; -} - -h3, h4 { - font-size: 1.334em; -} - -h5, h6 { - font-size: 0.75rem; -} - /* nav overrides */ nav .badge { diff --git a/view/css/conversation.css b/view/css/conversation.css index 80b5de250..7b0d87030 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -111,10 +111,6 @@ font-size: 1.319em; } -.wall-item-title { - font-size: $font_size; -} - .wall-item-title h3, .wall-item-content h3, .wall-item-content h4 { font-size: 1.112em; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c908b9fc8..8841260e3 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -23,6 +23,19 @@ body { margin: 0px; height: 100%; } + +h1, h2 { + font-size: 1.583em; +} + +h3, h4 { + font-size: 1.334em; +} + +h5, h6 { + font-size: 0.75rem; +} + .jslider { font-family: arial,freesans,sans-serif; } @@ -1966,6 +1979,10 @@ img.mail-list-sender-photo { /* conversation */ +.wall-item-title { + font-size: $font_size; +} + .hide-comments-outer, .thread-wrapper .wall-item-comment-wrapper, .wall-item-content-wrapper.comment { -- cgit v1.2.3