diff options
| -rw-r--r-- | view/css/bootstrap-red.css | 2 | ||||
| -rw-r--r-- | view/css/conversation.css | 25 | ||||
| -rw-r--r-- | view/css/mod_help.css | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 60 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 90 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 19 |
6 files changed, 65 insertions, 135 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 4f855ce39..5aa836434 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -11,7 +11,7 @@ nav .badge { } .nav-item.nav-item-hack { - height: 1.9rem; + height: 2.3rem; } #navbar-collapse-1 i { diff --git a/view/css/conversation.css b/view/css/conversation.css index aec457302..b923e3627 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -98,15 +98,7 @@ /* conv_item */ .wall-item-head { - padding: 10px 10px 0.5em 10px; -} - -.wall-item-content { - padding: 0.5em 10px; -} - -.wall-item-tools { - padding: 0.5em 10px 10px 10px; + line-height: 1.2; } .wall-item-info { @@ -138,6 +130,7 @@ a.wall-item-name-link { } .wall-item-ago .fa-check { + font-size: 0.75rem; cursor: pointer; } @@ -145,17 +138,6 @@ a.wall-item-name-link { overflow: hidden; } -.wall-item-content h1, -.wall-item-content h2 { - font-size: 1.319em; -} - -.wall-item-title h3, -.wall-item-content h3, -.wall-item-content h4 { - font-size: 1.112em; -} - .wall-item-content img { max-width: 100%; } @@ -163,9 +145,6 @@ a.wall-item-name-link { .wall-item-title h3 { font-weight: bold; margin: 0px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; } .wall-item-title-end { diff --git a/view/css/mod_help.css b/view/css/mod_help.css index 20e91c39b..c0b0bafa3 100644 --- a/view/css/mod_help.css +++ b/view/css/mod_help.css @@ -11,10 +11,6 @@ padding-bottom: 0.3em; } -#doco-content h4 { - font-weight: bold; -} - #region_1 .widget ul ul { list-style-type: none; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 33dcfedc9..dd6046570 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -54,27 +54,27 @@ main { } h1, .h1 { - font-size: 1.75em; + font-size: 2rem; } h2, .h2 { - font-size: 1.5rem; + font-size: 1.6rem; } h3, .h3 { - font-size: 1.25rem; + font-size: 1.2rem; } h4, .h4 { - font-size: 1rem; + font-size: 1.05rem; } h5, .h5 { - font-size: 0.75rem; + font-size: 0.9rem; } h6, .h6 { - font-size: 0.5rem; + font-size: 0.75rem; } @@ -347,7 +347,7 @@ footer { .fn { font-weight: bold; - font-size: 16px; + font-size: $font_size; color: #444444; } @@ -1333,10 +1333,6 @@ img.mail-conv-sender-photo { border-top-left-radius: $radiuspx; } -.wall-item-title { - font-size: $font_size; -} - .wall-item-footer { font-size: $body_font_size; margin-top: 2em; @@ -1407,14 +1403,8 @@ img.mail-conv-sender-photo { .wall-item-ago, .dropdown-sub-text { color: #777; - font-size: 0.833em; } -.wall-item-ago i { - font-size: 0.833em; -} - - .wall-item-content, .mail-conv-body, .page-body, @@ -1541,24 +1531,6 @@ nav img { border-radius: $radiuspx; } -/* -nav .dropdown-menu { - font-size: $body_font_size; - border-top-right-radius: 0px; - border-top-left-radius: 0px; - border-bottom-right-radius: $radiuspx; - border-bottom-left-radius: $radiuspx; -} - - -.dropdown-menu > .show > a, -.dropdown-menu > .show > a:focus, -.dropdown-menu > .show > a:hover { - color: #333; - background-color: #f5f5f5; -} -*/ - .dropdown-menu-img-sm { float: left; width: 36px; @@ -1847,14 +1819,6 @@ blockquote { font-size: $body_font_size; } -.btn-xs { - font-size: 0.75rem; -} - -.btn-default { - background-color: transparent; -} - @media screen and (max-width: 767px) { aside#region_1 { @@ -1875,16 +1839,6 @@ blockquote { border:1px; } - .wall-item-photo { - width: 48px !important; - height: 48px !important; - } - - .comment .wall-item-photo { - width: 32px !important; - height: 32px !important; - } - .acl-list-item { width: 98%; /* fallback if browser does not support calc() */ width: calc(100% - 10px); diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 43a973da1..6e8a43a47 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -10,33 +10,33 @@ if(! App::$install) { } // Load the owners pconfig - $nav_bg = get_pconfig($uid, "redbasic", "nav_bg"); - $nav_gradient_top = get_pconfig($uid, "redbasic", "nav_gradient_top"); - $nav_gradient_bottom = get_pconfig($uid, "redbasic", "nav_gradient_bottom"); - $nav_active_gradient_top = get_pconfig($uid, "redbasic", "nav_active_gradient_top"); - $nav_active_gradient_bottom = get_pconfig($uid, "redbasic", "nav_active_gradient_bottom"); - $nav_bd = get_pconfig($uid, "redbasic", "nav_bd"); - $nav_icon_colour = get_pconfig($uid, "redbasic", "nav_icon_colour"); - $nav_active_icon_colour = get_pconfig($uid, "redbasic", "nav_active_icon_colour"); + $nav_bg = get_pconfig($uid, 'redbasic', 'nav_bg'); + $nav_gradient_top = get_pconfig($uid, 'redbasic', 'nav_gradient_top'); + $nav_gradient_bottom = get_pconfig($uid, 'redbasic', 'nav_gradient_bottom'); + $nav_active_gradient_top = get_pconfig($uid, 'redbasic', 'nav_active_gradient_top'); + $nav_active_gradient_bottom = get_pconfig($uid, 'redbasic', 'nav_active_gradient_bottom'); + $nav_bd = get_pconfig($uid, 'redbasic', 'nav_bd'); + $nav_icon_colour = get_pconfig($uid, 'redbasic', 'nav_icon_colour'); + $nav_active_icon_colour = get_pconfig($uid, 'redbasic', 'nav_active_icon_colour'); $narrow_navbar = get_pconfig($uid,'redbasic','narrow_navbar'); $banner_colour = get_pconfig($uid,'redbasic','banner_colour'); - $link_colour = get_pconfig($uid, "redbasic", "link_colour"); + $link_colour = get_pconfig($uid, 'redbasic', 'link_colour'); $schema = get_pconfig($uid,'redbasic','schema'); - $bgcolour = get_pconfig($uid, "redbasic", "background_colour"); - $background_image = get_pconfig($uid, "redbasic", "background_image"); + $bgcolour = get_pconfig($uid, 'redbasic', 'background_colour'); + $background_image = get_pconfig($uid, 'redbasic', 'background_image'); $toolicon_colour = get_pconfig($uid,'redbasic','toolicon_colour'); $toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour'); - $item_colour = get_pconfig($uid, "redbasic", "item_colour"); - $comment_item_colour = get_pconfig($uid, "redbasic", "comment_item_colour"); - $comment_border_colour = get_pconfig($uid, "redbasic", "comment_border_colour"); - $comment_indent = get_pconfig($uid, "redbasic", "comment_indent"); - $body_font_size = get_pconfig($uid, "redbasic", "body_font_size"); - $font_size = get_pconfig($uid, "redbasic", "font_size"); - $font_colour = get_pconfig($uid, "redbasic", "font_colour"); - $radius = get_pconfig($uid, "redbasic", "radius"); - $shadow = get_pconfig($uid,"redbasic","photo_shadow"); - $converse_width=get_pconfig($uid,"redbasic","converse_width"); - $align_left=get_pconfig($uid,"redbasic","align_left"); + $item_colour = get_pconfig($uid, 'redbasic', 'item_colour'); + $comment_item_colour = get_pconfig($uid, 'redbasic', 'comment_item_colour'); + $comment_border_colour = get_pconfig($uid, 'redbasic', 'comment_border_colour'); + $comment_indent = get_pconfig($uid, 'redbasic', 'comment_indent'); + $body_font_size = get_pconfig($uid, 'redbasic', 'body_font_size'); + $font_size = get_pconfig($uid, 'redbasic', 'font_size'); + $font_colour = get_pconfig($uid, 'redbasic', 'font_colour'); + $radius = get_pconfig($uid, 'redbasic', 'radius'); + $shadow = get_pconfig($uid,'redbasic','photo_shadow'); + $converse_width=get_pconfig($uid,'redbasic','converse_width'); + $align_left=get_pconfig($uid,'redbasic','align_left'); $nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity'); $top_photo=get_pconfig($uid,'redbasic','top_photo'); $reply_photo=get_pconfig($uid,'redbasic','reply_photo'); @@ -86,59 +86,59 @@ if (! $schema) { //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting //individually. If we don't, we'll have problems if a user has set one, but not all options. if (! $nav_bg) - $nav_bg = "#222"; + $nav_bg = '#222'; if (! $nav_gradient_top) - $nav_gradient_top = "#3c3c3c"; + $nav_gradient_top = '#3c3c3c'; if (! $nav_gradient_bottom) - $nav_gradient_bottom = "#222"; + $nav_gradient_bottom = '#222'; if (! $nav_active_gradient_top) - $nav_active_gradient_top = "#222"; + $nav_active_gradient_top = '#222'; if (! $nav_active_gradient_bottom) - $nav_active_gradient_bottom = "#282828"; + $nav_active_gradient_bottom = '#282828'; if (! $nav_bd) - $nav_bd = "#222"; + $nav_bd = '#222'; if (! $nav_icon_colour) - $nav_icon_colour = "#999"; + $nav_icon_colour = '#999'; if (! $nav_active_icon_colour) - $nav_active_icon_colour = "#fff"; + $nav_active_icon_colour = '#fff'; if (! $link_colour) - $link_colour = "#0275d8"; + $link_colour = '#0275d8'; if (! $banner_colour) - $banner_colour = "#fff"; + $banner_colour = '#fff'; if (! $bgcolour) - $bgcolour = "rgb(254,254,254)"; + $bgcolour = 'rgb(254,254,254)'; if (! $background_image) $background_image =''; if (! $item_colour) - $item_colour = "rgb(238,238,238)"; + $item_colour = 'rgb(238,238,238)'; if (! $comment_item_colour) - $comment_item_colour = "rgb(255,255,255)"; + $comment_item_colour = 'rgb(255,255,255)'; if (! $comment_border_colour) - $comment_border_colour = "rgb(255,255,255)"; + $comment_border_colour = 'rgb(255,255,255)'; if (! $toolicon_colour) $toolicon_colour = '#777'; if (! $toolicon_activecolour) $toolicon_activecolour = '#000'; if (! $item_opacity) - $item_opacity = "1"; + $item_opacity = '1'; if (! $font_size) - $font_size = "1rem"; + $font_size = '1rem'; if (! $body_font_size) - $body_font_size = "0.75rem"; + $body_font_size = '0.9rem'; if (! $font_colour) - $font_colour = "#4d4d4d"; + $font_colour = '#4d4d4d'; if (! $radius) - $radius = "4"; + $radius = '4'; if (! $shadow) - $shadow = "0"; + $shadow = '0'; if (! $converse_width) - $converse_width = "790"; + $converse_width = '790'; if(! $top_photo) - $top_photo = '48px'; + $top_photo = '2.2rem'; if(! $comment_indent) $comment_indent = '0px'; if(! $reply_photo) - $reply_photo = '32px'; + $reply_photo = '2.2rem'; if($nav_min_opacity === false || $nav_min_opacity === '') { $nav_float_min_opacity = 1.0; $nav_percent_min_opacity = 100; diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index dde24997d..79317f146 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -18,18 +18,19 @@ {{$item.event}} </div> {{/if}} - <div class="wall-item-head"> + {{if $item.title}} + <div class="p-2 wall-item-title" id="wall-item-title-{{$item.id}}" title="{{$item.title}}"> + <h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3> + </div> + <hr class="my-0"> + {{/if}} + <div class="p-2 wall-item-head"> <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}"> <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a> </div> <div class="wall-item-photo-end" style="clear:both"></div> </div> - {{if $item.title}} - <div class="wall-item-title" id="wall-item-title-{{$item.id}}" title="{{$item.title}}"> - <h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3> - </div> - {{/if}} {{if $item.lock}} <div class="wall-item-lock dropdown"> <i class="fa fa-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul> @@ -45,7 +46,7 @@ </div> {{if $item.body}} - <div class="wall-item-content" id="wall-item-content-{{$item.id}}"> + <div class="p-2 wall-item-content" id="wall-item-content-{{$item.id}}"> <div class="wall-item-body e-content" id="wall-item-body-{{$item.id}}" > {{$item.body}} </div> @@ -53,7 +54,7 @@ </div> {{/if}} {{if $item.has_tags}} - <div class="wall-item-tools"> + <div class="p-2 wall-item-tools"> {{if $item.mentions}} <div class="body-tags" id="item-mentions"> <span class="tag">{{$item.mentions}}</span> @@ -77,7 +78,7 @@ <div class="clear"></div> </div> {{/if}} - <div class="wall-item-tools"> + <div class="p-2 wall-item-tools"> <div class="wall-item-tools-right pull-right"> {{if $item.toplevel && $item.emojis && $item.reactions}} <div class="btn-group dropdown"> |