aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/redbasic/css/narrow_navbar.css62
-rw-r--r--view/theme/redbasic/css/style.css911
-rw-r--r--view/theme/redbasic/js/redbasic.js41
-rw-r--r--view/theme/redbasic/php/config.php39
-rw-r--r--view/theme/redbasic/php/style.php111
-rw-r--r--view/theme/redbasic/php/theme.php4
-rw-r--r--view/theme/redbasic/tpl/theme_settings.tpl17
7 files changed, 262 insertions, 923 deletions
diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css
index 689b67168..99f083638 100644
--- a/view/theme/redbasic/css/narrow_navbar.css
+++ b/view/theme/redbasic/css/narrow_navbar.css
@@ -1,64 +1,30 @@
-@media screen and (min-width: 760px) {
+@media screen and (min-width: 767px) {
- aside {
- padding-top: 52px;
- }
-
- section {
- padding-top: 52px;
- }
-
- .navbar-nav > li > a {
- padding-top:7px !important;
- padding-bottom:3px !important;
+ nav.navbar {
+ padding-top: 1px;
+ padding-bottom: 1px
}
- .navbar {
- min-height:25px !important;
+ nav .badge {
+ top: 0px;
+ left: -0.25rem;
}
- nav .navbar-header img {
- height: 29px;
- width: 29px;
- margin-top: 1px;
- border-radius: 4px;
- }
-
- .navbar-left {
- height: 29px;
- }
-
- .container-fluid {
- min-height:29px;
- }
-
- .collapse .navbar-collapse {
- min-height:29px;
- }
-
- #nav-search-text {
- margin:6px 15px 4px 15px;
- }
-
- #nav-search-spinner {
- margin: 16px 0px 0px 25px;
+ .contextual-help-content-open {
+ top: 2.5rem;
}
- header #banner {
- margin-top:5px;
+ aside {
+ padding-top: 3.5rem;
}
- nav .dropdown-menu,
- nav .acpopup {
- top: 30px !important;
+ section {
+ padding-top: 3.5rem;
}
#jGrowl.top-right {
- top: 30px;
+ top: 3.5rem;
right: 15px;
}
- .contextual-help-content-open {
- top: 31px;
- }
}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 1a38c7f01..faa292fe5 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -8,13 +8,11 @@
/* generals */
html {
- font-size: 100%;
- overflow-x: hidden;
+ 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;
@@ -55,30 +53,41 @@ main {
}
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;
@@ -89,10 +98,6 @@ abbr {
}
/* icons */
-.tool-icons,
-.cat-icons {
- color: $toolicon_colour;
-}
a,
.fakelink {
@@ -110,34 +115,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;
}
@@ -174,8 +153,7 @@ pre {
color: #FF0000;
}
-nav,
-header {
+nav {
opacity: $nav_float_min_opacity;
filter:alpha(opacity=$nav_percent_min_opacity);
}
@@ -201,49 +179,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;
@@ -253,12 +190,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);
@@ -273,18 +210,18 @@ header #banner #logo-text {
.contextual-help-tool {
padding: 7px;
filter: alpha(opacity=20);
- opacity: .2;
+ opacity: .5;
}
.contextual-help-tool:hover {
filter: alpha(opacity=50);
- opacity: .5;
+ opacity: 1;
text-decoration: none;
}
.contextual-help-tool i {
- color: #000;
- font-size: 16px;
+ color: $font_colour;
+ font-size: 1.05rem;
}
/* contextual help end */
@@ -322,21 +259,6 @@ footer {
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;
@@ -349,7 +271,7 @@ footer {
.fn {
font-weight: bold;
- font-size: 16px;
+ font-size: 1rem;
color: #444444;
}
@@ -358,9 +280,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;
}
@@ -387,10 +307,6 @@ footer {
filter:alpha(opacity=100);
}
-#view-contact-end {
- clear: both;
-}
-
#profile-photo-wrapper img {
width: 100%;
height: 100%;
@@ -402,7 +318,7 @@ footer {
width: 251px;
height: 251px;
margin-bottom: 10px;
- border-radius: $radiuspx;
+ border-radius: $radius;
}
#hide-friends-yes-label,
@@ -456,8 +372,7 @@ footer {
.photo,
.contact-block-img {
- border-radius: $radiuspx;
- -moz-border-radius: $radiuspx;
+ border-radius: $radius;
box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
}
@@ -471,8 +386,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;
}
@@ -531,10 +445,6 @@ footer {
height: 34px;
}
-#contact-block-end {
- clear: both;
-}
-
.contact-block-img {
width:47px;
height:47px;
@@ -558,47 +468,22 @@ 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: -0.85rem;
+ margin-right: 1.6rem;
}
-#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;
}
#nav-search-text::-webkit-input-placeholder {
@@ -610,7 +495,7 @@ footer {
}
nav .acpopup {
- top: 50px !important;
+ top: 46px !important;
margin-left: -35px;
width: 290px;
}
@@ -647,7 +532,7 @@ nav .acpopup {
#cboxContent {
padding: 3px;
border: 0px solid #fff;
- border-radius: $radiuspx;
+ border-radius: $radius;
background-color: #fff;
z-index: 1052;
}
@@ -670,11 +555,6 @@ nav .acpopup {
text-align: center;
}
-.profile-match-break,
-.profile-match-end {
- clear: both;
-}
-
.profile-match-connect {
text-align: center;
font-weight: bold;
@@ -693,9 +573,6 @@ nav .acpopup {
float: right;
}
-#profile-match-wrapper-end {
- clear: both;
-}
.side-link {
margin-bottom: 15px;
}
@@ -708,10 +585,6 @@ nav .acpopup {
border: 1px solid #ddd;
}
-#group-members-end {
- clear: both;
-}
-
#group-separator {
margin-top: 10px;
margin-bottom: 10px;
@@ -724,11 +597,6 @@ nav .acpopup {
border: 1px solid #ddd;
}
-#group-all-contacts-end {
- clear: both;
- margin-bottom: 10px;
-}
-
#group-edit-desc {
margin-top: 15px;
}
@@ -742,10 +610,6 @@ nav .acpopup {
border: 1px solid #ddd;
}
-#prof-members-end {
- clear: both;
-}
-
#prof-separator {
margin-top: 10px;
margin-bottom: 10px;
@@ -758,11 +622,6 @@ nav .acpopup {
border: 1px solid #ddd;
}
-#prof-all-contacts-end {
- clear: both;
- margin-bottom: 10px;
-}
-
#prof-edit-desc {
margin-top: 15px;
}
@@ -776,10 +635,6 @@ nav .acpopup {
width: 80px;
margin-right: 15px;
}
-.notification-listing-end {
- clear: both;
- margin-bottom: 15px;
-}
/**
* OAuth
@@ -829,7 +684,7 @@ div.jGrowl div.info {
padding-left: 58px;
}
#jGrowl.top-right {
- top: 65px;
+ top: 4.5rem;
right: 15px;
}
@@ -837,142 +692,38 @@ 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;
+ display: block;
overflow: hidden;
text-overflow: ellipsis;
- display: block;
}
-.dropdown-sub-text {
- line-height: 1em;
+.dropdown-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%;
-}
-
#acl-search::-webkit-input-placeholder {
/* non-fontawesome fonts set a fallback for text parts of the placeholder*/
font-family: FontAwesome, sans-serif, arial, freesans;
@@ -983,59 +734,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 {
@@ -1046,66 +755,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);
}
@@ -1115,7 +778,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;
}
@@ -1181,36 +844,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;
}
@@ -1220,7 +886,8 @@ a .drop-icons:hover {
color: #FF0000;
}
-.lockview {
+.lockview,
+.sys-apps-toggle {
cursor: pointer;
}
@@ -1255,8 +922,7 @@ th,td {
/* mail */
img.mail-conv-sender-photo {
- -moz-border-radius: $radiuspx;
- border-radius: $radiuspx;
+ border-radius: $radius;
}
/* jot */
@@ -1273,25 +939,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 {
@@ -1311,48 +975,41 @@ img.mail-conv-sender-photo {
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 {
@@ -1379,8 +1036,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;
}
@@ -1388,37 +1045,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,
@@ -1426,37 +1069,18 @@ 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;
+ font-size: 1rem;
}
-.like-rotator {
- color: $toolicon_colour;
-}
-
-.comment-icon {
- font-size: 0.833em;
- color: $toolicon_colour;
-}
.comment-edit-text-empty,
.comment-edit-text-full {
border: 1px solid #ccc;
- border-radius: $radiuspx;
+ border-radius: $radius;
}
.comment-edit-text-empty {
color: gray;
- font-size: 12px;
-}
-
-.comment-edit-text-full {
- color: black;
}
.divgrow-showmore {
@@ -1478,19 +1102,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 {
@@ -1499,8 +1116,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 {
@@ -1522,63 +1138,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;
+ border-radius: $radius;
}
-nav .dropdown-menu {
- font-size: $body_font_size;
- border-top-right-radius: 0px;
- border-top-left-radius: 0px;
- border-bottom-right-radius: $radiuspx;
- border-bottom-left-radius: $radiuspx;
-}
-
-.dropdown-menu > .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 {
@@ -1588,20 +1191,20 @@ 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;
}
.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;
}
@@ -1614,8 +1217,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;
}
@@ -1658,22 +1265,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;
}
@@ -1690,6 +1297,7 @@ main.fullscreen .generic-content-wrapper {
top: 0px;
left: 0px;
border-radius: 0px;
+ border-width: 0px;
}
main.fullscreen .section-title-wrapper {
@@ -1726,160 +1334,58 @@ 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);
-}
-
-.panel-group .panel + .panel {
- margin-top: 0px;
-}
-
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;
+ color: $font_colour;
+ font-size: 0.9rem;
+ border-radius: $radius;
}
.dropdown-menu img {
- border-radius: $radiuspx;
+ border-radius: $radius;
}
-.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;
+.dropdown-item {
+ color: $font_colour;
}
-.navbar-inverse .navbar-collapse {
- border-color: $nav_bd;
+.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 {
- 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);
+.bg-inverse {
+ background-color: $nav_bg !important;
}
-
-.navbar-inverse .navbar-nav > li > a {
+.navbar-inverse .navbar-nav .nav-link,
+.usermenu i {
color: $nav_icon_colour;
}
-.navbar-inverse .navbar-nav > li > a:hover,
-.navbar-inverse .navbar-nav > li > a:focus {
- color: $nav_active_icon_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;
-}
-
-.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;
-}
-
-.navbar-inverse .navbar-toggle {
- border-color: $nav_bd;
-}
-.navbar-inverse .navbar-toggle:hover,
-.navbar-inverse .navbar-toggle:focus {
- background-color: $nav_bg;
-}
-
-.navbar-inverse .navbar-toggle .icon-bar {
- background-color: $nav_active_icon_colour;
-}
-
-.navbar-toggle-extra {
- color: $nav_active_icon_colour;
- padding: 7px 10px;
-}
-
-.navbar-toggle-extra-left {
- float: left;
- margin-left: 15px;
- margin-right: 0px;
- color: $nav_active_icon_colour;
- padding: 7px 10px;
-}
-
-a.navbar-toggle-extra:hover,
-a.navbar-toggle-extra-left:hover {
+.navbar-inverse .navbar-nav .nav-link:focus,
+.navbar-inverse .navbar-nav .nav-link:hover,
+.usermenu:focus i,
+.usermenu:hover i {
color: $nav_active_icon_colour;
- text-decoration: none;
-}
-
-.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) {
@@ -1897,33 +1403,6 @@ a.navbar-toggle-extra-left:hover {
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 {
@@ -1972,7 +1451,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 */
@@ -1981,7 +1460,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%;
@@ -1999,17 +1478,17 @@ 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;
@@ -2019,11 +1498,11 @@ dl.bb-dl > dd > li {
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;
}
@@ -2062,13 +1541,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 {
@@ -2091,30 +1570,25 @@ dl.bb-dl > dd > li {
#ace-editor,
#editor {
- border-bottom-left-radius: $radiuspx;
- border-bottom-right-radius: $radiuspx;
-}
-
-.sub-menu {
- margin-top: 10px;
- padding-left: 15px;
- border-left: 3px solid #eee;
+ border-bottom-left-radius: $radius;
+ border-bottom-right-radius: $radius;
}
-.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;
}
@@ -2128,6 +1602,7 @@ dl.bb-dl > dd > li {
margin-left: auto;
margin-right: auto;
}
+
#permcat-index {
margin: 10px;
}
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 81a95c68b..14b977b80 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -16,14 +16,21 @@ $(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),
+ offset_top: $('nav').outerHeight(true) + 10,
parent: '#region_1',
spacer: '#left_aside_spacer'
});
}
+ 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() {
@@ -41,29 +48,14 @@ $(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');
+ $('.usermenu').click(function() {
+ if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('show')){
+ $('#navbar-collapse-1, #navbar-collapse-2').removeClass('show');
}
- $('#expand-tabs-icon').toggleClass('fa-arrow-circle-down').toggleClass('fa-arrow-circle-up');
});
- $('.usermenu-head').click(function() {
- if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('in')){
- $('#navbar-collapse-1, #navbar-collapse-2').removeClass('in');
- }
- });
-
- if($('#tabs-collapse-1').length === 0) {
- $('#expand-tabs').hide();
- }
-
$("input[data-role=cat-tagsinput]").tagsinput({
- tagClass: 'label label-primary'
+ tagClass: 'badge badge-pill badge-warning'
});
var doctitle = document.title;
@@ -81,17 +73,14 @@ $(document).ready(function() {
function makeFullScreen(full) {
if(typeof full=='undefined' || full == true) {
- $('main').css({'transition': 'none'}).addClass('fullscreen');
- $('header, nav, aside, #fullscreen-btn').hide();
- $('#tabs-collapse-1').css({'visibility': 'hidden'});
+ $('main').addClass('fullscreen');
+ $('header, nav, aside, #fullscreen-btn').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 +98,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..752a02a6a 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -28,11 +28,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 +36,12 @@ 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 +55,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 +63,12 @@ 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 +88,20 @@ 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..a666f96f2 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -10,34 +10,23 @@ 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');
+ $align_left=get_pconfig($uid,'redbasic','align_left');
$top_photo=get_pconfig($uid,'redbasic','top_photo');
$reply_photo=get_pconfig($uid,'redbasic','reply_photo');
}
@@ -86,67 +75,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 = '#222';
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 = '#0275d8';
if (! $banner_colour)
- $banner_colour = "#fff";
+ $banner_colour = '#fff';
if (! $bgcolour)
- $bgcolour = "rgb(254,254,254)";
+ $bgcolour = 'rgb(254,254,254)';
if (! $background_image)
$background_image ='';
if (! $item_colour)
- $item_colour = "rgb(238,238,238)";
+ $item_colour = 'rgb(238,238,238)';
if (! $comment_item_colour)
- $comment_item_colour = "rgb(255,255,255)";
-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')) {
@@ -179,11 +140,6 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
$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 +148,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 +159,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 95d5a2001..a1147a5b4 100644
--- a/view/theme/redbasic/php/theme.php
+++ b/view/theme/redbasic/php/theme.php
@@ -3,8 +3,8 @@
/**
* * Name: Redbasic
* * Description: Hubzilla standard theme
- * * Version: 2.0
- * * MinVersion: 2.2RC
+ * * Version: 2.1
+ * * MinVersion: 2.3.1
* * MaxVersion: 3.0
* * Author: Fabrixxm
* * Maintainer: Mike Macgirvin
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index 9672d3d05..f90e37ac3 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -1,29 +1,20 @@
{{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 +22,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'});
});