fix blockquote

This commit is contained in:
marijus 2014-09-26 19:17:02 +02:00
parent 94fcf5885e
commit f652fbdf74
4 changed files with 17 additions and 16 deletions

View File

@ -74,8 +74,3 @@ nav .navbar-collapse .navbar-right {
code { code {
white-space: normal; white-space: normal;
} }
blockquote {
font-size: 1em;
}

View File

@ -115,13 +115,7 @@ pre {
border:1px solid $pre_borderc; border:1px solid $pre_borderc;
} }
blockquote {
background-color: $blockquote_bgcolour;
border-left: 4px solid $blockquote_bordercolour;
padding: 0.4em;
color: $blockquote_colour;
margin-left: 20px;
}
.ccollapse-wrapper { .ccollapse-wrapper {
border: 1px solid #CCC; border: 1px solid #CCC;
@ -2248,6 +2242,18 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
} }
/* bootstrap overrides */ /* bootstrap overrides */
blockquote {
font-size: $font_size;
font-style: italic;
background-color: $blockquote_bgcolour;
border-left: 3px solid $blockquote_bordercolour;
padding: 0.4em;
color: $blockquote_colour;
margin: 0px 0px 0px 20px;
}
.badge { .badge {
border-radius: $radiuspx; border-radius: $radiuspx;
} }

View File

@ -142,11 +142,11 @@ if(! $a->install) {
if (! $widget_brdrcolour) if (! $widget_brdrcolour)
$widget_brdrcolour = "rgba(238,238,238,0.8)"; $widget_brdrcolour = "rgba(238,238,238,0.8)";
if (! $blockquote_colour) if (! $blockquote_colour)
$blockquote_colour = "#000"; $blockquote_colour = "#4d4d4d";
if (! $blockquote_bgcolour) if (! $blockquote_bgcolour)
$blockquote_bgcolour = "#f4f8f9"; $blockquote_bgcolour = "";
if (! $blockquote_bordercolour) if (! $blockquote_bordercolour)
$blockquote_bordercolour = "#dae4ee"; $blockquote_bordercolour = "#ccc";
if (! $code_borderc) if (! $code_borderc)
$code_borderc = "#444"; $code_borderc = "#444";
if (! $code_bgcolour) if (! $code_bgcolour)

View File

@ -1,5 +1,5 @@
<div id="side-bar-photos-albums" class="widget"> <div id="side-bar-photos-albums" class="widget">
<h3><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$title}}</a></h3> <h3>{{$title}}</h3>
{{if $albums}} {{if $albums}}
<ul class="nav nav-pills nav-stacked"> <ul class="nav nav-pills nav-stacked">
{{foreach $albums as $al}} {{foreach $albums as $al}}