diff --git a/wp-content/themes/twentyseventeen/assets/css/editor-blocks.css b/wp-content/themes/twentyseventeen/assets/css/editor-blocks.css index 35c34bc..9e5dcae 100644 --- a/wp-content/themes/twentyseventeen/assets/css/editor-blocks.css +++ b/wp-content/themes/twentyseventeen/assets/css/editor-blocks.css @@ -388,7 +388,6 @@ html[lang="th"] .edit-post-visual-editor * { .editor-block-list__block ol, .block-library-list ol, .block-library-list .editor-rich-text__tinymce { - margin: 0 0 1.5em 1.5em; padding: 0; } @@ -420,23 +419,25 @@ html[lang="th"] .edit-post-visual-editor * { margin: 0; } -.rtl .edit-post-visual-editor ul:not(.wp-block-gallery), -.rtl .editor-block-list__block ul:not(.wp-block-gallery), -.rtl .block-library-list ul, -.rtl .edit-post-visual-editor ol, -.rtl .editor-block-list__block ol, -.rtl .block-library-list ol, -.rtl .block-library-list .editor-rich-text__tinymce, -.rtl .edit-post-visual-editor li > ul:not(.wp-block-gallery), -.rtl .editor-block-list__block li > ul:not(.wp-block-gallery), -.rtl .block-library-list li > ul:not(.wp-block-gallery), -.rtl .edit-post-visual-editor li > ol, -.rtl .editor-block-list__block li > ol, -.rtl .block-library-list li > ol { - margin-left: 1.5em; +.rtl .editor-styles-wrapper ul ul, +.rtl .editor-styles-wrapper ol ol, +.rtl .editor-styles-wrapper ul ol, +.rtl .editor-styles-wrapper ol ul { + margin-left: 0; margin-right: 1.5em; } +.wp-block-freeform.block-library-rich-text__tinymce ul:not(.wp-block-gallery), +.wp-block-freeform.block-library-rich-text__tinymce ol { + margin-left: 0; + padding-left: 1.5em; +} + +.rtl .wp-block-freeform.block-library-rich-text__tinymce ul:not(.wp-block-gallery), +.rtl .wp-block-freeform.block-library-rich-text__tinymce ol { + padding: 0; +} + /* Quote styles */ .editor-block-list__block blockquote p { diff --git a/wp-content/themes/twentyseventeen/assets/images/direct-light.jpg b/wp-content/themes/twentyseventeen/assets/images/direct-light.jpg new file mode 100644 index 0000000..a325579 Binary files /dev/null and b/wp-content/themes/twentyseventeen/assets/images/direct-light.jpg differ diff --git a/wp-content/themes/twentyseventeen/assets/images/stripes.jpg b/wp-content/themes/twentyseventeen/assets/images/stripes.jpg new file mode 100644 index 0000000..26e3b6d Binary files /dev/null and b/wp-content/themes/twentyseventeen/assets/images/stripes.jpg differ diff --git a/wp-content/themes/twentyseventeen/assets/images/white-border.jpg b/wp-content/themes/twentyseventeen/assets/images/white-border.jpg new file mode 100644 index 0000000..a1b11d7 Binary files /dev/null and b/wp-content/themes/twentyseventeen/assets/images/white-border.jpg differ diff --git a/wp-content/themes/twentyseventeen/functions.php b/wp-content/themes/twentyseventeen/functions.php index 354a617..4bc4640 100644 --- a/wp-content/themes/twentyseventeen/functions.php +++ b/wp-content/themes/twentyseventeen/functions.php @@ -44,6 +44,11 @@ function twentyseventeen_setup() { */ add_theme_support( 'title-tag' ); + /* + * Enables custom line height for blocks + */ + add_theme_support( 'custom-line-height' ); + /* * Enable support for Post Thumbnails on posts and pages. * @@ -79,6 +84,7 @@ function twentyseventeen_setup() { 'caption', 'script', 'style', + 'navigation-widgets', ) ); @@ -448,7 +454,7 @@ function twentyseventeen_scripts() { wp_enqueue_style( 'twentyseventeen-fonts', twentyseventeen_fonts_url(), array(), null ); // Theme stylesheet. - wp_enqueue_style( 'twentyseventeen-style', get_stylesheet_uri(), array(), '20190507' ); + wp_enqueue_style( 'twentyseventeen-style', get_stylesheet_uri(), array(), '20201208' ); // Theme block stylesheet. wp_enqueue_style( 'twentyseventeen-block-style', get_theme_file_uri( '/assets/css/blocks.css' ), array( 'twentyseventeen-style' ), '20190105' ); @@ -509,7 +515,7 @@ add_action( 'wp_enqueue_scripts', 'twentyseventeen_scripts' ); */ function twentyseventeen_block_editor_styles() { // Block styles. - wp_enqueue_style( 'twentyseventeen-block-editor-style', get_theme_file_uri( '/assets/css/editor-blocks.css' ), array(), '20190328' ); + wp_enqueue_style( 'twentyseventeen-block-editor-style', get_theme_file_uri( '/assets/css/editor-blocks.css' ), array(), '20201208' ); // Add custom fonts. wp_enqueue_style( 'twentyseventeen-fonts', twentyseventeen_fonts_url(), array(), null ); } @@ -663,3 +669,8 @@ require get_parent_theme_file_path( '/inc/customizer.php' ); * SVG icons functions and filters. */ require get_parent_theme_file_path( '/inc/icon-functions.php' ); + +/** + * Block Patterns. + */ +require get_template_directory() . '/inc/block-patterns.php'; diff --git a/wp-content/themes/twentyseventeen/functions.php.orig b/wp-content/themes/twentyseventeen/functions.php.orig deleted file mode 100644 index 3ab45c6..0000000 --- a/wp-content/themes/twentyseventeen/functions.php.orig +++ /dev/null @@ -1,667 +0,0 @@ - tag in the document head, and expect WordPress to - * provide it for us. - */ - add_theme_support( 'title-tag' ); - - /* - * Enable support for Post Thumbnails on posts and pages. - * - * @link https://developer.wordpress.org/themes/functionality/featured-images-post-thumbnails/ - */ - add_theme_support( 'post-thumbnails' ); - - add_image_size( 'twentyseventeen-featured-image', 2000, 1200, true ); - - add_image_size( 'twentyseventeen-thumbnail-avatar', 100, 100, true ); - - // Set the default content width. - $GLOBALS['content_width'] = 525; - - // This theme uses wp_nav_menu() in two locations. - register_nav_menus( - array( - 'top' => __( 'Top Menu', 'twentyseventeen' ), - 'social' => __( 'Social Links Menu', 'twentyseventeen' ), - ) - ); - - /* - * Switch default core markup for search form, comment form, and comments - * to output valid HTML5. - */ - add_theme_support( - 'html5', - array( - 'comment-form', - 'comment-list', - 'gallery', - 'caption', - 'script', - 'style', - ) - ); - - /* - * Enable support for Post Formats. - * - * See: https://wordpress.org/support/article/post-formats/ - */ - add_theme_support( - 'post-formats', - array( - 'aside', - 'image', - 'video', - 'quote', - 'link', - 'gallery', - 'audio', - ) - ); - - // Add theme support for Custom Logo. - add_theme_support( - 'custom-logo', - array( - 'width' => 250, - 'height' => 250, - 'flex-width' => true, - ) - ); - - // Add theme support for selective refresh for widgets. - add_theme_support( 'customize-selective-refresh-widgets' ); - - /* - * This theme styles the visual editor to resemble the theme style, - * specifically font, colors, and column width. - */ - add_editor_style( array( 'assets/css/editor-style.css', twentyseventeen_fonts_url() ) ); - - // Load regular editor styles into the new block-based editor. - add_theme_support( 'editor-styles' ); - - // Load default block styles. - add_theme_support( 'wp-block-styles' ); - - // Add support for responsive embeds. - add_theme_support( 'responsive-embeds' ); - - // Define and register starter content to showcase the theme on new sites. - $starter_content = array( - 'widgets' => array( - // Place three core-defined widgets in the sidebar area. - 'sidebar-1' => array( - 'text_business_info', - 'search', - 'text_about', - ), - - // Add the core-defined business info widget to the footer 1 area. - 'sidebar-2' => array( - 'text_business_info', - ), - - // Put two core-defined widgets in the footer 2 area. - 'sidebar-3' => array( - 'text_about', - 'search', - ), - ), - - // Specify the core-defined pages to create and add custom thumbnails to some of them. - 'posts' => array( - 'home', - 'about' => array( - 'thumbnail' => '{{image-sandwich}}', - ), - 'contact' => array( - 'thumbnail' => '{{image-espresso}}', - ), - 'blog' => array( - 'thumbnail' => '{{image-coffee}}', - ), - 'homepage-section' => array( - 'thumbnail' => '{{image-espresso}}', - ), - ), - - // Create the custom image attachments used as post thumbnails for pages. - 'attachments' => array( - 'image-espresso' => array( - 'post_title' => _x( 'Espresso', 'Theme starter content', 'twentyseventeen' ), - 'file' => 'assets/images/espresso.jpg', // URL relative to the template directory. - ), - 'image-sandwich' => array( - 'post_title' => _x( 'Sandwich', 'Theme starter content', 'twentyseventeen' ), - 'file' => 'assets/images/sandwich.jpg', - ), - 'image-coffee' => array( - 'post_title' => _x( 'Coffee', 'Theme starter content', 'twentyseventeen' ), - 'file' => 'assets/images/coffee.jpg', - ), - ), - - // Default to a static front page and assign the front and posts pages. - 'options' => array( - 'show_on_front' => 'page', - 'page_on_front' => '{{home}}', - 'page_for_posts' => '{{blog}}', - ), - - // Set the front page section theme mods to the IDs of the core-registered pages. - 'theme_mods' => array( - 'panel_1' => '{{homepage-section}}', - 'panel_2' => '{{about}}', - 'panel_3' => '{{blog}}', - 'panel_4' => '{{contact}}', - ), - - // Set up nav menus for each of the two areas registered in the theme. - 'nav_menus' => array( - // Assign a menu to the "top" location. - 'top' => array( - 'name' => __( 'Top Menu', 'twentyseventeen' ), - 'items' => array( - 'link_home', // Note that the core "home" page is actually a link in case a static front page is not used. - 'page_about', - 'page_blog', - 'page_contact', - ), - ), - - // Assign a menu to the "social" location. - 'social' => array( - 'name' => __( 'Social Links Menu', 'twentyseventeen' ), - 'items' => array( - 'link_yelp', - 'link_facebook', - 'link_twitter', - 'link_instagram', - 'link_email', - ), - ), - ), - ); - - /** - * Filters Twenty Seventeen array of starter content. - * - * @since Twenty Seventeen 1.1 - * - * @param array $starter_content Array of starter content. - */ - $starter_content = apply_filters( 'twentyseventeen_starter_content', $starter_content ); - - add_theme_support( 'starter-content', $starter_content ); -} -add_action( 'after_setup_theme', 'twentyseventeen_setup' ); - -/** - * Set the content width in pixels, based on the theme's design and stylesheet. - * - * Priority 0 to make it available to lower priority callbacks. - * - * @global int $content_width - */ -function twentyseventeen_content_width() { - - $content_width = $GLOBALS['content_width']; - - // Get layout. - $page_layout = get_theme_mod( 'page_layout' ); - - // Check if layout is one column. - if ( 'one-column' === $page_layout ) { - if ( twentyseventeen_is_frontpage() ) { - $content_width = 644; - } elseif ( is_page() ) { - $content_width = 740; - } - } - - // Check if is single post and there is no sidebar. - if ( is_single() && ! is_active_sidebar( 'sidebar-1' ) ) { - $content_width = 740; - } - - /** - * Filter Twenty Seventeen content width of the theme. - * - * @since Twenty Seventeen 1.0 - * - * @param int $content_width Content width in pixels. - */ - $GLOBALS['content_width'] = apply_filters( 'twentyseventeen_content_width', $content_width ); -} -add_action( 'template_redirect', 'twentyseventeen_content_width', 0 ); - -/** - * Register custom fonts. - */ -function twentyseventeen_fonts_url() { - $fonts_url = ''; - - /* - * translators: If there are characters in your language that are not supported - * by Libre Franklin, translate this to 'off'. Do not translate into your own language. - */ - $libre_franklin = _x( 'on', 'Libre Franklin font: on or off', 'twentyseventeen' ); - - if ( 'off' !== $libre_franklin ) { - $font_families = array(); - - $font_families[] = 'Libre Franklin:300,300i,400,400i,600,600i,800,800i'; - - $query_args = array( - 'family' => urlencode( implode( '|', $font_families ) ), - 'subset' => urlencode( 'latin,latin-ext' ), - 'display' => urlencode( 'fallback' ), - ); - - $fonts_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' ); - } - - return esc_url_raw( $fonts_url ); -} - -/** - * Add preconnect for Google Fonts. - * - * @since Twenty Seventeen 1.0 - * - * @param array $urls URLs to print for resource hints. - * @param string $relation_type The relation type the URLs are printed. - * @return array $urls URLs to print for resource hints. - */ -function twentyseventeen_resource_hints( $urls, $relation_type ) { - if ( wp_style_is( 'twentyseventeen-fonts', 'queue' ) && 'preconnect' === $relation_type ) { - $urls[] = array( - 'href' => 'https://fonts.gstatic.com', - 'crossorigin', - ); - } - - return $urls; -} -add_filter( 'wp_resource_hints', 'twentyseventeen_resource_hints', 10, 2 ); - -/** - * Register widget area. - * - * @link https://developer.wordpress.org/themes/functionality/sidebars/#registering-a-sidebar - */ -function twentyseventeen_widgets_init() { - register_sidebar( - array( - 'name' => __( 'Blog Sidebar', 'twentyseventeen' ), - 'id' => 'sidebar-1', - 'description' => __( 'Add widgets here to appear in your sidebar on blog posts and archive pages.', 'twentyseventeen' ), - 'before_widget' => '
', - 'after_widget' => '
', - 'before_title' => '

', - 'after_title' => '

', - ) - ); - - register_sidebar( - array( - 'name' => __( 'Footer 1', 'twentyseventeen' ), - 'id' => 'sidebar-2', - 'description' => __( 'Add widgets here to appear in your footer.', 'twentyseventeen' ), - 'before_widget' => '
', - 'after_widget' => '
', - 'before_title' => '

', - 'after_title' => '

', - ) - ); - - register_sidebar( - array( - 'name' => __( 'Footer 2', 'twentyseventeen' ), - 'id' => 'sidebar-3', - 'description' => __( 'Add widgets here to appear in your footer.', 'twentyseventeen' ), - 'before_widget' => '
', - 'after_widget' => '
', - 'before_title' => '

', - 'after_title' => '

', - ) - ); -} -add_action( 'widgets_init', 'twentyseventeen_widgets_init' ); - -/** - * Replaces "[...]" (appended to automatically generated excerpts) with ... and - * a 'Continue reading' link. - * - * @since Twenty Seventeen 1.0 - * - * @param string $link Link to single post/page. - * @return string 'Continue reading' link prepended with an ellipsis. - */ -function twentyseventeen_excerpt_more( $link ) { - if ( is_admin() ) { - return $link; - } - - $link = sprintf( - '

%2$s

', - esc_url( get_permalink( get_the_ID() ) ), - /* translators: %s: Post title. */ - sprintf( __( 'Continue reading "%s"', 'twentyseventeen' ), get_the_title( get_the_ID() ) ) - ); - return ' … ' . $link; -} -add_filter( 'excerpt_more', 'twentyseventeen_excerpt_more' ); - -/** - * Handles JavaScript detection. - * - * Adds a `js` class to the root `` element when JavaScript is detected. - * - * @since Twenty Seventeen 1.0 - */ -function twentyseventeen_javascript_detection() { - echo "\n"; -} -add_action( 'wp_head', 'twentyseventeen_javascript_detection', 0 ); - -/** - * Add a pingback url auto-discovery header for singularly identifiable articles. - */ -function twentyseventeen_pingback_header() { - if ( is_singular() && pings_open() ) { - printf( '' . "\n", esc_url( get_bloginfo( 'pingback_url' ) ) ); - } -} -add_action( 'wp_head', 'twentyseventeen_pingback_header' ); - -/** - * Display custom color CSS. - */ -function twentyseventeen_colors_css_wrap() { - if ( 'custom' !== get_theme_mod( 'colorscheme' ) && ! is_customize_preview() ) { - return; - } - - require_once get_parent_theme_file_path( '/inc/color-patterns.php' ); - $hue = absint( get_theme_mod( 'colorscheme_hue', 250 ) ); - - $customize_preview_data_hue = ''; - if ( is_customize_preview() ) { - $customize_preview_data_hue = 'data-hue="' . $hue . '"'; - } - ?> - - twentyseventeen_get_svg( array( 'icon' => 'quote-right' ) ), - ); - - if ( has_nav_menu( 'top' ) ) { - wp_enqueue_script( 'twentyseventeen-navigation', get_theme_file_uri( '/assets/js/navigation.js' ), array( 'jquery' ), '20161203', true ); - $twentyseventeen_l10n['expand'] = __( 'Expand child menu', 'twentyseventeen' ); - $twentyseventeen_l10n['collapse'] = __( 'Collapse child menu', 'twentyseventeen' ); - $twentyseventeen_l10n['icon'] = twentyseventeen_get_svg( - array( - 'icon' => 'angle-down', - 'fallback' => true, - ) - ); - } - - wp_enqueue_script( 'twentyseventeen-global', get_theme_file_uri( '/assets/js/global.js' ), array( 'jquery' ), '20190121', true ); - - wp_enqueue_script( 'jquery-scrollto', get_theme_file_uri( '/assets/js/jquery.scrollTo.js' ), array( 'jquery' ), '2.1.2', true ); - - wp_localize_script( 'twentyseventeen-skip-link-focus-fix', 'twentyseventeenScreenReaderText', $twentyseventeen_l10n ); - - if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) { - wp_enqueue_script( 'comment-reply' ); - } -} -add_action( 'wp_enqueue_scripts', 'twentyseventeen_scripts' ); - -/** - * Enqueues styles for the block-based editor. - * - * @since Twenty Seventeen 1.8 - */ -function twentyseventeen_block_editor_styles() { - // Block styles. - wp_enqueue_style( 'twentyseventeen-block-editor-style', get_theme_file_uri( '/assets/css/editor-blocks.css' ), array(), '20190328' ); - // Add custom fonts. - wp_enqueue_style( 'twentyseventeen-fonts', twentyseventeen_fonts_url(), array(), null ); -} -add_action( 'enqueue_block_editor_assets', 'twentyseventeen_block_editor_styles' ); - -/** - * Add custom image sizes attribute to enhance responsive image functionality - * for content images. - * - * @since Twenty Seventeen 1.0 - * - * @param string $sizes A source size value for use in a 'sizes' attribute. - * @param array $size Image size. Accepts an array of width and height - * values in pixels (in that order). - * @return string A source size value for use in a content image 'sizes' attribute. - */ -function twentyseventeen_content_image_sizes_attr( $sizes, $size ) { - $width = $size[0]; - - if ( 740 <= $width ) { - $sizes = '(max-width: 706px) 89vw, (max-width: 767px) 82vw, 740px'; - } - - if ( is_active_sidebar( 'sidebar-1' ) || is_archive() || is_search() || is_home() || is_page() ) { - if ( ! ( is_page() && 'one-column' === get_theme_mod( 'page_options' ) ) && 767 <= $width ) { - $sizes = '(max-width: 767px) 89vw, (max-width: 1000px) 54vw, (max-width: 1071px) 543px, 580px'; - } - } - - return $sizes; -} -add_filter( 'wp_calculate_image_sizes', 'twentyseventeen_content_image_sizes_attr', 10, 2 ); - -/** - * Filter the `sizes` value in the header image markup. - * - * @since Twenty Seventeen 1.0 - * - * @param string $html The HTML image tag markup being filtered. - * @param object $header The custom header object returned by 'get_custom_header()'. - * @param array $attr Array of the attributes for the image tag. - * @return string The filtered header image HTML. - */ -function twentyseventeen_header_image_tag( $html, $header, $attr ) { - if ( isset( $attr['sizes'] ) ) { - $html = str_replace( $attr['sizes'], '100vw', $html ); - } - return $html; -} -add_filter( 'get_header_image_tag', 'twentyseventeen_header_image_tag', 10, 3 ); - -/** - * Add custom image sizes attribute to enhance responsive image functionality - * for post thumbnails. - * - * @since Twenty Seventeen 1.0 - * - * @param array $attr Attributes for the image markup. - * @param int $attachment Image attachment ID. - * @param array $size Registered image size or flat array of height and width dimensions. - * @return array The filtered attributes for the image markup. - */ -function twentyseventeen_post_thumbnail_sizes_attr( $attr, $attachment, $size ) { - if ( is_archive() || is_search() || is_home() ) { - $attr['sizes'] = '(max-width: 767px) 89vw, (max-width: 1000px) 54vw, (max-width: 1071px) 543px, 580px'; - } else { - $attr['sizes'] = '100vw'; - } - - return $attr; -} -add_filter( 'wp_get_attachment_image_attributes', 'twentyseventeen_post_thumbnail_sizes_attr', 10, 3 ); - -/** - * Use front-page.php when Front page displays is set to a static page. - * - * @since Twenty Seventeen 1.0 - * - * @param string $template front-page.php. - * - * @return string The template to be used: blank if is_home() is true (defaults to index.php), else $template. - */ -function twentyseventeen_front_page_template( $template ) { - return is_home() ? '' : $template; -} -add_filter( 'frontpage_template', 'twentyseventeen_front_page_template' ); - -/** - * Modifies tag cloud widget arguments to display all tags in the same font size - * and use list format for better accessibility. - * - * @since Twenty Seventeen 1.4 - * - * @param array $args Arguments for tag cloud widget. - * @return array The filtered arguments for tag cloud widget. - */ -function twentyseventeen_widget_tag_cloud_args( $args ) { - $args['largest'] = 1; - $args['smallest'] = 1; - $args['unit'] = 'em'; - $args['format'] = 'list'; - - return $args; -} -add_filter( 'widget_tag_cloud_args', 'twentyseventeen_widget_tag_cloud_args' ); - -/** - * Get unique ID. - * - * This is a PHP implementation of Underscore's uniqueId method. A static variable - * contains an integer that is incremented with each call. This number is returned - * with the optional prefix. As such the returned value is not universally unique, - * but it is unique across the life of the PHP process. - * - * @since Twenty Seventeen 2.0 - * - * @see wp_unique_id() Themes requiring WordPress 5.0.3 and greater should use this instead. - * - * @staticvar int $id_counter - * - * @param string $prefix Prefix for the returned ID. - * @return string Unique ID. - */ -function twentyseventeen_unique_id( $prefix = '' ) { - static $id_counter = 0; - if ( function_exists( 'wp_unique_id' ) ) { - return wp_unique_id( $prefix ); - } - return $prefix . (string) ++$id_counter; -} - -/** - * Implement the Custom Header feature. - */ -require get_parent_theme_file_path( '/inc/custom-header.php' ); - -/** - * Custom template tags for this theme. - */ -require get_parent_theme_file_path( '/inc/template-tags.php' ); - -/** - * Additional features to allow styling of the templates. - */ -require get_parent_theme_file_path( '/inc/template-functions.php' ); - -/** - * Customizer additions. - */ -require get_parent_theme_file_path( '/inc/customizer.php' ); - -/** - * SVG icons functions and filters. - */ -require get_parent_theme_file_path( '/inc/icon-functions.php' ); diff --git a/wp-content/themes/twentyseventeen/inc/block-patterns.php b/wp-content/themes/twentyseventeen/inc/block-patterns.php new file mode 100644 index 0000000..f7ced0b --- /dev/null +++ b/wp-content/themes/twentyseventeen/inc/block-patterns.php @@ -0,0 +1,199 @@ + __( 'Twenty Seventeen', 'twentyseventeen' ) ) + ); +} + +/** + * Register Block Patterns. + */ +if ( function_exists( 'register_block_pattern' ) ) { + register_block_pattern( + 'twentyseventeen/large-heading-with-button', + array( + 'title' => __( 'Large Heading with Button', 'twentyseventeen' ), + 'categories' => array( 'twentyseventeen' ), + 'content' => ' +

' . __( 'Attract Leads with Marketing Campaigns that Work', 'twentyseventeen' ) . '

+ + + +
+
' . __( 'Our Services', 'twentyseventeen' ) . '
+
+ ', + ) + ); + + register_block_pattern( + 'twentyseventeen/images-with-text-and-link', + array( + 'title' => __( 'Images with Text and Link', 'twentyseventeen' ), + 'categories' => array( 'twentyseventeen' ), + 'content' => ' + + + +
+
+ +
' . __( 'Black Stripes', 'twentyseventeen' ) . '
+ + +

' . __( 'Branding', 'twentyseventeen' ) . '

+ + +

' . __( 'Communicate your purpose and goals with a beautiful logo that encapsulates your business.', 'twentyseventeen' ) . '

+ + +

' . __( 'See Case Study', 'twentyseventeen' ) . ' →

+
+ + +
+ + + +
' . __( 'White border', 'twentyseventeen' ) . '
+ + +

' . __( 'Web Design', 'twentyseventeen' ) . '

+ + +

' . __( 'Need a website? We've got you covered. Our design team will create a stunning design to transform your brand.', 'twentyseventeen' ) . '

+ + +

' . __( 'See Case Study', 'twentyseventeen' ) . ' →

+
+
+ ', + ) + ); + + register_block_pattern( + 'twentyseventeen/images-with-link', + array( + 'title' => __( 'Images with Link', 'twentyseventeen' ), + 'categories' => array( 'twentyseventeen' ), + 'content' => ' + + + +
+
+
+ +
' . __( 'Black Stripes', 'twentyseventeen' ) . '
+ + +

' . __( 'Branding', 'twentyseventeen' ) . '

+ + +

' . __( 'See Case Study', 'twentyseventeen' ) . ' →

+
+
+ + +
+
+ +
' . __( 'White border', 'twentyseventeen' ) . '
+ + +

' . __( 'Design', 'twentyseventeen' ) . '

+ + +

' . __( 'See Case Study', 'twentyseventeen' ) . ' →

+
+
+ + +
+
+ +
' . __( 'Direct Light', 'twentyseventeen' ) . '
+ + +

' . __( 'Strategy', 'twentyseventeen' ) . '

+ + +

' . __( 'See Case Study' ) . ' →

+
+
+
+ + + + ', + ) + ); + + register_block_pattern( + 'twentyseventeen/services', + array( + 'title' => __( 'Services', 'twentyseventeen' ), + 'categories' => array( 'twentyseventeen' ), + 'content' => ' + + + + +

' . __( 'Our Services', 'twentyseventeen' ) . '

+ + + +
+
+ +

' . __( 'Branding', 'twentyseventeen' ) . ' →
' . __( 'Web Design', 'twentyseventeen' ) . ' →
' . __( 'Web Development', 'twentyseventeen' ) . ' →

+ +
+ + + +
+ +

' . __( 'Content Strategy', 'twentyseventeen' ) . ' →
' . __( 'Marketing & SEO', 'twentyseventeen' ) . ' →
' . __( 'Video Production', 'twentyseventeen' ) . ' →

+
+
+ + + + + ', + ) + ); + + register_block_pattern( + 'twentyseventeen/contact-us', + array( + 'title' => __( 'Contact Us', 'twentyseventeen' ), + 'categories' => array( 'twentyseventeen' ), + 'content' => ' +
+

' . __( 'We are proud to serve outstanding clients.', 'twentyseventeen' ) . '

+ + + +
+
' . __( 'Contact us', 'twentyseventeen' ) . '
+
+
+ ', + ) + ); +} diff --git a/wp-content/themes/twentyseventeen/inc/customizer.php.orig b/wp-content/themes/twentyseventeen/inc/customizer.php.orig deleted file mode 100644 index b156d6b..0000000 --- a/wp-content/themes/twentyseventeen/inc/customizer.php.orig +++ /dev/null @@ -1,251 +0,0 @@ -get_setting( 'blogname' )->transport = 'postMessage'; - $wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage'; - $wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage'; - - $wp_customize->selective_refresh->add_partial( - 'blogname', - array( - 'selector' => '.site-title a', - 'render_callback' => 'twentyseventeen_customize_partial_blogname', - ) - ); - $wp_customize->selective_refresh->add_partial( - 'blogdescription', - array( - 'selector' => '.site-description', - 'render_callback' => 'twentyseventeen_customize_partial_blogdescription', - ) - ); - - /** - * Custom colors. - */ - $wp_customize->add_setting( - 'colorscheme', - array( - 'default' => 'light', - 'transport' => 'postMessage', - 'sanitize_callback' => 'twentyseventeen_sanitize_colorscheme', - ) - ); - - $wp_customize->add_setting( - 'colorscheme_hue', - array( - 'default' => 250, - 'transport' => 'postMessage', - 'sanitize_callback' => 'absint', // The hue is stored as a positive integer. - ) - ); - - $wp_customize->add_control( - 'colorscheme', - array( - 'type' => 'radio', - 'label' => __( 'Color Scheme', 'twentyseventeen' ), - 'choices' => array( - 'light' => __( 'Light', 'twentyseventeen' ), - 'dark' => __( 'Dark', 'twentyseventeen' ), - 'custom' => __( 'Custom', 'twentyseventeen' ), - ), - 'section' => 'colors', - 'priority' => 5, - ) - ); - - $wp_customize->add_control( - new WP_Customize_Color_Control( - $wp_customize, - 'colorscheme_hue', - array( - 'mode' => 'hue', - 'section' => 'colors', - 'priority' => 6, - ) - ) - ); - - /** - * Theme options. - */ - $wp_customize->add_section( - 'theme_options', - array( - 'title' => __( 'Theme Options', 'twentyseventeen' ), - 'priority' => 130, // Before Additional CSS. - ) - ); - - $wp_customize->add_setting( - 'page_layout', - array( - 'default' => 'two-column', - 'sanitize_callback' => 'twentyseventeen_sanitize_page_layout', - 'transport' => 'postMessage', - ) - ); - - $wp_customize->add_control( - 'page_layout', - array( - 'label' => __( 'Page Layout', 'twentyseventeen' ), - 'section' => 'theme_options', - 'type' => 'radio', - 'description' => __( 'When the two-column layout is assigned, the page title is in one column and content is in the other.', 'twentyseventeen' ), - 'choices' => array( - 'one-column' => __( 'One Column', 'twentyseventeen' ), - 'two-column' => __( 'Two Column', 'twentyseventeen' ), - ), - 'active_callback' => 'twentyseventeen_is_view_with_layout_option', - ) - ); - - /** - * Filter number of front page sections in Twenty Seventeen. - * - * @since Twenty Seventeen 1.0 - * - * @param int $num_sections Number of front page sections. - */ - $num_sections = apply_filters( 'twentyseventeen_front_page_sections', 4 ); - - // Create a setting and control for each of the sections available in the theme. - for ( $i = 1; $i < ( 1 + $num_sections ); $i++ ) { - $wp_customize->add_setting( - 'panel_' . $i, - array( - 'default' => false, - 'sanitize_callback' => 'absint', - 'transport' => 'postMessage', - ) - ); - - $wp_customize->add_control( - 'panel_' . $i, - array( - /* translators: %d: The front page section number. */ - 'label' => sprintf( __( 'Front Page Section %d Content', 'twentyseventeen' ), $i ), - 'description' => ( 1 !== $i ? '' : __( 'Select pages to feature in each area from the dropdowns. Add an image to a section by setting a featured image in the page editor. Empty sections will not be displayed.', 'twentyseventeen' ) ), - 'section' => 'theme_options', - 'type' => 'dropdown-pages', - 'allow_addition' => true, - 'active_callback' => 'twentyseventeen_is_static_front_page', - ) - ); - - $wp_customize->selective_refresh->add_partial( - 'panel_' . $i, - array( - 'selector' => '#panel' . $i, - 'render_callback' => 'twentyseventeen_front_page_section', - 'container_inclusive' => true, - ) - ); - } -} -add_action( 'customize_register', 'twentyseventeen_customize_register' ); - -/** - * Sanitize the page layout options. - * - * @param string $input Page layout. - */ -function twentyseventeen_sanitize_page_layout( $input ) { - $valid = array( - 'one-column' => __( 'One Column', 'twentyseventeen' ), - 'two-column' => __( 'Two Column', 'twentyseventeen' ), - ); - - if ( array_key_exists( $input, $valid ) ) { - return $input; - } - - return ''; -} - -/** - * Sanitize the colorscheme. - * - * @param string $input Color scheme. - */ -function twentyseventeen_sanitize_colorscheme( $input ) { - $valid = array( 'light', 'dark', 'custom' ); - - if ( in_array( $input, $valid, true ) ) { - return $input; - } - - return 'light'; -} - -/** - * Render the site title for the selective refresh partial. - * - * @since Twenty Seventeen 1.0 - * - * @see twentyseventeen_customize_register() - * - * @return void - */ -function twentyseventeen_customize_partial_blogname() { - bloginfo( 'name' ); -} - -/** - * Render the site tagline for the selective refresh partial. - * - * @since Twenty Seventeen 1.0 - * - * @see twentyseventeen_customize_register() - * - * @return void - */ -function twentyseventeen_customize_partial_blogdescription() { - bloginfo( 'description' ); -} - -/** - * Return whether we're previewing the front page and it's a static page. - */ -function twentyseventeen_is_static_front_page() { - return ( is_front_page() && ! is_home() ); -} - -/** - * Return whether we're on a view that supports a one or two column layout. - */ -function twentyseventeen_is_view_with_layout_option() { - // This option is available on all pages. It's also available on archives when there isn't a sidebar. - return ( is_page() || ( is_archive() && ! is_active_sidebar( 'sidebar-1' ) ) ); -} - -/** - * Bind JS handlers to instantly live-preview changes. - */ -function twentyseventeen_customize_preview_js() { - wp_enqueue_script( 'twentyseventeen-customize-preview', get_theme_file_uri( '/assets/js/customize-preview.js' ), array( 'customize-preview' ), '20161002', true ); -} -add_action( 'customize_preview_init', 'twentyseventeen_customize_preview_js' ); - -/** - * Load dynamic logic for the customizer controls area. - */ -function twentyseventeen_panels_js() { - wp_enqueue_script( 'twentyseventeen-customize-controls', get_theme_file_uri( '/assets/js/customize-controls.js' ), array(), '20161020', true ); -} -add_action( 'customize_controls_enqueue_scripts', 'twentyseventeen_panels_js' ); diff --git a/wp-content/themes/twentyseventeen/inc/template-tags.php b/wp-content/themes/twentyseventeen/inc/template-tags.php index 6b58d90..77bc90d 100644 --- a/wp-content/themes/twentyseventeen/inc/template-tags.php +++ b/wp-content/themes/twentyseventeen/inc/template-tags.php @@ -127,7 +127,7 @@ endif; * Display a front page section. * * @param WP_Customize_Partial $partial Partial associated with a selective refresh request. - * @param integer $id Front page section to display. + * @param int $id Front page section to display. */ function twentyseventeen_front_page_section( $partial = null, $id = 0 ) { if ( is_a( $partial, 'WP_Customize_Partial' ) ) { diff --git a/wp-content/themes/twentyseventeen/readme.txt b/wp-content/themes/twentyseventeen/readme.txt index a848751..8b56cad 100644 --- a/wp-content/themes/twentyseventeen/readme.txt +++ b/wp-content/themes/twentyseventeen/readme.txt @@ -1,10 +1,10 @@ === Twenty Seventeen === Contributors: wordpressdotorg -Tested up to: 5.5 -Version: 2.4 +Tested up to: 5.6 +Version: 2.5 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html -Tags: one-column, two-columns, right-sidebar, flexible-header, accessibility-ready, custom-colors, custom-header, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, post-formats, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready +Tags: one-column, two-columns, right-sidebar, flexible-header, accessibility-ready, custom-colors, custom-header, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, post-formats, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready, block-patterns == Description == @@ -57,8 +57,22 @@ Bundled header image, Copyright Alvin Engler License: CC0 1.0 Universal (CC0 1.0) Source: https://unsplash.com/@englr?photo=bIhpiQA009k +Bundled block pattern images, Copyright Solo Shutter +License: CC0 1.0 Universal (CC0 1.0) +Source: https://stocksnap.io/photo/striped-lines-BTNYMDDCBW + https://stocksnap.io/photo/striped-lines-5XWOPSWPWX + +Bundled block pattern image, Copyright Seacoast Sage +License: CC0 1.0 Universal (CC0 1.0) +Source: https://stocksnap.io/photo/striped-fabric-9CBVWF2CDU + == Changelog == += 2.5 = +* Released: December 8, 2020 + +https://codex.wordpress.org/Twenty_Seventeen_Theme_Changelog#Version_2.5 + = 2.4 = * Released: August 11, 2020 diff --git a/wp-content/themes/twentyseventeen/style.css b/wp-content/themes/twentyseventeen/style.css index cf90dee..ef829d7 100644 --- a/wp-content/themes/twentyseventeen/style.css +++ b/wp-content/themes/twentyseventeen/style.css @@ -4,13 +4,13 @@ Theme URI: https://wordpress.org/themes/twentyseventeen/ Author: the WordPress team Author URI: https://wordpress.org/ Description: Twenty Seventeen brings your site to life with header video and immersive featured images. With a focus on business sites, it features multiple sections on the front page as well as widgets, navigation and social menus, a logo, and more. Personalize its asymmetrical grid with a custom color scheme and showcase your multimedia content with post formats. Our default theme for 2017 works great in many languages, for any abilities, and on any device. -Version: 2.4 +Version: 2.5 Requires at least: 4.7 Requires PHP: 5.2.4 License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Text Domain: twentyseventeen -Tags: one-column, two-columns, right-sidebar, flexible-header, accessibility-ready, custom-colors, custom-header, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, post-formats, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready +Tags: one-column, two-columns, right-sidebar, flexible-header, accessibility-ready, custom-colors, custom-header, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, post-formats, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready, block-patterns This theme, like WordPress, is licensed under the GPL. Use it to make something cool, have fun, and share what you've learned with others. diff --git a/wp-content/themes/twentyseventeen/template-parts/page/content-front-page-panels.php b/wp-content/themes/twentyseventeen/template-parts/page/content-front-page-panels.php index 074af0d..ca0b5f6 100644 --- a/wp-content/themes/twentyseventeen/template-parts/page/content-front-page-panels.php +++ b/wp-content/themes/twentyseventeen/template-parts/page/content-front-page-panels.php @@ -1,87 +1,87 @@ - - -
> - - ID ), 'twentyseventeen-featured-image' ); - - // Calculate aspect ratio: h / w * 100%. - $ratio = $thumbnail[2] / $thumbnail[1] * 100; - ?> - -
-
-
- - - -
-
-
- ', '' ); ?> - - - -
- -
- "%s"', 'twentyseventeen' ), - get_the_title() - ) - ); - ?> -
- - - - 3, - 'post_status' => 'publish', - 'ignore_sticky_posts' => true, - 'no_found_rows' => true, - ) - ); - ?> - - have_posts() ) : ?> - -
- - have_posts() ) : - $recent_posts->the_post(); - get_template_part( 'template-parts/post/content', 'excerpt' ); - endwhile; - wp_reset_postdata(); - ?> -
- - - -
-
- -
+ + +
> + + ID ), 'twentyseventeen-featured-image' ); + + // Calculate aspect ratio: h / w * 100%. + $ratio = $thumbnail[2] / $thumbnail[1] * 100; + ?> + +
+
+
+ + + +
+
+
+ ', '' ); ?> + + + +
+ +
+ "%s"', 'twentyseventeen' ), + get_the_title() + ) + ); + ?> +
+ + + + 3, + 'post_status' => 'publish', + 'ignore_sticky_posts' => true, + 'no_found_rows' => true, + ) + ); + ?> + + have_posts() ) : ?> + +
+ + have_posts() ) : + $recent_posts->the_post(); + get_template_part( 'template-parts/post/content', 'excerpt' ); + endwhile; + wp_reset_postdata(); + ?> +
+ + + +
+
+ +