From e51035ba9a8def29537186ddaa52b5e7b90798d9 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Sun, 10 Jan 2016 20:45:39 +0100 Subject: String update es-es and nl. Plus some extra bits, incl .gitignore update with pageheader.html --- view/theme/redbasic/schema/bluegrid.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css index 820e84baa..f0ae1e8df 100644 --- a/view/theme/redbasic/schema/bluegrid.css +++ b/view/theme/redbasic/schema/bluegrid.css @@ -2,7 +2,7 @@ body { background-size: auto; } -.generic-content-wrapper-styled, #profile-jot-wrapper { +.generic-content-wrapper-styled { background-color: rgba(67,72,138,.8); color: #FFF; } -- cgit v1.2.3 From 97ebf9021c5297a7ab2e3685bf920458d4bd3181 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 21 Jan 2016 10:42:20 +0100 Subject: bootstrapify rating and connect buttons. position the connect button more prominent right under the profile image --- 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 5fcf901fb..d596fa332 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -310,6 +310,11 @@ footer { margin-bottom: 0px; } +.connect-btn-wrapper { + margin-bottom: 10px; + +} + .profile-edit-side-link { padding: 3px 0px; opacity: 0; -- cgit v1.2.3 From 928f1bfa7bdaa4f8a85ea4bec6ebcb182975f158 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 21 Jan 2016 10:58:38 +0100 Subject: css cleanup --- view/theme/redbasic/css/style.css | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index d596fa332..8020da00a 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -480,43 +480,12 @@ footer { float: right; } -.rconnect { - display: block; - color: $nav_active_icon_colour; - margin-top: 15px; - background-color: $nav_bg; - -webkit-border-radius: $radiuspx ; - -moz-border-radius: $radiuspx; - border-radius: $radiuspx; - border: 1px solid $nav_bd; - padding: 5px; - font-weight: bold; - clear: both; -} - -a.rateme, div.rateme { - display: block; - color: $nav_active_icon_colour; - background-color: $nav_bg; - -webkit-border-radius: $radiuspx ; - -moz-border-radius: $radiuspx; - border-radius: $radiuspx; - border: 1px solid $nav_bd; - padding: 5px; - font-weight: bold; - clear: both; -} - #pause { position: fixed; bottom: 5px; right: 5px; } -#vcard-end { - clear: both; -} - #contact-block { width: 100%; float: left; -- cgit v1.2.3 From b711c050db39bd733f4a48cbe575b9e926aa3d0d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 21 Jan 2016 11:48:10 +0100 Subject: make contact block look widget alike --- view/theme/redbasic/css/style.css | 7 ------- 1 file changed, 7 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 8020da00a..4ae08dec8 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -489,13 +489,6 @@ footer { #contact-block { width: 100%; float: left; - background-color: rgba(254,254,254,0.5); - border-bottom: 1px solid rgba(238,238,238,0.8); - -moz-border-radius: $radiuspx; - -webkit-border-radius: $radiuspx; - border-radius: $radiuspx; - padding: 10px; - margin-bottom:10px; } #contact-block-numcontacts { -- cgit v1.2.3 From 55e9bd36605690cc0dfdc03145ab8ed13a417866 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Thu, 21 Jan 2016 22:02:31 +0100 Subject: A few minor tweaks in schemas + link to login form in lostpass --- view/theme/redbasic/schema/bluegrid.css | 8 ++++++++ view/theme/redbasic/schema/dark.css | 2 +- view/theme/redbasic/schema/simple_black_on_white.css | 4 ++++ view/theme/redbasic/schema/simple_green_on_black.css | 4 ++++ view/theme/redbasic/schema/simple_white_on_black.css | 4 ++++ 5 files changed, 21 insertions(+), 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css index f0ae1e8df..38701024f 100644 --- a/view/theme/redbasic/schema/bluegrid.css +++ b/view/theme/redbasic/schema/bluegrid.css @@ -160,6 +160,14 @@ nav .badge:hover, nav .badge:focus { color: rgba(255,255,255,.8); } +.widget .conv-participants { + color: #BBB; +} + +.widget .active:hover .conv-participants, .widget .active:focus .conv-participants { + color: inherit; +} + .help-block, .comment-icon, .jot-icons, .admin-icons { color: inherit; } diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index 936f74761..f65e9aac9 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -88,7 +88,7 @@ background-color: #111; } -.jotnets-wrapper > a.btn { +a.btn, aside a { font-weight: 400 !important; } diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css index f69ba3450..5a6b2655b 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.css +++ b/view/theme/redbasic/schema/simple_black_on_white.css @@ -75,6 +75,10 @@ background-color: #fff; } +a.btn, aside a { + font-weight: 400 !important; +} + .btn-default { background-color: #fff; border-color: #000; diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css index 1f0a2f1e6..d25585f98 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.css +++ b/view/theme/redbasic/schema/simple_green_on_black.css @@ -75,6 +75,10 @@ background-color: #000; } +a.btn, aside a { + font-weight: 400 !important; +} + .btn-default { background-color: #000; border-color: #143D12; diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css index 627f3ee5c..277ac7a12 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.css +++ b/view/theme/redbasic/schema/simple_white_on_black.css @@ -71,6 +71,10 @@ background-color: #000; } +a.btn, aside a { + font-weight: 400 !important; +} + .btn-default { background-color: #000; border-color: #fff; -- cgit v1.2.3 From 68030d12cfefa8982774cca9714b0c1eed7b9537 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Wed, 27 Jan 2016 00:24:05 +0100 Subject: Linking new connection notification to pending connections (see Channel 1) and improved email notifications about new connections. Could not find a way to do this also for the generic notifications. Added hub domain of channel address on the new channel page. A few people on my hub didn't understood. This example will make it more clear. Some minor bits. --- view/theme/redbasic/schema/dark.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index f65e9aac9..b667dca5c 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -10,7 +10,13 @@ } #profile-photo-wrapper { - border:none; + border: none; +} + +#profile-edit-default-desc { + background-color: #665029; + color: #FFF; + padding: 20px; } .photo { -- cgit v1.2.3 From 385709853b7db64bbb660824e033674d594b3ac0 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 30 Jan 2016 14:26:38 +0100 Subject: css fixes --- view/theme/redbasic/css/style.css | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 4ae08dec8..ffa613bc9 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1160,6 +1160,13 @@ img.mail-conv-sender-photo { background-color: #fff; } +#profile-jot-wrapper { + background-color: rgba(254,254,254,.5); + border: 1px solid rgba(254,254,254,.5); + border-radius: $radiuspx; + +} + #profile-jot-text { color:#000; border: 1px solid #cccccc; @@ -1361,8 +1368,8 @@ img.mail-conv-sender-photo { /* widgets */ .widget { - background-color: rgba(254,254,254,0.5); - border-bottom: 1px solid rgba(238,238,238,0.8); + 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; @@ -1691,6 +1698,13 @@ nav .badge.mail-update:hover { padding: 7px 10px; } +.nav-tabs.nav-justified { + background-color: rgba(254,254,254,.5); + border: 1px solid rgba(254,254,254,.5); + border-top-left-radius: $radiuspx; + border-top-right-radius: $radiuspx; +} + .nav-tabs.nav-justified > .active > a, .nav-tabs.nav-justified > .active > a:hover, .nav-tabs.nav-justified > .active > a:focus { -- cgit v1.2.3 From c8d0a2b4bbb7b56f4ab82bfcb96df9d9025f3d15 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 30 Jan 2016 14:40:45 +0100 Subject: one more css fix --- 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 ffa613bc9..7b4a3ddd7 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -297,7 +297,7 @@ footer { margin-bottom: 10px; padding: 10px; background-color: rgba(254,254,254,0.5); - border-bottom: 1px solid rgba(238,238,238,0.8); + border: 1px solid rgba(254,254,254,0.5); -moz-border-radius: $radiuspx; -webkit-border-radius: $radiuspx; border-radius: $radiuspx; -- cgit v1.2.3 From 1f87fef9684a29da91fcb41a5d1d3bd4fb9a4619 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Sat, 30 Jan 2016 23:44:45 +0100 Subject: es-es+nl strings and fixing css maintained schemas --- view/theme/redbasic/schema/bluegrid.css | 7 +++++++ view/theme/redbasic/schema/dark.css | 12 ++++++++++-- view/theme/redbasic/schema/simple_black_on_white.css | 9 +++++++++ view/theme/redbasic/schema/simple_green_on_black.css | 9 +++++++++ view/theme/redbasic/schema/simple_white_on_black.css | 9 +++++++++ 5 files changed, 44 insertions(+), 2 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css index 38701024f..36e26302a 100644 --- a/view/theme/redbasic/schema/bluegrid.css +++ b/view/theme/redbasic/schema/bluegrid.css @@ -11,6 +11,11 @@ body { border: 1px solid #FFF; } +#profile-jot-wrapper { + background-color: inherit; + border: none; +} + .generic-content-wrapper-styled a:hover, .generic-content-wrapper-styled a:focus, .generic-content-wrapper-styled .field.checkbox:hover label, .generic-content-wrapper-styled .field.checkbox:focus label, .allcontact-link:hover, .allcontact-link:focus { color: rgba(255,255,255,.8); } @@ -458,3 +463,5 @@ a:hover > .icon-trash { background-color: #43488A !important; } } + + diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index b667dca5c..16044b224 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -5,6 +5,7 @@ .vcard, #contact-block, .widget { background-color: transparent; + border: none; border-bottom: 1px solid #333; border-radius: 0px } @@ -336,11 +337,18 @@ pre { text-decoration: underline; } - - @media (min-width: 768px) { .nav-tabs.nav-justified > li > a { border-bottom: 1px solid #333; } } +#profile-jot-wrapper { + background-color: inherit; + border: none; +} + +.nav-tabs.nav-justified { + background-color: inherit; + border: none; +} diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css index 5a6b2655b..ba9771a40 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.css +++ b/view/theme/redbasic/schema/simple_black_on_white.css @@ -5,6 +5,7 @@ .vcard, #contact-block, .widget { background-color: transparent; + border: none; border-bottom: 1px solid #fff; } @@ -265,4 +266,12 @@ pre { } } +#profile-jot-wrapper { + background-color: inherit; + border: none; +} +.nav-tabs.nav-justified { + background-color: inherit; + border: none; +} diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css index d25585f98..0928c64f3 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.css +++ b/view/theme/redbasic/schema/simple_green_on_black.css @@ -5,6 +5,7 @@ .vcard, #contact-block, .widget { background-color: transparent; + border: none; border-bottom: 1px solid #fff; } @@ -282,4 +283,12 @@ pre { } } +#profile-jot-wrapper { + background-color: inherit; + border: none; +} +.nav-tabs.nav-justified { + background-color: inherit; + border: none; +} diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css index 277ac7a12..45bdba1cd 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.css +++ b/view/theme/redbasic/schema/simple_white_on_black.css @@ -5,6 +5,7 @@ .vcard, #contact-block, .widget { background-color: transparent; + border: none; border-bottom: 1px solid #fff; } @@ -261,4 +262,12 @@ pre { } } +#profile-jot-wrapper { + background-color: inherit; + border: none; +} +.nav-tabs.nav-justified { + background-color: inherit; + border: none; +} -- cgit v1.2.3 From 7f453949a17f4d3cd755ab5fc96be21396c9cc91 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 1 Feb 2016 23:09:45 -0800 Subject: minor tweaks --- view/theme/redbasic/css/style.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 7b4a3ddd7..b2255b3af 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -962,6 +962,9 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { 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); -- cgit v1.2.3 From f1245206ceadd60fec4bd00948c115f74ad6dbd7 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 2 Feb 2016 12:40:40 +0100 Subject: change aside width to reflect recent widget style changes --- view/theme/redbasic/js/redbasic.js | 2 +- view/theme/redbasic/php/style.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 302efc365..38dc4d209 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -7,7 +7,7 @@ $(document).ready(function() { if( $('#css3-calc').width() == 10) { $(window).resize(function() { if($(window).width() < 767) { - $('main').css('width', $(window).width() + 285 ); + $('main').css('width', $(window).width() + 287 ); } else { $('main').css('width', '100%' ); } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index a0da5e302..443ebb1fb 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -154,7 +154,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) { $x = file_get_contents('view/theme/redbasic/css/style.css'); - $aside_width = 285; + $aside_width = 287; // left aside and right aside are 285px + converse width if($align_left) { -- cgit v1.2.3 From 48963f62f974ce4f2d8e26c344b65e87f704e4d6 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 8 Feb 2016 22:19:38 +0100 Subject: avoid collapsing only above the viewport --- view/theme/redbasic/php/style.php | 1 - 1 file changed, 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 443ebb1fb..0ca47b1fb 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -40,7 +40,6 @@ if(! $a->install) { $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'); - } // Now load the scheme. If a value is changed above, we'll keep the settings -- cgit v1.2.3 From 02e82e496e3ec8dbd8264248ad8550dd5e335cba Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 19 Feb 2016 22:28:21 +0100 Subject: pimp up mod new_channel --- view/theme/redbasic/css/style.css | 1 + 1 file changed, 1 insertion(+) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b2255b3af..f4fa0415c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1544,6 +1544,7 @@ nav .dropdown-menu { .section-content-tools-wrapper .section-content-danger-wrapper, .section-content-wrapper .section-content-danger-wrapper { margin-bottom: 10px; + border-bottom: none; border-radius: $radiuspx; } -- cgit v1.2.3 From 1fcc863298ec2bb4f4e1f4cf240a72a420863445 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Sun, 21 Feb 2016 23:00:12 +0100 Subject: There was nothing wrong with my pimped pubsites (was another problem). Took the opportunity to update schemas. Plus updated spanish and dutch strings. --- view/theme/redbasic/schema/dark.css | 8 ++++++++ view/theme/redbasic/schema/simple_green_on_black.css | 13 +++++++++++++ view/theme/redbasic/schema/simple_white_on_black.css | 8 ++++++++ 3 files changed, 29 insertions(+) (limited to 'view/theme') diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index 16044b224..6ed2501e1 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -352,3 +352,11 @@ pre { background-color: inherit; border: none; } + +.table-striped > tbody > tr:nth-of-type(2n+1), .table-hover > tbody > tr:hover { + background-color: #191919; +} + +.table > tbody > tr > td { + border-color: #888; +} diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css index 0928c64f3..e6901143b 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.css +++ b/view/theme/redbasic/schema/simple_green_on_black.css @@ -202,6 +202,7 @@ a.rconnect, a.rateme, div.rateme { text-decoration: underline; background-color: #000; color: #50f148; + border-color: #143D12; } aside .nav > li > a:hover, aside .nav > li > a:focus { @@ -292,3 +293,15 @@ pre { background-color: inherit; border: none; } + +.table-striped > tbody > tr:nth-of-type(2n+1) { + background-color: #000; +} + +.table-hover > tbody > tr:hover { + background-color: #143D12; +} + +.table > tbody > tr > td { + border-color: #143D12; +} diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css index 45bdba1cd..a2d024881 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.css +++ b/view/theme/redbasic/schema/simple_white_on_black.css @@ -271,3 +271,11 @@ pre { background-color: inherit; border: none; } + +.table-striped > tbody > tr:nth-of-type(2n+1), .table-hover > tbody > tr:hover { + background-color: #030303; +} + +.table > tbody > tr > td { + border-color: #FFF; +} -- cgit v1.2.3 From 9d3ce5597863e90fc3d28ceb500d1ce0a7023e5b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 25 Feb 2016 00:24:58 +0100 Subject: fix boxy scheme --- view/theme/redbasic/schema/boxy.css | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/schema/boxy.css b/view/theme/redbasic/schema/boxy.css index ad3e587f0..43ef3e34e 100644 --- a/view/theme/redbasic/schema/boxy.css +++ b/view/theme/redbasic/schema/boxy.css @@ -3,9 +3,5 @@ } .wall-item-content-wrapper.comment { - border-width: 0px 0px 1px 0px; -} - -.hide-comments-outer { - border-width: 1px 0px 1px 0px; + border-bottom: 1px solid #ccc; } -- cgit v1.2.3 From 2d45f9f385a5738d2126f66c0e5467533e6838c2 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 29 Feb 2016 23:58:32 +0100 Subject: provide footer bbcode --- 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 f4fa0415c..5dca2785c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1243,6 +1243,11 @@ img.mail-conv-sender-photo { font-size: $font_size; } +.wall-item-footer { + font-size: $body_font_size; + margin-top: 2em; +} + .wall-item-content-wrapper { background-color: $item_colour; border-top-right-radius: $radiuspx; -- cgit v1.2.3 From 0ebce75c7d53d209e47f4549105d27bbf1b5052a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 1 Mar 2016 13:09:04 +0100 Subject: css fixes to make jot look better with background colors or images --- view/theme/redbasic/css/style.css | 42 +++++++++++---------------------------- 1 file changed, 12 insertions(+), 30 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5dca2785c..82b6d0277 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -295,7 +295,7 @@ footer { .vcard { margin-bottom: 10px; - padding: 10px; + 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; @@ -341,9 +341,7 @@ footer { #profile-photo-wrapper { width: 251px; height: 251px; - margin-top: -10px; margin-bottom: 10px; - border: 1px solid #ccc; border-radius: $radiuspx; } @@ -1142,7 +1140,6 @@ img.mail-conv-sender-photo { .jothidden { font-weight: bold; - border-radius: $radiuspx; } .jothidden input::-webkit-input-placeholder { @@ -1153,27 +1150,18 @@ img.mail-conv-sender-photo { font-weight: bold; } -.jothidden > input { - border: 1px solid transparent; - background-color: transparent; -} -.jothidden > input:hover, -.jothidden > input:focus { - border: 1px solid #cccccc; - background-color: #fff; -} + #profile-jot-wrapper { - background-color: rgba(254,254,254,.5); - border: 1px solid rgba(254,254,254,.5); + background-color: rgba(254,254,254,1); + border: 1px solid #ccc; border-radius: $radiuspx; } #profile-jot-text { - color:#000; - border: 1px solid #cccccc; - -moz-border-radius: $radiuspx; + resize: vertical; + border-width: 0px; border-radius: $radiuspx; } @@ -1515,7 +1503,7 @@ nav .dropdown-menu { .section-content-tools-wrapper { padding: 7px 10px; background-color: $comment_item_colour; - border-bottom: 3px solid $comment_item_colour; + border-bottom: 1px solid #ccc; } .section-content-info-wrapper { @@ -1709,9 +1697,8 @@ nav .badge.mail-update:hover { .nav-tabs.nav-justified { background-color: rgba(254,254,254,.5); - border: 1px solid rgba(254,254,254,.5); - border-top-left-radius: $radiuspx; - border-top-right-radius: $radiuspx; + border-top-left-radius: 4px; + border-top-right-radius: 4px; } .nav-tabs.nav-justified > .active > a, @@ -1824,13 +1811,13 @@ nav .badge.mail-update:hover { /* Modified original CSS to match input in Redbasic */ .jothidden .bootstrap-tagsinput { - border-color: $bgcolour; - background-color: $bgcolour; + border: 0px solid transparent; + margin-bottom: 0px; box-shadow: none; display: inline-block; border-radius: $radiuspx; cursor: text; - padding: 0px 8px; + padding: 0px 10px; width: 100%; } @@ -1838,11 +1825,6 @@ nav .badge.mail-update:hover { font-size: 100%; } -.jothidden .bootstrap-tagsinput:hover, .jothidden .bootstrap-tagsinput:focus { - border: 1px solid #ccc; - background-color: #fff; -} - /* Abusing theme-green is less work than makeing a new new one */ .theme-green .back-bar .selected-bar { background-color: #000000; background-image: none; !important } -- cgit v1.2.3 From 4d6050f8e573030c1c13d5feb3efe45cc4cc7b22 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 1 Mar 2016 13:22:19 +0100 Subject: another css fix --- 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 82b6d0277..0b583b5f6 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1503,7 +1503,7 @@ nav .dropdown-menu { .section-content-tools-wrapper { padding: 7px 10px; background-color: $comment_item_colour; - border-bottom: 1px solid #ccc; + border-bottom: 3px solid comment_item_colour; } .section-content-info-wrapper { -- cgit v1.2.3 From 9d00db06b299e65e807d13d2df56ffdd1e2b5254 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 1 Mar 2016 14:03:34 +0100 Subject: fix resize issue --- view/theme/redbasic/css/style.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0b583b5f6..2cf311baa 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1160,11 +1160,16 @@ img.mail-conv-sender-photo { } #profile-jot-text { - resize: vertical; + resize: none; border-width: 0px; border-radius: $radiuspx; } +#profile-jot-text:focus { + resize: vertical; +} + + #profile-jot-text::-webkit-input-placeholder { font-size:16px; } -- cgit v1.2.3 From c97cc1487cbcac2c4fbc4d9e931a82df109af2e6 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 2 Mar 2016 12:31:25 +0100 Subject: a simple cover-photo implementation for redbasic default template --- view/theme/redbasic/css/style.css | 1 + view/theme/redbasic/js/redbasic.js | 23 +++++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 2cf311baa..f365bec1a 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -174,6 +174,7 @@ header #banner { z-index: 1040; margin-top: 14px; 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; diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 38dc4d209..7c5df0834 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -2,6 +2,17 @@ * redbasic theme specific JavaScript */ $(document).ready(function() { + + //Simple cover-photo implementation + if($('#cover-photo').length && $(window).width() > 767) { + $('.navbar-fixed-top').css('position', 'relative'); + $('main').css('padding-top', 0 + 'px'); + } + else { + $('#cover-photo').remove(); + + } + // CSS3 calc() fallback (for unsupported browsers) $('body').append(''); if( $('#css3-calc').width() == 10) { @@ -38,9 +49,7 @@ $(document).ready(function() { $("input[data-role=cat-tagsinput]").tagsinput({ tagClass: 'label label-primary' }); -}); -$(document).ready(function(){ var doctitle = document.title; function checkNotify() { var notifyUpdateElem = document.getElementById('notify-update'); @@ -53,3 +62,13 @@ $(document).ready(function(){ } setInterval(function () {checkNotify();}, 10 * 1000); }); + +//Simple cover-photo implementation +$(window).scroll(function () { + if($('#cover-photo').length && $(window).width() > 767 && $(window).scrollTop() >= $('#cover-photo').height()) { + $('main').css('padding-top', 71 + 'px'); + $(window).scrollTop($(window).scrollTop() - $('#cover-photo').height()) + $('.navbar-fixed-top').css('position', 'fixed'); + $('#cover-photo').remove(); + } +}); -- cgit v1.2.3 From c5d08fd5fdcd504dac010d62c434d16a92879852 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 2 Mar 2016 13:33:18 +0100 Subject: add a fade in effect to main while scrolling up cover photo --- view/theme/redbasic/js/redbasic.js | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'view/theme') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 7c5df0834..809776220 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -7,6 +7,7 @@ $(document).ready(function() { if($('#cover-photo').length && $(window).width() > 767) { $('.navbar-fixed-top').css('position', 'relative'); $('main').css('padding-top', 0 + 'px'); + $('main').css('opacity', 0); } else { $('#cover-photo').remove(); @@ -71,4 +72,8 @@ $(window).scroll(function () { $('.navbar-fixed-top').css('position', 'fixed'); $('#cover-photo').remove(); } + + if($('#cover-photo').length) { + $('main').css('opacity', ($(window).scrollTop()/$('#cover-photo').height()).toFixed(1)); + } }); -- cgit v1.2.3 From d3f2d2a2dbba70403d197221500aeae80d541557 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 2 Mar 2016 14:30:33 +0100 Subject: small fix to simple cover-photo --- view/theme/redbasic/js/redbasic.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 809776220..d3f9c5f70 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -6,12 +6,11 @@ $(document).ready(function() { //Simple cover-photo implementation if($('#cover-photo').length && $(window).width() > 767) { $('.navbar-fixed-top').css('position', 'relative'); - $('main').css('padding-top', 0 + 'px'); + $('aside, section').css('padding-top', 0 + 'px'); $('main').css('opacity', 0); } else { $('#cover-photo').remove(); - } // CSS3 calc() fallback (for unsupported browsers) @@ -67,7 +66,7 @@ $(document).ready(function() { //Simple cover-photo implementation $(window).scroll(function () { if($('#cover-photo').length && $(window).width() > 767 && $(window).scrollTop() >= $('#cover-photo').height()) { - $('main').css('padding-top', 71 + 'px'); + $('aside, section').css('padding-top', 71 + 'px'); $(window).scrollTop($(window).scrollTop() - $('#cover-photo').height()) $('.navbar-fixed-top').css('position', 'fixed'); $('#cover-photo').remove(); -- cgit v1.2.3 From 59e04aed1b7ea68b51b8672768dffd21f5a4bd4d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 3 Mar 2016 12:07:58 +0100 Subject: move cover-photo to template, add the ability to define a title and subtitle (defaults to channel name and addres), move js from redbasic.js to template. --- view/theme/redbasic/js/redbasic.js | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index d3f9c5f70..a4e13b8eb 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -3,16 +3,6 @@ */ $(document).ready(function() { - //Simple cover-photo implementation - if($('#cover-photo').length && $(window).width() > 767) { - $('.navbar-fixed-top').css('position', 'relative'); - $('aside, section').css('padding-top', 0 + 'px'); - $('main').css('opacity', 0); - } - else { - $('#cover-photo').remove(); - } - // CSS3 calc() fallback (for unsupported browsers) $('body').append(''); if( $('#css3-calc').width() == 10) { @@ -62,17 +52,3 @@ $(document).ready(function() { } setInterval(function () {checkNotify();}, 10 * 1000); }); - -//Simple cover-photo implementation -$(window).scroll(function () { - if($('#cover-photo').length && $(window).width() > 767 && $(window).scrollTop() >= $('#cover-photo').height()) { - $('aside, section').css('padding-top', 71 + 'px'); - $(window).scrollTop($(window).scrollTop() - $('#cover-photo').height()) - $('.navbar-fixed-top').css('position', 'fixed'); - $('#cover-photo').remove(); - } - - if($('#cover-photo').length) { - $('main').css('opacity', ($(window).scrollTop()/$('#cover-photo').height()).toFixed(1)); - } -}); -- cgit v1.2.3 From f1f19372ad518ea1408924253d68f445c7ec2f0a Mon Sep 17 00:00:00 2001 From: Jeroen van Riet Paap Date: Mon, 7 Mar 2016 17:01:12 +0100 Subject: Update config.php --- view/theme/redbasic/php/config.php | 1 + 1 file changed, 1 insertion(+) (limited to 'view/theme') diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 6bea5bddb..66597332c 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -98,6 +98,7 @@ if(feature_enabled(local_channel(),'expert')) $o .= replace_macros($t, array( '$submit' => t('Submit'), '$baseurl' => $a->get_baseurl(), + '$theme' => $a->channel['channel_theme'], '$expert' => $expert, '$title' => t("Theme settings"), '$schema' => array('redbasic_schema', t('Select scheme'), $arr['schema'], '', $scheme_choices), -- cgit v1.2.3 From 7a5213cc8e7aee131df4347442b05c56c47a3fac Mon Sep 17 00:00:00 2001 From: Jeroen van Riet Paap Date: Mon, 7 Mar 2016 17:03:02 +0100 Subject: Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. --- view/theme/redbasic/php/style.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'view/theme') diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 0ca47b1fb..ef1450681 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -215,3 +215,8 @@ if($align_left && file_exists('view/theme/redbasic/css/align_left.css')) { if($schemecss) { echo $schemecss; } + +// Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. + +if($a->channel['channel_theme'] != 'redbasic') + set_pconfig(local_channel(), 'redbasic', 'schema', '---'); -- cgit v1.2.3 From 95f5f3d44d813b1fcff2187bb96d4fd96ecad86a Mon Sep 17 00:00:00 2001 From: Jeroen van Riet Paap Date: Mon, 7 Mar 2016 17:06:10 +0100 Subject: Show only schema selector when Redbasic (so not a derived theme) --- view/theme/redbasic/tpl/theme_settings.tpl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'view/theme') diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index cdc9de489..0ec6d1741 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -1,4 +1,6 @@ +{{if $theme == redbasic}} {{include file="field_select.tpl" field=$schema}} +{{/if}} {{include file="field_checkbox.tpl" field=$align_left}} {{include file="field_checkbox.tpl" field=$narrow_navbar}} {{include file="field_input.tpl" field=$converse_width}} -- cgit v1.2.3 From 7bb461380e6198987da8827210297c29d301d022 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 9 Mar 2016 14:15:50 -0800 Subject: issue #319 - make sure we have a local_channel() and an App::channel before trying to change the default schema for a channel --- view/theme/redbasic/php/style.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index ef1450681..6058a3c14 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -218,5 +218,5 @@ if($schemecss) { // Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. -if($a->channel['channel_theme'] != 'redbasic') +if(local_channel() && $a->channel && $a->channel['channel_theme'] != 'redbasic') set_pconfig(local_channel(), 'redbasic', 'schema', '---'); -- cgit v1.2.3 From 2165733ddce0bcae386d8b4b25ef7fec83266db7 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 16 Mar 2016 23:07:29 +0100 Subject: move buttons to dropdown menu and some cleanup --- view/theme/redbasic/css/style.css | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f365bec1a..5aee57cad 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -260,34 +260,6 @@ footer { clear: both; } -#profile-edit-links { - padding-top: 15px; - padding-bottom: 15px; -} - -#profile-edit-links .btn { - margin: 0 10px 15px 0; -} - -.profile-import { - vertical-align: top; - text-align: left; -} - -.profile-import b { - color: $link_colour; -} - -.profile-import input { - color: $font_colour; - border: none; -} - -#profile-edit-drop-link { - color: #FFF; - font-weight: normal; -} - .fn { font-weight: bold; font-size: 16px; -- cgit v1.2.3 From a41a05e6c0b0fa5f9497f0880a2db9d8d7374092 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 17 Mar 2016 11:50:53 +0100 Subject: bring more structure to profiles edit --- 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 5aee57cad..4115ea764 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -128,8 +128,6 @@ pre { .heart { color: #FF0000; - font-size: 100%; - margin-right: 5px; } nav, -- cgit v1.2.3 From 40162cd6b712f45ecd21f41d7793b2a6be6ac021 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 17 Mar 2016 12:56:55 +0100 Subject: some work on profile listing --- view/theme/redbasic/css/style.css | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 4115ea764..f0e057425 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -328,37 +328,6 @@ footer { margin-bottom: 15px; } -.profile-listing-photo-wrapper { - float: left; -} - -.profile-listing-edit-buttons-wrapper { - clear: both; -} -.profile-listing-photo-edit-link { - float: left; - width: 125px; -} -.profile-listing-end { - clear: both; -} -.profile-listing-edit-buttons-wrapper img{ - border: none; - margin-right: 20px; -} -.profile-listing { - margin-top: 25px; -} -.profile-listing-name { - float: left; - margin-left: 32px; - margin-top: 10px; - color: #3172BD; - font-weight: bold; - width: 200px; - -} - .app-name { overflow: none; } -- cgit v1.2.3 From 30cf56bdb505ffa50bb7416ec8623fb97418d358 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 20 Mar 2016 01:45:56 +0100 Subject: make >>indicate group members<< in acl selector work again on group > show or group > dont show is selected --- view/theme/redbasic/css/style.css | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f0e057425..6ef9ea284 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -915,7 +915,15 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { border-radius: $radiuspx; } -.acl-list-item img{ +.acl-list-item.grouphide { + border: 1px solid red; +} + +.acl-list-item.groupshow { + border: 1px solid green; +} + +.acl-list-item img { width: 40px; height: 40px; float: left; -- cgit v1.2.3 From ba0812c4477fcae0b910f63de8134529797d51dc Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 27 Mar 2016 22:37:07 +0200 Subject: highlight table row on hover --- view/theme/redbasic/css/style.css | 1 + 1 file changed, 1 insertion(+) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 6ef9ea284..424055fbf 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1510,6 +1510,7 @@ nav .dropdown-menu { word-wrap: break-word; } +.locs-index-row:hover td, [id^="cloud-index-"]:hover td, .cloud-index-active { background-color: $item_colour; -- cgit v1.2.3 From 5462453bf2bde50166c68f90b08d24826dd07ba8 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 30 Mar 2016 14:31:55 +0200 Subject: some work on mod chat --- view/theme/redbasic/css/style.css | 1 + 1 file changed, 1 insertion(+) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 424055fbf..b92fe5afe 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1510,6 +1510,7 @@ nav .dropdown-menu { word-wrap: break-word; } +.chatroom-index-row:hover td, .locs-index-row:hover td, [id^="cloud-index-"]:hover td, .cloud-index-active { -- cgit v1.2.3 From df891f4ad2eee3b07bad73d703a46364dad03508 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 31 Mar 2016 00:37:40 +0200 Subject: more work on mod chat --- view/theme/redbasic/css/style.css | 7 ++++--- 1 file 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 b92fe5afe..7f9f621a3 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1263,7 +1263,8 @@ img.mail-conv-sender-photo { .wall-item-content, .mail-conv-body, -.page-body { +.page-body, +.chat-item-text { font-size: $font_size; clear: both; } @@ -1366,9 +1367,9 @@ img.mail-conv-sender-photo { border-radius: $radiuspx; } -.chat-item-text { +.chat-item-title { border-radius: $radiuspx; - background-color: #eee; + background-color: $item_colour; } /* nav bootstrap */ -- cgit v1.2.3 From 1cd3b4182595b838a535dd6b6990251db05d49e6 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 30 Mar 2016 22:13:24 -0700 Subject: deprecate $a->get_baseurl() --- 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 66597332c..789efc612 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -97,7 +97,7 @@ if(feature_enabled(local_channel(),'expert')) $t = get_markup_template('theme_settings.tpl'); $o .= replace_macros($t, array( '$submit' => t('Submit'), - '$baseurl' => $a->get_baseurl(), + '$baseurl' => z_root(), '$theme' => $a->channel['channel_theme'], '$expert' => $expert, '$title' => t("Theme settings"), -- cgit v1.2.3 From 3fdd110e0775113d2246a9db16c6c920ecddf19d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 31 Mar 2016 13:21:48 +0200 Subject: mod chat rework continued --- view/theme/redbasic/css/style.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 7f9f621a3..43607a95c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1264,7 +1264,8 @@ img.mail-conv-sender-photo { .wall-item-content, .mail-conv-body, .page-body, -.chat-item-text { +.chat-item-text, +.chat-item-text-self { font-size: $font_size; clear: both; } @@ -1363,11 +1364,13 @@ img.mail-conv-sender-photo { cursor: pointer; } -.chat-item-photo { +.chat-item-photo, +.chat-item-photo-self { border-radius: $radiuspx; } -.chat-item-title { +.chat-item-title, +.chat-item-title-self { border-radius: $radiuspx; background-color: $item_colour; } -- cgit v1.2.3 From 6c2673ae2aa311ee92b5b12b969b4483b52eef53 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 31 Mar 2016 22:42:28 +0200 Subject: various fixes regarding mod chat --- 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 43607a95c..443f96da9 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1375,6 +1375,10 @@ img.mail-conv-sender-photo { background-color: $item_colour; } +#chatMembers img { + border-radius: $radiuspx; +} + /* nav bootstrap */ -- cgit v1.2.3 From 90a5ba01a35aeb3629ebe76069e68c64b913a4d5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 31 Mar 2016 23:13:40 +0200 Subject: make fullscreen mode available for other modules and some cleanup --- view/theme/redbasic/css/style.css | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 443f96da9..3172a6520 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1518,6 +1518,20 @@ nav .dropdown-menu { word-wrap: break-word; } +.generic-content-wrapper.fullscreen { + position: fixed; + width: 100%; + height: 100%; + top: 0px; + left: 0px; + border-radius: 0px; + z-index: 10000; +} + +.generic-content-wrapper.fullscreen .section-title-wrapper { + border-radius: 0px; +} + .chatroom-index-row:hover td, .locs-index-row:hover td, [id^="cloud-index-"]:hover td, -- cgit v1.2.3 From 50d9b2934742ad9fb0dc8354d405789e3c14cd00 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 1 Apr 2016 00:16:39 +0200 Subject: slightly change the way fullscreen works and bring it to mod mail --- view/theme/redbasic/css/style.css | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 3172a6520..6feb1154b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1519,19 +1519,27 @@ nav .dropdown-menu { } .generic-content-wrapper.fullscreen { - position: fixed; + position: absolute; width: 100%; height: 100%; top: 0px; left: 0px; + border: 0px; border-radius: 0px; - z-index: 10000; } .generic-content-wrapper.fullscreen .section-title-wrapper { border-radius: 0px; } +.generic-content-wrapper.fullscreen .section-content-wrapper { + border-radius: 0px; +} + +#inline-btn { + display: none; +} + .chatroom-index-row:hover td, .locs-index-row:hover td, [id^="cloud-index-"]:hover td, -- cgit v1.2.3 From 9abd95fad3784a10fc48bc40f9b8a75d7d74edda Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 31 Mar 2016 16:06:03 -0700 Subject: static App --- view/theme/redbasic/php/config.php | 2 +- view/theme/redbasic/php/style.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 789efc612..04cf4f904 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -98,7 +98,7 @@ if(feature_enabled(local_channel(),'expert')) $o .= replace_macros($t, array( '$submit' => t('Submit'), '$baseurl' => z_root(), - '$theme' => $a->channel['channel_theme'], + '$theme' => App::$channel['channel_theme'], '$expert' => $expert, '$title' => t("Theme settings"), '$schema' => array('redbasic_schema', t('Select scheme'), $arr['schema'], '', $scheme_choices), diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 6058a3c14..83c35935a 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -1,6 +1,6 @@ install) { +if(! App::$install) { // Get the UID of the channel owner $uid = get_theme_uid(); @@ -218,5 +218,5 @@ if($schemecss) { // Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. -if(local_channel() && $a->channel && $a->channel['channel_theme'] != 'redbasic') +if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'redbasic') set_pconfig(local_channel(), 'redbasic', 'schema', '---'); -- cgit v1.2.3 From 60bb8f25f7bd1e857f8e70769b83f9c75521db29 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 1 Apr 2016 08:56:51 +0200 Subject: move fullscreen js code to redbasic.js where it belongs to --- view/theme/redbasic/js/redbasic.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'view/theme') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index a4e13b8eb..21b51af36 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -52,3 +52,18 @@ $(document).ready(function() { } setInterval(function () {checkNotify();}, 10 * 1000); }); + +function makeFullScreen(full) { + if(typeof full=='undefined' || full == true) { + $('#fullscreen-btn, header, nav, aside').hide(); + $('main').css({'width': '100%', 'max-width': 'none', 'left': '0px'}); + $('#inline-btn').show(); + $('.generic-content-wrapper').addClass('fullscreen'); + } + else { + $('#fullscreen-btn, header, nav, aside').show(); + $('main').removeAttr('style'); + $('#inline-btn').hide(); + $('.generic-content-wrapper').removeClass('fullscreen'); + } +} -- cgit v1.2.3 From 3edd4ce78fcf6a5384ec503249c4e1f0fb6143ff Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 3 Apr 2016 00:04:05 +0200 Subject: ease transition between fullscreen and inline view for small screens --- view/theme/redbasic/css/style.css | 4 +--- view/theme/redbasic/js/redbasic.js | 14 ++++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 6feb1154b..9dcfcdf3e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1723,9 +1723,7 @@ nav .badge.mail-update:hover { } main { - -webkit-transition: all 0.25s ease-out; - -moz-transition: all 0.25s ease-out; - transition: all 0.25s ease-out; + transition: all 0.25s ease-in-out; } main { diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 21b51af36..73628ebd9 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -55,15 +55,17 @@ $(document).ready(function() { function makeFullScreen(full) { if(typeof full=='undefined' || full == true) { - $('#fullscreen-btn, header, nav, aside').hide(); - $('main').css({'width': '100%', 'max-width': 'none', 'left': '0px'}); - $('#inline-btn').show(); + $('main').css({'transition': 'none', 'left': '0px', 'width': '100%', 'max-width': 'none'}); $('.generic-content-wrapper').addClass('fullscreen'); + $('#fullscreen-btn, header, nav, aside').css({'display': 'none'}); + $('#inline-btn').show(); + } else { - $('#fullscreen-btn, header, nav, aside').show(); - $('main').removeAttr('style'); - $('#inline-btn').hide(); + $('main').css({'left': '', 'width': '', 'max-width': ''}); $('.generic-content-wrapper').removeClass('fullscreen'); + $('#fullscreen-btn, header, nav, aside').css({'display': ''}); + $('#inline-btn').hide(); + $('main').css({'transition': ''}); } } -- cgit v1.2.3 From db4e9aeaadc15700aca737a620fb0a56c4ed3531 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 3 Apr 2016 12:19:49 +0200 Subject: fullscreen mode for events --- 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 9dcfcdf3e..9a365d8a7 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1521,10 +1521,8 @@ nav .dropdown-menu { .generic-content-wrapper.fullscreen { position: absolute; width: 100%; - height: 100%; top: 0px; left: 0px; - border: 0px; border-radius: 0px; } -- cgit v1.2.3 From f13096a6f3b26d9e88dc0d6c07c63a1d5f75346e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 3 Apr 2016 18:00:03 +0200 Subject: various fixes --- view/theme/redbasic/css/style.css | 14 +++++++++++--- view/theme/redbasic/js/redbasic.js | 6 ++---- 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 9a365d8a7..903900e7f 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1518,7 +1518,14 @@ nav .dropdown-menu { word-wrap: break-word; } -.generic-content-wrapper.fullscreen { +main.fullscreen { + left: 0px; + width: 100%; + height: 100%; + max-width: none; +} + +main.fullscreen .generic-content-wrapper { position: absolute; width: 100%; top: 0px; @@ -1526,11 +1533,12 @@ nav .dropdown-menu { border-radius: 0px; } -.generic-content-wrapper.fullscreen .section-title-wrapper { +main.fullscreen .section-title-wrapper { border-radius: 0px; } -.generic-content-wrapper.fullscreen .section-content-wrapper { +main.fullscreen .section-content-wrapper, +main.fullscreen .section-content-wrapper-np { border-radius: 0px; } diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 73628ebd9..877bcd840 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -55,15 +55,13 @@ $(document).ready(function() { function makeFullScreen(full) { if(typeof full=='undefined' || full == true) { - $('main').css({'transition': 'none', 'left': '0px', 'width': '100%', 'max-width': 'none'}); - $('.generic-content-wrapper').addClass('fullscreen'); + $('main').css({'transition': 'none'}).addClass('fullscreen'); $('#fullscreen-btn, header, nav, aside').css({'display': 'none'}); $('#inline-btn').show(); } else { - $('main').css({'left': '', 'width': '', 'max-width': ''}); - $('.generic-content-wrapper').removeClass('fullscreen'); + $('main').removeClass('fullscreen'); $('#fullscreen-btn, header, nav, aside').css({'display': ''}); $('#inline-btn').hide(); $('main').css({'transition': ''}); -- cgit v1.2.3