Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add/options #51

Open
wants to merge 47 commits into
base: master
Choose a base branch
from
+2,151 −454
Open

Add/options #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
d6e5bd3
flash free Meta box option and stretched layout option added
saudensabina Nov 12, 2019
a127677
Stretched layout image added.
saudensabina Nov 13, 2019
2a77641
Sass file compiled
saudensabina Nov 13, 2019
91cf0b5
Clean coding of Flash free theme.
saudensabina Nov 19, 2019
a3a6ffb
Code refactoring
saudensabina Nov 21, 2019
ed2a7e3
adding stretched laypout css
saurav-niroula Nov 21, 2019
cb27563
reformatting the scss for stretched layout option
saurav-niroula Nov 21, 2019
496582d
Menu settings added
saudensabina Nov 22, 2019
c715f0e
Header section border width option added
saudensabina Nov 22, 2019
3464403
Sticky menu options updated
saudensabina Nov 25, 2019
d2363af
sticky/non-sticky menu options modified
saudensabina Dec 3, 2019
d1c113e
Header button seting added
saudensabina Dec 4, 2019
9515a95
Header button link added.
saudensabina Dec 5, 2019
b9a90d9
Header button typography added.
saudensabina Dec 5, 2019
2e0ffe1
Header button border-radius added
saudensabina Dec 5, 2019
07af191
Header options arranged
saudensabina Dec 5, 2019
367881a
menu desktop css
saurav-niroula Dec 9, 2019
c524962
Header Settings options arranged
saudensabina Dec 9, 2019
a40661c
Header button added in responsive device
saudensabina Dec 9, 2019
fef66e2
css modified for breadcumb padding,menu button issues and overall pad…
saurav-niroula Dec 9, 2019
700fa2c
page header breadcumb modified
saurav-niroula Dec 9, 2019
087bfc3
strethed layout css added
saurav-niroula Dec 9, 2019
4b4b70f
stretched layout css added
saurav-niroula Dec 9, 2019
08fa874
Header button color error fixed
saudensabina Dec 10, 2019
0dc2cdb
css added for responsive layout and menu color issue
saurav-niroula Dec 10, 2019
0479dd9
css added for menu button color
saurav-niroula Dec 10, 2019
8acb8a5
header button css modified
saudensabina Dec 11, 2019
b127d75
css added for non transparent layput options
saurav-niroula Dec 12, 2019
316e246
css added for transparent layout option
saurav-niroula Dec 13, 2019
8dc71d3
Header top background color added
saudensabina Dec 16, 2019
968eadb
css added for header menu
saurav-niroula Dec 16, 2019
4474fbf
css addded for top header options
saurav-niroula Dec 16, 2019
04f4332
css added for header top options
saurav-niroula Dec 16, 2019
986a1f6
css added for stretched layout
saurav-niroula Dec 18, 2019
73416d8
css added for stretched layout
saurav-niroula Dec 18, 2019
54655ae
css added for btn and menu align layout
saurav-niroula Dec 18, 2019
2ddb71c
Page header title color option added
saudensabina Dec 19, 2019
f7c1d37
css add for 1st degree submenus
saurav-niroula Dec 20, 2019
f4323a5
css add for breadcumb default, link and title color
saurav-niroula Dec 20, 2019
f5e8892
Pageheader title default color changed
saudensabina Dec 20, 2019
af753f1
css add for changing default colors
saurav-niroula Dec 20, 2019
8923d51
Merge branch 'Add/Options' of https://github.com/themegrill/flash int…
saurav-niroula Dec 20, 2019
eeb5f98
css add for responsive header top
saurav-niroula Dec 20, 2019
c2c03c6
css add for undo the last change for responsive header top
saurav-niroula Dec 20, 2019
436d333
css added for main content padding
saurav-niroula Dec 30, 2019
d0a2f0c
css add for menu and button color issue in mobile
saurav-niroula Dec 31, 2019
3ef4f91
css add for responsive menu
saurav-niroula Jan 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
698 changes: 670 additions & 28 deletions assets/sass/_theme-style.scss
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions footer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

?>

</div><!-- .tg-container -->
</div><!-- .tg-container -->
</div><!-- #content -->

<?php
Expand All @@ -35,7 +35,6 @@
<?php do_action( 'flash_copyright_area' ); ?>

<?php wp_nav_menu( array( 'theme_location' => 'footer', 'menu_class' => 'footer-menu', 'fallback_cb' => false, ) ); ?>

