Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
ideadude committed Mar 13, 2021
2 parents 8e6778c + 0312da5 commit 12a62f5
Show file tree
Hide file tree
Showing 6 changed files with 315 additions and 107 deletions.
4 changes: 4 additions & 0 deletions components/header/mobile-menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
if ( is_active_sidebar( 'sidebar-5' ) ) {
dynamic_sidebar( 'sidebar-5' );
} elseif ( has_nav_menu( 'primary' ) ) {
$meta_login = get_theme_mod( 'meta_login', false );
if ( ! empty( $meta_login ) ) {
get_template_part( 'components/header/meta', 'member' );
}
wp_nav_menu(
array(
'theme_location' => 'primary',
Expand Down
189 changes: 172 additions & 17 deletions css/dark.css
Original file line number Diff line number Diff line change
@@ -1,20 +1,175 @@
/* Inverted Color Profiles for Dark Backgrounds */
body, blockquote.quote, q, .lead, div.lead p {color: #FFF; }
hr {background-color: #666; }
#site-navigation, .footer-navigation, .main-navigation a, .meta-navigation li, .header-right .widget_nav_menu li, .footer-navigation li, #secondary .widget-title, .widget_calendar #wp-calendar caption, #secondary .widget a, #secondary .widget a:link {border-color: #666; }
#secondary .widget a, #secondary .widget a:link {color: #AAA; }
blockquote { }
/*--------------------------------------------------------------
Inverted Color Profiles for Dark Backgrounds
--------------------------------------------------------------*/
body,
blockquote.quote,
.q,
.lead,
div.lead p,
.pmpro_content_message {
color: #FFF;
}
hr {
background-color: #666;
}
#site-navigation {
border-top: none;
}
.footer-navigation ul,
.footer-navigation.footer-widgets-empty ul,
.main-navigation a,
.meta-navigation ul li,
.header-right .widget_nav_menu ul li,
.footer-navigation ul li,
.pmpro_content_message,
#secondary .widget-title,
.widget_calendar #wp-calendar caption,
#secondary .widget a,
#secondary .widget a:link,
#secondary .widget_pmpro_member_login .pmpro_login_wrap,
#secondary .widget_pmpro_member_login .pmpro_logged_in_welcome_wrap {
border-color: rgba(255,255,255,0.3);
}
#secondary .widget a,
#secondary .widget a:link {
color: #AAA;
}
blockquote,
.pre,
#secondary .widget-title,
.post .entry-footer,
#your-profile h3,
#primary .tml-action-links,
thead th,
tbody tr:nth-child(even) th,
tbody tr:nth-child(even) td,
.pmpro_content_message,
#bbpress-forums li.bbp-header,
#secondary .widget_pmpro_member_login .pmpro_login_wrap,
#secondary .widget_pmpro_member_login .pmpro_logged_in_welcome_wrap {
background: rgba(255,255,255,0.1);
}
.comment,
.comment.depth-1.thread-alt,
.comment .comment.alt,
.comment.odd .child-comments .comment {
background: none;
}
mark,
.ins {
color: #000;
}
.search-form input[type=search],
#mobile-navigation .search-form input[type=search] {
background: none;
color: rgba(255,255,255,0.8);
}
.content-area input[type=text],
.content-area input[type=email],
.content-area input[type=url],
.content-area input[type=password],
.content-area input[type=search],
.content-area textarea,
#secondary input[type=text],
#secondary input[type=email],
#secondary input[type=url],
#secondary input[type=password],
#secondary input[type=search],
#secondary textarea,
.footer-widgets input[type=text],
.footer-widgets input[type=email],
.footer-widgets input[type=url],
.footer-widgets input[type=password],
.footer-widgets input[type=search],
.footer-widgets textarea,
#mobile-navigation input[type=text],
#mobile-navigation input[type=password] {
color: #FFF;
background: none;
border-color: rgba(255,255,255,0.3);
}

blockquote, pre, .comment.odd .child-comments .comment, #secondary .widget-title, .widget_calendar #wp-calendar caption, .post .entry-footer, .comment.even, .pingback.even, .trackback.even, .comment.even .child-comments .comment, #your-profile h3, #primary .tml-action-links, thead th, tbody tr:nth-child(even) th, tbody tr:nth-child(even) td, #bbpress-forums li.bbp-header {background: rgba(255,255,255,0.1); }
.comment.odd .child-comments .comment {background: none; }
/* Comments */
.comment,
.pingback,
.trackback {
border-color: rgba(255,255,255,0.1);
}
.comment,
.pingback.even,
.trackback.event {
background: none;
}
.comment.depth-1.thread-alt,
.comment .comment.alt {
background: rgba(255,255,255,0.1);
}
.comment.even .child-comments .comment {
background: none;
}
.comment.odd .child-comments .comment {
background: rgba(255,255,255,0.1);
}
.comment-meta .comment-author.vcard {
color: #FFF;
}
.comment-meta .comment-metadata .edit-link {
border-left-color: rgba(255,255,255,0.3);
}
.comment-respond .comment-notes, .comment-respond .form-allowed-tags {
color: #AAA;
}

