Skip to content

Commit

Permalink
Merge pull request #125 from FameThemes/Development
Browse files Browse the repository at this point in the history
Update to version 1.1.3
  • Loading branch information
shrimp2t authored Dec 7, 2016
2 parents 75993a7 + 61b4357 commit 8f84020
Show file tree
Hide file tree
Showing 11 changed files with 73 additions and 38 deletions.
2 changes: 1 addition & 1 deletion assets/sass/_contents.scss
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
border-left: none;
border-right: none;
margin-bottom: 50px;
@extend .clearfix;
@extend .clearfix !optional;
.nav-previous {
float: left;
}
Expand Down
6 changes: 3 additions & 3 deletions assets/sass/_document.scss
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ h6 {
margin-bottom: 15px;
@include rem('margin-bottom', 15px);
margin-top: 0;
@extend .break;
@extend .break !optional;
color: #444444;
& a {
color: #444444;
Expand Down Expand Up @@ -137,7 +137,7 @@ ul,ol,dl,p,details,address,.vcard,figure,pre,fieldset,table,dt,dd,hr {
margin-top: 0;
}
p,ul,ol,dl,blockquote {
@extend .break;
@extend .break !optional;
}


Expand Down Expand Up @@ -212,7 +212,7 @@ pre {
line-height: 1.7;
margin: $base 0;
padding: $base;
@extend .break;
@extend .break !optional;
}

details {
Expand Down
9 changes: 9 additions & 0 deletions assets/sass/_elements.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,12 @@
}
}
}