</div>
</div>
</footer><!-- #colophon -->
Expand Down
1 change: 1 addition & 0 deletions functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,3 +344,4 @@ function flash_font_family_change() {
}

add_action( 'after_setup_theme', 'flash_font_family_change' );

2 changes: 1 addition & 1 deletion gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ function compressZip() {
// Watch for file changes
function watch() {
gulp.watch( paths.scss.src, styles );
gulp.watch( [ paths.js.src, paths.php.src ], browserSyncReload );
gulp.watch( paths.js.src, minifyJs );
}


Expand Down
5 changes: 3 additions & 2 deletions header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@

<div class="header-bottom">
<div class="tg-container">

<div class="logo">
<?php if( function_exists( 'the_custom_logo' ) && has_custom_logo() ) : ?>
<figure class="logo-image">
Expand Down Expand Up @@ -123,6 +122,7 @@
<?php $logo_position = get_theme_mod( 'flash_logo_position', 'left-logo-right-menu' ); ?>

<?php if ( $logo_position == 'center-logo-below-menu' ): ?>

<div class="header-action-container">

<?php if( ( get_theme_mod( 'flash_header_cart', '' ) != '1' ) && class_exists( 'WooCommerce' ) ) :
Expand Down Expand Up @@ -189,12 +189,13 @@
/**
* flash_after_header hook
*/

do_action( 'flash_after_header' ); ?>

<?php get_template_part( 'template-parts/header-media' ); ?>

<?php if( !is_front_page() ) : ?>
<nav id="flash-breadcrumbs" class="breadcrumb-trail breadcrumbs">
<nav id="flash-breadcrumbs" class="breadcrumb-trail breadcrumbs pageheader-<?php echo esc_attr( flash_pageheader_class() ); ?>">
<div class="tg-container">
<?php flash_page_title(); ?>
<?php flash_breadcrumbs(); ?>
Expand Down
Binary file added images/large-page-header-size.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/medium-page-header-size.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/small-page-header-size.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/stretched-layout.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
47 changes: 11 additions & 36 deletions inc/class-flash-admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public function flash_ajax_import_button_handler() {
public function admin_menu() {
$theme = wp_get_theme( get_template() );

$page = add_theme_page( esc_html__( 'About', 'flash' ) . ' ' . $theme->display( 'Name' ), esc_html__( 'About', 'flash' ) . ' ' . $theme->display( 'Name' ), 'activate_plugins', 'flash-sitelibrary', array(
$page = add_theme_page( esc_html__( 'About', 'flash' ) . ' ' . $theme->display( 'Name' ), esc_html__( 'About', 'flash' ) . ' ' . $theme->display( 'Name' ), 'activate_plugins', 'flash-sitelibrary', array(
$this,
'sitelibrary_screen',
) );
Expand Down Expand Up @@ -485,7 +485,6 @@ public function supported_plugins_screen() {
<div class="wrap about-wrap">

<?php $this->intro(); ?>

<p class="about-description"><?php esc_html_e( 'This theme recommends following plugins.', 'flash' ); ?></p>
<ol>
<li>
Expand All @@ -504,9 +503,9 @@ public function supported_plugins_screen() {
</li>
<li>
<a href="<?php echo esc_url( 'https://wordpress.org/plugins/restaurantpress/' ); ?>" target="_blank"><?php esc_html_e( 'RestaurantPress', 'flash' ); ?></a>
<?php esc_html_e( ' by ThemeGrill', 'flash' ); ?></li>
<?php esc_html_e( ' by ThemeGrill', 'flash' ); ?>
</li>
</ol>

</div>
<?php
}
Expand All @@ -521,7 +520,6 @@ public function free_vs_pro_screen() {
<?php $this->intro(); ?>

<p class="about-description"><?php esc_html_e( 'Upgrade to PRO version for more exciting features.', 'flash' ); ?></p>

<table>
<thead>
<tr>
Expand Down Expand Up @@ -609,65 +607,42 @@ public function free_vs_pro_screen() {
<tr>
<td><h3><?php esc_html_e( 'FT: Heading Widget', 'flash' ); ?></h3></td>
<td><span class="dashicons dashicons-yes"></span></td>
<td>
<span class="dashicons dashicons-yes"></span>(<?php esc_html_e( '3 New Styles', 'flash' ); ?>
)
</td>
<td><span class="dashicons dashicons-yes"></span>(<?php esc_html_e( '3 New Styles', 'flash' ); ?>)</td>
</tr>
<tr>
<td><h3><?php esc_html_e( 'FT: Service Widget', 'flash' ); ?></h3></td>
<td><span class="dashicons dashicons-yes"></span></td>
<td>
<span class="dashicons dashicons-yes"></span>(<?php esc_html_e( '3 New Styles', 'flash' ); ?>
)
</td>
<td><span class="dashicons dashicons-yes"></span>(<?php esc_html_e( '3 New Styles', 'flash' ); ?>)</td>
</tr>
<tr>
<td><h3><?php esc_html_e( 'FT: Call To Action Widget', 'flash' ); ?></h3></td>
<td><span class="dashicons dashicons-yes"></span></td>
<td>
<span class="dashicons dashicons-yes"></span>(<?php esc_html_e( '3 New Styles', 'flash' ); ?>
)
</td>
<td><span class="dashicons dashicons-yes"></span>(<?php esc_html_e( '3 New Styles', 'flash' ); ?>)</td>
</tr>
<tr>
<td><h3><?php esc_html_e( 'FT: Testimonial Widget', 'flash' ); ?></h3></td>
<td><span class="dashicons dashicons-yes"></span></td>
<td>
<span class="dashicons dashicons-yes"></span>(<?php esc_html_e( '4 New Styles', 'flash' ); ?>
)
</td>
<td><span class="dashicons dashicons-yes"></span>(<?php esc_html_e( '4 New Styles', 'flash' ); ?>)</td>
</tr>
<tr>
<td><h3><?php esc_html_e( 'FT: Team Widget', 'flash' ); ?></h3></td>
<td><span class="dashicons dashicons-yes"></span></td>
<td>
<span class="dashicons dashicons-yes"></span>(<?php esc_html_e( '4 New Styles', 'flash' ); ?>
)
</td>
<td><span class="dashicons dashicons-yes"></span>(<?php esc_html_e( '4 New Styles', 'flash' ); ?>)</td>
</tr>
<tr>
<td><h3><?php esc_html_e( 'FT: Portfolio Widget', 'flash' ); ?></h3></td>
<td><span class="dashicons dashicons-yes"></span></td>
<td><span class="dashicons dashicons-yes"></span>(<?php esc_html_e( '1 New Style', 'flash' ); ?>
)
</td>
<td><span class="dashicons dashicons-yes"></span>(<?php esc_html_e( '1 New Style', 'flash' ); ?>)</td>
</tr>
<tr>
<td><h3><?php esc_html_e( 'FT: Animated Number Counter', 'flash' ); ?></h3></td>
<td><span class="dashicons dashicons-yes"></span></td>
<td>
<span class="dashicons dashicons-yes"></span>(<?php esc_html_e( '4 New Styles', 'flash' ); ?>
)
</td>
<td><span class="dashicons dashicons-yes"></span>(<?php esc_html_e( '4 New Styles', 'flash' ); ?>)</td>
</tr>
<tr>
<td><h3><?php esc_html_e( 'FT: Blog', 'flash' ); ?></h3></td>
<td><span class="dashicons dashicons-yes"></span></td>
<td>
<span class="dashicons dashicons-yes"></span>(<?php esc_html_e( '3 New Styles', 'flash' ); ?>
)
</td>
<td><span class="dashicons dashicons-yes"></span>(<?php esc_html_e( '3 New Styles', 'flash' ); ?>)</td>
</tr>
<tr>
<td><h3><?php esc_html_e( 'FT: Google Map', 'flash' ); ?></h3></td>
Expand Down
4 changes: 2 additions & 2 deletions inc/class-flash-site-library.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ public function flash_site_library_demo_packages() {
public static function flash_site_library_get_demos() {
$template = 'flash';
$packages = get_transient( 'flash_site_library_theme_' . $template );

if ( false === $packages ) {
$raw_packages = wp_safe_remote_get( "https://raw.githubusercontent.com/themegrill/themegrill-demo-pack/master/configs/{$template}.json" );

if ( ! is_wp_error( $raw_packages ) ) {
$packages = json_decode( wp_remote_retrieve_body( $raw_packages ) );

if ( $packages ) {
set_transient( 'flash_site_library_theme_' . $template, $packages, WEEK_IN_SECONDS );
}
Expand Down
Loading