diff options
| author | marijus <mario@mariovavti.com> | 2014-09-26 19:17:02 +0200 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-09-26 19:17:02 +0200 |
| commit | f652fbdf74ca646679df52825a7604893eca13e5 (patch) | |
| tree | 7dc72da7701cf139a0e5233418ba58d8037d2465 /view | |
| parent | 94fcf5885ee6543140884143afaba9a06adac3f9 (diff) | |
| download | volse-hubzilla-f652fbdf74ca646679df52825a7604893eca13e5.tar.gz volse-hubzilla-f652fbdf74ca646679df52825a7604893eca13e5.tar.bz2 volse-hubzilla-f652fbdf74ca646679df52825a7604893eca13e5.zip | |
fix blockquote
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/bootstrap-red.css | 5 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 20 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 6 | ||||
| -rwxr-xr-x | view/tpl/photo_albums.tpl | 2 |
4 files changed, 17 insertions, 16 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 0c004ee05..ba4cc08b0 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -74,8 +74,3 @@ nav .navbar-collapse .navbar-right { code { white-space: normal; } - - -blockquote { - font-size: 1em; -} diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 2cb2d917d..c908b9fc8 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -115,13 +115,7 @@ pre { 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 { border: 1px solid #CCC; @@ -2248,6 +2242,18 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ } /* 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 { border-radius: $radiuspx; } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index d6d77e961..edf77cb0b 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -142,11 +142,11 @@ if(! $a->install) { if (! $widget_brdrcolour) $widget_brdrcolour = "rgba(238,238,238,0.8)"; if (! $blockquote_colour) - $blockquote_colour = "#000"; + $blockquote_colour = "#4d4d4d"; if (! $blockquote_bgcolour) - $blockquote_bgcolour = "#f4f8f9"; + $blockquote_bgcolour = ""; if (! $blockquote_bordercolour) - $blockquote_bordercolour = "#dae4ee"; + $blockquote_bordercolour = "#ccc"; if (! $code_borderc) $code_borderc = "#444"; if (! $code_bgcolour) diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl index 27f156c68..cbb07cac3 100755 --- a/view/tpl/photo_albums.tpl +++ b/view/tpl/photo_albums.tpl @@ -1,5 +1,5 @@ <div id="side-bar-photos-albums" class="widget"> - <h3><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$title}}</a></h3> + <h3>{{$title}}</h3> {{if $albums}} <ul class="nav nav-pills nav-stacked"> {{foreach $albums as $al}} |