/* WP 4.7 Shortcut */
section > .customize-partial-edit-shortcut {
z-index: 95;
button {
left: 30px;
}
}
2 changes: 1 addition & 1 deletion assets/sass/_structure.scss
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
// Essential Styles
.nav-menu {
float: right;
@extend .clearfix;
@extend .clearfix !optional;
ul {
position: absolute;
display: none;
Expand Down
2 changes: 1 addition & 1 deletion assets/sass/_widgets.scss
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
.widget-area .widget_categories ul,
.widget-area .widget_archive ul,
.widget-area .widget_meta ul{
@extend .clearfix;
@extend .clearfix !optional;
}


Expand Down
2 changes: 1 addition & 1 deletion assets/sass/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Author: FameThemes
Author URI: https://www.famethemes.com
Description: Big - Bold and stylish, Screenr is a multiuse fullscreen theme well suited for business, portfolio, digital agency, product showcase, freelancers and everyone else who appreciate good design. Also with the flexible of the header and navigation, it can be use for one page or multiple pages website. The theme was built on Bootstrap 4, so you know it contains clean, precise code that makes for a highly streamlined site. (Live preview : http://www.famethemes.com/preview/?theme=Screenr)
Version: 1.1.2
Version: 1.1.3
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Text Domain: screenr
Expand Down
5 changes: 5 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
== Changelog ==
= 1.1.3 =
* WP 4.7 compatible.
* Support WP 4.7 customizer shortcut.
* Update option to disable slider.

= 1.1.2 =
* Improve customizer js.
* Visual editor show textarea instead when use disable visual editor.
Expand Down
4 changes: 4 additions & 0 deletions functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,10 @@ function screenr_setup() {
),
) );


// Add theme support for selective refresh for widgets.
add_theme_support( 'customize-selective-refresh-widgets' );

}
endif;
add_action( 'after_setup_theme', 'screenr_setup' );
Expand Down
3 changes: 1 addition & 2 deletions inc/customizer-sections.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,8 @@ protected function render_template() { ?>
<li id="accordion-section-{{ data.id }}" class="accordion-section control-section control-section-{{ data.type }}">
<h3 class="accordion-section-title">
{{ data.title }}

<# if ( data.plus_text && data.plus_url ) { #>
<a href="{{ data.plus_url }}" class="" target="_blank">{{ data.plus_text }} →</a>
<a href="{{ data.plus_url }}" class="" target="_blank">{{ data.plus_text }} &rarr;</a>
<# } #>
</h3>
</li>
Expand Down
53 changes: 31 additions & 22 deletions section-parts/section-slider.php
Original file line number Diff line number Diff line change
@@ -1,32 +1,41 @@
<?php
$default = apply_filters( 'screenr_default_slider_items', array(
array(
'content_layout_1' => screenr_get_default_slider_content(),
'media'=> array(
'url' => get_template_directory_uri() . '/assets/images/hero.jpg',
'id' => ''
$disable = get_theme_mod( 'slider_disable' );
if ( ! $disable ) {
$default = apply_filters('screenr_default_slider_items', array(
array(
'content_layout_1' => screenr_get_default_slider_content(),
'media' => array(
'url' => get_template_directory_uri() . '/assets/images/hero.jpg',
'id' => ''
)
)
)
)
);
$slider = new Screenr_Slider( get_theme_mod( 'slider_items', $default ) ) ;
$autoplay = get_theme_mod( 'slider_autoplay' , 7000 );
?>
<?php if ( ! screenr_is_selective_refresh() ) { ?>
<section id="<?php echo esc_attr( get_theme_mod( 'slider_id', 'hero' ) ); ?>" class="section-slider screenr-section swiper-slider <?php echo screenr_is_fullscreen() ? 'full-screen' : ''; ?> fixed" >
<?php } ?>
<div class="swiper-container" data-autoplay="<?php echo intval( $autoplay ); ?>">
);
$slider = new Screenr_Slider(get_theme_mod('slider_items', $default));
$autoplay = get_theme_mod('slider_autoplay', 7000);
?>
<?php if (!screenr_is_selective_refresh()) { ?>
<section id="<?php echo esc_attr(get_theme_mod('slider_id', 'hero')); ?>" class="section-slider screenr-section swiper-slider <?php echo screenr_is_fullscreen() ? 'full-screen' : ''; ?> fixed" >
<?php } ?>
<div class="swiper-container" data-autoplay="<?php echo intval($autoplay); ?>">
<div class="swiper-wrapper">
<?php
echo $slider->render();
echo $slider->render();
?>
</div>
<?php if ( $slider->number_item > 1 ) { ?>
<div class="swiper-button-prev"><i class="fa fa-angle-left" ></i> <div class="slide-count"> <span class="slide-current" >1</span> <span class="sep"></span> <span class="slide-total">3</span> </div></div>
<div class="swiper-button-next"><i class="fa fa-angle-right" ></i> <div class="slide-count"> <span class="slide-current" >1</span> <span class="sep"></span> <span class="slide-total">3</span> </div> </div>
<?php if ($slider->number_item > 1) { ?>
<div class="swiper-button-prev"><i class="fa fa-angle-left"></i>

<div class="slide-count"><span class="slide-current">1</span> <span class="sep"></span> <span class="slide-total">3</span></div>
</div>
<div class="swiper-button-next"><i class="fa fa-angle-right"></i>

<div class="slide-count"><span class="slide-current">1</span> <span class="sep"></span> <span class="slide-total">3</span></div>
</div>
<?php } ?>
<div class="btn-next-section"></div>
</div>
<?php if ( ! screenr_is_selective_refresh() ) { ?>
</section>
<?php } ?>
<?php if (!screenr_is_selective_refresh()) { ?>
</section>
<?php }
}
23 changes: 16 additions & 7 deletions style.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Author: FameThemes
Author URI: https://www.famethemes.com
Description: Big - Bold and stylish, Screenr is a multiuse fullscreen theme well suited for business, portfolio, digital agency, product showcase, freelancers and everyone else who appreciate good design. Also with the flexible of the header and navigation, it can be use for one page or multiple pages website. The theme was built on Bootstrap 4, so you know it contains clean, precise code that makes for a highly streamlined site. (Live preview : http://www.famethemes.com/preview/?theme=Screenr)
Version: 1.1.2
Version: 1.1.3
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Text Domain: screenr
Expand Down Expand Up @@ -1304,7 +1304,7 @@ input[type="radio"], input[type="checkbox"] {

.site-footer .footer-widgets.section-padding {
padding: 60px 0px 20px 0px;
padding: 3.75rem 0rem 1.25rem 0rem;
padding: 3.75rem 0px 1.25rem 0px;
}

.site-footer .sidebar .widget a {
Expand Down Expand Up @@ -2083,6 +2083,15 @@ input[type="radio"], input[type="checkbox"] {
color: #333333;
}

/* WP 4.7 Shortcut */
section > .customize-partial-edit-shortcut {
z-index: 95;
}

section > .customize-partial-edit-shortcut button {
left: 30px;
}

/*--------------------------------------------------------------
7.0 Widgets
--------------------------------------------------------------*/
Expand Down Expand Up @@ -2273,17 +2282,17 @@ ul.hours span {
------------------------------*/
.section-padding {
padding: 50px 0px;
padding: 3.125rem 0rem;
padding: 3.125rem 0px;
}

.section-padding-lg {
padding: 70px 0px;
padding: 4.375rem 0rem;
padding: 4.375rem 0px;
}

.section-padding-larger {
padding: 100px 0px;
padding: 6.25rem 0rem;
padding: 6.25rem 0px;
}

.section-padding-empty {
Expand Down Expand Up @@ -2375,7 +2384,7 @@ ul.hours span {
display: inline-block;
position: relative;
margin: 0px 0px 10px 0px;
margin: 0rem 0rem 0.625rem 0rem;
margin: 0px 0px 0.625rem 0px;
text-transform: uppercase;
letter-spacing: 2px;
}
Expand Down Expand Up @@ -3188,7 +3197,7 @@ ul.hours span {
text-align: center;
}

.contact-details:after() {
.contact-details:after {
content: "";
display: table;
clear: both;
Expand Down

0 comments on commit 8f84020

Please sign in to comment.