mark, ins {color: #000; }
/*--------------------------------------------------------------
Paid Memberships Pro Integrated Styles
--------------------------------------------------------------*/
#pmpro_levels .post h2,
.memberlite_signup h2,
.pmpro_signup_form h2 {
background: rgba(255,255,255,0.2);
}
#pmpro_levels_table {
background: none;
}
#pmpro_levels_table.pmpro_checkout thead th,
#pmpro_form .pmpro_checkout thead th {
color: #FFF;
}
#pmpro_levels.pmpro_levels-table.pmpro_level-highlight,
#pmpro_levels.pmpro_levels-div .pmpro_level-highlight,
#pmpro_levels.pmpro_levels-2col .pmpro_level-highlight,
#pmpro_levels.pmpro_levels-3col .pmpro_level-highlight,
#pmpro_levels.pmpro_levels-4col .pmpro_level-highlight,
.memberlite_signup,
.pmpro_signup_form {
background: rgba(255,255,255,0.1);
border-left: none;
border-right: none;
}
form#pmpro_form .pmpro_checkout h3 {
background: rgba(255,255,255,0.1);
border-color: rgba(255,255,255,0.3);
}
.pmpro_checkout_gateway-stripe form.pmpro_form #pmpro_payment_information_fields div#AccountNumber,
.pmpro_checkout_gateway-stripe form.pmpro_form #pmpro_payment_information_fields div#Expiry,
.pmpro_checkout_gateway-stripe form.pmpro_form #pmpro_payment_information_fields div#CVV,
.pmpro_billing_gateway-stripe form.pmpro_form #pmpro_payment_information_fields div#AccountNumber,
.pmpro_billing_gateway-stripe form.pmpro_form #pmpro_payment_information_fields div#Expiry,
.pmpro_billing_gateway-stripe form.pmpro_form #pmpro_payment_information_fields div#CVV {
color: #FFF;
background: none;
border-color: rgba(255,255,255,0.3);
}

#pmpro_levels .post h2, .memberlite_signup h2, .pmpro_signup_form h2 {background: rgba(255,255,255,0.2); }

#pmpro_levels_table {background: none; }
#pmpro_levels_table.pmpro_checkout thead th, #pmpro_form .pmpro_checkout thead th {color: #FFF; }
#pmpro_levels.pmpro_levels-table.pmpro_level-highlight, #pmpro_levels.pmpro_levels-div .pmpro_level-highlight, #pmpro_levels.pmpro_levels-2col .pmpro_level-highlight, #pmpro_levels.pmpro_levels-3col .pmpro_level-highlight, #pmpro_levels.pmpro_levels-4col .pmpro_level-highlight, .memberlite_signup, .pmpro_signup_form {background: rgba(255,255,255,0.1); border-left: none; border-right: none; }

.bbp-pagination {color: #AAA; }
#bbpress-forums div.even, #bbpress-forums ul.odd, #bbpress-forums div.even, #bbpress-forums ul.even {background: none; }
/*--------------------------------------------------------------
bbPress specific CSS
--------------------------------------------------------------*/
.bbp-pagination {
color: #AAA;
}
#bbpress-forums div.even,
#bbpress-forums ul.odd,
#bbpress-forums div.even,
#bbpress-forums ul.even {
background: none;
}
2 changes: 1 addition & 1 deletion functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @package Memberlite
*/
define( 'MEMBERLITE_VERSION', '4.5.2' );
define( 'MEMBERLITE_VERSION', '4.5.3' );

