From 7b992decd4fdd670e6c01ea31a14e756974bf1a2 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 29 Jul 2017 16:06:42 +0200 Subject: close the apps-menu if the notifications-menu is open and vice versa --- view/theme/redbasic/js/redbasic.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index a4fee495c..5a586b9f9 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -54,6 +54,18 @@ $(document).ready(function() { } }); + $('#menu-btn').click(function() { + if($('#navbar-collapse-1').hasClass('show')){ + $('#navbar-collapse-1').removeClass('show'); + } + }); + + $('#notifications-btn').click(function() { + if($('#navbar-collapse-2').hasClass('show')){ + $('#navbar-collapse-2').removeClass('show'); + } + }); + $("input[data-role=cat-tagsinput]").tagsinput({ tagClass: 'badge badge-pill badge-warning text-dark' }); -- cgit v1.2.3 From 8b6a24c67d6cc5f96c9255a18fe1a61257bc76b8 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 1 Aug 2017 14:25:59 +0200 Subject: remove blugrid schema until somebody cares to fix it --- view/theme/redbasic/schema/bluegrid.css | 515 -------------------------------- view/theme/redbasic/schema/bluegrid.php | 28 -- 2 files changed, 543 deletions(-) delete mode 100644 view/theme/redbasic/schema/bluegrid.css delete mode 100644 view/theme/redbasic/schema/bluegrid.php (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css deleted file mode 100644 index 46e28197e..000000000 --- a/view/theme/redbasic/schema/bluegrid.css +++ /dev/null @@ -1,515 +0,0 @@ -body { - background-size: auto; -} - -.generic-content-wrapper-styled { - background-color: rgba(67,72,138,.8); - color: #FFF; -} - -.generic-content-wrapper-styled .btn-default:hover, #profile-jot-wrapper .btn-default:hover { - 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); -} - -.generic-content-wrapper, .profile-jot-text, .comment-edit-text-empty, .comment-edit-text-full, input.widget-input, .wall-item-content-wrapper, .section-title-wrapper, .section-content-wrapper { - border-radius: 0px !important; -} - -.generic-content-wrapper { - background-color: rgba(255,255,255,.8); - color: #4d4d4d; -} - -.wall-item-content-wrapper { - background-color: #FFF; -} - -.hide-comments-outer, .wall-item-content-wrapper.comment, .wall-item-comment-wrapper { - background-color: transparent; -} - -.generic-content-wrapper-styled .generic-content-wrapper { - color: #4D4D4D; -} - -.generic-content-wrapper-styled .generic-content-wrapper a { - color: #43488A; -} - -.generic-content-wrapper #profile-jot-wrapper { - background-color: transparent; - color: #4D4D4D; -} - -.generic-content-wrapper input#jot-title, .generic-content-wrapper input#jot-pagetitle { - color: #4D4D4D; -} - -.generic-content-wrapper input#jot-title:hover, .generic-content-wrapper input#jot-title:focus { - color: #4D4D4D; - border-radius: 0px; -} - - -.fn, .widget h3, .nav-tabs a, .generic-content-wrapper-styled a, .dropdown-menu > li > a, #channels-desc, input#jot-title { - color: #fff; - border-radius: 0px -} - -ul.dropdown-menu.acpopup > li.textcomplete-item > a { - color: #43488A; -} - -ul.dropdown-menu.acpopup > li.textcomplete-item > a:hover, ul.dropdown-menu.acpopup > li.textcomplete-item > a:focus { - background-color: #43488A; - color: #FFF; - cursor: pointer; -} - -input#jot-title:hover, input#jot-title:focus { - color: #43488A; - border-radius: 0px; -} - -.navbar-inverse { - background-color: transparent; - border-color: transparent; - background-image: none; -} - -.navbar-inverse .navbar-nav > .active > a { - background-image: none; - background: rgba(255,255,255,.5); -} - -.navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus { - background: rgba(255,255,255,.5); -} - -.navbar-inverse .navbar-nav > li > a:hover, -.navbar-inverse .navbar-nav > li > a:focus { - color: #43488A; - background: rgba(255,255,255,.5); -} - -.navbar-inverse .navbar-nav > .open > a, -.navbar-inverse .navbar-nav > .open > a:hover, -.navbar-inverse .navbar-nav > .open > a:focus { - background-color: #43488A; - color: #fff; -} - -#nav-search-text { - color: #fff; - background-color: #43488A; - border-radius: 0px; - border-color: transparent; -} - -nav .dropdown-menu, .wall-item-tools .dropdown-menu, .section-title-wrapper .dropdown-menu, .section-content-wrapper .dropdown-menu { - background-color: #43488A; - color: #fff; - border-radius: 0; - border: none; - box-shadow: 0px 6px 12px rgba(45,48,92,.176); -} - -.dropdown-menu > li > a:focus, .dropdown-menu > li > a:hover { - color: #43488A; - background-color: rgba(255,255,255,.7); - text-decoration: underline; -} - -.vcard .dropdown-menu { - background-color: rgba(255,255,255,.97); - border-radius: 0; - border: none; - box-shadow: 0px 6px 12px rgba(169,169,169,.176); -} - -.vcard .dropdown-menu a, .fc-today { - color: #43488A; -} - -.vcard .dropdown-menu > li > a:focus, .vcard .dropdown-menu > li > a:hover { - color: #43488A; - background-color: rgba( 255,255,255,.7); - text-decoration: underline; -} - -nav .badge { - background-color: rgba(255,255,255,.8); - color: #43488A; - border-radius: 0px !important; -} - -nav .badge:hover, nav .badge:focus { - background-color: rgba(67,72,138,.8); - color: #FFF; -} - -.field.checkbox > div > input:checked + label .onoffswitch-switch { - background-color: #43488A; -} - -.widget .field.checkbox:hover label { - 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; -} - -#adminpage table tr:hover, #adminpage table tr:hover a, #adminpage table tr td.tools a:hover, #adminpage table tr:focus, #adminpage table tr:focus a, #adminpage table tr td.tools a:focus { - color: #43488A; -} - -#adminpage table tr:hover .tools a, #adminpage table tr:focus .tools a, .generic-content-wrapper-styled > .descriptive-text { - color: #FFF; -} - -.generic-content-wrapper-styled > .sources-links { - font-weight: bold; -} - -.wall-item-tools .btn { - border-color: #43488A; -} - -.vcard, #contact-block, .widget { - background-color: rgba(67,72,138,.8); - color: #fff; - border-radius: 0; - border: none; - box-shadow: 0px 6px 12px rgba(45,48,92,.176); -} - -.tags a { - color: inherit; -} - -#profile-photo-wrapper { - border: none; -} - -.nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus { - color: #43488A; - text-decoration: none; - border: none; -} - -.nav-tabs > li.active { - background-color: rgba(255,255,255,.5); -} - -.nav-tabs.nav-justified > .active > a, .nav-tabs.nav-justified > .active > a:hover { - border-color: transparent; -} - -.nav-tabs.nav-justified { - background-color: rgba(67,72,138,.8); - border-bottom: 1px solid rgba(255,255,255,.5); - border-radius: 0px; -} - -.nav-tabs.nav-justified > li > a { - border-bottom: 1px solid transparent; - border-radius: 0px; -} - -.nav > li > a:focus, .nav > li > a:hover { - text-decoration: underline; - background-color: rgba(255,255,255,.5); - color: #43488A; - border-radius: 0; - border-color: transparent; -} - -.nav > li > a { - color: #FFF; - border-radius: 0px; -} - -.fc-event { - border: none !important; - background-color: rgba(255,255,255,.7) !important; - color: #43488A !important; - text-shadow: none !important; -} - -div.rateme { - border-radius: 0px; - font-weight: 400; -} - -div.rateme:hover, div.rateme:focus, a.rateme:hover, a.rateme:focus { - background-color: #43488A; - border-radius: 0px; - color: #FFF; - font-weight: 400; - -webkit-transition: all .3s ease-in-out; - -moz-transition: all .3s ease-in-out; - transition: all .3s ease-in-out; -} - -.info { - background: rgba(255,255,255,.7) url("/images/hz-32.png") no-repeat scroll 15px center !important; - color: #43488A !important; -} - -.notice { - background: rgba(215,43,52,.7) url("/images/hz-white-32.png") no-repeat scroll 15px center !important; - color: #FFF !important; -} - -#chatTopBar { - background-color: rgba(255,255,255,.8); - color: #4d4d4d; - height: 500px; - width: 596px; - overflow-y: auto; -} - -.chat-item-text { - border-radius: 0px; - padding: 5px; - background-color: #FFF; -} - -input { - border-radius: 0px; -} - -.home-welcome { - color: #FFF; - margin-bottom: 30px; -} - -#login-main { - margin-top: 0; - color: #EEE; -} - -#remember_me_container label:hover, #remember_container label:hover { - color: #FFF; -} - -#login-main #lost-password-link, #login-main #register-link { - color: #FFF; -} - -#nav-login .modal-content { - background-color: #43488A; - background-image: url('/images/bggrid.png'); - box-shadow: 0 5px 15px rgba(0,0,0,.3); - -webkit-box-shadow: 0 5px 15px rgba(0,0,0,.3); -} - -#nav-login h3, #nav-login button.close { - color: #EEE; -} - -#nav-login .modal-header { - border-bottom: none; -} - -.directory-item { - margin-bottom: 0px; - padding-bottom: 20px; - background-color: #FFF; -} - -.directory-item.lframe { - background-color: transparent !important; -} - -.contact-entry-wrapper { - border: 1px solid rgba(255,255,255,.5); -} - -.contact-entry-edit:hover a, .contact-entry-edit:focus a, .generic-content-wrapper-styled > p > span.btn.btn-default > a:hover,.generic-content-wrapper-styled > p > span.btn.btn-default > a:focus, div#profile-edit-links a:hover, div#profile-edit-links a:focus { - color: #43488A; -} - -.profile-edit-side-link, input#profile-photo-upload, .allcontact-link, #newchannel-form .descriptive-paragraph { - color: #FFF; -} - -.profile-edit-side-link:hover, .profile-edit-side-link:focus { - color: #FFF; - text-decoration: none; -} - -.section-content-info-wrapper { - color: #fff; - background-color: #43488A; -} - -.section-content-info-wrapper a { - color: #fff; -} - -.btn, #event-edit-form .btn, input.directory-rating-submit { - border: 1px solid #FFF; - color: #FFF; - background-color: #43488A; - border-radius: 0; - font-weight: 400; - -webkit-transition: all .3s ease-in-out; - -moz-transition: all .3s ease-in-out; - transition: all .3s ease-in-out; -} - -.btn:hover, .btn:focus, #event-edit-form .btn:hover, #event-edit-form .btn:focus { - border: 1px solid #FFF; - outline: 0; - color: #43488A; - background-color: #FFF; -} - -.btn-default:hover, .btn-default:focus, .open > .dropdown-toggle.btn-default, input.directory-rating-submit:hover, input.directory-rating-submit:focus { - border: 1px solid #43488A; - outline: 0; - color: #43488A; - background-color: #FFF; -} - -.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button, input#side-follow-submit, .profile-edit-submit-wrapper > input.profile-edit-submit-button, input#profile-photo-submit, form#chat-form > input, div#adminpage > form > div.submit > input, input.sources-submit, input.contact-edit-submit, input#dbtn-submit, input#newchannel-submit-button, input#contacts-search-submit, input#register-submit-button { - background-color: #FFF; - color: #43488A; - border-radius: 0px; - -webkit-transition: all .3s ease-in-out; - -moz-transition: all .3s ease-in-out; - transition: all .3s ease-in-out; -} - -.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus, input#side-follow-submit:hover, input#side-follow-submit:focus, .profile-edit-submit-wrapper > input.profile-edit-submit-button:hover, .profile-edit-submit-wrapper > input.profile-edit-submit-button:focus, input#profile-photo-submit:hover, input#profile-photo-submit:focus, form#chat-form > input:hover, form#chat-form > input:focus, div#adminpage > form > div.submit > input:hover, div#adminpage > form > div.submit > input:focus, input.sources-submit:hover, input.sources-submit:focus, input.contact-edit-submit:focus, input.contact-edit-submit:hover, input#dbtn-submit:hover, input#dbtn-submit:focus, input#newchannel-submit-button:hover, input#newchannel-submit-button:focus, input#contacts-search-submit:hover, input#contacts-search-submit:focus, input#register-submit-button:hover, input#register-submit-button:focus { - border-color: #FFF; - background-color: #43488A; - color: #FFF; - border-radius: 0px; -} - -.comment-tools .btn, #prvmail-tools .btn, .generic-content-wrapper .btn { - border: 1px solid #43488A; - color: #43488A; - background-color: #FFF; -} - -.comment-tools .btn:hover, .comment-tools .btn:focus, #prvmail-tools .btn:hover, #prvmail-tools .btn:focus, .generic-content-wrapper .btn:hover, .generic-content-wrapper .btn:focus { - border: 1px solid #43488A !important; - color: #FFF; - background-color: #43488A; -} - -.comment-tools .btn-primary, #prvmail-submit .btn-primary, .settings-submit-wrapper .btn-primary, .generic-content-wrapper .btn-primary { - background-color: #43488A; - color: #FFF; - border: 1px solid #43488A; -} - -.comment-tools .btn-primary:hover, .comment-tools .btn-primary:focus, #prvmail-submit .btn-primary:hover, #prvmail-submit .btn-primary:focus, .settings-submit-wrapper .btn-primary:hover, .settings-submit-wrapper .btn-primary:focus, .generic-content-wrapper .btn-primary:hover, .generic-content-wrapper .btn-primary:focus { - border-color: #43488A; - background-color: #FFF; - color: #43488A; -} - -.btn-success { - color: #FFF !important; - background-color: #5CB85C !important; - border-color: #4CAE4C !important; -} - -.btn-success:hover, .btn-success:focus { - color: #FFF !important; - background-color: #449D44 !important; - border-color: #398439 !important; -} - -.btn-warning { - color: #FFF !important; - background-color: #F0AD4E !important; - border-color: #EEA236 !important; -} - -.btn-warning:hover, .btn-warning:focus { - color: #FFF !important; - background-color: #EC971F !important; - border-color: #D58512 !important; -} - -.btn-danger, form#chat-destroy > input { - background-color: #D9534F !important; - border-color: #D43F3A !important; - color: #FFF !important; -} -.btn-danger:hover, .btn-danger:focus, form#chat-destroy > input:hover, form#chat-destroy > input:focus { - color: #FFF !important; - background-color: #C9302C !important; - border-color: #AC2925 !important; -} - -a:hover > .fa-trash-o { - color: #C9302C !important; -} - -@media screen and (max-width: 767px) { - .navbar-inverse .navbar-collapse { - background-color: #43488A; - border: none; - } - .navbar-inverse .navbar-toggle { - border-color: #576295; - background-color: #43488A; - border-radius: 0px; - } - .navbar-inverse .navbar-toggle .icon-bar { - background-color: #FFF; - } - .navbar-inverse .navbar-toggle .fa-arrow-circle-down, .navbar-inverse .navbar-toggle .fa-arrow-circle-right, .navbar-inverse .navbar-toggle .fa-arrow-circle-up, .navbar-inverse .navbar-toggle .fa-arrow-circle-left, .navbar-inverse .navbar-toggle .fa-question-circle { - color: #FFF; - } - .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-down, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-down, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-right, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-right, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-up, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-up, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-left, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-left { - color: #43488A; - } - .navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus { - background-color: #FFF !important; - } - .navbar-toggle:hover .icon-bar , .navbar-toggle:focus .icon-bar { - background-color: #43488A !important; - } -} - -.help-content { - color: #FFF; - border: none; -} - -.help-content a { - color: #FFF; - font-weight: 600; -} - -.help-content-open { - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; -} - diff --git a/view/theme/redbasic/schema/bluegrid.php b/view/theme/redbasic/schema/bluegrid.php deleted file mode 100644 index fdb552611..000000000 --- a/view/theme/redbasic/schema/bluegrid.php +++ /dev/null @@ -1,28 +0,0 @@ - Date: Wed, 2 Aug 2017 00:28:05 +0200 Subject: css fix --- view/theme/redbasic/css/style.css | 1 + 1 file changed, 1 insertion(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 2c881049e..fd2ceb2c9 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -484,6 +484,7 @@ footer { #nav-search-text { width: 280px; + padding: .15rem .5rem; } #nav-search-text::-webkit-input-placeholder { -- cgit v1.2.3 From a97b09210e977d52a5bda1dee2b1eddc19afc013 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 1 Aug 2017 18:05:04 -0700 Subject: auto preview when inserting a media item or embed into a post. Since this unanticipated action could be alarming (some might think the post was actually submitted), also provide a visible preview indicator within the previewed content. Remove the css for the old striped background image which hasn't been available for previewed content for a year or two. --- view/theme/redbasic/css/style.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 2c881049e..17956ef31 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -251,8 +251,7 @@ footer { margin-top: 15px; } -.preview { - background: url('../img/gray_and_white_diagonal_stripes_background_seamless.gif'); +.preview-indicator { } #theme-preview { -- cgit v1.2.3 From 59108b18aeac22d4fb63d6957b7de68004e83af6 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 7 Aug 2017 18:19:02 -0700 Subject: remove some no longer used images/icons --- view/theme/redbasic/img/bbedit.png | Bin 2145 -> 0 bytes view/theme/redbasic/img/border.jpg | Bin 342 -> 0 bytes view/theme/redbasic/img/editicons.png | Bin 6300 -> 0 bytes view/theme/redbasic/img/ff-16.jpg | Bin 644 -> 0 bytes view/theme/redbasic/img/file.gif | Bin 613 -> 0 bytes view/theme/redbasic/img/friendika-16.png | Bin 699 -> 0 bytes view/theme/redbasic/img/jotperms.png | Bin 510 -> 0 bytes view/theme/redbasic/img/login-bg.gif | Bin 237 -> 0 bytes view/theme/redbasic/img/notify_on.png | Bin 721 -> 0 bytes view/theme/redbasic/img/photo-menu.jpg | Bin 459 -> 0 bytes view/theme/redbasic/img/shiny.png | Bin 362 -> 0 bytes 11 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 view/theme/redbasic/img/bbedit.png delete mode 100644 view/theme/redbasic/img/border.jpg delete mode 100644 view/theme/redbasic/img/editicons.png delete mode 100644 view/theme/redbasic/img/ff-16.jpg delete mode 100644 view/theme/redbasic/img/file.gif delete mode 100644 view/theme/redbasic/img/friendika-16.png delete mode 100644 view/theme/redbasic/img/jotperms.png delete mode 100644 view/theme/redbasic/img/login-bg.gif delete mode 100644 view/theme/redbasic/img/notify_on.png delete mode 100644 view/theme/redbasic/img/photo-menu.jpg delete mode 100644 view/theme/redbasic/img/shiny.png (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/img/bbedit.png b/view/theme/redbasic/img/bbedit.png deleted file mode 100644 index b89f2f7a8..000000000 Binary files a/view/theme/redbasic/img/bbedit.png and /dev/null differ diff --git a/view/theme/redbasic/img/border.jpg b/view/theme/redbasic/img/border.jpg deleted file mode 100644 index 034a1cb63..000000000 Binary files a/view/theme/redbasic/img/border.jpg and /dev/null differ diff --git a/view/theme/redbasic/img/editicons.png b/view/theme/redbasic/img/editicons.png deleted file mode 100644 index 171a40876..000000000 Binary files a/view/theme/redbasic/img/editicons.png and /dev/null differ diff --git a/view/theme/redbasic/img/ff-16.jpg b/view/theme/redbasic/img/ff-16.jpg deleted file mode 100644 index 3621f5914..000000000 Binary files a/view/theme/redbasic/img/ff-16.jpg and /dev/null differ diff --git a/view/theme/redbasic/img/file.gif b/view/theme/redbasic/img/file.gif deleted file mode 100644 index c532335ed..000000000 Binary files a/view/theme/redbasic/img/file.gif and /dev/null differ diff --git a/view/theme/redbasic/img/friendika-16.png b/view/theme/redbasic/img/friendika-16.png deleted file mode 100644 index 1a742ecdc..000000000 Binary files a/view/theme/redbasic/img/friendika-16.png and /dev/null differ diff --git a/view/theme/redbasic/img/jotperms.png b/view/theme/redbasic/img/jotperms.png deleted file mode 100644 index d133a6e01..000000000 Binary files a/view/theme/redbasic/img/jotperms.png and /dev/null differ diff --git a/view/theme/redbasic/img/login-bg.gif b/view/theme/redbasic/img/login-bg.gif deleted file mode 100644 index cde836c89..000000000 Binary files a/view/theme/redbasic/img/login-bg.gif and /dev/null differ diff --git a/view/theme/redbasic/img/notify_on.png b/view/theme/redbasic/img/notify_on.png deleted file mode 100644 index 18002e15c..000000000 Binary files a/view/theme/redbasic/img/notify_on.png and /dev/null differ diff --git a/view/theme/redbasic/img/photo-menu.jpg b/view/theme/redbasic/img/photo-menu.jpg deleted file mode 100644 index fde5eb535..000000000 Binary files a/view/theme/redbasic/img/photo-menu.jpg and /dev/null differ diff --git a/view/theme/redbasic/img/shiny.png b/view/theme/redbasic/img/shiny.png deleted file mode 100644 index 994c0d05d..000000000 Binary files a/view/theme/redbasic/img/shiny.png and /dev/null differ -- cgit v1.2.3 From e70bf975084ee44662bc2c1c19d2fe6aa0268dee Mon Sep 17 00:00:00 2001 From: git-marijus Date: Mon, 28 Aug 2017 23:42:17 +0200 Subject: rewrite comment form handling --- view/theme/redbasic/css/style.css | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 37277b612..621fa2781 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1073,16 +1073,11 @@ img.mail-conv-sender-photo { } -.comment-edit-text-empty, -.comment-edit-text-full { +.comment-edit-text { border: 1px solid #ccc; border-radius: $radius; } -.comment-edit-text-empty { - color: gray; -} - .divgrow-showmore { display: block; border-top: 1px dashed #ccc; -- cgit v1.2.3 From 1104e2652f15aaa405208b6dec9e439fb8c39537 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 7 Sep 2017 21:29:32 -0700 Subject: improve the code block styling a wee bit --- view/theme/redbasic/css/style.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 621fa2781..b508b2576 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -136,6 +136,8 @@ input, optgroup, select, textarea { pre code { border: none; + padding: 1em 1.5em; + border-radius: $radius; } code { -- cgit v1.2.3 From 9b542c5bcf127e67374bb63a41c2d0da818cd987 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 8 Sep 2017 09:43:25 +0200 Subject: fix radius --- view/theme/redbasic/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b508b2576..3e457c621 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -137,7 +137,6 @@ input, optgroup, select, textarea { pre code { border: none; padding: 1em 1.5em; - border-radius: $radius; } code { @@ -149,6 +148,7 @@ pre { background: #F5F5F5; color: #333; border:1px solid #ccc; + border-radius: $radius; } .heart { -- cgit v1.2.3 From 962a3f7945df3fcc2fe533f2a645dc246fbd4dca Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 19 Sep 2017 22:40:05 +0200 Subject: fix some issues with sticky-kit --- view/theme/redbasic/js/redbasic.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 5a586b9f9..b36e35ccc 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -16,12 +16,10 @@ $(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, - parent: '#region_1', + offset_top: parseInt($('#region_1').css('padding-top')), + parent: 'main', spacer: '#left_aside_spacer' }); } -- cgit v1.2.3 From ea5262a0df3d6f8ed6c1d26f272982c9ee6cbf8e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 26 Sep 2017 13:02:11 +0200 Subject: get rid of spinner.js in use a lightweight css spinner instead --- view/theme/redbasic/css/style.css | 87 ++++++++++++++++++++++++++++++++++----- 1 file changed, 76 insertions(+), 11 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 3e457c621..0d85162d3 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -7,6 +7,7 @@ /* generals */ + html { font-size: $font_size; } @@ -228,6 +229,79 @@ nav { /* contextual help end */ +/* spinner */ + +.spinner-wrapper { + display: none; +} + +.spinner.s { + height: 1rem; + width: 1rem; +} + +.spinner.m { + height: 2rem; + width: 2rem; +} + +.spinner.l { + height: 3rem; + width: 3rem; +} + +.spinner { + margin: 0 auto; + position: relative; + -webkit-animation: rotation 1s infinite linear; + -moz-animation: rotation 1s infinite linear; + -o-animation: rotation 1s infinite linear; + animation: rotation 1s infinite linear; + border-left: .2rem solid rgba(77, 77, 77, .15); + border-right: .2rem solid rgba(77, 77, 77, .15); + border-bottom: .2rem solid rgba(77, 77, 77, .15); + border-top: .2rem solid rgba(77, 77, 77, .5); + border-radius: 100%; +} + +@-webkit-keyframes rotation { + from { + -webkit-transform: rotate(0deg); + } + to { + -webkit-transform: rotate(359deg); + } +} + +@-moz-keyframes rotation { + from { + -moz-transform: rotate(0deg); + } + to { + -moz-transform: rotate(359deg); + } +} + +@-o-keyframes rotation { + from { + -o-transform: rotate(0deg); + } + to { + -o-transform: rotate(359deg); + } +} + +@keyframes rotation { + from { + transform: rotate(0deg); + } + to { + transform: rotate(359deg); + } +} + +/* spinner end */ + /* footer */ footer { @@ -478,8 +552,8 @@ footer { #nav-search-spinner { float: right; - margin-top: -0.85rem; - margin-right: 1.6rem; + margin-top: -1.4rem; + margin-right: 1rem; } @@ -721,11 +795,6 @@ div.jGrowl div.jGrowl-notification { display: block; } -#page-spinner { - color: #777; - margin: 24px; -} - #acl-search::-webkit-input-placeholder { /* non-fontawesome fonts set a fallback for text parts of the placeholder*/ font-family: FontAwesome, sans-serif, arial, freesans; @@ -973,10 +1042,6 @@ img.mail-conv-sender-photo { display: none; } -#profile-rotator { - color: #777; -} - .jot-icons.jot-lock-warn { color: darkorange; } -- cgit v1.2.3 From b8a0bc0b0b31670d2c424a40f7511132896a76d2 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 27 Sep 2017 12:06:06 +0200 Subject: fix some missing spinners --- view/theme/redbasic/css/style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0d85162d3..1b7aee30d 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1259,7 +1259,8 @@ img.mail-conv-sender-photo { .generic-content-wrapper { border: 1px solid #ccc; box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.2); - border-radius: $radius; + border-radius: $radius; + margin-bottom: 1.5rem; } .section-title-wrapper { -- cgit v1.2.3 From 9625d940a5383d7a6dba5a711bb3ce8a12becdd9 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 27 Sep 2017 13:21:27 +0200 Subject: do not use our spinner css on the justifiedGallery spinner which has the same classname hardcoded --- view/theme/redbasic/css/style.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 1b7aee30d..de6f8dac1 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -250,7 +250,9 @@ nav { width: 3rem; } -.spinner { +.spinner.s, +.spinner.m, +.spinner.l { margin: 0 auto; position: relative; -webkit-animation: rotation 1s infinite linear; -- cgit v1.2.3 From 6f709a6f57d10df73bf6d6ba5fc44c22d80f8717 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sat, 7 Oct 2017 23:44:27 -0700 Subject: navbar controls now functionally hidden with too low z-index when cover_photo is showing and navbar doesn't have class fixed-top --- view/theme/redbasic/css/style.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index de6f8dac1..22bdc2dbc 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1454,6 +1454,10 @@ blockquote { background-color: $nav_bg !important; } +.navbar { + z-index:1030; +} + .navbar-dark .navbar-nav .nav-link, .usermenu i { color: $nav_icon_colour; -- cgit v1.2.3 From 991db280be4c3cbbff4fb1e4dae8f303a487ed3f Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 8 Oct 2017 17:19:29 +0200 Subject: experimental new notifications - needs pconfig experimental_notif set to 1 for your channel to work. --- view/theme/redbasic/js/redbasic.js | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index b36e35ccc..c67c67a51 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -64,6 +64,13 @@ $(document).ready(function() { } }); + $('#notifications-btn-1').click(function() { + $('#region_3').toggleClass('fs'); + if($('#navbar-collapse-2').hasClass('show')){ + $('#navbar-collapse-2').removeClass('show'); + } + }); + $("input[data-role=cat-tagsinput]").tagsinput({ tagClass: 'badge badge-pill badge-warning text-dark' }); -- cgit v1.2.3 From 54a06903230ad87570b3a37161fa888dd38cb389 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 9 Oct 2017 13:35:58 +0200 Subject: more new notifications fixes --- view/theme/redbasic/js/redbasic.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index c67c67a51..257e7cfb6 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -24,11 +24,6 @@ $(document).ready(function() { }); } - if(($(window).width() < 767) && ($('#left_aside_wrapper .widget, #left_aside_wrapper .vcard').length > 0)) - $('#expand-aside').show(); - else - $('#expand-aside').hide(); - $('#expand-aside').on('click', toggleAside); $('section').on('click', function() { @@ -64,8 +59,14 @@ $(document).ready(function() { } }); + var notifications_parent = $('#notifications')[0].parentElement.id; $('#notifications-btn-1').click(function() { - $('#region_3').toggleClass('fs'); + if($('#notifications').hasClass('fs')) + $('#notifications').prependTo('#' + notifications_parent); + else + $('#notifications').prependTo('body'); + + $('#notifications').toggleClass('fs'); if($('#navbar-collapse-2').hasClass('show')){ $('#navbar-collapse-2').removeClass('show'); } -- cgit v1.2.3 From f99c007187b83755d7b1c80c63fde7c1162a99c4 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 9 Oct 2017 17:49:15 +0200 Subject: new notification changes - use sticky_kit instead of position fixed --- view/theme/redbasic/css/style.css | 4 ++++ view/theme/redbasic/js/redbasic.js | 5 +++++ 2 files changed, 9 insertions(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index de6f8dac1..a912fb825 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -161,6 +161,10 @@ nav { filter:alpha(opacity=$nav_percent_min_opacity); } +#nav-app-link { + white-space: nowrap; +} + #powered-by { font-size: 0.5rem; position: absolute; diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 257e7cfb6..3fa9d2a76 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -22,6 +22,11 @@ $(document).ready(function() { parent: 'main', spacer: '#left_aside_spacer' }); + $('#right_aside_wrapper').stick_in_parent({ + offset_top: parseInt($('#region_3').css('padding-top')), + parent: 'main', + spacer: '#right_aside_spacer' + }); } $('#expand-aside').on('click', toggleAside); -- cgit v1.2.3 From 41cf846ee3c51257dc8ba05e498345b3e568e422 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 10 Oct 2017 12:08:51 +0200 Subject: new notification fixes --- view/theme/redbasic/js/redbasic.js | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 3fa9d2a76..4f71c1e73 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -16,19 +16,27 @@ $(document).ready(function() { } $('#css3-calc').remove(); // Remove the test element - if($(window).width() > 767) { + if($(window).width() >= 767) { $('#left_aside_wrapper').stick_in_parent({ - offset_top: parseInt($('#region_1').css('padding-top')), + offset_top: parseInt($('aside').css('padding-top')), parent: 'main', spacer: '#left_aside_spacer' }); + } + + if($(window).width() >= 1200) { $('#right_aside_wrapper').stick_in_parent({ - offset_top: parseInt($('#region_3').css('padding-top')), + offset_top: parseInt($('aside').css('padding-top')), parent: 'main', spacer: '#right_aside_spacer' }); } + + $('#notifications_wrapper.fs #notifications').stick_in_parent({ + parent: '#notifications_wrapper' + }); + $('#expand-aside').on('click', toggleAside); $('section').on('click', function() { @@ -46,6 +54,16 @@ $(document).ready(function() { } }); + + var right_aside_height = $('#rightt_aside_wrapper').height(); + + $('#right_aside_wrapper').on('click', function() { + if(right_aside_height != $('#right_aside_wrapper').height()) { + $(document.body).trigger("sticky_kit:recalc"); + right_aside_height = $('#right_aside_wrapper').height(); + } + }); + $('.usermenu').click(function() { if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('show')){ $('#navbar-collapse-1, #navbar-collapse-2').removeClass('show'); @@ -64,14 +82,14 @@ $(document).ready(function() { } }); - var notifications_parent = $('#notifications')[0].parentElement.id; + var notifications_parent = $('#notifications_wrapper')[0].parentElement.id; $('#notifications-btn-1').click(function() { - if($('#notifications').hasClass('fs')) - $('#notifications').prependTo('#' + notifications_parent); + if($('#notifications_wrapper').hasClass('fs')) + $('#notifications_wrapper').prependTo('#' + notifications_parent); else - $('#notifications').prependTo('body'); + $('#notifications_wrapper').prependTo('section'); - $('#notifications').toggleClass('fs'); + $('#notifications_wrapper').toggleClass('fs'); if($('#navbar-collapse-2').hasClass('show')){ $('#navbar-collapse-2').removeClass('show'); } -- cgit v1.2.3 From 030d703a05084fa4efec7afece7948846dd6f6a9 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 10 Oct 2017 16:03:59 +0200 Subject: remove left_align mode --- view/theme/redbasic/css/align_left.css | 8 -------- view/theme/redbasic/php/config.php | 3 --- view/theme/redbasic/php/style.php | 13 ++----------- view/theme/redbasic/tpl/theme_settings.tpl | 1 - 4 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 view/theme/redbasic/css/align_left.css (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/align_left.css b/view/theme/redbasic/css/align_left.css deleted file mode 100644 index acb2893e3..000000000 --- a/view/theme/redbasic/css/align_left.css +++ /dev/null @@ -1,8 +0,0 @@ -main { - margin-left: 0px; -} - -aside#region_3 { - width: auto; - padding: 0px 0px 0px 0px; -} diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 8dbe1be9c..f98182739 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -52,7 +52,6 @@ class RedbasicConfig { $arr['radius'] = get_pconfig(local_channel(),'redbasic', 'radius' ); $arr['shadow'] = get_pconfig(local_channel(),'redbasic', 'photo_shadow' ); $arr['converse_width']=get_pconfig(local_channel(),"redbasic","converse_width"); - $arr['align_left']=get_pconfig(local_channel(),"redbasic","align_left"); $arr['top_photo']=get_pconfig(local_channel(),"redbasic","top_photo"); $arr['reply_photo']=get_pconfig(local_channel(),"redbasic","reply_photo"); return $this->form($arr); @@ -79,7 +78,6 @@ class RedbasicConfig { set_pconfig(local_channel(), 'redbasic', 'radius', $_POST['redbasic_radius']); set_pconfig(local_channel(), 'redbasic', 'photo_shadow', $_POST['redbasic_shadow']); set_pconfig(local_channel(), 'redbasic', 'converse_width', $_POST['redbasic_converse_width']); - set_pconfig(local_channel(), 'redbasic', 'align_left', $_POST['redbasic_align_left']); set_pconfig(local_channel(), 'redbasic', 'top_photo', $_POST['redbasic_top_photo']); set_pconfig(local_channel(), 'redbasic', 'reply_photo', $_POST['redbasic_reply_photo']); } @@ -112,7 +110,6 @@ class RedbasicConfig { '$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'))), '$top_photo' => array('redbasic_top_photo', t('Set size of conversation author photo'), $arr['top_photo']), '$reply_photo' => array('redbasic_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']), )); diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index e5a6eb0cd..91cc0b85b 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -26,7 +26,6 @@ if(! App::$install) { $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'); $top_photo=get_pconfig($uid,'redbasic','top_photo'); $reply_photo=get_pconfig($uid,'redbasic','reply_photo'); } @@ -117,10 +116,6 @@ if(file_exists('view/theme/redbasic/css/style.css')) { $x .= file_get_contents('view/theme/redbasic/css/narrow_navbar.css'); } - if($align_left && file_exists('view/theme/redbasic/css/align_left.css')) { - $x .= file_get_contents('view/theme/redbasic/css/align_left.css'); - } - if($schemecss) { $x .= $schemecss; } @@ -128,12 +123,8 @@ if(file_exists('view/theme/redbasic/css/style.css')) { $aside_width = 288; // left aside and right aside are 285px + converse width - if($align_left) { - $main_width = (($aside_width) + intval($converse_width)); - } - else { - $main_width = (($aside_width * 2) + intval($converse_width)); - } + $main_width = (($aside_width * 2) + intval($converse_width)); + // prevent main_width smaller than 768px $main_width = (($main_width < 768) ? 768 : $main_width); diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index f90e37ac3..7c552b49e 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -1,4 +1,3 @@ -{{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}} -- cgit v1.2.3 From 07ae4319501ac6edc024a849b4d060f171f27178 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 10 Oct 2017 20:02:42 +0200 Subject: css fixes --- view/theme/redbasic/css/style.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 2e8d71954..8b4a6ac82 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -787,18 +787,21 @@ div.jGrowl div.jGrowl-notification { .contactname { font-weight: bold; + color: $font_colour; display: block; overflow: hidden; text-overflow: ellipsis; } .dropdown-notification, +.notification, .member-item { line-height: 1.1em; font-size: 0.75rem; overflow: hidden; text-overflow: ellipsis; display: block; + white-space: nowrap; } #acl-search::-webkit-input-placeholder { -- cgit v1.2.3 From 56a675f713f3e971b1c9ccb60ab818f583dfc29e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 11 Oct 2017 21:32:23 +0200 Subject: z-index issue and some icons. rename notifications-btn-1 to notifications-btn --- view/theme/redbasic/css/style.css | 2 +- view/theme/redbasic/js/redbasic.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 8b4a6ac82..aea75df65 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -50,7 +50,7 @@ main { height: 100%; background: rgba(0, 0, 0, .5); cursor: pointer; - z-index: 1029; + z-index: 1028; } h1, .h1 { diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 4f71c1e73..04199ea95 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -83,7 +83,7 @@ $(document).ready(function() { }); var notifications_parent = $('#notifications_wrapper')[0].parentElement.id; - $('#notifications-btn-1').click(function() { + $('#notifications-btn').click(function() { if($('#notifications_wrapper').hasClass('fs')) $('#notifications_wrapper').prependTo('#' + notifications_parent); else -- cgit v1.2.3