From 39d56fd08f3ee2efc3d5eeddb75025034ee5e2c7 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 9 Mar 2017 10:17:57 +0100 Subject: initial commit for the bootstrap version 4 branch - upgrade lib and make nav.tpl kind of working again --- view/theme/redbasic/css/style.css | 55 +++++---------------------------------- 1 file changed, 7 insertions(+), 48 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c632dbc74..0b82202c7 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -570,34 +570,14 @@ footer { display: none; } -#nav-searchbar { - float: right; - margin-top: 2px; - margin-right: 10px; -} - #nav-search-spinner { float: left; margin: 25px 0px 0px 25px; color: $nav_active_icon_colour; } -#nav-search-text:hover, -#nav-search-text:focus { - background-color: #fff; - color: #000; -} - #nav-search-text { - font-size: 12px; - width: 200px; - height: 20px; - margin: 15px; - padding: 0px 5px 0px 5px; - border-radius: $radiuspx; - border-color: $nav_bd; - background-color: #eee; - transition: background-color 300ms ease 0s; + width: 250px; } #nav-search-text::-webkit-input-placeholder { @@ -1568,16 +1548,14 @@ nav .dropdown-menu { margin-right: 5px; } -#usermenu-caret { - color: $nav_icon_colour; -} - -.usermenu-head { - float: left; +.usermenu { + width: 32px; + height: 32px; } -.usermenu-head:hover #usermenu-caret { - color: $nav_active_icon_colour; +.usermenu img { + width: 100%; + height: 100%; } .page-title { @@ -1827,25 +1805,6 @@ nav .badge.mail-update { background-color: $nav_active_icon_colour; } -.navbar-toggle-extra { - color: $nav_active_icon_colour; - padding: 7px 10px; -} - -.navbar-toggle-extra-left { - float: left; - margin-left: 15px; - margin-right: 0px; - color: $nav_active_icon_colour; - padding: 7px 10px; -} - -a.navbar-toggle-extra:hover, -a.navbar-toggle-extra-left:hover { - color: $nav_active_icon_colour; - text-decoration: none; -} - .nav-tabs.nav-justified { background-color: rgba(254,254,254,.5); border-top-left-radius: 4px; -- cgit v1.2.3 From 14d1912115c40c3c905b9a077732c526e0a15ffd Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 9 Mar 2017 22:04:17 +0100 Subject: upgrade bs to latest git and some more progress --- view/theme/redbasic/css/style.css | 62 +++++++++++++++++++++------------------ view/theme/redbasic/php/style.php | 2 +- 2 files changed, 34 insertions(+), 30 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0b82202c7..7250ff961 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -54,28 +54,27 @@ main { } h1, .h1 { - font-size: 2em; + font-size: 1.75em; } h2, .h2 { - font-size: 1.667em; + font-size: 1.5rem; } h3, .h3 { - font-size: 1.334em; + font-size: 1.25rem; } h4, .h4 { - font-size: 1em; - font-weight: bold; + font-size: 1rem; } h5, .h5 { - font-size: 1em; + font-size: 0.75rem; } h6, .h6 { - font-size: 0.75em; + font-size: 0.5rem; } @@ -213,7 +212,7 @@ nav #banner #logo-text a:hover { text-decoration: none; } header #banner { z-index: 1040; - margin-top: 14px; + margin-top: 10px; text-align: center; text-shadow: 1px 1px 2px rgba(0,0,0,.5); font-size: 14px; @@ -576,10 +575,19 @@ footer { color: $nav_active_icon_colour; } +/* #nav-search-text { - width: 250px; + font-size: 12px; + width: 200px; + height: 20px; + margin-right: 15px; + padding: 0px 5px 0px 5px; + border-radius: $radiuspx; + border-color: $nav_bd; + background-color: #eee; + transition: background-color 300ms ease 0s; } - +*/ #nav-search-text::-webkit-input-placeholder { font-family: FontAwesome, sans-serif; } @@ -589,7 +597,7 @@ footer { } nav .acpopup { - top: 50px !important; + top: 46px !important; margin-left: -35px; width: 290px; } @@ -1400,11 +1408,13 @@ img.mail-conv-sender-photo { font-size: 0.833em; } + .wall-item-content, .mail-conv-body, .page-body, .chat-item-text, -.chat-item-text-self { +.chat-item-text-self, +#doco-content { font-size: $font_size; clear: both; } @@ -1520,6 +1530,7 @@ nav img { border-radius: $radiuspx; } +/* nav .dropdown-menu { font-size: $body_font_size; border-top-right-radius: 0px; @@ -1528,12 +1539,14 @@ nav .dropdown-menu { border-bottom-left-radius: $radiuspx; } -.dropdown-menu > .active > a, -.dropdown-menu > .active > a:focus, -.dropdown-menu > .active > a:hover { + +.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; @@ -1549,8 +1562,8 @@ nav .dropdown-menu { } .usermenu { - width: 32px; - height: 32px; + width: 2rem; + height: 2rem; } .usermenu img { @@ -1732,17 +1745,6 @@ blockquote { margin: 0px; } -.badge { - border-radius: $radiuspx; -} - -nav .badge.home-update, -nav .badge.notify-update, -nav .badge.intro-update, -nav .badge.mail-update { - background-color: #C9302C; -} - .dropdown-menu { font-size: $body_font_size; border-radius: $radiuspx; @@ -1752,6 +1754,7 @@ nav .badge.mail-update { border-radius: $radiuspx; } +/* .navbar-inverse { background-image: -webkit-linear-gradient(top, $nav_gradient_top 0%, $nav_gradient_bottom 100%); background-image: linear-gradient(to bottom, $nav_gradient_top 0%, $nav_gradient_bottom 100%); @@ -1760,6 +1763,7 @@ nav .badge.mail-update { border-color: $nav_bd; } + .navbar-inverse .navbar-collapse { border-color: $nav_bd; } @@ -1804,7 +1808,7 @@ nav .badge.mail-update { .navbar-inverse .navbar-toggle .icon-bar { background-color: $nav_active_icon_colour; } - +*/ .nav-tabs.nav-justified { background-color: rgba(254,254,254,.5); border-top-left-radius: 4px; diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 9b994ebdf..85b495792 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -122,7 +122,7 @@ if (! $toolicon_activecolour) if (! $item_opacity) $item_opacity = "1"; if (! $font_size) - $font_size = "0.9rem"; + $font_size = "1rem"; if (! $body_font_size) $body_font_size = "0.75rem"; if (! $font_colour) -- cgit v1.2.3 From 0f9ddbf3b2509ef4651a9b58d008330d6bc8cfd9 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 10 Mar 2017 17:02:55 +0100 Subject: fixing classes --- view/theme/redbasic/css/style.css | 26 +++++++++++++------------- view/theme/redbasic/php/style.php | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 7250ff961..33dcfedc9 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1169,9 +1169,15 @@ margin-right: 50px; } .generic-icons { - font-size: 1.2em; + font-size: 1rem; color: $toolicon_colour; - margin-right: 7px; + margin-right: 0.5rem; +} + +.generic-icons-right { + font-size: 1rem; + color: $toolicon_colour; + margin-left: 0.5rem; } .generic-icons:hover { @@ -1476,6 +1482,11 @@ img.mail-conv-sender-photo { color: $toolicon_colour; } +.widget .nav-item:hover { + background-color: #eee; + border-radius: $radiuspx; +} + #note-text { border: 1px solid #ccc; border-radius: $radiuspx; @@ -2063,17 +2074,6 @@ dl.bb-dl > dd > li { border-left: 3px solid #eee; } -.nav-pills-stacked-icons { - padding: 6px 10px; - float: right; - position: relative; - z-index:1; -} - -.nav-pills-stacked-icons:hover + a { - background-color: #eee; -} - .app-icon { font-size: 80px; color: $toolicon_colour; diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 85b495792..43a973da1 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -102,7 +102,7 @@ if (! $nav_icon_colour) if (! $nav_active_icon_colour) $nav_active_icon_colour = "#fff"; if (! $link_colour) - $link_colour = "#337AB7"; + $link_colour = "#0275d8"; if (! $banner_colour) $banner_colour = "#fff"; if (! $bgcolour) -- cgit v1.2.3 From 83d07b955185a6d64c7646a0467dd8ca479d4923 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 11 Mar 2017 15:07:30 +0100 Subject: font size and post title adjust --- view/theme/redbasic/css/style.css | 60 +++----------------------- view/theme/redbasic/php/style.php | 90 +++++++++++++++++++-------------------- 2 files changed, 52 insertions(+), 98 deletions(-) (limited to 'view/theme') 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; -- cgit v1.2.3 From 8aabc6bc3dfccb85f44b5db4708a756124277e1e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 12 Mar 2017 21:11:28 +0100 Subject: many dropdown and class fixes. still a long way to go... --- view/theme/redbasic/css/style.css | 35 ++++++++++++++++++++--------------- view/theme/redbasic/js/redbasic.js | 18 +++++++----------- 2 files changed, 27 insertions(+), 26 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index dd6046570..caebd04d5 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -918,9 +918,6 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { padding-top: 2px; font-weight: bold; line-height: 1em; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; display: block; } @@ -1314,9 +1311,10 @@ img.mail-conv-sender-photo { /* conversation */ -.nsfw-wrap { - text-align: center; - font-size: $body_font_size; + +.top-radius { + border-top-right-radius: $radiuspx; + border-top-left-radius: $radiuspx; } .wall-event-item { @@ -1532,10 +1530,10 @@ nav img { } .dropdown-menu-img-sm { - float: left; - width: 36px; - height: 36px; + width: 3em; + height: 3em; margin-right: 5px; + float: left; } .dropdown-menu-img-xs { @@ -1587,8 +1585,12 @@ nav img { text-overflow: ellipsis; } +.section-subtitle-wrapper h3 { + padding: 3px; +} + .section-subtitle-wrapper { - padding: 7px 10px; + padding: 4px 10px; background-color: $item_colour; border-bottom: 3px solid $comment_item_colour; } @@ -1708,6 +1710,10 @@ nav ul li .notify-unseen /* bootstrap overrides */ +.btn { + font-size: $body_font_size; +} + .panel { background-color: transparent; border: 0px solid transparent; @@ -1792,6 +1798,8 @@ blockquote { background-color: $nav_active_icon_colour; } */ + +/* .nav-tabs.nav-justified { background-color: rgba(254,254,254,.5); border-top-left-radius: 4px; @@ -1809,16 +1817,13 @@ blockquote { .nav-tabs > li.active > a:focus { background-color: transparent; } +*/ #tabs-collapse-1 { padding: 0px; margin-bottom: 25px; } -.btn { - font-size: $body_font_size; -} - @media screen and (max-width: 767px) { aside#region_1 { @@ -1995,7 +2000,7 @@ dl.bb-dl > dd > li { .field.checkbox > div > input:checked + label .onoffswitch-switch { right: 0px; - background-color: #337AB7; + background-color: #0275d8; } .help-searchlist { diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 81a95c68b..1ed5e520f 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -40,21 +40,17 @@ $(document).ready(function() { left_aside_height = $('#left_aside_wrapper').height(); } }); - - if($('#left_aside_wrapper').length && $('#left_aside_wrapper').html().length === 0) { - $('#expand-aside').hide(); - } - +/* $('#expand-tabs').click(function() { - if(!$('#tabs-collapse-1').hasClass('in')){ - $('html, body').animate({ scrollTop: 0 }, 'slow'); + if($('#tabs-collapse-1').hasClass('show')){ + $('#tabs-collapse-1').removeClass('show'); } $('#expand-tabs-icon').toggleClass('fa-arrow-circle-down').toggleClass('fa-arrow-circle-up'); }); - - $('.usermenu-head').click(function() { - if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('in')){ - $('#navbar-collapse-1, #navbar-collapse-2').removeClass('in'); +*/ + $('.usermenu').click(function() { + if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('show')){ + $('#navbar-collapse-1, #navbar-collapse-2').removeClass('show'); } }); -- cgit v1.2.3 From 700c05a55bab34c40f24fbe4f83a0fa9882559b2 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 13 Mar 2017 16:34:23 +0100 Subject: many class fixes and revive shiny class for item titles in a new way --- view/theme/redbasic/css/style.css | 9 +++------ view/theme/redbasic/js/redbasic.js | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index caebd04d5..fe41c2bdd 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1703,8 +1703,7 @@ main.fullscreen .section-content-wrapper-np { nav ul li .undefined, nav ul li .notify-seen, -nav ul li .notify-unseen - { +nav ul li .notify-unseen { max-height: 3rem; } @@ -1819,10 +1818,6 @@ blockquote { } */ -#tabs-collapse-1 { - padding: 0px; - margin-bottom: 25px; -} @media screen and (max-width: 767px) { @@ -2052,3 +2047,5 @@ dl.bb-dl > dd > li { #permcat-index { margin: 10px; } + +.shiny { background-color: red; } diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 1ed5e520f..4686e93db 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -18,7 +18,7 @@ $(document).ready(function() { if($(window).width() > 767) { $('#left_aside_wrapper').stick_in_parent({ - offset_top: $('nav').outerHeight(true), + offset_top: $('nav').outerHeight(true) + 10, parent: '#region_1', spacer: '#left_aside_spacer' }); @@ -105,7 +105,7 @@ function toggleAside() { $('main').addClass('region_1-on') $('
').appendTo('section'); $('#left_aside_wrapper').stick_in_parent({ - offset_top: $('nav').outerHeight(true) - 10, + offset_top: $('nav').outerHeight(true) + 10, parent: '#region_1', spacer: '#left_aside_spacer' }); -- cgit v1.2.3 From 7b9df1d40101cff801208b8dbcf8c8c0bc42365e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 14 Mar 2017 14:12:44 +0100 Subject: css fixes --- view/theme/redbasic/css/style.css | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index fe41c2bdd..498e816db 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -921,17 +921,14 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { display: block; } -.dropdown-sub-text { +.dropdown-notification { line-height: 1em; + font-size: 0.75rem; overflow: hidden; text-overflow: ellipsis; display: block; } -.notify-seen a { - background: #ddd; -} - #page-spinner { color: #777; margin: 24px; @@ -1470,11 +1467,6 @@ img.mail-conv-sender-photo { color: $toolicon_colour; } -.widget .nav-item:hover { - background-color: #eee; - border-radius: $radiuspx; -} - #note-text { border: 1px solid #ccc; border-radius: $radiuspx; @@ -1537,8 +1529,8 @@ nav img { } .dropdown-menu-img-xs { - height: 18px; - width: 18px; + height: 1em; + width: 1em; margin-right: 5px; } @@ -1701,12 +1693,9 @@ main.fullscreen .section-content-wrapper-np { background-color: $item_colour; } -nav ul li .undefined, -nav ul li .notify-seen, -nav ul li .notify-unseen { - max-height: 3rem; +.notify-seen { + background-color: $item_colour; } - /* bootstrap overrides */ .btn { -- cgit v1.2.3 From a0a376e95e78e4c1ac9fb5da30f46cea0b4d0de5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 14 Mar 2017 18:31:19 +0100 Subject: hide nav search behind a button, css fixes and cleanup --- view/theme/redbasic/css/style.css | 51 ++++++--------------------------------- 1 file changed, 8 insertions(+), 43 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 498e816db..0e9eab16a 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -108,34 +108,7 @@ a:focus, cursor: pointer; } -input[type="text"], -input[type="password"], -input[type="submit"], -input[type="file"], -select, -textarea { - font-family: sans-serif, arial, freesans; - font-size: $body_font_size; -} - -input { - padding: 5px; - line-height: 1.5; - border: 1px solid #ccc; - -moz-border-radius: $radiuspx; - border-radius: $radiuspx; -} - -input[type="submit"] { - background-color: #F0F0F0; - font-weight: bold; - color: #0080FF; - text-decoration: none; - padding: 6px 12px; -} - input, optgroup, select, textarea { - color: #333; resize: vertical; } @@ -570,24 +543,16 @@ footer { } #nav-search-spinner { - float: left; - margin: 25px 0px 0px 25px; - color: $nav_active_icon_colour; + float: right; + margin-top: -0.85rem; + margin-right: 1.1rem; } -/* + #nav-search-text { - font-size: 12px; - width: 200px; - height: 20px; - margin-right: 15px; - padding: 0px 5px 0px 5px; - border-radius: $radiuspx; - border-color: $nav_bd; - background-color: #eee; - transition: background-color 300ms ease 0s; + width: 280px; } -*/ + #nav-search-text::-webkit-input-placeholder { font-family: FontAwesome, sans-serif; } @@ -1535,8 +1500,8 @@ nav img { } .usermenu { - width: 2rem; - height: 2rem; + width: 2.2rem; + height: 2.2rem; } .usermenu img { -- cgit v1.2.3 From 3b2398ed015f1ada35b4098f6cc7f4431c65423d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 14 Mar 2017 18:59:27 +0100 Subject: css fixes --- view/theme/redbasic/css/style.css | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0e9eab16a..d81c8a75d 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -545,7 +545,7 @@ footer { #nav-search-spinner { float: right; margin-top: -0.85rem; - margin-right: 1.1rem; + margin-right: 1.6rem; } @@ -880,14 +880,12 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { } .contactname { - padding-top: 2px; font-weight: bold; - line-height: 1em; display: block; } .dropdown-notification { - line-height: 1em; + line-height: 1.1em; font-size: 0.75rem; overflow: hidden; text-overflow: ellipsis; @@ -1487,15 +1485,15 @@ nav img { } .dropdown-menu-img-sm { - width: 3em; - height: 3em; + width: 3.3em; + height: 3.3em; margin-right: 5px; float: left; } .dropdown-menu-img-xs { - height: 1em; - width: 1em; + height: 1.1em; + width: 1.1em; margin-right: 5px; } -- cgit v1.2.3 From aa33cacb62ef25cbab7c6ee1b253ed58072e6e44 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 15 Mar 2017 16:42:55 +0100 Subject: style hashtags, mentions and categories. hide expand-aside button if not needed. css and class fixes --- view/theme/redbasic/css/style.css | 5 ++--- view/theme/redbasic/js/redbasic.js | 7 +++++++ view/theme/redbasic/php/style.php | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index d81c8a75d..ba12bf3bd 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1292,7 +1292,7 @@ img.mail-conv-sender-photo { } .wall-item-footer { - font-size: $body_font_size; + font-size: 0.75rem; margin-top: 2em; } @@ -1367,8 +1367,7 @@ img.mail-conv-sender-photo { .mail-conv-body, .page-body, .chat-item-text, -.chat-item-text-self, -#doco-content { +.chat-item-text-self { font-size: $font_size; clear: both; } diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 4686e93db..45d80186d 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -16,6 +16,8 @@ $(document).ready(function() { } $('#css3-calc').remove(); // Remove the test element + + if($(window).width() > 767) { $('#left_aside_wrapper').stick_in_parent({ offset_top: $('nav').outerHeight(true) + 10, @@ -24,6 +26,11 @@ $(document).ready(function() { }); } + if($('#region_1 .widget').length > 0) + $('#expand-aside').show(); + else + $('#expand-aside').hide(); + $('#expand-aside').on('click', toggleAside); $('section').on('click', function() { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 6e8a43a47..08efcda4c 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -134,11 +134,11 @@ if (! $shadow) if (! $converse_width) $converse_width = '790'; if(! $top_photo) - $top_photo = '2.2rem'; + $top_photo = '2.3rem'; if(! $comment_indent) $comment_indent = '0px'; if(! $reply_photo) - $reply_photo = '2.2rem'; + $reply_photo = '2.3rem'; if($nav_min_opacity === false || $nav_min_opacity === '') { $nav_float_min_opacity = 1.0; $nav_percent_min_opacity = 100; -- cgit v1.2.3 From e7a5aa7b9cbe0ff9a3840500c4e7eebf6896dc93 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 15 Mar 2017 17:28:00 +0100 Subject: js fixes --- view/theme/redbasic/css/style.css | 2 +- view/theme/redbasic/js/redbasic.js | 17 +++-------------- 2 files changed, 4 insertions(+), 15 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index ba12bf3bd..bcf987b2b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1850,7 +1850,7 @@ dl.bb-dl > dd > li { font-weight: normal; font-style: normal; text-decoration: inherit; - content:"\f069"; + content:"\f069 "; } /* Modified original CSS to match input in Redbasic */ diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 45d80186d..07412151f 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -26,7 +26,7 @@ $(document).ready(function() { }); } - if($('#region_1 .widget').length > 0) + if(($(window).width() < 767) && ($('#left_aside_wrapper .widget').length > 0)) $('#expand-aside').show(); else $('#expand-aside').hide(); @@ -47,26 +47,15 @@ $(document).ready(function() { left_aside_height = $('#left_aside_wrapper').height(); } }); -/* - $('#expand-tabs').click(function() { - if($('#tabs-collapse-1').hasClass('show')){ - $('#tabs-collapse-1').removeClass('show'); - } - $('#expand-tabs-icon').toggleClass('fa-arrow-circle-down').toggleClass('fa-arrow-circle-up'); - }); -*/ + $('.usermenu').click(function() { if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('show')){ $('#navbar-collapse-1, #navbar-collapse-2').removeClass('show'); } }); - - if($('#tabs-collapse-1').length === 0) { - $('#expand-tabs').hide(); - } $("input[data-role=cat-tagsinput]").tagsinput({ - tagClass: 'label label-primary' + tagClass: 'badge badge-pill badge-warning' }); var doctitle = document.title; -- cgit v1.2.3 From d10525a375884850b1b643796b839747cbc623b2 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 17 Mar 2017 14:22:10 +0100 Subject: fix item_list and item_search templates. make item filer use a bootdtrap modal and some css and class fixes --- view/theme/redbasic/css/style.css | 75 ++++++--------------------------------- 1 file changed, 11 insertions(+), 64 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index bcf987b2b..f0b08a738 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -358,10 +358,6 @@ footer { filter:alpha(opacity=100); } -#view-contact-end { - clear: both; -} - #profile-photo-wrapper img { width: 100%; height: 100%; @@ -502,10 +498,6 @@ footer { height: 34px; } -#contact-block-end { - clear: both; -} - .contact-block-img { width:47px; height:47px; @@ -529,15 +521,9 @@ footer { } .wall-item-conv { - padding: 7px 10px; background-color: $comment_item_colour; } - -#conversation-end { - clear: both; -} - #nav-notifications-template { display: none; } @@ -622,11 +608,6 @@ nav .acpopup { text-align: center; } -.profile-match-break, -.profile-match-end { - clear: both; -} - .profile-match-connect { text-align: center; font-weight: bold; @@ -645,9 +626,6 @@ nav .acpopup { float: right; } -#profile-match-wrapper-end { - clear: both; -} .side-link { margin-bottom: 15px; } @@ -660,10 +638,6 @@ nav .acpopup { border: 1px solid #ddd; } -#group-members-end { - clear: both; -} - #group-separator { margin-top: 10px; margin-bottom: 10px; @@ -676,11 +650,6 @@ nav .acpopup { border: 1px solid #ddd; } -#group-all-contacts-end { - clear: both; - margin-bottom: 10px; -} - #group-edit-desc { margin-top: 15px; } @@ -694,10 +663,6 @@ nav .acpopup { border: 1px solid #ddd; } -#prof-members-end { - clear: both; -} - #prof-separator { margin-top: 10px; margin-bottom: 10px; @@ -710,11 +675,6 @@ nav .acpopup { border: 1px solid #ddd; } -#prof-all-contacts-end { - clear: both; - margin-bottom: 10px; -} - #prof-edit-desc { margin-top: 15px; } @@ -728,10 +688,6 @@ nav .acpopup { width: 80px; margin-right: 15px; } -.notification-listing-end { - clear: both; - margin-bottom: 15px; -} /** * OAuth @@ -789,13 +745,6 @@ div.jGrowl div.jGrowl-notification { min-height: 60px; } -#id_term_label { - width:75px; -} -#id_term { - width:100px; -} - #nav-search-text-ac .autocomplete { position: fixed; top: 51px; @@ -884,7 +833,8 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { display: block; } -.dropdown-notification { +.dropdown-notification, +.member-item { line-height: 1.1em; font-size: 0.75rem; overflow: hidden; @@ -897,10 +847,6 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { margin: 24px; } -.tabs-end { - clear: both; -} - .modal-header .contextual-help-tool { /* Mostly duplicating ".modal-header .close" and ".close" layout settings from bootstrap */ float: right; @@ -1335,11 +1281,6 @@ img.mail-conv-sender-photo { border-top: 0px solid $comment_item_colour; } -.wall-item-like, -.wall-item-dislike { - font-size: 11px; -} - .wall-item-photo { border: none; width: $top_photo !important; @@ -1369,7 +1310,6 @@ img.mail-conv-sender-photo { .chat-item-text, .chat-item-text-self { font-size: $font_size; - clear: both; } .item-tool { @@ -1483,14 +1423,21 @@ nav img { border-radius: $radiuspx; } -.dropdown-menu-img-sm { +.menu-img-3 { width: 3.3em; height: 3.3em; margin-right: 5px; float: left; } -.dropdown-menu-img-xs { +.menu-img-2 { + height: 2.2em; + width: 2.2em; + margin-right: 5px; + float: left; +} + +.menu-img-1 { height: 1.1em; width: 1.1em; margin-right: 5px; -- cgit v1.2.3 From 828028259c71e9454a4a5b25c88cc81672511d79 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 17 Mar 2017 20:48:06 +0100 Subject: css fixes --- view/theme/redbasic/css/style.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f0b08a738..3b0afb267 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1419,14 +1419,11 @@ img.mail-conv-sender-photo { /* nav bootstrap */ -nav img { - border-radius: $radiuspx; -} - .menu-img-3 { width: 3.3em; height: 3.3em; margin-right: 5px; + border-radius: $radiuspx; float: left; } @@ -1434,18 +1431,21 @@ nav img { height: 2.2em; width: 2.2em; margin-right: 5px; + border-radius: $radiuspx; float: left; } .menu-img-1 { - height: 1.1em; - width: 1.1em; + height: 1.5em; + width: 1.5em; margin-right: 5px; + border-radius: $radiuspx; } .usermenu { width: 2.2rem; height: 2.2rem; + border-radius: $radiuspx; } .usermenu img { -- cgit v1.2.3 From 92778066648b72b52787f428e1632a7eb99b14a5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 17 Mar 2017 21:42:27 +0100 Subject: fix usermenu radius --- view/theme/redbasic/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 3b0afb267..f7833a2bc 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1445,12 +1445,12 @@ img.mail-conv-sender-photo { .usermenu { width: 2.2rem; height: 2.2rem; - border-radius: $radiuspx; } .usermenu img { width: 100%; height: 100%; + border-radius: $radiuspx; } .page-title { -- cgit v1.2.3 From 2556d05602906bbace27c796de2f5b3cbacd4448 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 18 Mar 2017 17:28:46 +0100 Subject: bs4 fixes --- view/theme/redbasic/css/style.css | 231 ++++---------------------------------- 1 file changed, 22 insertions(+), 209 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f7833a2bc..e7d70d35c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -77,6 +77,11 @@ h6, .h6 { font-size: 0.75rem; } +#banner { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} .jslider { font-family: sans-serif, arial, freesans; @@ -109,6 +114,7 @@ a:focus, } input, optgroup, select, textarea { + color: $font_colour; resize: vertical; } @@ -145,8 +151,7 @@ pre { color: #FF0000; } -nav, -header { +nav { opacity: $nav_float_min_opacity; filter:alpha(opacity=$nav_percent_min_opacity); } @@ -172,49 +177,8 @@ header { padding: 10px; } -nav #banner #logo-text a { - font-size: 40px; - font-weight: bold; - margin-left: 3px; - color: #000000; - -} -nav #banner #logo-text a:hover { text-decoration: none; } - .nav-channel-select { margin-left: 8px; } -header #banner { - z-index: 1040; - margin-top: 10px; - text-align: center; - text-shadow: 1px 1px 2px rgba(0,0,0,.5); - font-size: 14px; - font-family: tahoma, "Lucida Sans", sans; - color: $banner_colour; - font-weight: bold; - whitespace: nowrap; -} - -header #banner a, -header #banner a:active, -header #banner a:visited, -header #banner a:link, -header #banner a:hover { - color: $banner_colour; - text-decoration: none; - outline: none; - vertical-align: bottom; -} - -header #banner #logo-img { - height: 22px; - margin-top: 5px; -} - -header #banner #logo-text { - font-size: 22px; -} - /* contextual help */ .contextual-help-content { display: none; @@ -244,18 +208,18 @@ header #banner #logo-text { .contextual-help-tool { padding: 7px; filter: alpha(opacity=20); - opacity: .2; + opacity: .5; } .contextual-help-tool:hover { filter: alpha(opacity=50); - opacity: .5; + opacity: 1; text-decoration: none; } .contextual-help-tool i { - color: #000; - font-size: 16px; + color: $font_colour; + font-size: 1.05rem; } /* contextual help end */ @@ -847,22 +811,6 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { margin: 24px; } -.modal-header .contextual-help-tool { - /* Mostly duplicating ".modal-header .close" and ".close" layout settings from bootstrap */ - float: right; - font-size: 21px; - padding: 0; - margin-top: -4px; - margin-right: 15px; - line-height: 1; -} - -#acl-search { - padding: 4px; - border: 1px solid #ccc; - width: 100%; -} - #acl-search::-webkit-input-placeholder { /* non-fontawesome fonts set a fallback for text parts of the placeholder*/ font-family: FontAwesome, sans-serif, arial, freesans; @@ -873,59 +821,17 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { font-family: FontAwesome, sans-serif, arial, freesans; } -#aclModal .modal-body { - padding-top: 10px; -} - -#acl-showlimited-description { - font-size: 90%; - color: #888; - margin-left: 10px; - margin-bottom: 4px; -} - -#acl-list { - border: 1px solid #ccc; - -webkit-border-radius: $radiuspx ; - -moz-border-radius: $radiuspx; - border-radius: $radiuspx; -} - -#acl-search-wrapper { - padding: 7px 10px; - background-color: $item_colour; - border-top-left-radius: $radiuspx; - border-top-right-radius: $radiuspx; - border-bottom: 1px solid #ccc; -} - -#acl-list-content-wrapper { - display: block; - overflow: auto; - clear: both; - min-height: 62px; - padding: 10px 10px 0px 0px; - -} - -#jotnets-wrapper, #jotnets-collapse { - margin-bottom: 18px; -} - -#jot-preview-content { - margin-top: 10px; -} .acl-list-item { - width: 48%; /* fallback if browser does not support calc() */ - width: calc(50% - 10px); + width: 100%; + padding: 0.5rem; + margin-bottom: 0.5rem; border: 1px solid #ccc; - margin: 0px 0px 10px 10px; - padding: 5px; float: left; - -webkit-border-radius: $radiuspx ; - -moz-border-radius: $radiuspx; border-radius: $radiuspx; - background-color: white; +} + +.acl-item-header { + width: 100%; } .acl-list-item.grouphide { @@ -936,62 +842,16 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { border: 1px solid green; } -.acl-list-item img { - width: 40px; - height: 40px; - float: left; - margin-right: 5px; - -webkit-border-radius: $radiuspx ; - -moz-border-radius: $radiuspx; - border-radius: $radiuspx; -} - .acl-list-item.taggable { background-color: #ddddff; } -.acl-list-item p { - font-size: $font_size; - margin: 0px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - .acl-button-show, .acl-button-hide { float: right; margin-left: 5px; } -#acl-showlimited-caption, -#acl-showall-caption { - font-size: 115%; -} - -#acl-radiowrapper-showall { - margin-top: 20px; - margin-bottom: 20px; -} -#acl-radiowrapper-showlimited { - margin-bottom: 0; -} - -#acl-showall + i { - font-size: 140%; -} - -#acl-info-icon, -#acl-info-icon:active { - font-size: 110%; - color: $link_colour; - text-decoration: none; -} - -#acl-showall-caption { - margin-left: 0.35em; -} - .contact-block-content { margin-top: 10px; } @@ -1208,7 +1068,7 @@ img.mail-conv-sender-photo { } .jot-icons { - color: $toolicon_colour; + //color: $toolicon_colour; } .jot-icons.jot-lock-warn { @@ -1321,11 +1181,6 @@ img.mail-conv-sender-photo { color: $toolicon_colour; } -.comment-icon { - font-size: 0.833em; - color: $toolicon_colour; -} - .comment-edit-text-empty, .comment-edit-text-full { border: 1px solid #ccc; @@ -1334,11 +1189,6 @@ img.mail-conv-sender-photo { .comment-edit-text-empty { color: gray; - font-size: 12px; -} - -.comment-edit-text-full { - color: black; } .divgrow-showmore { @@ -1447,9 +1297,9 @@ img.mail-conv-sender-photo { height: 2.2rem; } -.usermenu img { - width: 100%; - height: 100%; +#avatar { + width: 2.2rem; + height: 2.2rem; border-radius: $radiuspx; } @@ -1607,22 +1457,6 @@ main.fullscreen .section-content-wrapper-np { } /* bootstrap overrides */ -.btn { - font-size: $body_font_size; -} - -.panel { - background-color: transparent; - border: 0px solid transparent; - border-radius: 0px; - -webkit-box-shadow: 0 0px 0px rgba(0, 0, 0, .0); - box-shadow: 0 0px 0px rgba(0, 0, 0, .0); -} - -.panel-group .panel + .panel { - margin-top: 0px; -} - blockquote { font-size: $font_size; font-style: italic; @@ -1696,27 +1530,6 @@ blockquote { } */ -/* -.nav-tabs.nav-justified { - background-color: rgba(254,254,254,.5); - border-top-left-radius: 4px; - border-top-right-radius: 4px; -} - -.nav-tabs.nav-justified > .active > a, -.nav-tabs.nav-justified > .active > a:hover, -.nav-tabs.nav-justified > .active > a:focus { - border-bottom-color: transparent; -} - -.nav-tabs > li.active > a, -.nav-tabs > li.active > a:hover, -.nav-tabs > li.active > a:focus { - background-color: transparent; -} -*/ - - @media screen and (max-width: 767px) { aside#region_1 { -- cgit v1.2.3 From 82b35e27620e97eb01ab55fe97b55c9ec8e05b81 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 18 Mar 2017 20:00:32 +0100 Subject: fix abook_edit and private mail --- view/theme/redbasic/css/style.css | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e7d70d35c..5e579a213 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -952,11 +952,6 @@ margin-right: 50px; margin-right: 7px; } -nav .navbar-collapse.in .generic-icons, -nav .navbar-collapse.collapsing .generic-icons { - color: $nav_active_icon_colour; -} - .admin-icons { font-size: 1.2em; color: $toolicon_colour; @@ -1267,8 +1262,6 @@ img.mail-conv-sender-photo { border-radius: $radiuspx; } -/* nav bootstrap */ - .menu-img-3 { width: 3.3em; height: 3.3em; @@ -1557,13 +1550,6 @@ blockquote { } -/* release the navbar in landscape view on small devices */ -@media screen and (max-height: 320px) { - .navbar-fixed-top { - position: absolute; - } -} - .shareable_element_text { height: 300px; width: 300px; -- cgit v1.2.3 From 2bdf63d069954dcdcd211f519bdc7a1d8fee1295 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 18 Mar 2017 22:01:46 +0100 Subject: more abook_edit and some css --- view/theme/redbasic/css/style.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5e579a213..56047cdb4 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -795,6 +795,8 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { .contactname { font-weight: bold; display: block; + overflow: hidden; + text-overflow: ellipsis; } .dropdown-notification, -- cgit v1.2.3 From b2ad4e8c2a41fda822fb2c52d470aaddd4dd1102 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 18 Mar 2017 23:45:55 +0100 Subject: bs4 fixes --- view/theme/redbasic/css/style.css | 3 +-- view/theme/redbasic/js/redbasic.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 56047cdb4..cd5178688 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1288,8 +1288,7 @@ img.mail-conv-sender-photo { } .usermenu { - width: 2.2rem; - height: 2.2rem; + width: 3.5rem; } #avatar { diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 07412151f..b522f8dd1 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -26,7 +26,7 @@ $(document).ready(function() { }); } - if(($(window).width() < 767) && ($('#left_aside_wrapper .widget').length > 0)) + if(($(window).width() < 767) && ($('#left_aside_wrapper .widget, #left_aside_wrapper .vcard').length > 0)) $('#expand-aside').show(); else $('#expand-aside').hide(); -- cgit v1.2.3 From 2a25ddff3685502e22a7de8d30bb2c423c4d0ed1 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 19 Mar 2017 10:51:58 +0100 Subject: bs4 fixes --- view/theme/redbasic/css/style.css | 130 ++++++++++++++++++-------------------- view/theme/redbasic/php/style.php | 2 +- 2 files changed, 63 insertions(+), 69 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index cd5178688..decaf0d4e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -293,9 +293,9 @@ footer { padding: 0px 10px 10px 10px; background-color: rgba(254,254,254,0.5); border: 1px solid rgba(254,254,254,0.5); - -moz-border-radius: $radiuspx; - -webkit-border-radius: $radiuspx; - border-radius: $radiuspx; + -moz-border-radius: $radius; + -webkit-border-radius: $radius; + border-radius: $radius; word-wrap: break-word; } @@ -333,7 +333,7 @@ footer { width: 251px; height: 251px; margin-bottom: 10px; - border-radius: $radiuspx; + border-radius: $radius; } #hide-friends-yes-label, @@ -387,8 +387,8 @@ footer { .photo, .contact-block-img { - border-radius: $radiuspx; - -moz-border-radius: $radiuspx; + border-radius: $radius; + -moz-border-radius: $radius; box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; } @@ -402,8 +402,8 @@ footer { .profile-match-photo img, .directory-photo-img { - border-radius: $radiuspx; - -moz-border-radius: $radiuspx; + border-radius: $radius; + -moz-border-radius: $radius; box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; } @@ -549,7 +549,7 @@ nav .acpopup { #cboxContent { padding: 3px; border: 0px solid #fff; - border-radius: $radiuspx; + border-radius: $radius; background-color: #fff; z-index: 1052; } @@ -721,8 +721,8 @@ div.jGrowl div.jGrowl-notification { #id-name-ac .autocomplete, #contact-search-ac .autocomplete { margin-top: 2px; - margin-left: $radiuspx; - margin-right: $radiuspx; + margin-left: $radius; + margin-right: $radius; border: 1px solid #666; border-top: none; @@ -734,8 +734,8 @@ div.jGrowl div.jGrowl-notification { text-align: left; max-height: 350px; overflow: auto; - border-bottom-left-radius: $radiuspx; - border-bottom-right-radius: $radiuspx; + border-bottom-left-radius: $radius; + border-bottom-right-radius: $radius; } .autocomplete .selected { @@ -829,7 +829,7 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { margin-bottom: 0.5rem; border: 1px solid #ccc; float: left; - border-radius: $radiuspx; + border-radius: $radius; } .acl-item-header { @@ -867,7 +867,7 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { .reshared-content { margin-left: 20px; } .shared_header img { - border-radius: $radiuspx; + border-radius: $radius; margin-right: 10px; } @@ -1008,8 +1008,8 @@ th,td { /* mail */ img.mail-conv-sender-photo { - -moz-border-radius: $radiuspx; - border-radius: $radiuspx; + -moz-border-radius: $radius; + border-radius: $radius; } /* jot */ @@ -1026,25 +1026,23 @@ img.mail-conv-sender-photo { font-weight: bold; } - - #profile-jot-wrapper { background-color: rgba(254,254,254,1); border: 1px solid #ccc; - border-radius: $radiuspx; + border-radius: $radius; } #profile-jot-text { - border-radius: $radiuspx; + border-radius: $radius; } #profile-jot-text::-webkit-input-placeholder { - font-size: 16px; + font-size: 1.2rem; } #profile-jot-text::-moz-placeholder { - font-size: 16px; + font-size: 1.2rem; } #profile-jot-text:focus::-webkit-input-placeholder { @@ -1064,10 +1062,6 @@ img.mail-conv-sender-photo { color: #777; } -.jot-icons { - //color: $toolicon_colour; -} - .jot-icons.jot-lock-warn { color: darkorange; } @@ -1076,22 +1070,22 @@ img.mail-conv-sender-photo { /* conversation */ .top-radius { - border-top-right-radius: $radiuspx; - border-top-left-radius: $radiuspx; + border-top-right-radius: $radius; + border-top-left-radius: $radius; } .wall-event-item { padding: 10px; color: #fff; background-color: #3A87AD; /* should reflect calendar color */ - border-top-left-radius: $radiuspx; - border-top-right-radius: $radiuspx; + border-top-left-radius: $radius; + border-top-right-radius: $radius; } .wall-photo-item img { max-width: 100% !important; - border-top-right-radius: $radiuspx; - border-top-left-radius: $radiuspx; + border-top-right-radius: $radius; + border-top-left-radius: $radius; } .wall-item-footer { @@ -1101,8 +1095,8 @@ img.mail-conv-sender-photo { .wall-item-content-wrapper { background-color: $item_colour; - border-top-right-radius: $radiuspx; - border-top-left-radius: $radiuspx; + border-top-right-radius: $radius; + border-top-left-radius: $radius; } .wall-item-content-wrapper.comment { @@ -1129,8 +1123,8 @@ img.mail-conv-sender-photo { padding: 7px 10px; background-color: $item_colour; border-radius: 0px; - border-bottom-right-radius: $radiuspx; - border-bottom-left-radius: $radiuspx; + border-bottom-right-radius: $radius; + border-bottom-left-radius: $radius; border-top: 3px solid $comment_item_colour; } @@ -1151,8 +1145,8 @@ img.mail-conv-sender-photo { } .wall-item-photo { - border-radius: $radiuspx; - -moz-border-radius: $radiuspx; + border-radius: $radius; + -moz-border-radius: $radius; box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; } @@ -1181,7 +1175,7 @@ img.mail-conv-sender-photo { .comment-edit-text-empty, .comment-edit-text-full { border: 1px solid #ccc; - border-radius: $radiuspx; + border-radius: $radius; } .comment-edit-text-empty { @@ -1207,9 +1201,9 @@ img.mail-conv-sender-photo { .widget { background-color: rgba(254,254,254,.5); border: 1px solid rgba(254,254,254,.5); - -moz-border-radius: $radiuspx; - -webkit-border-radius: $radiuspx; - border-radius: $radiuspx; + -moz-border-radius: $radius; + -webkit-border-radius: $radius; + border-radius: $radius; } .widget h3 { @@ -1218,8 +1212,8 @@ img.mail-conv-sender-photo { #note-text { border: 1px solid #ccc; - border-radius: $radiuspx; - -moz-border-radius: $radiuspx; + border-radius: $radius; + -moz-border-radius: $radius; } .fileas-ul { @@ -1228,8 +1222,8 @@ img.mail-conv-sender-photo { #datebrowse-sidebar select { border: 1px solid #ccc; - border-radius: $radiuspx; - -moz-border-radius: $radiuspx; + border-radius: $radius; + -moz-border-radius: $radius; } .thing-show img { @@ -1251,24 +1245,24 @@ img.mail-conv-sender-photo { .chat-item-photo, .chat-item-photo-self { - border-radius: $radiuspx; + border-radius: $radius; } .chat-item-title, .chat-item-title-self { - border-radius: $radiuspx; + border-radius: $radius; background-color: $item_colour; } #chatMembers img { - border-radius: $radiuspx; + border-radius: $radius; } .menu-img-3 { width: 3.3em; height: 3.3em; margin-right: 5px; - border-radius: $radiuspx; + border-radius: $radius; float: left; } @@ -1276,7 +1270,7 @@ img.mail-conv-sender-photo { height: 2.2em; width: 2.2em; margin-right: 5px; - border-radius: $radiuspx; + border-radius: $radius; float: left; } @@ -1284,7 +1278,7 @@ img.mail-conv-sender-photo { height: 1.5em; width: 1.5em; margin-right: 5px; - border-radius: $radiuspx; + border-radius: $radius; } .usermenu { @@ -1294,7 +1288,7 @@ img.mail-conv-sender-photo { #avatar { width: 2.2rem; height: 2.2rem; - border-radius: $radiuspx; + border-radius: $radius; } .page-title { @@ -1304,20 +1298,20 @@ img.mail-conv-sender-photo { .generic-content-wrapper-styled { background-color: $bgcolour; padding: 10px; - border-radius: $radiuspx; + border-radius: $radius; } .generic-content-wrapper { border: 1px solid #ccc; box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.2); - border-radius: $radiuspx; + border-radius: $radius; } .section-title-wrapper { padding: 7px 10px; background-color: $item_colour; - border-top-left-radius: $radiuspx; - border-top-right-radius: $radiuspx; + border-top-left-radius: $radius; + border-top-right-radius: $radius; border-bottom: 3px solid $comment_item_colour; } @@ -1378,22 +1372,22 @@ img.mail-conv-sender-photo { .section-content-wrapper .section-content-danger-wrapper { margin-bottom: 10px; border-bottom: none; - border-radius: $radiuspx; + border-radius: $radius; } .section-content-wrapper { padding: 7px 10px; background-color: $comment_item_colour; - border-bottom-left-radius: $radiuspx; - border-bottom-right-radius: $radiuspx; + border-bottom-left-radius: $radius; + border-bottom-right-radius: $radius; word-wrap: break-word; } .section-content-wrapper-np { background-color: $comment_item_colour; - border-bottom-left-radius: $radiuspx; - border-bottom-right-radius: $radiuspx; + border-bottom-left-radius: $radius; + border-bottom-right-radius: $radius; word-wrap: break-word; } @@ -1461,11 +1455,11 @@ blockquote { .dropdown-menu { font-size: $body_font_size; - border-radius: $radiuspx; + border-radius: $radius; } .dropdown-menu img { - border-radius: $radiuspx; + border-radius: $radius; } /* @@ -1606,7 +1600,7 @@ dl.bb-dl > dd > li { margin-bottom: 0px; box-shadow: none; display: inline-block; - border-radius: $radiuspx; + border-radius: $radius; cursor: text; padding: 0px 10px; width: 100%; @@ -1716,8 +1710,8 @@ dl.bb-dl > dd > li { #ace-editor, #editor { - border-bottom-left-radius: $radiuspx; - border-bottom-right-radius: $radiuspx; + border-bottom-left-radius: $radius; + border-bottom-right-radius: $radius; } .sub-menu { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 08efcda4c..f4e6d8046 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -128,7 +128,7 @@ if (! $body_font_size) if (! $font_colour) $font_colour = '#4d4d4d'; if (! $radius) - $radius = '4'; + $radius = '0.25rem'; if (! $shadow) $shadow = '0'; if (! $converse_width) -- cgit v1.2.3 From 89b550735467a2b07bc69dbff4efbe3ebcaff08a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 19 Mar 2017 12:10:16 +0100 Subject: fix custom fontsize for app --- view/theme/redbasic/css/style.css | 16 ++++++++-------- view/theme/redbasic/php/config.php | 7 ++----- view/theme/redbasic/php/style.php | 4 ---- view/theme/redbasic/tpl/theme_settings.tpl | 3 +-- 4 files changed, 11 insertions(+), 19 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index decaf0d4e..4ab2fe036 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -8,12 +8,12 @@ /* generals */ html { - font-size: 100%; + font-size: $font_size; } body { font-family: sans-serif, arial, freesans; - font-size: $body_font_size; + font-size: 0.9rem; background-color: $bgcolour; background-image: url('$background_image'); background-attachment: fixed; @@ -284,7 +284,7 @@ footer { .fn { font-weight: bold; - font-size: $font_size; + font-size: 1rem; color: #444444; } @@ -751,7 +751,7 @@ div.jGrowl div.jGrowl-notification { .jslider .jslider-scale ins { color: #333; - font-size: $body_font_size; + font-size: 0.9rem; width: 100px; text-align: center; } @@ -1160,7 +1160,7 @@ img.mail-conv-sender-photo { .page-body, .chat-item-text, .chat-item-text-self { - font-size: $font_size; + font-size: 1rem; } .item-tool { @@ -1288,7 +1288,7 @@ img.mail-conv-sender-photo { #avatar { width: 2.2rem; height: 2.2rem; - border-radius: $radius; + border-radius: 50%; } .page-title { @@ -1446,7 +1446,7 @@ main.fullscreen .section-content-wrapper-np { /* bootstrap overrides */ blockquote { - font-size: $font_size; + font-size: 1rem; font-style: italic; border-left: 3px solid #ccc; padding: 1em 0px 1em 1.5em; @@ -1454,7 +1454,7 @@ blockquote { } .dropdown-menu { - font-size: $body_font_size; + font-size: 0.9rem; border-radius: $radius; } diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index b03e94e46..419dd20b2 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -46,7 +46,6 @@ class RedbasicConfig { $arr['toolicon_colour'] = get_pconfig(local_channel(),'redbasic','toolicon_colour'); $arr['toolicon_activecolour'] = get_pconfig(local_channel(),'redbasic','toolicon_activecolour'); $arr['font_size'] = get_pconfig(local_channel(),'redbasic', 'font_size' ); - $arr['body_font_size'] = get_pconfig(local_channel(),'redbasic', 'body_font_size' ); $arr['font_colour'] = get_pconfig(local_channel(),'redbasic', 'font_colour' ); $arr['radius'] = get_pconfig(local_channel(),'redbasic', 'radius' ); $arr['shadow'] = get_pconfig(local_channel(),'redbasic', 'photo_shadow' ); @@ -84,7 +83,6 @@ class RedbasicConfig { set_pconfig(local_channel(), 'redbasic', 'toolicon_colour', $_POST['redbasic_toolicon_colour']); set_pconfig(local_channel(), 'redbasic', 'toolicon_activecolour', $_POST['redbasic_toolicon_activecolour']); set_pconfig(local_channel(), 'redbasic', 'font_size', $_POST['redbasic_font_size']); - set_pconfig(local_channel(), 'redbasic', 'body_font_size', $_POST['redbasic_body_font_size']); set_pconfig(local_channel(), 'redbasic', 'font_colour', $_POST['redbasic_font_colour']); set_pconfig(local_channel(), 'redbasic', 'radius', $_POST['redbasic_radius']); set_pconfig(local_channel(), 'redbasic', 'photo_shadow', $_POST['redbasic_shadow']); @@ -127,10 +125,9 @@ class RedbasicConfig { '$comment_indent' => array('redbasic_comment_indent', t('Set the indent for comments'), $arr['comment_indent']), '$toolicon_colour' => array('redbasic_toolicon_colour',t('Set the basic color for item icons'),$arr['toolicon_colour']), '$toolicon_activecolour' => array('redbasic_toolicon_activecolour',t('Set the hover color for item icons'),$arr['toolicon_activecolour']), - '$body_font_size' => array('redbasic_body_font_size', t('Set font-size for the entire application'), $arr['body_font_size'], t('Example: 14px')), - '$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $arr['font_size']), + '$font_size' => array('redbasic_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Example: 14px')), '$font_colour' => array('redbasic_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']), - '$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius']), + '$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius'], t('Example: 4px')), '$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $arr['shadow']), '$converse_width' => array('redbasic_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')), '$align_left' => array('redbasic_align_left',t('Left align page content'),$arr['align_left'], '', array(t('No'),t('Yes'))), diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index f4e6d8046..6a993ac28 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -30,7 +30,6 @@ if(! App::$install) { $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'); @@ -123,8 +122,6 @@ if (! $item_opacity) $item_opacity = '1'; if (! $font_size) $font_size = '1rem'; -if (! $body_font_size) - $body_font_size = '0.9rem'; if (! $font_colour) $font_colour = '#4d4d4d'; if (! $radius) @@ -197,7 +194,6 @@ if(file_exists('view/theme/redbasic/css/style.css')) { '$toolicon_activecolour' => $toolicon_activecolour, '$font_size' => $font_size, '$font_colour' => $font_colour, - '$body_font_size' => $body_font_size, '$radius' => $radius, '$shadow' => $shadow, '$converse_width' => $converse_width, diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index 9672d3d05..3d748464c 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -1,6 +1,7 @@ {{include file="field_checkbox.tpl" field=$align_left}} {{include file="field_checkbox.tpl" field=$narrow_navbar}} {{include file="field_input.tpl" field=$converse_width}} +{{include file="field_input.tpl" field=$font_size}} {{if $expert}} {{include file="field_colorinput.tpl" field=$nav_bg}} {{include file="field_colorinput.tpl" field=$nav_gradient_top}} @@ -17,8 +18,6 @@ {{include file="field_colorinput.tpl" field=$comment_item_colour}} {{*include file="field_colorinput.tpl" field=$comment_border_colour*}} {{*include file="field_input.tpl" field=$comment_indent*}} - {{include file="field_input.tpl" field=$body_font_size}} - {{include file="field_input.tpl" field=$font_size}} {{include file="field_colorinput.tpl" field=$font_colour}} {{include file="field_colorinput.tpl" field=$link_colour}} {{include file="field_colorinput.tpl" field=$banner_colour}} -- cgit v1.2.3 From 57584ea4295df83f3dfd57d99917178ecf2e250f Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 19 Mar 2017 13:28:06 +0100 Subject: remove redundant css --- view/theme/redbasic/css/style.css | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 4ab2fe036..c98084e85 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -768,30 +768,10 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { text-decoration: none; } -.widget.rateme { - margin-top: 15px; - padding: 0; -} - .widget .conv-participants { color: $font_colour; } -.notif-item a { - color: #000; -} - -.notif-item a:hover { - text-decoration: underline; - color: #000; -} - -.notif-image { - width: 32px; - height: 32px; - padding: 7px 7px 0px 0px; -} - .contactname { font-weight: bold; display: block; -- cgit v1.2.3 From d78b64d5b330e6e1266dff04670b452dd07638ef Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 19 Mar 2017 14:00:59 +0100 Subject: fix narrow navbar setting and contextual-help position --- view/theme/redbasic/css/narrow_navbar.css | 62 +++++++------------------------ view/theme/redbasic/css/style.css | 2 +- 2 files changed, 15 insertions(+), 49 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css index 689b67168..33db6ce83 100644 --- a/view/theme/redbasic/css/narrow_navbar.css +++ b/view/theme/redbasic/css/narrow_navbar.css @@ -1,64 +1,30 @@ -@media screen and (min-width: 760px) { +@media screen and (min-width: 767px) { - aside { - padding-top: 52px; - } - - section { - padding-top: 52px; - } - - .navbar-nav > li > a { - padding-top:7px !important; - padding-bottom:3px !important; + nav.navbar { + padding-top: 1px; + padding-bottom: 1px } - .navbar { - min-height:25px !important; + nav .badge { + top: 0px; + left: -0.25rem; } - nav .navbar-header img { - height: 29px; - width: 29px; - margin-top: 1px; - border-radius: 4px; - } - - .navbar-left { - height: 29px; - } - - .container-fluid { - min-height:29px; - } - - .collapse .navbar-collapse { - min-height:29px; - } - - #nav-search-text { - margin:6px 15px 4px 15px; - } - - #nav-search-spinner { - margin: 16px 0px 0px 25px; + .contextual-help-content-open { + top: 2.4rem; } - header #banner { - margin-top:5px; + aside { + padding-top: 3.5rem; } - nav .dropdown-menu, - nav .acpopup { - top: 30px !important; + section { + padding-top: 3.5rem; } #jGrowl.top-right { - top: 30px; + top: 3.5rem; right: 15px; } - .contextual-help-content-open { - top: 31px; - } } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c98084e85..07ee5fca3 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -188,7 +188,7 @@ nav { .contextual-help-content-open { display: block; position: fixed; - top: 51px; + top: 3.25rem; left: 0px; width: 100%; max-height: 50%; -- cgit v1.2.3 From 774923be1c598b10885e1e077889527f3f9c0afe Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 19 Mar 2017 14:20:21 +0100 Subject: fix jgrowl position and remove some redundant css --- view/theme/redbasic/css/style.css | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 07ee5fca3..100074886 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -701,7 +701,7 @@ div.jGrowl div.info { padding-left: 58px; } #jGrowl.top-right { - top: 65px; + top: 4.5rem; right: 15px; } @@ -709,13 +709,6 @@ div.jGrowl div.jGrowl-notification { min-height: 60px; } -#nav-search-text-ac .autocomplete { - position: fixed; - top: 51px; - border: 1px solid $nav_bd; - border-top: none; -} - #recip-ac .autocomplete, #poke-recip-ac .autocomplete, #id-name-ac .autocomplete, -- cgit v1.2.3 From c85f1a208d461fad1d5d2b4d091f026d924a9a63 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 19 Mar 2017 14:29:09 +0100 Subject: a % example for font size --- view/theme/redbasic/php/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 419dd20b2..04516df78 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -125,7 +125,7 @@ class RedbasicConfig { '$comment_indent' => array('redbasic_comment_indent', t('Set the indent for comments'), $arr['comment_indent']), '$toolicon_colour' => array('redbasic_toolicon_colour',t('Set the basic color for item icons'),$arr['toolicon_colour']), '$toolicon_activecolour' => array('redbasic_toolicon_activecolour',t('Set the hover color for item icons'),$arr['toolicon_activecolour']), - '$font_size' => array('redbasic_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Example: 14px')), + '$font_size' => array('redbasic_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 87.5%, 14px')), '$font_colour' => array('redbasic_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']), '$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius'], t('Example: 4px')), '$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $arr['shadow']), -- cgit v1.2.3 From a0245f3e9307f4b1d195b764bd9956fb85058769 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 19 Mar 2017 17:06:55 +0100 Subject: css fixes --- view/theme/redbasic/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 100074886..de179d56e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1261,7 +1261,7 @@ img.mail-conv-sender-photo { #avatar { width: 2.2rem; height: 2.2rem; - border-radius: 50%; + border-radius: $radius; } .page-title { -- cgit v1.2.3 From 2f3f95d3a9473d4b9c15727c960f51026c992094 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 19 Mar 2017 19:59:45 +0100 Subject: change the btn-outline-secondary:hover color to soething sane --- view/theme/redbasic/css/style.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index de179d56e..db06d39c3 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1435,6 +1435,10 @@ blockquote { border-radius: $radius; } +.btn-outline-secondary:hover { + color: $font_colour; +} + /* .navbar-inverse { background-image: -webkit-linear-gradient(top, $nav_gradient_top 0%, $nav_gradient_bottom 100%); -- cgit v1.2.3 From 37d350c3f589779a32ca356047d8c7244ac4878f Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 20 Mar 2017 11:18:23 +0100 Subject: update to latest bs4 from git and change hidden-* classes to d-* --- view/theme/redbasic/css/style.css | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index db06d39c3..b689b3209 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1435,10 +1435,6 @@ blockquote { border-radius: $radius; } -.btn-outline-secondary:hover { - color: $font_colour; -} - /* .navbar-inverse { background-image: -webkit-linear-gradient(top, $nav_gradient_top 0%, $nav_gradient_bottom 100%); @@ -1510,16 +1506,6 @@ blockquote { left: 0px; } - .thread-wrapper.toplevel_item { - width: 100%; - border:1px; - } - - .acl-list-item { - width: 98%; /* fallback if browser does not support calc() */ - width: calc(100% - 10px); - } - } .shareable_element_text { -- cgit v1.2.3 From 837efcf5e73b7fbc81697bcb1257ef8cf6912cdd Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 20 Mar 2017 20:59:46 +0100 Subject: fix fullscreen and bbco_autocomplete popup rendering --- view/theme/redbasic/css/style.css | 12 +++--------- view/theme/redbasic/js/redbasic.js | 9 +++------ 2 files changed, 6 insertions(+), 15 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b689b3209..3548e237f 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1364,19 +1364,13 @@ img.mail-conv-sender-photo { word-wrap: break-word; } -main.fullscreen { - left: 0px; - width: 100%; - height: 100vh; - max-width: none; -} - main.fullscreen .generic-content-wrapper { - position: absolute; - width: 100%; + position: fixed; top: 0px; left: 0px; + width: 100%; border-radius: 0px; + border-width: 0px; } main.fullscreen .section-title-wrapper { diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index b522f8dd1..8106f913d 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -73,17 +73,14 @@ $(document).ready(function() { function makeFullScreen(full) { if(typeof full=='undefined' || full == true) { - $('main').css({'transition': 'none'}).addClass('fullscreen'); - $('header, nav, aside, #fullscreen-btn').hide(); - $('#tabs-collapse-1').css({'visibility': 'hidden'}); + $('main').addClass('fullscreen'); + $('header, nav, aside, #fullscreen-btn').css({'visibility': 'hidden'}); $('#inline-btn').show(); } else { $('main').removeClass('fullscreen'); - $('header, nav, aside, #fullscreen-btn').show(); - $('#tabs-collapse-1').css({'visibility': ''}); + $('header, nav, aside, #fullscreen-btn').css({'visibility': ''}); $('#inline-btn').hide(); - $('main').css({'transition': ''}); $(document.body).trigger("sticky_kit:recalc"); } } -- cgit v1.2.3 From cbcd1954618da8ba7013a42fcec5bff531535ba9 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 20 Mar 2017 22:39:29 +0100 Subject: fix webpages widgets --- view/theme/redbasic/css/style.css | 3 ++- view/theme/redbasic/js/redbasic.js | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 3548e237f..f233e9a76 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1672,9 +1672,10 @@ dl.bb-dl > dd > li { } .sub-menu { + width: 100%; margin-top: 10px; padding-left: 15px; - border-left: 3px solid #eee; + border-left: 0.2rem solid #eee; } .app-icon { diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 8106f913d..6aba457f1 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -74,12 +74,12 @@ $(document).ready(function() { function makeFullScreen(full) { if(typeof full=='undefined' || full == true) { $('main').addClass('fullscreen'); - $('header, nav, aside, #fullscreen-btn').css({'visibility': 'hidden'}); + $('header, nav, aside, #fullscreen-btn').hide(); $('#inline-btn').show(); } else { $('main').removeClass('fullscreen'); - $('header, nav, aside, #fullscreen-btn').css({'visibility': ''}); + $('header, nav, aside, #fullscreen-btn').show(); $('#inline-btn').hide(); $(document.body).trigger("sticky_kit:recalc"); } -- cgit v1.2.3 From a6f232f2b0613b8114424034da8814cffb566dd7 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 20 Mar 2017 23:20:14 +0100 Subject: really fix fullscreen and fix some issues in chat --- view/theme/redbasic/css/style.css | 11 +++++++++-- view/theme/redbasic/js/redbasic.js | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f233e9a76..fba5edc43 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1364,11 +1364,18 @@ img.mail-conv-sender-photo { word-wrap: break-word; } +main.fullscreen { + left: 0px; + width: 100%; + height: 100vh; + max-width: none; +} + main.fullscreen .generic-content-wrapper { - position: fixed; + position: absolute; + width: 100%; top: 0px; left: 0px; - width: 100%; border-radius: 0px; border-width: 0px; } diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 6aba457f1..995c7a504 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -74,7 +74,7 @@ $(document).ready(function() { function makeFullScreen(full) { if(typeof full=='undefined' || full == true) { $('main').addClass('fullscreen'); - $('header, nav, aside, #fullscreen-btn').hide(); + $('header, nav, aside, #fullscreen-btn').attr('style','display:none !important');; $('#inline-btn').show(); } else { -- cgit v1.2.3 From 7de57174183e467f89c0795565ebc3d6da90bb1d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 20 Mar 2017 23:21:02 +0100 Subject: superfluos ; --- view/theme/redbasic/js/redbasic.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 995c7a504..14b977b80 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -74,7 +74,7 @@ $(document).ready(function() { function makeFullScreen(full) { if(typeof full=='undefined' || full == true) { $('main').addClass('fullscreen'); - $('header, nav, aside, #fullscreen-btn').attr('style','display:none !important');; + $('header, nav, aside, #fullscreen-btn').attr('style','display:none !important'); $('#inline-btn').show(); } else { -- cgit v1.2.3 From efdd95fe7fde36bab90764657afb615ebf4f63a3 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 22 Mar 2017 11:52:22 +0100 Subject: css fixes --- view/theme/redbasic/css/style.css | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index fba5edc43..e8e2da40a 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1678,13 +1678,22 @@ dl.bb-dl > dd > li { border-bottom-right-radius: $radius; } +.sub-menu-wrapper { + padding-left: 1rem; + display: none; +} + .sub-menu { width: 100%; - margin-top: 10px; - padding-left: 15px; + margin-top: 0.5rem; + padding-left: 1rem; border-left: 0.2rem solid #eee; } +.w100 { + width: 100%; +} + .app-icon { font-size: 80px; color: $toolicon_colour; @@ -1701,8 +1710,7 @@ dl.bb-dl > dd > li { margin-left: auto; margin-right: auto; } + #permcat-index { margin: 10px; } - -.shiny { background-color: red; } -- cgit v1.2.3 From 4d50fe0928d6da63d6ec646f0047a82ad839a7a7 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 23 Mar 2017 09:35:59 +0100 Subject: bump versions --- view/theme/redbasic/php/theme.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/php/theme.php b/view/theme/redbasic/php/theme.php index 95d5a2001..a1147a5b4 100644 --- a/view/theme/redbasic/php/theme.php +++ b/view/theme/redbasic/php/theme.php @@ -3,8 +3,8 @@ /** * * Name: Redbasic * * Description: Hubzilla standard theme - * * Version: 2.0 - * * MinVersion: 2.2RC + * * Version: 2.1 + * * MinVersion: 2.3.1 * * MaxVersion: 3.0 * * Author: Fabrixxm * * Maintainer: Mike Macgirvin -- cgit v1.2.3 From 727a2fe4ea2447a82967e1791eeb8116e69bd9f9 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 24 Mar 2017 10:23:23 +0100 Subject: restrict height of images in #banner to 1.5 rem --- view/theme/redbasic/css/style.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e8e2da40a..3d104f981 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -83,6 +83,11 @@ h6, .h6 { text-overflow: ellipsis; } +#banner img { + max-height: 1.5rem; + width: auto; +} + .jslider { font-family: sans-serif, arial, freesans; } -- cgit v1.2.3 From 83abceb8bed7a262c745a8384786d7bd47b81904 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 24 Mar 2017 10:29:44 +0100 Subject: must be 1.35rem --- view/theme/redbasic/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 3d104f981..c38c5c4d0 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -84,7 +84,7 @@ h6, .h6 { } #banner img { - max-height: 1.5rem; + max-height: 1.35rem; width: auto; } -- cgit v1.2.3 From 5dc457b16c2d2cc0721fb3af1a786e8f0e32ef73 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 24 Mar 2017 16:10:37 +0100 Subject: fix some active and hover colors --- view/theme/redbasic/css/style.css | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c38c5c4d0..3e321f54d 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -766,10 +766,14 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { text-decoration: none; } -.widget .conv-participants { +.conv-participants { color: $font_colour; } +.active .conv-participants { + color: #fff; +} + .contactname { font-weight: bold; display: block; @@ -1129,10 +1133,19 @@ img.mail-conv-sender-photo { } .wall-item-ago, -.dropdown-sub-text { +a:hover .wall-item-ago, +.dropdown-sub-text, +a:hover .dropdown-sub-text { color: #777; } +.active .wall-item-ago, +a:active .wall-item-ago, +.active .dropdown-sub-text, +a:active .dropdown-sub-text { + color: #fff; +} + .wall-item-content, .mail-conv-body, .page-body, -- cgit v1.2.3 From fd23844c8dad0df4ebccc4b056a5c464cf490cde Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 24 Mar 2017 16:50:59 +0100 Subject: remove redundant css --- view/theme/redbasic/css/style.css | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 3e321f54d..e059e524f 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -264,19 +264,6 @@ footer { /*TODO: we should use one class for all this. */ -.group-selected, -.fileas-selected, -.categories-selected, -.search-selected, -.active, -.group-selected:hover, -.fileas-selected:hover, -.categories-selected:hover, -.search-selected:hover, -.active:hover { - color: $font_colour; -} - #cropimage-wrapper, #cropimage-preview-wrapper { float: left; padding: 30px; -- cgit v1.2.3 From 28e0911f295f49af8f559434d119286ef7ca9d83 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 24 Mar 2017 17:07:22 +0100 Subject: remove obsolete todo --- view/theme/redbasic/css/style.css | 2 -- 1 file changed, 2 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e059e524f..d00547e36 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -262,8 +262,6 @@ footer { margin: 15px 0px; } -/*TODO: we should use one class for all this. */ - #cropimage-wrapper, #cropimage-preview-wrapper { float: left; padding: 30px; -- cgit v1.2.3