// get default values for options/etc
require_once get_template_directory() . '/inc/defaults.php';
Expand Down
6 changes: 3 additions & 3 deletions inc/defaults.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
'bgcolor_site_navigation_elements' => '#site-navigation, .main-navigation ul.sub-menu',
'color_site_navigation_elements' => '.main-navigation a',
'color_site_navigation_hover_elements' => '.main-navigation li:hover, .main-navigation li:hover > a',
'color_link_color_elements' => '.content-area a, .footer-navigation a, .site-info a',
'color_link_hover_elements' => '.content-area a:hover, .footer-navigation a:hover, .site-info a:hover',
'color_link_color_elements' => '.content-area a:not(.wp-block-button__link), .footer-navigation a, .site-info a',
'color_link_hover_elements' => '.content-area a:hover:not(.wp-block-button__link), .footer-navigation a:hover, .site-info a:hover',
'color_meta_link_color_elements' => '.header-right .menu a',
'color_primary_background_elements' => '#mobile-navigation, #mobile-navigation-height-col, .masthead, .footer-widgets, .btn_primary, .btn_primary:link, .menu-toggle, .bg_primary, .banner_primary, .has-color-primary-background-color',
'color_primary_background_hover_elements' => '.btn_primary:hover',
'color_primary_color_elements' => '#meta-navigation ul ul a, #pmpro_levels .post h2, .memberlite_signup h2, .pmpro_signup_form h2, .primary, .has-text-color.has-color-primary-color',
'color_primary_color_hover_elements' => '#meta-navigation ul ul a:hover',
'color_secondary_background_elements' => '#meta-member .meta-member-inner, #meta-member .member-navigation .sub-menu, .btn_secondary, .btn_secondary:link, .memberlite_tabbable ul.memberlite_tabs li.memberlite_active a, .memberlite_tabbable ul.memberlite_tabs li.memberlite_active a:hover, .banner_secondary, #banner_bottom, .has-color-secondary-background-color',
'color_secondary_background_elements' => '.header-right #meta-member .meta-member-inner, #meta-member .member-navigation .sub-menu, .btn_secondary, .btn_secondary:link, .memberlite_tabbable ul.memberlite_tabs li.memberlite_active a, .memberlite_tabbable ul.memberlite_tabs li.memberlite_active a:hover, .banner_secondary, #banner_bottom, .has-color-secondary-background-color',
'color_secondary_background_hover_elements' => '.btn_secondary:hover',
'color_secondary_border_elements' => '#pmpro_levels .pmpro_level-highlight, #pmpro_levels.pmpro_levels-2col .pmpro_level-highlight, #pmpro_levels.pmpro_levels-3col .pmpro_level-highlight, #pmpro_levels.pmpro_levels-4col .pmpro_level-highlight, #pmpro_levels.pmpro_levels-div .pmpro_level-highlight, #pmpro_levels.pmpro_advanced_levels-compare_table thead tr:first-child th.pmpro_level-highlight, #pmpro_levels.pmpro_advanced_levels-compare_table tfoot tr:last-child td.pmpro_level-highlight, .memberlite_signup, .pmpro_signup_form, .memberlite_tabbable ul.memberlite_tabs li.memberlite_active a, .memberlite_tabbable .memberlite_tab_content',
'color_secondary_border_left_elements' => '#pmpro_levels.pmpro_advanced_levels-compare_table thead th.pmpro_level-highlight, #pmpro_levels.pmpro_advanced_levels-compare_table tbody td.pmpro_level-highlight, #pmpro_levels.pmpro_advanced_levels-compare_table tfoot td.pmpro_level-highlight, #pmpro_levels.pmpro_levels-table .pmpro_level-highlight td:first-child, .memberlite_tabbable ul.memberlite_tabs li.memberlite_active a',
Expand Down
11 changes: 8 additions & 3 deletions readme.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
=== Memberlite ===
Contributors: kimannwall, strangerstudios
Requires at least: WordPress 4.4
Tested up to: WordPress 5.6
Version: 4.5.2
Requires at least: 4.4
Tested up to: 5.7
Requires PHP: 5.6
Stable tag: 4.5.3
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Tags: one-column, two-columns, left-sidebar, right-sidebar, flexible-header, custom-background, custom-colors, custom-header, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, full-width-template, post-formats, theme-options, threaded-comments, translation-ready, e-commerce
Expand Down Expand Up @@ -108,6 +108,11 @@ We highly recommend using these plugins for every site running Memberlite:

== Changelog ==

= 4.5.3 - 2021-03-13 =
* ENHANCEMENT: Now showing member welcome/links in mobile menu if no other widgets defined.
* BUG FIX: Fixed issues with background color and font color for button or cover blocks.
* BUG FIX: General improvements for sites using an inverted (dark) body background color.

= 4.5.2 - 2020-12-08 =
* BUG FIX: Fixed issue with the Log in and Log Out links in member header theme area.
* BUG FIX/ENHANCEMENT: Fixed localization and escaping throughout theme.
Expand Down
Loading

0 comments on commit 12a62f5

Please sign in to comment.