diff options
Diffstat (limited to 'view/theme/redbasic')
21 files changed, 713 insertions, 206 deletions
diff --git a/view/theme/redbasic/css/align_left.css b/view/theme/redbasic/css/align_left.css new file mode 100644 index 000000000..acb2893e3 --- /dev/null +++ b/view/theme/redbasic/css/align_left.css @@ -0,0 +1,8 @@ +main { + margin-left: 0px; +} + +aside#region_3 { + width: auto; + padding: 0px 0px 0px 0px; +} diff --git a/view/theme/redbasic/css/converse_center.css b/view/theme/redbasic/css/converse_center.css deleted file mode 100644 index 9b4246a5b..000000000 --- a/view/theme/redbasic/css/converse_center.css +++ /dev/null @@ -1,10 +0,0 @@ -main { - margin-left: auto; - margin-right: auto; -} - -aside#region_3 { - width: $aside_widthpx; - min-width: $aside_widthpx; - max-width: $aside_widthpx; -} diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 702c7238e..e83610f51 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -24,13 +24,15 @@ body { height: 100%; } -aside#region_1 { +aside { width: $aside_widthpx; min-width: $aside_widthpx; max-width: $aside_widthpx; } main { + margin-left: auto; + margin-right: auto; max-width: $main_widthpx; } @@ -127,7 +129,7 @@ pre code { code { font-size: 1em; - padding: 5px; + padding: 1em; border: 1px solid #ccc; background: #ccc; color: #000; @@ -199,13 +201,14 @@ nav #banner #logo-text a:hover { text-decoration: none; } .nav-channel-select { margin-left: 8px; } header #banner { -/* overflow: hidden; */ - text-align: center; - font-size: 14px; - font-family: tahoma, "Lucida Sans", sans; - color: $banner_colour; - font-weight: bold; - margin-top: 14px; + z-index: 1040; + margin-top: 14px; + text-align: center; + font-size: 14px; + font-family: tahoma, "Lucida Sans", sans; + color: $banner_colour; + font-weight: bold; + whitespace: nowrap; } header #banner a, @@ -213,15 +216,17 @@ header #banner a:active, header #banner a:visited, header #banner a:link, header #banner a:hover { - color: #FFF; - text-decoration: none; - outline: none; - vertical-align: bottom; + 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; } @@ -347,7 +352,7 @@ footer { .vcard { margin-bottom: 10px; padding: 10px; - background-color: $comment_item_colour; + background-color: rgba(254,254,254,0.5); border-bottom: 1px solid rgba(238,238,238,0.8); -moz-border-radius: $radiuspx; -webkit-border-radius: $radiuspx; @@ -698,7 +703,7 @@ a.rateme, div.rateme { #contact-block { width: 100%; float: left; - background-color: $comment_item_colour; + background-color: rgba(254,254,254,0.5); border-bottom: 1px solid rgba(238,238,238,0.8); -moz-border-radius: $radiuspx; -webkit-border-radius: $radiuspx; @@ -751,8 +756,8 @@ a.rateme, div.rateme { } .wall-item-conv { - padding-top: 5px; - padding-bottom: 10px; + padding: 7px 10px; + background-color: $comment_item_colour; } @@ -790,11 +795,11 @@ a.rateme, div.rateme { } #nav-search-text::-webkit-input-placeholder { - font-family: FontAwesome; + font-family: FontAwesome, sans-serif; } #nav-search-text::-moz-placeholder { - font-family: FontAwesome; + font-family: FontAwesome, sans-serif; } nav .acpopup { @@ -1301,15 +1306,8 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { padding: 0; } -/* header */ -header { - position: fixed; - left: 43%; - right: 43%; - margin: 0px; - padding: 0px; - z-index: 1040; - color: #fff; +.widget .conv-participants { + color: $font_colour; } .notif-item a { @@ -1435,7 +1433,10 @@ header { .profile-match-connect { margin-top: 5px; } .reshared-content { margin-left: 20px; } -.shared_header img { margin-right: 10px; } +.shared_header img { + border-radius: $radiuspx; + margin-right: 10px; +} .tag1 { font-size : 0.9em !important; @@ -1529,22 +1530,6 @@ a .drop-icons:hover { margin-right: 10px; color: #FF0000; } - -.attachlink { - float: left; - border: 1px solid black; - padding: 5px; - margin-right: 8px; -} - -.attach-icons { - font-size: 1.4em; -} - -.attach-clip { - margin-right: 3px; - font-size: 1.8em; -} #menulist { list-style-type: none; @@ -1568,9 +1553,9 @@ th,td { overflow: hidden; } -/* message */ +/* mail */ -img.mail-list-sender-photo { +img.mail-conv-sender-photo { -moz-border-radius: $radiuspx; border-radius: $radiuspx; } @@ -1637,46 +1622,56 @@ img.mail-list-sender-photo { } /* conversation */ +.nsfw-wrap { + text-align: center; + font-size: $body_font_size; +} -.wall-item-title { - font-size: $font_size; +.wall-item-head { + padding: 10px 10px 0.5em 10px; } -.hide-comments-outer, -.thread-wrapper .wall-item-comment-wrapper, -.wall-item-content-wrapper.comment { - margin-left: $comment_indent; +.wall-item-content { + padding: 0.5em 10px; } -.wall-item-content-wrapper { - background-color: $item_colour; - padding: 10px; +.wall-photo-item { + /*padding: 0.5em 10px;*/ +} + +.wall-photo-item img { + max-width: 100% !important; border-top-right-radius: $radiuspx; border-top-left-radius: $radiuspx; } -.generic-content-wrapper-styled { - background-color: $comment_item_colour; - padding: 10px; - border-radius: $radiuspx; +.wall-item-tools { + padding: 0.5em 10px 10px 10px; +} + + +.wall-item-title { + font-size: $font_size; +} + +.wall-item-content-wrapper { + background-color: $item_colour; + border-top-right-radius: $radiuspx; + border-top-left-radius: $radiuspx; } .wall-item-content-wrapper.comment { background-color: $comment_item_colour; - border-color: $comment_border_colour; - border-style: solid; - border-width: 0px 0px 0px 3px; - border-radius: 0px; - padding: 7px 10px 7px 7px; + border-top-right-radius: 0px; + border-top-left-radius: 0px; } .hide-comments-outer { background-color: $comment_item_colour; - border-color: $comment_border_colour; border-top-color: #ccc; border-style: solid; border-top-style: dashed; - border-width: 1px 0px 0px 3px; + border-width: 1px 0px 0px 0px; text-align: center; border-radius: 0px; } @@ -1691,11 +1686,11 @@ img.mail-list-sender-photo { border-radius: 0px; border-bottom-right-radius: $radiuspx; border-bottom-left-radius: $radiuspx; - margin-top: 3px; + border-top: 3px solid $comment_item_colour; } .wall-item-comment-wrapper-wc { - margin-top: 0px; + border-top: 0px solid $comment_item_colour; } .wall-item-like, @@ -1731,6 +1726,7 @@ img.mail-list-sender-photo { } .wall-item-content, +.mail-conv-body, .page-body { font-size: $font_size; clear: both; @@ -1779,14 +1775,13 @@ img.mail-list-sender-photo { .divgrow-showmore:hover { border-top: 1px dashed #adadad; - text-decoration: underline; } /* widgets */ .widget { - background-color: $comment_item_colour; + background-color: rgba(254,254,254,0.5); border-bottom: 1px solid rgba(238,238,238,0.8); -moz-border-radius: $radiuspx; -webkit-border-radius: $radiuspx; @@ -1867,12 +1862,24 @@ nav .dropdown-menu { margin: 7px 0px; } +.generic-content-wrapper-styled { + background-color: $bgcolour; + padding: 10px; + border-radius: $radiuspx; +} + +.generic-content-wrapper { + border: 1px solid #ccc; + box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.2); + border-radius: $radiuspx; +} + .section-title-wrapper { padding: 7px 10px; background-color: $item_colour; border-top-left-radius: $radiuspx; border-top-right-radius: $radiuspx; - margin-bottom: 3px; + border-bottom: 3px solid $comment_item_colour; } .section-title-wrapper h2, @@ -1887,20 +1894,20 @@ nav .dropdown-menu { .section-subtitle-wrapper { padding: 7px 10px; background-color: $item_colour; - margin-bottom: 3px; + border-bottom: 3px solid $comment_item_colour; } .section-content-tools-wrapper { padding: 7px 10px; background-color: $comment_item_colour; - margin-bottom: 3px + border-bottom: 3px solid $comment_item_colour; } .section-content-info-wrapper { padding: 21px 10px; color: #31708f; background-color: #d9edf7; - margin-bottom: 3px; + border-bottom: 3px solid $comment_item_colour; text-align: center; } @@ -1908,7 +1915,7 @@ nav .dropdown-menu { padding: 21px 10px; color: #8a6d3b; background-color: #fcf8e3; - margin-bottom: 3px; + border-bottom: 3px solid $comment_item_colour; text-align: center; } @@ -1916,7 +1923,7 @@ nav .dropdown-menu { padding: 21px 10px; color: #a94442; background-color: #f2dede; - margin-bottom: 3px; + border-bottom: 3px solid $comment_item_colour; text-align: center; } @@ -2296,3 +2303,11 @@ nav .badge.mail-update:hover { /*.channels_ckbx, .pending_ckbx, .users_ckbx { margin-top: -5px !important; }*/ + +.help-searchlist { + list-style-type: none; +} + +.help-searchlist a { + font-size: 130%; +} diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index c0b2b6da9..6bea5bddb 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -31,7 +31,7 @@ function theme_content(&$a) { $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['converse_center']=get_pconfig(local_channel(),"redbasic","converse_center"); + $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"); @@ -68,7 +68,7 @@ function theme_post(&$a) { 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', 'converse_center', $_POST['redbasic_converse_center']); + 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']); @@ -79,7 +79,7 @@ function theme_post(&$a) { function redbasic_form(&$a, $arr) { $scheme_choices = array(); - $scheme_choices["---"] = t("Light (Red Matrix default)"); + $scheme_choices["---"] = t("Focus (Hubzilla default)"); $files = glob('view/theme/redbasic/schema/*.php'); if($files) { foreach($files as $file) { @@ -126,7 +126,7 @@ if(feature_enabled(local_channel(),'expert')) '$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius']), '$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')), - '$converse_center' => array('redbasic_converse_center',t('Center page content'),$arr['converse_center'], '', array(t('No'),t('Yes'))), + '$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 96dba59e5..a0da5e302 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -36,7 +36,7 @@ if(! $a->install) { $radius = get_pconfig($uid, "redbasic", "radius"); $shadow = get_pconfig($uid,"redbasic","photo_shadow"); $converse_width=get_pconfig($uid,"redbasic","converse_width"); - $converse_center=get_pconfig($uid,"redbasic","converse_center"); + $align_left=get_pconfig($uid,"redbasic","align_left"); $nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity'); $top_photo=get_pconfig($uid,'redbasic','top_photo'); $reply_photo=get_pconfig($uid,'redbasic','reply_photo'); @@ -107,15 +107,15 @@ if (! $link_colour) if (! $banner_colour) $banner_colour = "#fff"; if (! $bgcolour) - $bgcolour = "#fdfdfd"; + $bgcolour = "rgb(254,254,254)"; if (! $background_image) $background_image =''; if (! $item_colour) - $item_colour = "rgba(238,238,238,0.8)"; + $item_colour = "rgb(238,238,238)"; if (! $comment_item_colour) - $comment_item_colour = "rgba(254,254,254,0.4)"; + $comment_item_colour = "rgb(255,255,255)"; if (! $comment_border_colour) - $comment_border_colour = "rgba(238,238,238,0.8)"; + $comment_border_colour = "rgb(255,255,255)"; if (! $toolicon_colour) $toolicon_colour = '#777'; if (! $toolicon_activecolour) @@ -133,7 +133,7 @@ if (! $radius) if (! $shadow) $shadow = "0"; if (! $converse_width) - $converse_width = "1024"; + $converse_width = "790"; if(! $top_photo) $top_photo = '48px'; if(! $comment_indent) @@ -156,12 +156,12 @@ if(file_exists('view/theme/redbasic/css/style.css')) { $aside_width = 285; - // left aside and right aside are is 231px + converse width - if($converse_center) { - $main_width = (($aside_width * 2) + intval($converse_width)); + // left aside and right aside are 285px + converse width + if($align_left) { + $main_width = (($aside_width) + intval($converse_width)); } else { - $main_width = (($aside_width) + 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); @@ -209,9 +209,8 @@ if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) { echo file_get_contents('view/theme/redbasic/css/narrow_navbar.css'); } -if($converse_center && file_exists('view/theme/redbasic/css/converse_center.css')) { - $cc = file_get_contents('view/theme/redbasic/css/converse_center.css'); - echo str_replace(array_keys($options), array_values($options), $cc); +if($align_left && file_exists('view/theme/redbasic/css/align_left.css')) { + echo file_get_contents('view/theme/redbasic/css/align_left.css'); } if($schemecss) { diff --git a/view/theme/redbasic/php/theme.php b/view/theme/redbasic/php/theme.php index e68533bb4..f0679a532 100644 --- a/view/theme/redbasic/php/theme.php +++ b/view/theme/redbasic/php/theme.php @@ -2,7 +2,7 @@ /** * * Name: Redbasic - * * Description: RedMatrix standard theme + * * Description: Hubzilla standard theme * * Version: 1.0 * * Author: Fabrixxm * * Maintainer: Mike Macgirvin diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css new file mode 100644 index 000000000..2c6f34558 --- /dev/null +++ b/view/theme/redbasic/schema/bluegrid.css @@ -0,0 +1,444 @@ +body { + background-size: auto; +} + +.generic-content-wrapper-styled, #profile-jot-wrapper { + 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; +} + +.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 { + 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); +} + +.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); +} + +#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; +} + +#login-main { + max-width: 100%; + 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 a:hover, .contact-entry-edit a:focus, .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; +} + +.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 { + 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 { + 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 > .icon-trash { + 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 .icon-circle-arrow-down, .navbar-inverse .navbar-toggle .icon-circle-arrow-right, .navbar-inverse .navbar-toggle .icon-circle-arrow-up, .navbar-inverse .navbar-toggle .icon-circle-arrow-left { + color: #FFF; + } + .navbar-inverse .navbar-toggle:hover .icon-circle-arrow-down, .navbar-inverse .navbar-toggle:focus .icon-circle-arrow-down, .navbar-inverse .navbar-toggle:hover .icon-circle-arrow-right, .navbar-inverse .navbar-toggle:focus .icon-circle-arrow-right, .navbar-inverse .navbar-toggle:hover .icon-circle-arrow-up, .navbar-inverse .navbar-toggle:focus .icon-circle-arrow-up, .navbar-inverse .navbar-toggle:hover .icon-circle-arrow-left, .navbar-inverse .navbar-toggle:focus .icon-circle-arrow-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; + } +} diff --git a/view/theme/redbasic/schema/bluegrid.php b/view/theme/redbasic/schema/bluegrid.php new file mode 100644 index 000000000..fdb552611 --- /dev/null +++ b/view/theme/redbasic/schema/bluegrid.php @@ -0,0 +1,28 @@ +<?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/boxy.css b/view/theme/redbasic/schema/boxy.css index f3da9b262..ad3e587f0 100644 --- a/view/theme/redbasic/schema/boxy.css +++ b/view/theme/redbasic/schema/boxy.css @@ -3,9 +3,9 @@ } .wall-item-content-wrapper.comment { - border-width: 0px 1px 1px 1px; + border-width: 0px 0px 1px 0px; } .hide-comments-outer { - border-width: 1px 1px 1px 1px; + border-width: 1px 0px 1px 0px; } diff --git a/view/theme/redbasic/schema/boxy.php b/view/theme/redbasic/schema/boxy.php index d609ccd25..f298a0def 100644 --- a/view/theme/redbasic/schema/boxy.php +++ b/view/theme/redbasic/schema/boxy.php @@ -2,3 +2,5 @@ if (! $radiuspx) $radiuspx = "4"; +if (! $comment_border_colour) + $comment_border_colour = "rgb(238,238,238)"; diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index 02ee4707e..20f9e0833 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -1,11 +1,30 @@ +.generic-content-wrapper { + border: 1px solid #111; + background-color: transparent; +} + .vcard, #contact-block, .widget { - border-bottom: 1px solid #fff; + background-color: transparent; + border-bottom: 1px solid #333; + border-radius: 0px +} + +#profile-photo-wrapper { + border:none; +} + +.photo { + box-shadow: none; } .abook-pending-contact, .abook-permschange { background: #402900; } +.contact-entry-wrapper { + border: 1px solid #333; +} + #cboxContent a { color: #000; } @@ -69,7 +88,7 @@ background-color: #111; } -.btn-default { +.btn { background-color: #1e1e1e; border-color: #222; color: #ccc; @@ -77,7 +96,7 @@ box-shadow: none; } -.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active { +.btn:hover, .btn:focus, .btn:active { background-color: #222; border-color: #222; color: #fff; @@ -88,6 +107,52 @@ text-decoration: none; } +.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button { + background-color: #337AB7; + color: #FFF; +} + +.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 { + border-color: #204D74; + background-color: #286090; + color: #FFF; +} + +.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; +} + .pager_first, .pager_last, .pager_prev, @@ -171,6 +236,7 @@ nav .dropdown-menu { text-decoration: underline; background-color: #222; color: #ccc; + border-color: #333; } aside .nav > li > a:hover, aside .nav > li > a:focus { @@ -241,10 +307,27 @@ pre { border-color: #222; } +.pmenu-item:hover a { + background-color: #333 !important; + color: #ddd; +} + .preview { background: url('../img/gray_and_black_diagonal_stripes_background_seamless.gif'); } +.xdsoft_datepicker.active { + color: #222 !important; + text-decoration: none !important; +} + +.xdsoft_datepicker.active:hover, .xdsoft_datepicker.active:focus { + color: #222 !important; + text-decoration: underline; +} + + + @media (min-width: 768px) { .nav-tabs.nav-justified > li > a { border-bottom: 1px solid #333; diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 92e703325..af4b122f1 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -34,5 +34,8 @@ $toolicon_activecolour = '#fff'; if (! $font_colour) $font_colour = "#ccc"; + if (! $converse_width) + $converse_width = "1024"; + diff --git a/view/theme/redbasic/schema/focus.css b/view/theme/redbasic/schema/focus.css deleted file mode 100644 index ea983ffc8..000000000 --- a/view/theme/redbasic/schema/focus.css +++ /dev/null @@ -1,22 +0,0 @@ -.generic-content-wrapper { - border: 1px solid #ccc; - box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.2); - border-radius: 4px; - background-color: #fff; -} - -.wall-item-content-wrapper.comment { - background-color: #fff; -} - -.section-content-tools-wrapper, -.section-content-wrapper, -.section-content-wrapper-np, -.hide-comments-outer { - background-color: #fff; -} - -.wall-item-conv { - padding-top: 10px; - padding-left: 10px; -} diff --git a/view/theme/redbasic/schema/focus.php b/view/theme/redbasic/schema/focus.php deleted file mode 100644 index 1f1963764..000000000 --- a/view/theme/redbasic/schema/focus.php +++ /dev/null @@ -1,63 +0,0 @@ -<?php -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"; -if (! $nav_icon_colour) - $nav_icon_colour = "#999"; -if (! $nav_active_icon_colour) - $nav_active_icon_colour = "#fff"; -if (! $link_colour) - $link_colour = "#337AB7"; -if (! $banner_colour) - $banner_colour = "#fff"; -if (! $bgcolour) - $bgcolour = "#fdfdfd"; -if (! $background_image) - $background_image =''; -if (! $item_colour) - $item_colour = "rgb(238,238,238)"; -if (! $comment_item_colour) - $comment_item_colour = "rgba(254,254,254,0.4)"; -if (! $comment_border_colour) - $comment_border_colour = "transparent"; -if (! $toolicon_colour) - $toolicon_colour = '#777'; -if (! $toolicon_activecolour) - $toolicon_activecolour = '#000'; -if (! $item_opacity) - $item_opacity = "1"; -if (! $font_size) - $font_size = "0.9rem"; -if (! $body_font_size) - $body_font_size = "0.75rem"; -if (! $font_colour) - $font_colour = "#4d4d4d"; -if (! $radius) - $radius = "4"; -if (! $shadow) - $shadow = "0"; -if (! $converse_width) - $converse_width = "790"; -if(! $top_photo) - $top_photo = '48px'; -if(! $comment_indent) - $comment_indent = '0px'; -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; -} diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css index c00f3c260..f69ba3450 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.css +++ b/view/theme/redbasic/schema/simple_black_on_white.css @@ -1,4 +1,10 @@ +.generic-content-wrapper { + border: 1px solid #fff; + background-color: transparent; +} + .vcard, #contact-block, .widget { + background-color: transparent; border-bottom: 1px solid #fff; } diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white.php index 6853a0ed5..554e832f0 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.php +++ b/view/theme/redbasic/schema/simple_black_on_white.php @@ -34,6 +34,9 @@ $comment_border_colour = "rgba(255,255,255,0.8)"; if (! $font_colour) $font_colour = "#000"; + if (! $converse_width) + $converse_width = "1024"; + diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css index ce4465930..1f0a2f1e6 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.css +++ b/view/theme/redbasic/schema/simple_green_on_black.css @@ -1,4 +1,10 @@ +.generic-content-wrapper { + border: 1px solid #000; + background-color: transparent; +} + .vcard, #contact-block, .widget { + background-color: transparent; border-bottom: 1px solid #fff; } diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black.php index 2660624d6..8192180db 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.php +++ b/view/theme/redbasic/schema/simple_green_on_black.php @@ -34,3 +34,5 @@ $comment_border_colour = "rgba(0,0,0,0.8)"; if (! $font_colour) $font_colour = "#46D43F"; + if (! $converse_width) + $converse_width = "1024"; diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css index 3504265b9..627f3ee5c 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.css +++ b/view/theme/redbasic/schema/simple_white_on_black.css @@ -1,9 +1,11 @@ -.vcard, #contact-block, .widget { - border-bottom: 1px solid #fff; +.generic-content-wrapper { + border: 1px solid #000; + background-color: transparent; } -.abook-pending-contact, .abook-permschange { - background: #000; +.vcard, #contact-block, .widget { + background-color: transparent; + border-bottom: 1px solid #fff; } #cboxContent a { diff --git a/view/theme/redbasic/schema/simple_white_on_black.php b/view/theme/redbasic/schema/simple_white_on_black.php index a76709ac9..b64f60bbe 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.php +++ b/view/theme/redbasic/schema/simple_white_on_black.php @@ -34,3 +34,5 @@ $comment_border_colour = "rgba(0,0,0,0.8)"; if (! $font_colour) $font_colour = "#fff"; + if (! $converse_width) + $converse_width = "1024"; diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index 8a4fc666e..cdc9de489 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -1,4 +1,7 @@ {{include file="field_select.tpl" field=$schema}} +{{include file="field_checkbox.tpl" field=$align_left}} +{{include file="field_checkbox.tpl" field=$narrow_navbar}} +{{include file="field_input.tpl" field=$converse_width}} {{if $expert}} {{include file="field_colorinput.tpl" field=$nav_bg}} {{include file="field_colorinput.tpl" field=$nav_gradient_top}} @@ -13,8 +16,8 @@ {{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_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}} @@ -26,11 +29,7 @@ {{include file="field_input.tpl" field=$shadow}} {{include file="field_input.tpl" field=$top_photo}} {{include file="field_input.tpl" field=$reply_photo}} -{{/if}} -{{include file="field_input.tpl" field=$converse_width}} -{{include file="field_checkbox.tpl" field=$converse_center}} -{{include file="field_checkbox.tpl" field=$narrow_navbar}} -{{if $expert}} + <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'}); |