From b948ab595592e4a43f684a49dc681a755f8c8673 Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 26 Sep 2014 12:29:07 +0200 Subject: some more work on photos - work in progress --- view/css/bootstrap-red.css | 39 +++++++++++++--------------- view/css/widgets.css | 1 - view/theme/redbasic/css/style.css | 53 +++++++++++++++++---------------------- view/tpl/photo_albums.tpl | 27 ++++++++++---------- view/tpl/photos_recent.tpl | 16 ++++++------ 5 files changed, 61 insertions(+), 75 deletions(-) (limited to 'view') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index a382a42b3..5a7b82f50 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -1,37 +1,27 @@ /* override some bootstrap settings */ -html { - font-size: 100%; +h1, h2 { + font-size: 1.583em; } -h1, -.h1 { - font-size: 24px; +h3, h4 { + font-size: 1.334em; } -h2, -.h2 { - font-size: 18px; +h5, h6 { + font-size: 0.75rem; } -h3, -.h3 { - font-size: 16px; +.wall-item-content h1, .wall-item-content h2 { + font-size: 1.319em; } -h4, -.h4 { - font-size: 14px; +.wall-item-title { + font-size: $font_size; } -h5, -.h5 { - font-size: 12px; -} - -h6, -.h6 { - font-size: 10px; +.wall-item-title h3, .wall-item-content h3, .wall-item-content h4 { + font-size: 1.112em; } /* nav overrides */ @@ -96,3 +86,8 @@ nav .navbar-collapse .navbar-right { code { white-space: normal; } + + +blockquote { + font-size: 1em; +} diff --git a/view/css/widgets.css b/view/css/widgets.css index 8bf5a9e97..bcd52cfee 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -9,7 +9,6 @@ .widget h3 { margin-left: -10px; margin-top: 0px; - margin-bottom: 10px; } /* suggest */ diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 4e662f1db..2cb2d917d 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -9,6 +9,7 @@ /* generals */ html { height: 100%; + font-size: 100%; } body { @@ -2206,10 +2207,6 @@ nav ul li { max-height: 50px } -nav .badge { - border-radius: $radiuspx; -} - nav .dropdown-menu { font-size: $body_font_size; border-top-right-radius: 0px; @@ -2251,32 +2248,8 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ } /* bootstrap overrides */ -blockquote { - font-size: 1em; -} - -h1, h2 { - font-size: 1.583em; -} - -h3, h4 { - font-size: 1.334em; -} - -h5, h6 { - font-size: 0.75rem; -} - -.wall-item-content h1, .wall-item-content h2 { - 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; +.badge { + border-radius: $radiuspx; } .dropdown-menu { @@ -2448,6 +2421,26 @@ h5, h6 { background-image: linear-gradient(to bottom, $advperm_gradientcol 0px, $advperm_bgcolour 100%); } +.section-title-wrapper { + padding: 7px 10px; + background-color: $item_colour; + border-radius: $radiuspx; + margin-bottom: 10px; +} + +.section-title-wrapper h3 { + margin-top: 0px; + margin-bottom: 0px; +} + +.section-title-submenu { + margin-top: 10px; +} + +.section-title-submenu a { + margin-right: 10px; +} + @media screen and (max-width: 767px) { aside#region_1 { background: rgba(0, 0, 0, .1); diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl index 7ff4a8cc0..27f156c68 100755 --- a/view/tpl/photo_albums.tpl +++ b/view/tpl/photo_albums.tpl @@ -1,15 +1,16 @@ diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index fce518cfe..b4094512c 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -1,13 +1,11 @@ -

{{$title}}

-{{if $can_post}} -{{$upload.0}} -{{/if}} - +
+

{{$title}}

+
-{{foreach $photos as $photo}} - {{include file="photo_top.tpl"}} -{{/foreach}} -
+ {{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} + {{/foreach}} +
-- cgit v1.2.3 From 574c4845b711c9ebf53efb2a0fe846f5aea46e87 Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 26 Sep 2014 12:34:22 +0200 Subject: move some css to the right place --- view/css/bootstrap-red.css | 12 ------------ view/css/conversation.css | 12 ++++++++++++ view/css/widgets.css | 1 + 3 files changed, 13 insertions(+), 12 deletions(-) (limited to 'view') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 5a7b82f50..0c004ee05 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -12,18 +12,6 @@ h5, h6 { font-size: 0.75rem; } -.wall-item-content h1, .wall-item-content h2 { - 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; -} - /* nav overrides */ nav .badge { diff --git a/view/css/conversation.css b/view/css/conversation.css index c7b381928..80b5de250 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -107,6 +107,18 @@ overflow: auto; } +.wall-item-content h1, .wall-item-content h2 { + 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; +} + .wall-item-content img { max-width: 95%; } diff --git a/view/css/widgets.css b/view/css/widgets.css index bcd52cfee..96b4c1d60 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -2,6 +2,7 @@ /* Easiest way to indent the widget body - indent the entire widget and then shift the header label back to the left */ .widget { + word-wrap: break-word; margin-bottom: 10px; padding: 10px 10px 10px 20px; } -- cgit v1.2.3 From f652fbdf74ca646679df52825a7604893eca13e5 Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 26 Sep 2014 19:17:02 +0200 Subject: fix blockquote --- view/css/bootstrap-red.css | 5 ----- view/theme/redbasic/css/style.css | 20 +++++++++++++------- view/theme/redbasic/php/style.php | 6 +++--- view/tpl/photo_albums.tpl | 2 +- 4 files changed, 17 insertions(+), 16 deletions(-) (limited to 'view') 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 @@ -- cgit v1.2.3 From 04e460c8f8915be3b7911bf0b9c9c0bcd8703e25 Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 26 Sep 2014 19:34:39 +0200 Subject: upload first but not inside another {{if}} --- view/tpl/photo_albums.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl index cc0890e26..5602f8571 100755 --- a/view/tpl/photo_albums.tpl +++ b/view/tpl/photo_albums.tpl @@ -1,10 +1,10 @@