diff options
Diffstat (limited to 'view/theme/redbasic')
28 files changed, 468 insertions, 1531 deletions
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/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css index 6b09b031a..99f083638 100644 --- a/view/theme/redbasic/css/narrow_navbar.css +++ b/view/theme/redbasic/css/narrow_navbar.css @@ -1,68 +1,30 @@ -@media screen and (min-width: 760px) { +@media screen and (min-width: 767px) { - aside { - padding-top: 52px; - } - - section { - padding-top: 52px; + nav.navbar { + padding-top: 1px; + padding-bottom: 1px } - .navbar-nav > li > a { - padding-top:7px !important; - padding-bottom:3px !important; - } - - .navbar { - min-height:25px !important; - } - - nav .navbar-header img { - height: 29px; - width: 29px; - margin-top: 1px; - border-radius: 4px; - } - - .navbar-left { - height: 29px; - } - - .container-fluid { - min-height:29px; - } - - .collapse .navbar-collapse { - min-height:29px; - } - - #nav-search-text { - margin:6px 15px 4px 15px; - } - - #nav-search-spinner { - margin: 16px 0px 0px 25px; + nav .badge { + top: 0px; + left: -0.25rem; } - header #banner { - margin-top:5px; + .contextual-help-content-open { + top: 2.5rem; } - nav .dropdown-menu, - nav .acpopup { - top: 30px !important; + aside { + padding-top: 3.5rem; } - nav .badge { - top: -29px; + section { + padding-top: 3.5rem; } #jGrowl.top-right { - top: 30px; + top: 3.5rem; right: 15px; } - .contextual-help-content-open { - top: 31px; - } } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 7551dfe87..aea75df65 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -7,13 +7,13 @@ /* generals */ + html { - font-size: 100%; + font-size: $font_size; } body { - font-family: sans-serif, arial, freesans; - font-size: $body_font_size; + font-size: 0.9rem; background-color: $bgcolour; background-image: url('$background_image'); background-attachment: fixed; @@ -48,35 +48,47 @@ main { left: 0; width: 100%; height: 100%; + background: rgba(0, 0, 0, .5); cursor: pointer; - z-index: 1029; + z-index: 1028; } h1, .h1 { - font-size: 2em; + font-size: 2rem; } h2, .h2 { - font-size: 1.667em; + font-size: 1.6rem; } h3, .h3 { - font-size: 1.334em; + font-size: 1.2rem; } h4, .h4 { - font-size: 1em; - font-weight: bold; + font-size: 1.05rem; } h5, .h5 { - font-size: 1em; + font-size: 0.9rem; } h6, .h6 { - font-size: 0.75em; + font-size: 0.75rem; +} + +#banner { + color: $banner_colour; + font-weight: bold; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } +#banner img { + max-height: 1.35rem; + width: auto; +} .jslider { font-family: sans-serif, arial, freesans; @@ -87,10 +99,6 @@ abbr { } /* icons */ -.tool-icons, -.cat-icons { - color: $toolicon_colour; -} a, .fakelink { @@ -108,34 +116,8 @@ a:focus, cursor: pointer; } -input[type="text"], -input[type="password"], -input[type="submit"], -input[type="file"], -select, -textarea { - font-family: sans-serif, arial, freesans; - font-size: $body_font_size; -} - -input { - padding: 5px; - line-height: 1.5; - border: 1px solid #ccc; - -moz-border-radius: $radiuspx; - border-radius: $radiuspx; -} - -input[type="submit"] { - background-color: #F0F0F0; - font-weight: bold; - color: #0080FF; - text-decoration: none; - padding: 6px 12px; -} - input, optgroup, select, textarea { - color: #333; + font-size: 0.9rem !important; resize: vertical; } @@ -155,6 +137,7 @@ input, optgroup, select, textarea { pre code { border: none; + padding: 1em 1.5em; } code { @@ -166,18 +149,22 @@ pre { background: #F5F5F5; color: #333; border:1px solid #ccc; + border-radius: $radius; } .heart { color: #FF0000; } -nav, -header { +nav { opacity: $nav_float_min_opacity; filter:alpha(opacity=$nav_percent_min_opacity); } +#nav-app-link { + white-space: nowrap; +} + #powered-by { font-size: 0.5rem; position: absolute; @@ -199,49 +186,8 @@ header { padding: 10px; } -nav #banner #logo-text a { - font-size: 40px; - font-weight: bold; - margin-left: 3px; - color: #000000; - -} -nav #banner #logo-text a:hover { text-decoration: none; } - .nav-channel-select { margin-left: 8px; } -header #banner { - z-index: 1040; - margin-top: 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; - font-weight: bold; - whitespace: nowrap; -} - -header #banner a, -header #banner a:active, -header #banner a:visited, -header #banner a:link, -header #banner a:hover { - color: $banner_colour; - text-decoration: none; - outline: none; - vertical-align: bottom; -} - -header #banner #logo-img { - height: 22px; - margin-top: 5px; -} - -header #banner #logo-text { - font-size: 22px; -} - /* contextual help */ .contextual-help-content { display: none; @@ -251,11 +197,12 @@ header #banner #logo-text { .contextual-help-content-open { display: block; position: fixed; - top: 51px; + top: 3.35rem; left: 0px; + width: 100%; max-height: 50%; background: $comment_item_colour; - padding: 20px; + padding: 1rem; border-bottom: #ccc 1px solid; overflow: auto; -moz-box-shadow: 0px 3px 3px rgba(0,0,0,0.2); @@ -270,22 +217,97 @@ header #banner #logo-text { .contextual-help-tool { padding: 7px; filter: alpha(opacity=20); - opacity: .2; + opacity: .5; } .contextual-help-tool:hover { filter: alpha(opacity=50); - opacity: .5; + opacity: 1; text-decoration: none; } .contextual-help-tool i { - color: #000; - font-size: 16px; + color: $font_colour; + font-size: 1.05rem; } /* contextual help end */ +/* spinner */ + +.spinner-wrapper { + display: none; +} + +.spinner.s { + height: 1rem; + width: 1rem; +} + +.spinner.m { + height: 2rem; + width: 2rem; +} + +.spinner.l { + height: 3rem; + width: 3rem; +} + +.spinner.s, +.spinner.m, +.spinner.l { + 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 { @@ -311,29 +333,13 @@ footer { margin-top: 15px; } -.preview { - background: url('../img/gray_and_white_diagonal_stripes_background_seamless.gif'); +.preview-indicator { } #theme-preview { margin: 15px 0px; } -/*TODO: we should use one class for all this. */ - -.group-selected, -.fileas-selected, -.categories-selected, -.search-selected, -.active, -.group-selected:hover, -.fileas-selected:hover, -.categories-selected:hover, -.search-selected:hover, -.active:hover { - color: $font_colour; -} - #cropimage-wrapper, #cropimage-preview-wrapper { float: left; padding: 30px; @@ -346,7 +352,7 @@ footer { .fn { font-weight: bold; - font-size: 16px; + font-size: 1rem; color: #444444; } @@ -355,9 +361,7 @@ footer { padding: 0px 10px 10px 10px; background-color: rgba(254,254,254,0.5); border: 1px solid rgba(254,254,254,0.5); - -moz-border-radius: $radiuspx; - -webkit-border-radius: $radiuspx; - border-radius: $radiuspx; + border-radius: $radius; word-wrap: break-word; } @@ -384,10 +388,6 @@ footer { filter:alpha(opacity=100); } -#view-contact-end { - clear: both; -} - #profile-photo-wrapper img { width: 100%; height: 100%; @@ -399,7 +399,7 @@ footer { width: 251px; height: 251px; margin-bottom: 10px; - border-radius: $radiuspx; + border-radius: $radius; } #hide-friends-yes-label, @@ -453,8 +453,7 @@ footer { .photo, .contact-block-img { - border-radius: $radiuspx; - -moz-border-radius: $radiuspx; + border-radius: $radius; box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; } @@ -468,8 +467,7 @@ footer { .profile-match-photo img, .directory-photo-img { - border-radius: $radiuspx; - -moz-border-radius: $radiuspx; + border-radius: $radius; box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; } @@ -528,10 +526,6 @@ footer { height: 34px; } -#contact-block-end { - clear: both; -} - .contact-block-img { width:47px; height:47px; @@ -555,47 +549,23 @@ footer { } .wall-item-conv { - padding: 7px 10px; background-color: $comment_item_colour; } - -#conversation-end { - clear: both; -} - #nav-notifications-template { display: none; } -#nav-searchbar { - float: right; - margin-top: 2px; - margin-right: 10px; -} - #nav-search-spinner { - float: left; - margin: 25px 0px 0px 25px; - color: $nav_active_icon_colour; + float: right; + margin-top: -1.4rem; + margin-right: 1rem; } -#nav-search-text:hover, -#nav-search-text:focus { - background-color: #fff; - color: #000; -} #nav-search-text { - font-size: 12px; - width: 200px; - height: 20px; - margin: 15px; - padding: 0px 5px 0px 5px; - border-radius: $radiuspx; - border-color: $nav_bd; - background-color: #eee; - transition: background-color 300ms ease 0s; + width: 280px; + padding: .15rem .5rem; } #nav-search-text::-webkit-input-placeholder { @@ -607,7 +577,7 @@ footer { } nav .acpopup { - top: 50px !important; + top: 46px !important; margin-left: -35px; width: 290px; } @@ -644,7 +614,7 @@ nav .acpopup { #cboxContent { padding: 3px; border: 0px solid #fff; - border-radius: $radiuspx; + border-radius: $radius; background-color: #fff; z-index: 1052; } @@ -667,11 +637,6 @@ nav .acpopup { text-align: center; } -.profile-match-break, -.profile-match-end { - clear: both; -} - .profile-match-connect { text-align: center; font-weight: bold; @@ -690,9 +655,6 @@ nav .acpopup { float: right; } -#profile-match-wrapper-end { - clear: both; -} .side-link { margin-bottom: 15px; } @@ -705,10 +667,6 @@ nav .acpopup { border: 1px solid #ddd; } -#group-members-end { - clear: both; -} - #group-separator { margin-top: 10px; margin-bottom: 10px; @@ -721,11 +679,6 @@ nav .acpopup { border: 1px solid #ddd; } -#group-all-contacts-end { - clear: both; - margin-bottom: 10px; -} - #group-edit-desc { margin-top: 15px; } @@ -739,10 +692,6 @@ nav .acpopup { border: 1px solid #ddd; } -#prof-members-end { - clear: both; -} - #prof-separator { margin-top: 10px; margin-bottom: 10px; @@ -755,11 +704,6 @@ nav .acpopup { border: 1px solid #ddd; } -#prof-all-contacts-end { - clear: both; - margin-bottom: 10px; -} - #prof-edit-desc { margin-top: 15px; } @@ -773,10 +717,6 @@ nav .acpopup { width: 80px; margin-right: 15px; } -.notification-listing-end { - clear: both; - margin-bottom: 15px; -} /** * OAuth @@ -826,7 +766,7 @@ div.jGrowl div.info { padding-left: 58px; } #jGrowl.top-right { - top: 65px; + top: 4.5rem; right: 15px; } @@ -834,140 +774,34 @@ div.jGrowl div.jGrowl-notification { min-height: 60px; } -#id_term_label { - width:75px; -} -#id_term { - width:100px; -} - -#nav-search-text-ac .autocomplete { - position: fixed; - top: 51px; - border: 1px solid $nav_bd; - border-top: none; -} - -#recip-ac .autocomplete, -#poke-recip-ac .autocomplete, -#id-name-ac .autocomplete, -#contact-search-ac .autocomplete { - margin-top: 2px; - margin-left: $radiuspx; - margin-right: $radiuspx; - border: 1px solid #666; - border-top: none; - -} - -.autocomplete { - color: $font_colour; - cursor: pointer; - text-align: left; - max-height: 350px; - overflow: auto; - border-bottom-left-radius: $radiuspx; - border-bottom-right-radius: $radiuspx; -} - -.autocomplete .selected { - background: #eee; -} - -.autocomplete div { - padding: 2px 5px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - .jslider .jslider-scale ins { color: #333; - font-size: $body_font_size; + font-size: 0.9rem; width: 100px; text-align: center; } -a.rconnect, a.rateme, div.rateme { - color: $nav_active_icon_colour; - text-decoration: none; - font-weight: normal; - outline: none; -} - -a.rconnect:hover, a.rateme:hover, div.rateme:hover { - color: #0080FF; - text-decoration: none; -} - -.widget.rateme { - margin-top: 15px; - padding: 0; -} - -.widget .conv-participants { +.conv-participants { color: $font_colour; } -.notif-item a { - color: #000; -} - -.notif-item a:hover { - text-decoration: underline; - color: #000; -} - -.notif-image { - width: 32px; - height: 32px; - padding: 7px 7px 0px 0px; -} - .contactname { - padding-top: 2px; font-weight: bold; - line-height: 1em; - white-space: nowrap; + color: $font_colour; + display: block; overflow: hidden; text-overflow: ellipsis; - display: block; } -.dropdown-sub-text { - line-height: 1em; +.dropdown-notification, +.notification, +.member-item { + line-height: 1.1em; + font-size: 0.75rem; overflow: hidden; text-overflow: ellipsis; display: block; -} - -.notify-seen a { - background: #ddd; -} - -#page-spinner { - color: #777; - margin: 24px; -} - -.tabs-end { - clear: both; -} - -.modal-header .contextual-help-tool { - /* Mostly duplicating ".modal-header .close" and ".close" layout settings from bootstrap */ - float: right; - font-size: 21px; - padding: 0; - margin-top: -4px; - margin-right: 15px; - line-height: 1; -} - -#acl-search { - padding: 4px; - border: 1px solid #ccc; - width: 100%; + white-space: nowrap; } #acl-search::-webkit-input-placeholder { @@ -980,59 +814,17 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { font-family: FontAwesome, sans-serif, arial, freesans; } -#aclModal .modal-body { - padding-top: 10px; -} - -#acl-showlimited-description { - font-size: 90%; - color: #888; - margin-left: 10px; - margin-bottom: 4px; -} - -#acl-list { - border: 1px solid #ccc; - -webkit-border-radius: $radiuspx ; - -moz-border-radius: $radiuspx; - border-radius: $radiuspx; -} - -#acl-search-wrapper { - padding: 7px 10px; - background-color: $item_colour; - border-top-left-radius: $radiuspx; - border-top-right-radius: $radiuspx; - border-bottom: 1px solid #ccc; -} - -#acl-list-content-wrapper { - display: block; - overflow: auto; - clear: both; - min-height: 62px; - padding: 10px 10px 0px 0px; - -} - -#jotnets-wrapper, #jotnets-collapse { - margin-bottom: 18px; -} - -#jot-preview-content { - margin-top: 10px; -} .acl-list-item { - width: 48%; /* fallback if browser does not support calc() */ - width: calc(50% - 10px); + width: 100%; + padding: 0.5rem; + margin-bottom: 0.5rem; border: 1px solid #ccc; - margin: 0px 0px 10px 10px; - padding: 5px; float: left; - -webkit-border-radius: $radiuspx ; - -moz-border-radius: $radiuspx; - border-radius: $radiuspx; - background-color: white; + border-radius: $radius; +} + +.acl-item-header { + width: 100%; } .acl-list-item.grouphide { @@ -1043,66 +835,20 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { border: 1px solid green; } -.acl-list-item img { - width: 40px; - height: 40px; - float: left; - margin-right: 5px; - -webkit-border-radius: $radiuspx ; - -moz-border-radius: $radiuspx; - border-radius: $radiuspx; -} - .acl-list-item.taggable { background-color: #ddddff; } -.acl-list-item p { - font-size: $font_size; - margin: 0px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - .acl-button-show, .acl-button-hide { float: right; margin-left: 5px; } -#acl-showlimited-caption, -#acl-showall-caption { - font-size: 115%; -} - -#acl-radiowrapper-showall { - margin-top: 20px; - margin-bottom: 20px; -} -#acl-radiowrapper-showlimited { - margin-bottom: 0; -} - -#acl-showall + i { - font-size: 140%; -} - -#acl-info-icon, -#acl-info-icon:active { - font-size: 110%; - color: $link_colour; - text-decoration: none; -} - -#acl-showall-caption { - margin-left: 0.35em; -} - .contact-block-content { margin-top: 10px; } -.contact-block-img.archived, .app-deleted { +.contact-block-img.archived, .app-deleted, .dim { opacity: 0.3; filter:alpha(opacity=30); } @@ -1112,7 +858,7 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { .reshared-content { margin-left: 20px; } .shared_header img { - border-radius: $radiuspx; + border-radius: $radius; margin-right: 10px; } @@ -1178,36 +924,39 @@ margin-right: 50px; list-style-type: none; } -.generic-icons { - font-size: 1.2em; - color: $toolicon_colour; - margin-right: 7px; +.generic-icons, +a .generic-icons { + font-size: 1rem; + margin-right: 0.5rem; + color: $font_colour; } -.generic-icons:hover { - color: $toolicon_colour; +.generic-icons:hover, +a .generic-icons:hover { + color: $font_colour; } -.generic-icons-nav { - font-size: 1.2em; - margin-right: 7px; +.generic-icons-right { + font-size: 1rem; + margin-left: 0.5rem; + color: $font_colour; } -nav .navbar-collapse.in .generic-icons, -nav .navbar-collapse.collapsing .generic-icons { - color: $nav_active_icon_colour; + +.generic-icons-nav { + font-size: 1rem; + margin-right: 7px; } .admin-icons { font-size: 1.2em; - color: $toolicon_colour; margin-right: 7px; } .drop-icons, a .drop-icons { - color: $toolicon_colour; - font-size: 1.2em; + font-size: 1rem; + color: $font_colour; text-decoration: none; cursor: pointer; } @@ -1217,7 +966,8 @@ a .drop-icons:hover { color: #FF0000; } -.lockview { +.lockview, +.sys-apps-toggle { cursor: pointer; } @@ -1252,8 +1002,7 @@ th,td { /* mail */ img.mail-conv-sender-photo { - -moz-border-radius: $radiuspx; - border-radius: $radiuspx; + border-radius: $radius; } /* jot */ @@ -1270,25 +1019,23 @@ img.mail-conv-sender-photo { font-weight: bold; } - - #profile-jot-wrapper { background-color: rgba(254,254,254,1); border: 1px solid #ccc; - border-radius: $radiuspx; + border-radius: $radius; } #profile-jot-text { - border-radius: $radiuspx; + border-radius: $radius; } #profile-jot-text::-webkit-input-placeholder { - font-size: 16px; + font-size: 1.2rem; } #profile-jot-text::-moz-placeholder { - font-size: 16px; + font-size: 1.2rem; } #profile-jot-text:focus::-webkit-input-placeholder { @@ -1304,52 +1051,41 @@ img.mail-conv-sender-photo { display: none; } -#profile-rotator { - color: #777; -} - -.jot-icons { - color: $toolicon_colour; -} - .jot-icons.jot-lock-warn { color: darkorange; } /* conversation */ -.nsfw-wrap { - text-align: center; - font-size: $body_font_size; + +.top-radius { + border-top-right-radius: $radius; + border-top-left-radius: $radius; } .wall-event-item { padding: 10px; color: #fff; background-color: #3A87AD; /* should reflect calendar color */ - border-top-left-radius: $radiuspx; - border-top-right-radius: $radiuspx; + border-top-left-radius: $radius; + border-top-right-radius: $radius; } .wall-photo-item img { max-width: 100% !important; - border-top-right-radius: $radiuspx; - border-top-left-radius: $radiuspx; -} - -.wall-item-title { - font-size: $font_size; + border-top-right-radius: $radius; + border-top-left-radius: $radius; } .wall-item-footer { - font-size: $body_font_size; + font-size: 0.75rem; margin-top: 2em; } .wall-item-content-wrapper { background-color: $item_colour; - border-top-right-radius: $radiuspx; - border-top-left-radius: $radiuspx; + border-top-right-radius: $radius; + border-top-left-radius: $radius; } .wall-item-content-wrapper.comment { @@ -1376,8 +1112,8 @@ img.mail-conv-sender-photo { padding: 7px 10px; background-color: $item_colour; border-radius: 0px; - border-bottom-right-radius: $radiuspx; - border-bottom-left-radius: $radiuspx; + border-bottom-right-radius: $radius; + border-bottom-left-radius: $radius; border-top: 3px solid $comment_item_colour; } @@ -1385,37 +1121,23 @@ img.mail-conv-sender-photo { border-top: 0px solid $comment_item_colour; } -.wall-item-like, -.wall-item-dislike { - font-size: 11px; -} .wall-item-photo { + width: $top_photo; + height: $top_photo; border: none; - width: $top_photo !important; - height: $top_photo !important; - + border-radius: $radius; + box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; } .comment .wall-item-photo { - width: $reply_photo !important; - height: $reply_photo !important; -} - -.wall-item-photo { - border-radius: $radiuspx; - -moz-border-radius: $radiuspx; - box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; + width: $reply_photo; + height: $reply_photo; } .wall-item-ago, .dropdown-sub-text { color: #777; - font-size: 0.833em; -} - -.wall-item-ago i { - font-size: 0.833em; } .wall-item-content, @@ -1423,37 +1145,13 @@ img.mail-conv-sender-photo { .page-body, .chat-item-text, .chat-item-text-self { - font-size: $font_size; - clear: both; -} - -.item-tool { - font-size: 1.2em; - color: $toolicon_colour; -} - -.like-rotator { - color: $toolicon_colour; + font-size: 1rem; } -.comment-icon { - font-size: 0.833em; - color: $toolicon_colour; -} -.comment-edit-text-empty, -.comment-edit-text-full { +.comment-edit-text { border: 1px solid #ccc; - border-radius: $radiuspx; -} - -.comment-edit-text-empty { - color: gray; - font-size: 12px; -} - -.comment-edit-text-full { - color: black; + border-radius: $radius; } .divgrow-showmore { @@ -1475,19 +1173,12 @@ img.mail-conv-sender-photo { .widget { background-color: rgba(254,254,254,.5); border: 1px solid rgba(254,254,254,.5); - -moz-border-radius: $radiuspx; - -webkit-border-radius: $radiuspx; - border-radius: $radiuspx; -} - -.widget h3 { - color: $toolicon_colour; + border-radius: $radius; } #note-text { border: 1px solid #ccc; - border-radius: $radiuspx; - -moz-border-radius: $radiuspx; + border-radius: $radius; } .fileas-ul { @@ -1496,8 +1187,7 @@ img.mail-conv-sender-photo { #datebrowse-sidebar select { border: 1px solid #ccc; - border-radius: $radiuspx; - -moz-border-radius: $radiuspx; + border-radius: $radius; } .thing-show img { @@ -1519,63 +1209,50 @@ img.mail-conv-sender-photo { .chat-item-photo, .chat-item-photo-self { - border-radius: $radiuspx; + border-radius: $radius; } .chat-item-title, .chat-item-title-self { - border-radius: $radiuspx; + border-radius: $radius; background-color: $item_colour; } #chatMembers img { - border-radius: $radiuspx; -} - -/* nav bootstrap */ - -nav img { - border-radius: $radiuspx; -} - -nav .dropdown-menu { - font-size: $body_font_size; - border-top-right-radius: 0px; - border-top-left-radius: 0px; - border-bottom-right-radius: $radiuspx; - border-bottom-left-radius: $radiuspx; + border-radius: $radius; } -.dropdown-menu > .active > a, -.dropdown-menu > .active > a:focus, -.dropdown-menu > .active > a:hover { - color: #333; - background-color: #f5f5f5; -} - -.dropdown-menu-img-sm { - float: left; - width: 36px; - height: 36px; +.menu-img-3 { + width: 3.3em; + height: 3.3em; margin-right: 5px; + border-radius: $radius; + float: left; } -.dropdown-menu-img-xs { - height: 18px; - width: 18px; +.menu-img-2 { + height: 2.2em; + width: 2.2em; margin-right: 5px; + border-radius: $radius; + float: left; } -#usermenu-caret { - color: $nav_icon_colour; +.menu-img-1 { + height: 1.5em; + width: 1.5em; + margin-right: 5px; + border-radius: $radius; } -.usermenu-head { - float: left; +.usermenu { + width: 3.75rem; } -.usermenu-head:hover #usermenu-caret { - color: $nav_active_icon_colour; +#avatar { + width: 2.35rem; + height: 2.35rem; + border-radius: $radius; } .page-title { @@ -1585,20 +1262,21 @@ nav .dropdown-menu { .generic-content-wrapper-styled { background-color: $bgcolour; padding: 10px; - border-radius: $radiuspx; + border-radius: $radius; } .generic-content-wrapper { border: 1px solid #ccc; box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.2); - border-radius: $radiuspx; + border-radius: $radius; + margin-bottom: 1.5rem; } .section-title-wrapper { padding: 7px 10px; background-color: $item_colour; - border-top-left-radius: $radiuspx; - border-top-right-radius: $radiuspx; + border-top-left-radius: $radius; + border-top-right-radius: $radius; border-bottom: 3px solid $comment_item_colour; } @@ -1611,8 +1289,12 @@ nav .dropdown-menu { text-overflow: ellipsis; } +.section-subtitle-wrapper h3 { + padding: 3px; +} + .section-subtitle-wrapper { - padding: 7px 10px; + padding: 4px 10px; background-color: $item_colour; border-bottom: 3px solid $comment_item_colour; } @@ -1625,24 +1307,24 @@ nav .dropdown-menu { .section-content-info-wrapper { padding: 21px 10px; - color: #31708f; - background-color: #d9edf7; + color: #0c5460; + background-color: #d1ecf1; border-bottom: 3px solid $comment_item_colour; text-align: center; } .section-content-warning-wrapper { padding: 21px 10px; - color: #8a6d3b; - background-color: #fcf8e3; + color: #856404; + background-color: #fff3cd; border-bottom: 3px solid $comment_item_colour; text-align: center; } .section-content-danger-wrapper { padding: 21px 10px; - color: #a94442; - background-color: #f2dede; + color: #721c24; + background-color: #f8d7da; border-bottom: 3px solid $comment_item_colour; text-align: center; } @@ -1655,22 +1337,22 @@ nav .dropdown-menu { .section-content-wrapper .section-content-danger-wrapper { margin-bottom: 10px; border-bottom: none; - border-radius: $radiuspx; + border-radius: $radius; } .section-content-wrapper { padding: 7px 10px; background-color: $comment_item_colour; - border-bottom-left-radius: $radiuspx; - border-bottom-right-radius: $radiuspx; + border-bottom-left-radius: $radius; + border-bottom-right-radius: $radius; word-wrap: break-word; } .section-content-wrapper-np { background-color: $comment_item_colour; - border-bottom-left-radius: $radiuspx; - border-bottom-right-radius: $radiuspx; + border-bottom-left-radius: $radius; + border-bottom-right-radius: $radius; word-wrap: break-word; } @@ -1687,6 +1369,7 @@ main.fullscreen .generic-content-wrapper { top: 0px; left: 0px; border-radius: 0px; + border-width: 0px; } main.fullscreen .section-title-wrapper { @@ -1723,157 +1406,80 @@ main.fullscreen .section-content-wrapper-np { background-color: $item_colour; } -nav ul li .undefined, -nav ul li .notify-seen, -nav ul li .notify-unseen - { - max-height: 3rem; +.notify-seen { + background-color: $item_colour; } - /* bootstrap overrides */ -.panel { - background-color: transparent; - border: 0px solid transparent; - border-radius: 0px; - -webkit-box-shadow: 0 0px 0px rgba(0, 0, 0, .0); - box-shadow: 0 0px 0px rgba(0, 0, 0, .0); +.btn, +.form-control, +.nav-pills .nav-link, +.nav-tabs .nav-link { + border-radius: $radius; } -.panel-group .panel + .panel { - margin-top: 0px; +.rounded-top { + border-top-left-radius: $radius !important; + border-top-right-radius: $radius !important; } blockquote { - font-size: $font_size; + font-size: 1rem; font-style: italic; border-left: 3px solid #ccc; padding: 1em 0px 1em 1.5em; margin: 0px; } -.badge { - border-radius: $radiuspx; -} - -nav .badge.home-update, -nav .badge.notify-update, -nav .badge.intro-update, -nav .badge.mail-update { - background-color: #C9302C; -} - .dropdown-menu { - font-size: $body_font_size; - border-radius: $radiuspx; -} - -.dropdown-menu img { - border-radius: $radiuspx; -} - -.navbar-inverse { - background-image: -webkit-linear-gradient(top, $nav_gradient_top 0%, $nav_gradient_bottom 100%); - background-image: linear-gradient(to bottom, $nav_gradient_top 0%, $nav_gradient_bottom 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=$nav_gradient_top, endColorstr=$nav_gradient_bottom, GradientType=0); - background-color: $nav_bg; - border-color: $nav_bd; -} - -.navbar-inverse .navbar-collapse { - border-color: $nav_bd; -} - -.navbar-inverse .navbar-nav > .active > a { - background-image: -webkit-linear-gradient(top, $nav_active_gradient_top 0%, $nav_active_gradient_bottom 100%); - background-image: linear-gradient(to bottom, $nav_active_gradient_top 0%, $nav_active_gradient_bottom 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=$nav_active_gradient_top, endColorstr=$nav_active_gradient_bottom, GradientType=0); + color: $font_colour; + font-size: 0.9rem; + border-radius: $radius; } - -.navbar-inverse .navbar-nav > li > a { - color: $nav_icon_colour; +.dropdown-item { + color: $font_colour; } -.navbar-inverse .navbar-nav > li > a:hover, -.navbar-inverse .navbar-nav > li > a:focus { - color: $nav_active_icon_colour; +.dropdown-item:active, +.dropdown-item:focus, +.dropdown-item:hover, +.textcomplete-item:focus .dropdown-item, +.textcomplete-item:hover .dropdown-item, +.textcomplete-item.active .dropdown-item, +.textcomplete-item:active .dropdown-item { + color: $font_colour; + background-color: $item_colour; } -.navbar-inverse .navbar-nav > .active > a, -.navbar-inverse .navbar-nav > .active > a:hover, -.navbar-inverse .navbar-nav > .active > a:focus { - color: $nav_active_icon_colour; +.dropdown-item.active { + color: #fff; + background-color: #007bff; } -.navbar-inverse .navbar-nav > .open > a, -.navbar-inverse .navbar-nav > .open > a:hover, -.navbar-inverse .navbar-nav > .open > a:focus { - background-color: $nav_bd; - color: $nav_active_icon_colour; +.bg-dark { + background-color: $nav_bg !important; } -.navbar-inverse .navbar-toggle { - border-color: $nav_bd; -} -.navbar-inverse .navbar-toggle:hover, -.navbar-inverse .navbar-toggle:focus { - background-color: $nav_bg; +.navbar { + z-index:1030; } -.navbar-inverse .navbar-toggle .icon-bar { - background-color: $nav_active_icon_colour; +.navbar-dark .navbar-nav .nav-link, +.usermenu i { + color: $nav_icon_colour; } -#expand-aside, -#expand-tabs, -#doco-return-to-top-btn, -#context-help-btn, -#notifications-btn, -#login_nav_btn_collapse { +.navbar-dark .navbar-nav .nav-link:focus, +.navbar-dark .navbar-nav .nav-link:hover, +.usermenu:focus i, +.usermenu:hover i { color: $nav_active_icon_colour; - padding: 7px 10px; -} - -.nav-tabs.nav-justified { - background-color: rgba(254,254,254,.5); - border-top-left-radius: 4px; - border-top-right-radius: 4px; -} - -.nav-tabs.nav-justified > .active > a, -.nav-tabs.nav-justified > .active > a:hover, -.nav-tabs.nav-justified > .active > a:focus { - border-bottom-color: transparent; -} - -.nav-tabs > li.active > a, -.nav-tabs > li.active > a:hover, -.nav-tabs > li.active > a:focus { - background-color: transparent; -} - -#tabs-collapse-1 { - padding: 0px; - margin-bottom: 25px; -} - -.btn { - font-size: $body_font_size; -} - -.btn-xs { - font-size: 0.75rem; -} - -.btn-default { - background-color: transparent; } @media screen and (max-width: 767px) { aside#region_1 { - background: rgba(0, 0, 0, .1); border-right: 1px solid $nav_bd; } @@ -1886,33 +1492,6 @@ nav .badge.mail-update { left: 0px; } - .thread-wrapper.toplevel_item { - width: 100%; - border:1px; - } - - .wall-item-photo { - width: 48px !important; - height: 48px !important; - } - - .comment .wall-item-photo { - width: 32px !important; - height: 32px !important; - } - - .acl-list-item { - width: 98%; /* fallback if browser does not support calc() */ - width: calc(100% - 10px); - } - -} - -/* release the navbar in landscape view on small devices */ -@media screen and (max-height: 320px) { - .navbar-fixed-top { - position: absolute; - } } .shareable_element_text { @@ -1961,7 +1540,7 @@ dl.bb-dl > dd > li { font-weight: normal; font-style: normal; text-decoration: inherit; - content:"\f069"; + content:"\f069 "; } /* Modified original CSS to match input in Redbasic */ @@ -1970,7 +1549,7 @@ dl.bb-dl > dd > li { margin-bottom: 0px; box-shadow: none; display: inline-block; - border-radius: $radiuspx; + border-radius: $radius; cursor: text; padding: 0px 10px; width: 100%; @@ -1988,31 +1567,31 @@ dl.bb-dl > dd > li { /* Turn checkboxes into switches */ -.field.checkbox > div { +.form-group.checkbox > div { position: relative; width: 60px; -webkit-user-select:none; -moz-user-select:none; -ms-user-select: none; display:inline-block; } -.field.checkbox input { +.form-group.checkbox input { display: none; } -.field.checkbox > div label { +.form-group.checkbox > div label { display: block; overflow: hidden; cursor: pointer; border: 1px solid #ccc; - border-radius: 4px; + border-radius: $radius; margin:0px; -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s; -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; } -.field.checkbox:hover label { +.form-group.checkbox:hover label { color: $link_colour; } -.field.checkbox:hover > div label { +.form-group.checkbox:hover > div label { border-color: $link_colour; } @@ -2051,13 +1630,13 @@ dl.bb-dl > dd > li { -o-transition: all 0.3s ease-in 0s; transition: all 0.3s ease-in 0s; } -.field.checkbox > div > input:checked + label .onoffswitch-inner { +.form-group.checkbox > div > input:checked + label .onoffswitch-inner { margin-left: 0px; } -.field.checkbox > div > input:checked + label .onoffswitch-switch { +.form-group.checkbox > div > input:checked + label .onoffswitch-switch { right: 0px; - background-color: #337AB7; + background-color: #0275d8; } .help-searchlist { @@ -2080,30 +1659,25 @@ dl.bb-dl > dd > li { #ace-editor, #editor { - border-bottom-left-radius: $radiuspx; - border-bottom-right-radius: $radiuspx; + border-bottom-left-radius: $radius; + border-bottom-right-radius: $radius; } -.sub-menu { - margin-top: 10px; - padding-left: 15px; - border-left: 3px solid #eee; -} - -.nav-pills-stacked-icons { - padding: 6px 10px; - float: right; - position: relative; - z-index:1; +.sub-menu-wrapper { + padding-left: 1rem; + display: none; } -.nav-pills-stacked-icons:hover + a { - background-color: #eee; +.sub-menu { + width: 100%; + margin-top: 0.5rem; + padding-left: 1rem; + border-left: 0.2rem solid #eee; } .app-icon { + color: #777; font-size: 80px; - color: $toolicon_colour; text-shadow: 3px 3px 3px lightgrey; } @@ -2117,6 +1691,7 @@ dl.bb-dl > dd > li { margin-left: auto; margin-right: auto; } + #permcat-index { margin: 10px; } diff --git a/view/theme/redbasic/img/bbedit.png b/view/theme/redbasic/img/bbedit.png Binary files differdeleted file mode 100644 index b89f2f7a8..000000000 --- a/view/theme/redbasic/img/bbedit.png +++ /dev/null diff --git a/view/theme/redbasic/img/border.jpg b/view/theme/redbasic/img/border.jpg Binary files differdeleted file mode 100644 index 034a1cb63..000000000 --- a/view/theme/redbasic/img/border.jpg +++ /dev/null diff --git a/view/theme/redbasic/img/editicons.png b/view/theme/redbasic/img/editicons.png Binary files differdeleted file mode 100644 index 171a40876..000000000 --- a/view/theme/redbasic/img/editicons.png +++ /dev/null diff --git a/view/theme/redbasic/img/ff-16.jpg b/view/theme/redbasic/img/ff-16.jpg Binary files differdeleted file mode 100644 index 3621f5914..000000000 --- a/view/theme/redbasic/img/ff-16.jpg +++ /dev/null diff --git a/view/theme/redbasic/img/file.gif b/view/theme/redbasic/img/file.gif Binary files differdeleted file mode 100644 index c532335ed..000000000 --- a/view/theme/redbasic/img/file.gif +++ /dev/null diff --git a/view/theme/redbasic/img/friendika-16.png b/view/theme/redbasic/img/friendika-16.png Binary files differdeleted file mode 100644 index 1a742ecdc..000000000 --- a/view/theme/redbasic/img/friendika-16.png +++ /dev/null diff --git a/view/theme/redbasic/img/jotperms.png b/view/theme/redbasic/img/jotperms.png Binary files differdeleted file mode 100644 index d133a6e01..000000000 --- a/view/theme/redbasic/img/jotperms.png +++ /dev/null diff --git a/view/theme/redbasic/img/login-bg.gif b/view/theme/redbasic/img/login-bg.gif Binary files differdeleted file mode 100644 index cde836c89..000000000 --- a/view/theme/redbasic/img/login-bg.gif +++ /dev/null diff --git a/view/theme/redbasic/img/notify_on.png b/view/theme/redbasic/img/notify_on.png Binary files differdeleted file mode 100644 index 18002e15c..000000000 --- a/view/theme/redbasic/img/notify_on.png +++ /dev/null diff --git a/view/theme/redbasic/img/photo-menu.jpg b/view/theme/redbasic/img/photo-menu.jpg Binary files differdeleted file mode 100644 index fde5eb535..000000000 --- a/view/theme/redbasic/img/photo-menu.jpg +++ /dev/null diff --git a/view/theme/redbasic/img/shiny.png b/view/theme/redbasic/img/shiny.png Binary files differdeleted file mode 100644 index 994c0d05d..000000000 --- a/view/theme/redbasic/img/shiny.png +++ /dev/null diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 81a95c68b..04199ea95 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -16,14 +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: $('nav').outerHeight(true), - parent: '#region_1', + 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($('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() { @@ -41,29 +54,49 @@ $(document).ready(function() { } }); - if($('#left_aside_wrapper').length && $('#left_aside_wrapper').html().length === 0) { - $('#expand-aside').hide(); - } - $('#expand-tabs').click(function() { - if(!$('#tabs-collapse-1').hasClass('in')){ - $('html, body').animate({ scrollTop: 0 }, 'slow'); + 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(); } - $('#expand-tabs-icon').toggleClass('fa-arrow-circle-down').toggleClass('fa-arrow-circle-up'); }); - $('.usermenu-head').click(function() { - if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('in')){ - $('#navbar-collapse-1, #navbar-collapse-2').removeClass('in'); + $('.usermenu').click(function() { + if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('show')){ + $('#navbar-collapse-1, #navbar-collapse-2').removeClass('show'); + } + }); + + $('#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'); + } + }); + + var notifications_parent = $('#notifications_wrapper')[0].parentElement.id; + $('#notifications-btn').click(function() { + if($('#notifications_wrapper').hasClass('fs')) + $('#notifications_wrapper').prependTo('#' + notifications_parent); + else + $('#notifications_wrapper').prependTo('section'); + + $('#notifications_wrapper').toggleClass('fs'); + if($('#navbar-collapse-2').hasClass('show')){ + $('#navbar-collapse-2').removeClass('show'); } }); - - if($('#tabs-collapse-1').length === 0) { - $('#expand-tabs').hide(); - } $("input[data-role=cat-tagsinput]").tagsinput({ - tagClass: 'label label-primary' + tagClass: 'badge badge-pill badge-warning text-dark' }); var doctitle = document.title; @@ -81,17 +114,14 @@ $(document).ready(function() { function makeFullScreen(full) { if(typeof full=='undefined' || full == true) { - $('main').css({'transition': 'none'}).addClass('fullscreen'); - $('header, nav, aside, #fullscreen-btn').hide(); - $('#tabs-collapse-1').css({'visibility': 'hidden'}); + $('main').addClass('fullscreen'); + $('header, nav, aside, #fullscreen-btn').attr('style','display:none !important'); $('#inline-btn').show(); } else { $('main').removeClass('fullscreen'); $('header, nav, aside, #fullscreen-btn').show(); - $('#tabs-collapse-1').css({'visibility': ''}); $('#inline-btn').hide(); - $('main').css({'transition': ''}); $(document.body).trigger("sticky_kit:recalc"); } } @@ -109,7 +139,7 @@ function toggleAside() { $('main').addClass('region_1-on') $('<div id="overlay"></div>').appendTo('section'); $('#left_aside_wrapper').stick_in_parent({ - offset_top: $('nav').outerHeight(true) - 10, + offset_top: $('nav').outerHeight(true) + 10, parent: '#region_1', spacer: '#left_aside_spacer' }); diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index b03e94e46..f98182739 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -5,10 +5,20 @@ namespace Zotlabs\Theme; class RedbasicConfig { function get_schemas() { - $scheme_choices = array(); - $scheme_choices["---"] = t("Focus (Hubzilla default)"); $files = glob('view/theme/redbasic/schema/*.php'); + + $scheme_choices = []; + if($files) { + + if(in_array('view/theme/redbasic/schema/default.php', $files)) { + $scheme_choices['---'] = t('Default'); + $scheme_choices['focus'] = t('Focus (Hubzilla default)'); + } + else { + $scheme_choices['---'] = t('Focus (Hubzilla default)'); + } + foreach($files as $file) { $f = basename($file, ".php"); if($f != 'default') { @@ -17,6 +27,7 @@ class RedbasicConfig { } } } + return $scheme_choices; } @@ -28,11 +39,6 @@ class RedbasicConfig { $arr = array(); $arr['narrow_navbar'] = get_pconfig(local_channel(),'redbasic', 'narrow_navbar' ); $arr['nav_bg'] = get_pconfig(local_channel(),'redbasic', 'nav_bg' ); - $arr['nav_gradient_top'] = get_pconfig(local_channel(),'redbasic', 'nav_gradient_top' ); - $arr['nav_gradient_bottom'] = get_pconfig(local_channel(),'redbasic', 'nav_gradient_bottom' ); - $arr['nav_active_gradient_top'] = get_pconfig(local_channel(),'redbasic', 'nav_active_gradient_top' ); - $arr['nav_active_gradient_bottom'] = get_pconfig(local_channel(),'redbasic', 'nav_active_gradient_bottom' ); - $arr['nav_bd'] = get_pconfig(local_channel(),'redbasic', 'nav_bd' ); $arr['nav_icon_colour'] = get_pconfig(local_channel(),'redbasic', 'nav_icon_colour' ); $arr['nav_active_icon_colour'] = get_pconfig(local_channel(),'redbasic', 'nav_active_icon_colour' ); $arr['link_colour'] = get_pconfig(local_channel(),'redbasic', 'link_colour' ); @@ -41,18 +47,11 @@ class RedbasicConfig { $arr['background_image'] = get_pconfig(local_channel(),'redbasic', 'background_image' ); $arr['item_colour'] = get_pconfig(local_channel(),'redbasic', 'item_colour' ); $arr['comment_item_colour'] = get_pconfig(local_channel(),'redbasic', 'comment_item_colour' ); - $arr['comment_border_colour'] = get_pconfig(local_channel(),'redbasic', 'comment_border_colour' ); - $arr['comment_indent'] = get_pconfig(local_channel(),'redbasic', 'comment_indent' ); - $arr['toolicon_colour'] = get_pconfig(local_channel(),'redbasic','toolicon_colour'); - $arr['toolicon_activecolour'] = get_pconfig(local_channel(),'redbasic','toolicon_activecolour'); $arr['font_size'] = get_pconfig(local_channel(),'redbasic', 'font_size' ); - $arr['body_font_size'] = get_pconfig(local_channel(),'redbasic', 'body_font_size' ); $arr['font_colour'] = get_pconfig(local_channel(),'redbasic', 'font_colour' ); $arr['radius'] = get_pconfig(local_channel(),'redbasic', 'radius' ); $arr['shadow'] = get_pconfig(local_channel(),'redbasic', 'photo_shadow' ); $arr['converse_width']=get_pconfig(local_channel(),"redbasic","converse_width"); - $arr['align_left']=get_pconfig(local_channel(),"redbasic","align_left"); - $arr['nav_min_opacity']=get_pconfig(local_channel(),"redbasic","nav_min_opacity"); $arr['top_photo']=get_pconfig(local_channel(),"redbasic","top_photo"); $arr['reply_photo']=get_pconfig(local_channel(),"redbasic","reply_photo"); return $this->form($arr); @@ -66,11 +65,6 @@ class RedbasicConfig { if (isset($_POST['redbasic-settings-submit'])) { set_pconfig(local_channel(), 'redbasic', 'narrow_navbar', $_POST['redbasic_narrow_navbar']); set_pconfig(local_channel(), 'redbasic', 'nav_bg', $_POST['redbasic_nav_bg']); - set_pconfig(local_channel(), 'redbasic', 'nav_gradient_top', $_POST['redbasic_nav_gradient_top']); - set_pconfig(local_channel(), 'redbasic', 'nav_gradient_bottom', $_POST['redbasic_nav_gradient_bottom']); - set_pconfig(local_channel(), 'redbasic', 'nav_active_gradient_top', $_POST['redbasic_nav_active_gradient_top']); - set_pconfig(local_channel(), 'redbasic', 'nav_active_gradient_bottom', $_POST['redbasic_nav_active_gradient_bottom']); - set_pconfig(local_channel(), 'redbasic', 'nav_bd', $_POST['redbasic_nav_bd']); set_pconfig(local_channel(), 'redbasic', 'nav_icon_colour', $_POST['redbasic_nav_icon_colour']); set_pconfig(local_channel(), 'redbasic', 'nav_active_icon_colour', $_POST['redbasic_nav_active_icon_colour']); set_pconfig(local_channel(), 'redbasic', 'link_colour', $_POST['redbasic_link_colour']); @@ -79,18 +73,11 @@ class RedbasicConfig { set_pconfig(local_channel(), 'redbasic', 'background_image', $_POST['redbasic_background_image']); set_pconfig(local_channel(), 'redbasic', 'item_colour', $_POST['redbasic_item_colour']); set_pconfig(local_channel(), 'redbasic', 'comment_item_colour', $_POST['redbasic_comment_item_colour']); - set_pconfig(local_channel(), 'redbasic', 'comment_border_colour', $_POST['redbasic_comment_border_colour']); - set_pconfig(local_channel(), 'redbasic', 'comment_indent', $_POST['redbasic_comment_indent']); - set_pconfig(local_channel(), 'redbasic', 'toolicon_colour', $_POST['redbasic_toolicon_colour']); - set_pconfig(local_channel(), 'redbasic', 'toolicon_activecolour', $_POST['redbasic_toolicon_activecolour']); set_pconfig(local_channel(), 'redbasic', 'font_size', $_POST['redbasic_font_size']); - set_pconfig(local_channel(), 'redbasic', 'body_font_size', $_POST['redbasic_body_font_size']); set_pconfig(local_channel(), 'redbasic', 'font_colour', $_POST['redbasic_font_colour']); set_pconfig(local_channel(), 'redbasic', 'radius', $_POST['redbasic_radius']); set_pconfig(local_channel(), 'redbasic', 'photo_shadow', $_POST['redbasic_shadow']); 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', 'nav_min_opacity', $_POST['redbasic_nav_min_opacity']); set_pconfig(local_channel(), 'redbasic', 'top_photo', $_POST['redbasic_top_photo']); set_pconfig(local_channel(), 'redbasic', 'reply_photo', $_POST['redbasic_reply_photo']); } @@ -110,31 +97,19 @@ class RedbasicConfig { '$title' => t("Theme settings"), '$narrow_navbar' => array('redbasic_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar'], '', array(t('No'),t('Yes'))), '$nav_bg' => array('redbasic_nav_bg', t('Navigation bar background color'), $arr['nav_bg']), - '$nav_gradient_top' => array('redbasic_nav_gradient_top', t('Navigation bar gradient top color'), $arr['nav_gradient_top']), - '$nav_gradient_bottom' => array('redbasic_nav_gradient_bottom', t('Navigation bar gradient bottom color'), $arr['nav_gradient_bottom']), - '$nav_active_gradient_top' => array('redbasic_nav_active_gradient_top', t('Navigation active button gradient top color'), $arr['nav_active_gradient_top']), - '$nav_active_gradient_bottom' => array('redbasic_nav_active_gradient_bottom', t('Navigation active button gradient bottom color'), $arr['nav_active_gradient_bottom']), - '$nav_bd' => array('redbasic_nav_bd', t('Navigation bar border color '), $arr['nav_bd']), '$nav_icon_colour' => array('redbasic_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']), '$nav_active_icon_colour' => array('redbasic_nav_active_icon_colour', t('Navigation bar active icon color '), $arr['nav_active_icon_colour']), - '$link_colour' => array('redbasic_link_colour', t('link color'), $arr['link_colour'], '', $link_colours), + '$link_colour' => array('redbasic_link_colour', t('Link color'), $arr['link_colour'], '', $link_colours), '$banner_colour' => array('redbasic_banner_colour', t('Set font-color for banner'), $arr['banner_colour']), '$bgcolour' => array('redbasic_background_colour', t('Set the background color'), $arr['bgcolour']), '$background_image' => array('redbasic_background_image', t('Set the background image'), $arr['background_image']), '$item_colour' => array('redbasic_item_colour', t('Set the background color of items'), $arr['item_colour']), '$comment_item_colour' => array('redbasic_comment_item_colour', t('Set the background color of comments'), $arr['comment_item_colour']), - '$comment_border_colour' => array('redbasic_comment_border_colour', t('Set the border color of comments'), $arr['comment_border_colour']), - '$comment_indent' => array('redbasic_comment_indent', t('Set the indent for comments'), $arr['comment_indent']), - '$toolicon_colour' => array('redbasic_toolicon_colour',t('Set the basic color for item icons'),$arr['toolicon_colour']), - '$toolicon_activecolour' => array('redbasic_toolicon_activecolour',t('Set the hover color for item icons'),$arr['toolicon_activecolour']), - '$body_font_size' => array('redbasic_body_font_size', t('Set font-size for the entire application'), $arr['body_font_size'], t('Example: 14px')), - '$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $arr['font_size']), + '$font_size' => array('redbasic_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 1rem, 100%, 16px')), '$font_colour' => array('redbasic_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']), - '$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius']), + '$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius'], t('Example: 4px')), '$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $arr['shadow']), '$converse_width' => array('redbasic_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')), - '$align_left' => array('redbasic_align_left',t('Left align page content'),$arr['align_left'], '', array(t('No'),t('Yes'))), - '$nav_min_opacity' => array('redbasic_nav_min_opacity',t('Set minimum opacity of nav bar - to hide it'),$arr['nav_min_opacity']), '$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 9b994ebdf..91cc0b85b 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -10,34 +10,22 @@ if(! App::$install) { } // Load the owners pconfig - $nav_bg = get_pconfig($uid, "redbasic", "nav_bg"); - $nav_gradient_top = get_pconfig($uid, "redbasic", "nav_gradient_top"); - $nav_gradient_bottom = get_pconfig($uid, "redbasic", "nav_gradient_bottom"); - $nav_active_gradient_top = get_pconfig($uid, "redbasic", "nav_active_gradient_top"); - $nav_active_gradient_bottom = get_pconfig($uid, "redbasic", "nav_active_gradient_bottom"); - $nav_bd = get_pconfig($uid, "redbasic", "nav_bd"); - $nav_icon_colour = get_pconfig($uid, "redbasic", "nav_icon_colour"); - $nav_active_icon_colour = get_pconfig($uid, "redbasic", "nav_active_icon_colour"); - $narrow_navbar = get_pconfig($uid,'redbasic','narrow_navbar'); + $nav_bg = get_pconfig($uid, 'redbasic', 'nav_bg'); + $nav_icon_colour = get_pconfig($uid, 'redbasic', 'nav_icon_colour'); + $nav_active_icon_colour = get_pconfig($uid, 'redbasic', 'nav_active_icon_colour'); $banner_colour = get_pconfig($uid,'redbasic','banner_colour'); - $link_colour = get_pconfig($uid, "redbasic", "link_colour"); + $narrow_navbar = get_pconfig($uid,'redbasic','narrow_navbar'); + $link_colour = get_pconfig($uid, 'redbasic', 'link_colour'); $schema = get_pconfig($uid,'redbasic','schema'); - $bgcolour = get_pconfig($uid, "redbasic", "background_colour"); - $background_image = get_pconfig($uid, "redbasic", "background_image"); - $toolicon_colour = get_pconfig($uid,'redbasic','toolicon_colour'); - $toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour'); - $item_colour = get_pconfig($uid, "redbasic", "item_colour"); - $comment_item_colour = get_pconfig($uid, "redbasic", "comment_item_colour"); - $comment_border_colour = get_pconfig($uid, "redbasic", "comment_border_colour"); - $comment_indent = get_pconfig($uid, "redbasic", "comment_indent"); - $body_font_size = get_pconfig($uid, "redbasic", "body_font_size"); - $font_size = get_pconfig($uid, "redbasic", "font_size"); - $font_colour = get_pconfig($uid, "redbasic", "font_colour"); - $radius = get_pconfig($uid, "redbasic", "radius"); - $shadow = get_pconfig($uid,"redbasic","photo_shadow"); - $converse_width=get_pconfig($uid,"redbasic","converse_width"); - $align_left=get_pconfig($uid,"redbasic","align_left"); - $nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity'); + $bgcolour = get_pconfig($uid, 'redbasic', 'background_colour'); + $background_image = get_pconfig($uid, 'redbasic', 'background_image'); + $item_colour = get_pconfig($uid, 'redbasic', 'item_colour'); + $comment_item_colour = get_pconfig($uid, 'redbasic', 'comment_item_colour'); + $font_size = get_pconfig($uid, 'redbasic', 'font_size'); + $font_colour = get_pconfig($uid, 'redbasic', 'font_colour'); + $radius = get_pconfig($uid, 'redbasic', 'radius'); + $shadow = get_pconfig($uid,'redbasic','photo_shadow'); + $converse_width=get_pconfig($uid,'redbasic','converse_width'); $top_photo=get_pconfig($uid,'redbasic','top_photo'); $reply_photo=get_pconfig($uid,'redbasic','reply_photo'); } @@ -67,10 +55,9 @@ if (($schema) && ($schema != '---')) { } -// If we haven't got a schema, load the default. We shouldn't touch this - we -// should leave it for admins to define for themselves. -// default.php and default.css MUST be symlinks to existing schema files. -if (! $schema) { +// Allow admins to set a default schema for the hub. +// default.php and default.css MUST be symlinks to existing schema files in view/theme/redbasic/schema +if ((!$schema) || ($schema == '---')) { if(file_exists('view/theme/redbasic/schema/default.php')) { $schemefile = 'view/theme/redbasic/schema/default.php'; @@ -86,67 +73,39 @@ if (! $schema) { //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting //individually. If we don't, we'll have problems if a user has set one, but not all options. if (! $nav_bg) - $nav_bg = "#222"; -if (! $nav_gradient_top) - $nav_gradient_top = "#3c3c3c"; -if (! $nav_gradient_bottom) - $nav_gradient_bottom = "#222"; -if (! $nav_active_gradient_top) - $nav_active_gradient_top = "#222"; -if (! $nav_active_gradient_bottom) - $nav_active_gradient_bottom = "#282828"; -if (! $nav_bd) - $nav_bd = "#222"; + $nav_bg = '#343a40'; if (! $nav_icon_colour) - $nav_icon_colour = "#999"; + $nav_icon_colour = 'rgba(255, 255, 255, 0.5)'; if (! $nav_active_icon_colour) - $nav_active_icon_colour = "#fff"; + $nav_active_icon_colour = 'rgba(255, 255, 255, 0.75)'; if (! $link_colour) - $link_colour = "#337AB7"; + $link_colour = '#007bff'; if (! $banner_colour) - $banner_colour = "#fff"; + $banner_colour = '#fff'; if (! $bgcolour) - $bgcolour = "rgb(254,254,254)"; + $bgcolour = 'rgb(254,254,254)'; if (! $background_image) $background_image =''; if (! $item_colour) - $item_colour = "rgb(238,238,238)"; + $item_colour = 'rgb(238,238,238)'; if (! $comment_item_colour) - $comment_item_colour = "rgb(255,255,255)"; -if (! $comment_border_colour) - $comment_border_colour = "rgb(255,255,255)"; -if (! $toolicon_colour) - $toolicon_colour = '#777'; -if (! $toolicon_activecolour) - $toolicon_activecolour = '#000'; + $comment_item_colour = 'rgb(255,255,255)'; if (! $item_opacity) - $item_opacity = "1"; + $item_opacity = '1'; if (! $font_size) - $font_size = "0.9rem"; -if (! $body_font_size) - $body_font_size = "0.75rem"; + $font_size = '0.875rem'; if (! $font_colour) - $font_colour = "#4d4d4d"; + $font_colour = '#4d4d4d'; if (! $radius) - $radius = "4"; + $radius = '0.25rem'; if (! $shadow) - $shadow = "0"; + $shadow = '0'; if (! $converse_width) - $converse_width = "790"; + $converse_width = '790'; if(! $top_photo) - $top_photo = '48px'; -if(! $comment_indent) - $comment_indent = '0px'; + $top_photo = '2.3rem'; if(! $reply_photo) - $reply_photo = '32px'; -if($nav_min_opacity === false || $nav_min_opacity === '') { - $nav_float_min_opacity = 1.0; - $nav_percent_min_opacity = 100; -} -else { - $nav_float_min_opacity = (float) $nav_min_opacity; - $nav_percent_min_opacity = (int) 100 * $nav_min_opacity; -} + $reply_photo = '2.3rem'; // Apply the settings if(file_exists('view/theme/redbasic/css/style.css')) { @@ -157,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; } @@ -168,22 +123,13 @@ 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); $options = array ( '$nav_bg' => $nav_bg, - '$nav_gradient_top' => $nav_gradient_top, - '$nav_gradient_bottom' => $nav_gradient_bottom, - '$nav_active_gradient_top' => $nav_active_gradient_top, - '$nav_active_gradient_bottom' => $nav_active_gradient_bottom, - '$nav_bd' => $nav_bd, '$nav_icon_colour' => $nav_icon_colour, '$nav_active_icon_colour' => $nav_active_icon_colour, '$link_colour' => $link_colour, @@ -192,12 +138,8 @@ if(file_exists('view/theme/redbasic/css/style.css')) { '$background_image' => $background_image, '$item_colour' => $item_colour, '$comment_item_colour' => $comment_item_colour, - '$comment_border_colour' => $comment_border_colour, - '$toolicon_colour' => $toolicon_colour, - '$toolicon_activecolour' => $toolicon_activecolour, '$font_size' => $font_size, '$font_colour' => $font_colour, - '$body_font_size' => $body_font_size, '$radius' => $radius, '$shadow' => $shadow, '$converse_width' => $converse_width, @@ -207,7 +149,6 @@ if(file_exists('view/theme/redbasic/css/style.css')) { '$reply_photo' => $reply_photo, '$pmenu_top' => $pmenu_top, '$pmenu_reply' => $pmenu_reply, - '$comment_indent' => $comment_indent, '$main_width' => $main_width, '$aside_width' => $aside_width ); diff --git a/view/theme/redbasic/php/theme.php b/view/theme/redbasic/php/theme.php index 997b59750..2b90ae85f 100644 --- a/view/theme/redbasic/php/theme.php +++ b/view/theme/redbasic/php/theme.php @@ -3,7 +3,9 @@ /** * * Name: Redbasic * * Description: Hubzilla standard theme - * * Version: 1.0 + * * Version: 2.1 + * * MinVersion: 2.3.1 + * * MaxVersion: 6.0 * * Author: Fabrixxm * * Maintainer: Mike Macgirvin * * Maintainer: Mario Vavti diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php index 3179c7078..b12d80ea5 100644 --- a/view/theme/redbasic/php/theme_init.php +++ b/view/theme/redbasic/php/theme_init.php @@ -1,19 +1,18 @@ <?php -head_add_css('library/font_awesome/css/font-awesome.min.css'); -head_add_css('library/bootstrap/css/bootstrap.min.css'); -head_add_css('library/bootstrap-tagsinput/bootstrap-tagsinput.css'); -head_add_css('view/css/bootstrap-red.css'); -head_add_css('library/datetimepicker/jquery.datetimepicker.css'); -//head_add_css('library/colorpicker/css/colorpicker.css'); -head_add_css('library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css'); +head_add_css('/library/font_awesome/css/font-awesome.min.css'); +head_add_css('/library/bootstrap/css/bootstrap.min.css'); +head_add_css('/library/bootstrap-tagsinput/bootstrap-tagsinput.css'); +head_add_css('/view/css/bootstrap-red.css'); +head_add_css('/library/datetimepicker/jquery.datetimepicker.css'); +head_add_css('/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css'); require_once('view/php/theme_init.php'); -head_add_js('library/bootstrap/js/bootstrap.min.js'); -head_add_js('library/bootbox/bootbox.min.js'); -head_add_js('library/bootstrap-tagsinput/bootstrap-tagsinput.js'); -head_add_js('library/datetimepicker/jquery.datetimepicker.js'); -//head_add_js('library/colorpicker/js/colorpicker.js'); -head_add_js('library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js'); -//head_add_js('library/bootstrap-colorpicker/src/js/docs.js'); +head_add_js('/library/popper/popper.min.js'); +head_add_js('/library/bootstrap/js/bootstrap.min.js'); +head_add_js('/library/bootbox/bootbox.min.js'); +head_add_js('/library/bootstrap-tagsinput/bootstrap-tagsinput.js'); +head_add_js('/library/datetimepicker/jquery.datetimepicker.js'); +head_add_js('/library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js'); + diff --git a/view/theme/redbasic/schema/BS-Default.css b/view/theme/redbasic/schema/BS-Default.css new file mode 100644 index 000000000..9045d3b97 --- /dev/null +++ b/view/theme/redbasic/schema/BS-Default.css @@ -0,0 +1,7 @@ +.navbar-dark .navbar-toggler { + color: rgba(0,0,0,0.7); +} + +#notifications-btn.text-white { + color: #777 !important; +} diff --git a/view/theme/redbasic/schema/BS-Default.php b/view/theme/redbasic/schema/BS-Default.php index ce464fe2c..14ee130d9 100644 --- a/view/theme/redbasic/schema/BS-Default.php +++ b/view/theme/redbasic/schema/BS-Default.php @@ -1,22 +1,12 @@ <?php if (! $nav_bg) - $nav_bg = "#f8f8f8"; - if (! $nav_bd) - $nav_bd = "#e7e7e7"; - if (! $nav_gradient_top) - $nav_gradient_top = "#fff"; - if (! $nav_gradient_bottom) - $nav_gradient_bottom = "#f8f8f8"; - if (! $nav_active_gradient_top) - $nav_active_gradient_top = "#ebebeb"; - if (! $nav_active_gradient_bottom) - $nav_active_gradient_bottom = "#f3f3f3"; + $nav_bg = "#f8f9fa"; if (! $nav_icon_colour) - $nav_icon_colour = "#777"; + $nav_icon_colour = "rgba(0, 0, 0, 0.5);"; if (! $nav_active_icon_colour) - $nav_active_icon_colour = "#555"; + $nav_active_icon_colour = "rgba(0, 0, 0, 0.7)"; if (! $radius) - $radius = "4"; + $radius = "4px"; if (! $banner_colour) - $banner_colour = "#777"; + $banner_colour = "rgba(0, 0, 0, 0.7)"; diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css deleted file mode 100644 index 64e5a2c95..000000000 --- a/view/theme/redbasic/schema/bluegrid.css +++ /dev/null @@ -1,491 +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: rgba(67,72,138,.97); - 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; -} - -.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 @@ -<?php - - if (! $nav_bg) - $nav_bg = "#FFF"; - if (! $nav_active_gradient_top) - $nav_active_gradient_top = "#FFF"; - if (! $nav_active_gradient_bottom) - $nav_active_gradient_bottom = "#43488A"; - if (! $nav_bd) - $nav_bd = "#fff"; - if (! $nav_icon_colour) - $nav_icon_colour = "#FFF"; - if (! $nav_active_icon_colour) - $nav_active_icon_colour = "#43488A"; - if (! $banner_colour) - $banner_colour = "#fff"; - if (! $bgcolour) - $bgcolour = "#43488A"; - if (! $background_image) - $background_image = "/images/bggrid.png"; - if (! $link_colour) - $link_colour = "#43488A"; - - - - - - diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index f9114141d..b1aa5e07a 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -139,6 +139,10 @@ option { background-color: #111; } +.nav-link.active { + color:#000 !important; +} + a.btn, aside a { font-weight: 400 !important; } @@ -270,26 +274,20 @@ nav .dropdown-menu { background: #999; } -.nav-tabs{ +.nav-tabs { border-bottom:1px solid #333; } -.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{ - border:1px solid #333; -} - -.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus { +.nav-tabs .nav-link.active { color: #fff; - background-color: #111; -} - -.nav-tabs.nav-justified > li > a { - color: #ccc; + background-color: #111; + border-color: #333; } -.nav-tabs > li > a:hover, .nav-tabs > li > a:focus { - text-decoration: underline; - background-color: #222; +.nav-tabs .nav-link:hover, +.nav-tabs .nav-link:focus { + text-decoration: underline; + background-color: #222; color: #ccc; border-color: #333; } @@ -417,7 +415,6 @@ pre { .contextual-help-content-open { background: $nav_bg; - top: 50px; border-bottom: #555 1px solid; box-shadow: 0px 3px 3px rgba(85,85,85,0.2); } diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css index f06fd3667..915cc4e18 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.css +++ b/view/theme/redbasic/schema/simple_black_on_white.css @@ -294,8 +294,6 @@ pre { .contextual-help-content-open { background: #FFF; - top: 50px; - } .profile-match-wrapper { diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css index c7bb99334..7f3f99fce 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.css +++ b/view/theme/redbasic/schema/simple_green_on_black.css @@ -367,7 +367,6 @@ pre { .contextual-help-content-open { background: $nav_bg; - top: 50px; border-bottom: #1C5419 1px solid; box-shadow: 0px 3px 3px rgba(28,84,25,0.2); } diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css index dabc26743..7e7f80f2f 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.css +++ b/view/theme/redbasic/schema/simple_white_on_black.css @@ -340,7 +340,6 @@ pre { .contextual-help-content-open { background: $nav_bg; - top: 50px; border-bottom: #FFF 1px solid; box-shadow: 0px 3px 3px rgba(255,255,255,0.2); } diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index 9672d3d05..7c552b49e 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -1,29 +1,19 @@ -{{include file="field_checkbox.tpl" field=$align_left}} {{include file="field_checkbox.tpl" field=$narrow_navbar}} {{include file="field_input.tpl" field=$converse_width}} +{{include file="field_input.tpl" field=$font_size}} {{if $expert}} {{include file="field_colorinput.tpl" field=$nav_bg}} - {{include file="field_colorinput.tpl" field=$nav_gradient_top}} - {{include file="field_colorinput.tpl" field=$nav_gradient_bottom}} - {{include file="field_colorinput.tpl" field=$nav_active_gradient_top}} - {{include file="field_colorinput.tpl" field=$nav_active_gradient_bottom}} - {{include file="field_colorinput.tpl" field=$nav_bd}} {{include file="field_colorinput.tpl" field=$nav_icon_colour}} {{include file="field_colorinput.tpl" field=$nav_active_icon_colour}} - {{include file="field_input.tpl" field=$nav_min_opacity}} + {{include file="field_colorinput.tpl" field=$banner_colour}} {{include file="field_colorinput.tpl" field=$bgcolour}} {{include file="field_colorinput.tpl" field=$background_image}} {{include file="field_colorinput.tpl" field=$item_colour}} {{include file="field_colorinput.tpl" field=$comment_item_colour}} {{*include file="field_colorinput.tpl" field=$comment_border_colour*}} {{*include file="field_input.tpl" field=$comment_indent*}} - {{include file="field_input.tpl" field=$body_font_size}} - {{include file="field_input.tpl" field=$font_size}} {{include file="field_colorinput.tpl" field=$font_colour}} {{include file="field_colorinput.tpl" field=$link_colour}} - {{include file="field_colorinput.tpl" field=$banner_colour}} - {{include file="field_colorinput.tpl" field=$toolicon_colour}} - {{include file="field_colorinput.tpl" field=$toolicon_activecolour}} {{include file="field_input.tpl" field=$radius}} {{include file="field_input.tpl" field=$shadow}} {{include file="field_input.tpl" field=$top_photo}} @@ -31,8 +21,8 @@ <script> $(function(){ - $('#id_redbasic_nav_bg,#id_redbasic_nav_gradient_top,#id_redbasic_nav_gradient_bottom,#id_redbasic_nav_active_gradient_top,#id_redbasic_nav_active_gradient_bottom').colorpicker({format: 'rgba'}); - $('#id_redbasic_nav_bd,#id_redbasic_nav_icon_colour ,#id_redbasic_nav_active_icon_colour,#id_redbasic_banner_colour,#id_redbasic_link_colour,#id_redbasic_background_colour').colorpicker(); + $('#id_redbasic_nav_bg, #id_redbasic_nav_icon_colour, #id_redbasic_nav_active_icon_colour, #id_redbasic_banner_colour').colorpicker({format: 'rgba'}); + $('#id_redbasic_link_colour,#id_redbasic_background_colour').colorpicker(); $('#id_redbasic_toolicon_colour,#id_redbasic_toolicon_activecolour,#id_redbasic_font_colour').colorpicker(); $('#id_redbasic_item_colour,#id_redbasic_comment_item_colour,#id_redbasic_comment_border_colour').colorpicker({format: 'rgba'}); }); |
