fix and cleanup custom theme settings
This commit is contained in:
		| @@ -369,10 +369,10 @@ function NavUpdate() { | ||||
| 			updateCountsOnly = false; | ||||
|  | ||||
| 			if(data.network || data.home || data.intros || data.mail || data.all_events || data.notify) { | ||||
| 				$('#notifications-btn').removeClass('text-muted').addClass('text-white'); | ||||
| 				$('#notifications-btn').css('opacity', 1); | ||||
| 			} | ||||
| 			else { | ||||
| 				$('#notifications-btn').removeClass('text-white').addClass('text-muted'); | ||||
| 				$('#notifications-btn').css('opacity', 0.5); | ||||
| 				$('#navbar-collapse-1').removeClass('in'); | ||||
| 			} | ||||
|  | ||||
|   | ||||
| @@ -78,6 +78,8 @@ h6, .h6 { | ||||
| } | ||||
|  | ||||
| #banner { | ||||
| 	color: $banner_colour; | ||||
| 	font-weight: bold; | ||||
| 	white-space: nowrap; | ||||
| 	overflow: hidden; | ||||
| 	text-overflow: ellipsis; | ||||
| @@ -97,10 +99,6 @@ abbr { | ||||
| } | ||||
|  | ||||
| /* icons */ | ||||
| .tool-icons, | ||||
| .cat-icons { | ||||
| 	color: $toolicon_colour; | ||||
| } | ||||
|  | ||||
| a, | ||||
| .fakelink { | ||||
| @@ -735,18 +733,6 @@ div.jGrowl div.jGrowl-notification { | ||||
| 	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; | ||||
| } | ||||
|  | ||||
| .conv-participants { | ||||
| 	color: $font_colour; | ||||
| } | ||||
| @@ -898,19 +884,14 @@ margin-right: 50px; | ||||
|  | ||||
| .generic-icons { | ||||
| 	font-size: 1rem; | ||||
| 	color: $toolicon_colour; | ||||
| 	margin-right: 0.5rem; | ||||
| } | ||||
|  | ||||
| .generic-icons-right { | ||||
| 	font-size: 1rem; | ||||
| 	color: $toolicon_colour; | ||||
| 	margin-left: 0.5rem; | ||||
| } | ||||
|  | ||||
| .generic-icons:hover { | ||||
| 	color: $toolicon_colour; | ||||
| } | ||||
|  | ||||
| .generic-icons-nav { | ||||
| 	font-size: 1.2em; | ||||
| @@ -919,13 +900,11 @@ margin-right: 50px; | ||||
|  | ||||
| .admin-icons { | ||||
| 	font-size: 1.2em; | ||||
| 	color: $toolicon_colour; | ||||
| 	margin-right: 7px; | ||||
| } | ||||
|  | ||||
| .drop-icons, | ||||
| a .drop-icons { | ||||
| 	color: $toolicon_colour; | ||||
| 	font-size: 1.2em; | ||||
| 	text-decoration: none; | ||||
| 	cursor: pointer; | ||||
| @@ -1132,14 +1111,6 @@ a:active .dropdown-sub-text { | ||||
| 	font-size: 1rem; | ||||
| } | ||||
|  | ||||
| .item-tool { | ||||
| 	font-size: 1.2em; | ||||
| 	color: $toolicon_colour; | ||||
| } | ||||
|  | ||||
| .like-rotator { | ||||
| 	color: $toolicon_colour; | ||||
| } | ||||
|  | ||||
| .comment-edit-text-empty, | ||||
| .comment-edit-text-full { | ||||
| @@ -1173,10 +1144,6 @@ a:active .dropdown-sub-text { | ||||
| 	border-radius: $radius; | ||||
| } | ||||
|  | ||||
| .widget h3 { | ||||
| 	color: $toolicon_colour; | ||||
| } | ||||
|  | ||||
| #note-text { | ||||
| 	border: 1px solid #ccc; | ||||
| 	border-radius: $radius; | ||||
| @@ -1428,62 +1395,19 @@ blockquote { | ||||
| 	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; | ||||
| .bg-inverse { | ||||
| 	background-color: $nav_bg !important; | ||||
| } | ||||
|  | ||||
|  | ||||
| .navbar-inverse .navbar-collapse { | ||||
| 	border-color: $nav_bd; | ||||
| .navbar-inverse .navbar-nav .nav-link { | ||||
|   color: $nav_icon_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); | ||||
| .navbar-inverse .navbar-nav .nav-link:focus, | ||||
| .navbar-inverse .navbar-nav .nav-link:hover { | ||||
|   color: $nav_active_icon_colour; | ||||
| } | ||||
|  | ||||
|  | ||||
| .navbar-inverse .navbar-nav > li > a { | ||||
| 	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; | ||||
| } | ||||
| */ | ||||
|  | ||||
| @media screen and (max-width: 767px) { | ||||
|  | ||||
| 	aside#region_1 { | ||||
| @@ -1688,7 +1612,6 @@ dl.bb-dl > dd > li { | ||||
|  | ||||
| .app-icon { | ||||
| 	font-size: 80px; | ||||
| 	color: $toolicon_colour; | ||||
| 	text-shadow: 3px 3px 3px lightgrey; | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -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,17 +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['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); | ||||
| @@ -65,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']); | ||||
| @@ -78,17 +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', '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']); | ||||
| 		} | ||||
| @@ -108,30 +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']), | ||||
| 			'$font_size' => array('redbasic_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 87.5%, 14px')), | ||||
| 			'$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'], 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']), | ||||
| 			)); | ||||
|   | ||||
| @@ -11,32 +11,22 @@ if(! App::$install) { | ||||
|  | ||||
| 	// Load the owners pconfig | ||||
| 	$nav_bg = get_pconfig($uid, 'redbasic', 'nav_bg'); | ||||
| 	$nav_gradient_top = get_pconfig($uid, 'redbasic', 'nav_gradient_top'); | ||||
| 	$nav_gradient_bottom = get_pconfig($uid, 'redbasic', 'nav_gradient_bottom'); | ||||
| 	$nav_active_gradient_top = get_pconfig($uid, 'redbasic', 'nav_active_gradient_top'); | ||||
| 	$nav_active_gradient_bottom = get_pconfig($uid, 'redbasic', 'nav_active_gradient_bottom'); | ||||
| 	$nav_bd = get_pconfig($uid, 'redbasic', 'nav_bd'); | ||||
| 	$nav_icon_colour = get_pconfig($uid, 'redbasic', 'nav_icon_colour'); | ||||
| 	$nav_active_icon_colour = get_pconfig($uid, 'redbasic', 'nav_active_icon_colour'); | ||||
| 	$narrow_navbar = get_pconfig($uid,'redbasic','narrow_navbar'); | ||||
| 	$banner_colour = get_pconfig($uid,'redbasic','banner_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'); | ||||
| 	$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'); | ||||
| 	$top_photo=get_pconfig($uid,'redbasic','top_photo'); | ||||
| 	$reply_photo=get_pconfig($uid,'redbasic','reply_photo'); | ||||
| } | ||||
| @@ -86,20 +76,10 @@ if (! $schema) { | ||||
| //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'; | ||||
| 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 = '#0275d8'; | ||||
| if (! $banner_colour) | ||||
| @@ -112,12 +92,6 @@ if (! $item_colour) | ||||
| 	$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'; | ||||
| if (! $item_opacity) | ||||
| 	$item_opacity = '1'; | ||||
| if (! $font_size) | ||||
| @@ -132,18 +106,8 @@ if (! $converse_width) | ||||
| 	$converse_width = '790'; | ||||
| if(! $top_photo) | ||||
| 	$top_photo = '2.3rem'; | ||||
| if(! $comment_indent) | ||||
| 	$comment_indent = '0px'; | ||||
| if(! $reply_photo) | ||||
| 	$reply_photo = '2.3rem'; | ||||
| 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; | ||||
| } | ||||
|  | ||||
| // Apply the settings | ||||
| if(file_exists('view/theme/redbasic/css/style.css')) { | ||||
| @@ -176,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, | ||||
| @@ -189,9 +148,6 @@ 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, | ||||
| 		'$radius' => $radius, | ||||
| @@ -203,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 | ||||
| 	); | ||||
|   | ||||
| @@ -4,14 +4,9 @@ | ||||
| {{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}} | ||||
| @@ -20,9 +15,6 @@ | ||||
| 	{{*include file="field_input.tpl" field=$comment_indent*}} | ||||
| 	{{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}} | ||||
| @@ -30,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'}); | ||||
| 	}); | ||||
|   | ||||
| @@ -20,7 +20,7 @@ | ||||
| 		<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i> | ||||
| 	</button> | ||||
| 	{{if $localuser}} | ||||
| 	<button id="notifications-btn" type="button" class="navbar-toggler border-0 text-muted" data-toggle="collapse" data-target="#navbar-collapse-1"> | ||||
| 	<button id="notifications-btn" type="button" class="navbar-toggler border-0 text-white" data-toggle="collapse" data-target="#navbar-collapse-1"> | ||||
| 		<i class="fa fa-exclamation-circle"></i> | ||||
| 	</button> | ||||
| 	{{/if}} | ||||
| @@ -169,7 +169,7 @@ | ||||
| 		{{/if}} | ||||
| 	</ul> | ||||
|  | ||||
| 	<div id="banner" class="navbar-text text-white font-weight-bold d-none d-md-flex">{{$banner}}</div> | ||||
| 	<div id="banner" class="navbar-text d-none d-md-flex">{{$banner}}</div> | ||||
|  | ||||
| 	<ul id="nav-right" class="navbar-nav ml-auto d-none d-md-flex"> | ||||
| 		<li class="nav-item collapse clearfix" id="nav-search"> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user