Skip to content
This repository has been archived by the owner on May 5, 2021. It is now read-only.

Commit

Permalink
Merge pull request #162 from Codeinwp/development
Browse files Browse the repository at this point in the history 
Fixed layout issue on search results page 
Improved customizer options for slider and sidebar
  • Loading branch information
@rodica-andronache
rodica-andronache authored Dec 16, 2016
2 parents 53f68ce + 760f1b2 commit 07c60ff
Show file tree
Hide file tree
Showing 8 changed files with 63 additions and 124 deletions.
14 changes: 6 additions & 8 deletions css/admin-style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ button.zillah_general_control_remove_field:hover{
.zillah-ad-widget{
margin: 0 auto 10px;
position: relative;
box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}

.zillah-ad-widget-top{
Expand Down Expand Up @@ -90,7 +91,10 @@ button.zillah_general_control_remove_field:hover{
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
user-select: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}

.zillah-ad-widget-inside {
Expand Down Expand Up @@ -125,17 +129,11 @@ button.zillah_general_control_remove_field:hover{
height: 40px;
line-height: 40px !important;
background-color: #f1f1f1;
background-image: -ms-linear-gradient(top, #f9f9f9, #ececec);
background-image: -moz-linear-gradient(top, #f9f9f9, #ececec);
background-image: -o-linear-gradient(top, #f9f9f9, #ececec);
background-image: -webkit-gradient(linear, left top, left bottom, from(#f9f9f9), to(#ececec));
background-image: -webkit-linear-gradient(top, #f9f9f9, #ececec);
background-image: linear-gradient(top, #f9f9f9, #ececec);
overflow: hidden;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
-moz-box-shadow: inset 0 1px 0 #fff;
-webkit-box-shadow: inset 0 1px 0 #fff;
box-shadow: inset 0 1px 0 #fff;
text-align: center;
Expand Down
33 changes: 0 additions & 33 deletions css/bootstrap-theme.css
View file

Large diffs are not rendered by default.

52 changes: 9 additions & 43 deletions css/bootstrap.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ figure {
hr {
height: 0;
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
}
pre {
Expand Down Expand Up @@ -146,7 +145,6 @@ input {
input[type="checkbox"],
input[type="radio"] {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
padding: 0;
}
Expand All @@ -156,7 +154,6 @@ input[type="number"]::-webkit-outer-spin-button {
}
input[type="search"] {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
-webkit-appearance: textfield;
}
Expand Down Expand Up @@ -1067,13 +1064,11 @@ th {
}
* {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
*:before,
*:after {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
html {
Expand Down Expand Up @@ -1138,7 +1133,6 @@ img {
border: 1px solid #ddd;
border-radius: 4px;
-webkit-transition: all .2s ease-in-out;
-o-transition: all .2s ease-in-out;
transition: all .2s ease-in-out;
}
.img-circle {
Expand Down Expand Up @@ -2514,7 +2508,6 @@ label {
}
input[type="search"] {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
input[type="radio"],
Expand Down Expand Up @@ -2563,8 +2556,9 @@ output {
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
-o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
}
.form-control:focus {
border-color: #66afe9;
Expand Down Expand Up @@ -3470,7 +3464,6 @@ input[type="button"].btn-block {
.fade {
opacity: 0;
-webkit-transition: opacity .15s linear;
-o-transition: opacity .15s linear;
transition: opacity .15s linear;
}
.fade.in {
Expand All @@ -3493,13 +3486,10 @@ tbody.collapse.in {
height: 0;
overflow: hidden;
-webkit-transition-timing-function: ease;
-o-transition-timing-function: ease;
transition-timing-function: ease;
-webkit-transition-duration: .35s;
-o-transition-duration: .35s;
transition-duration: .35s;
-webkit-transition-property: height, visibility;
-o-transition-property: height, visibility;
transition-property: height, visibility;
}
.caret {
Expand Down Expand Up @@ -3534,7 +3524,6 @@ tbody.collapse.in {
text-align: left;
list-style: none;
background-color: #fff;
-webkit-background-clip: padding-box;
background-clip: padding-box;
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, .15);
Expand Down Expand Up @@ -5010,7 +4999,6 @@ a.badge:focus {
border: 1px solid #ddd;
border-radius: 4px;
-webkit-transition: border .2s ease-in-out;
-o-transition: border .2s ease-in-out;
transition: border .2s ease-in-out;
}
.thumbnail > img,
Expand Down Expand Up @@ -5110,14 +5098,6 @@ a.thumbnail.active {
background-position: 0 0;
}
}
@-o-keyframes progress-bar-stripes {
from {
background-position: 40px 0;
}
to {
background-position: 0 0;
}
}
@keyframes progress-bar-stripes {
from {
background-position: 40px 0;
Expand Down Expand Up @@ -5147,53 +5127,45 @@ a.thumbnail.active {
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
-webkit-transition: width .6s ease;
-o-transition: width .6s ease;
transition: width .6s ease;
}
.progress-striped .progress-bar,
.progress-bar-striped {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-webkit-background-size: 40px 40px;
background-size: 40px 40px;
}
.progress.active .progress-bar,
.progress-bar.active {
-webkit-animation: progress-bar-stripes 2s linear infinite;
-o-animation: progress-bar-stripes 2s linear infinite;
animation: progress-bar-stripes 2s linear infinite;
}
.progress-bar-success {
background-color: #5cb85c;
}
.progress-striped .progress-bar-success {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
}
.progress-bar-info {
background-color: #5bc0de;
}
.progress-striped .progress-bar-info {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
}
.progress-bar-warning {
background-color: #f0ad4e;
}
.progress-striped .progress-bar-warning {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
}
.progress-bar-danger {
background-color: #d9534f;
}
.progress-striped .progress-bar-danger {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
}
.media {
Expand Down Expand Up @@ -5883,17 +5855,16 @@ button.close {
}
.modal.fade .modal-dialog {
-webkit-transition: -webkit-transform .3s ease-out;
-o-transition: -o-transform .3s ease-out;
transition: transform .3s ease-out;
transition: -webkit-transform .3s ease-out;
transition: transform .3s ease-out;
transition: transform .3s ease-out, -webkit-transform .3s ease-out;
-webkit-transform: translate(0, -25%);
-ms-transform: translate(0, -25%);
-o-transform: translate(0, -25%);
transform: translate(0, -25%);
}
.modal.in .modal-dialog {
-webkit-transform: translate(0, 0);
-ms-transform: translate(0, 0);
-o-transform: translate(0, 0);
transform: translate(0, 0);
}
.modal-open .modal {
Expand All @@ -5908,7 +5879,6 @@ button.close {
.modal-content {
position: relative;
background-color: #fff;
-webkit-background-clip: padding-box;
background-clip: padding-box;
border: 1px solid #999;
border: 1px solid rgba(0, 0, 0, .2);
Expand Down Expand Up @@ -6128,7 +6098,6 @@ button.close {
word-wrap: normal;
white-space: normal;
background-color: #fff;
-webkit-background-clip: padding-box;
background-clip: padding-box;
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, .2);
Expand Down Expand Up @@ -6249,7 +6218,6 @@ button.close {
position: relative;
display: none;
-webkit-transition: .6s ease-in-out left;
-o-transition: .6s ease-in-out left;
transition: .6s ease-in-out left;
}
.carousel-inner > .item > img,
Expand All @@ -6259,8 +6227,9 @@ button.close {
@media all and (transform-3d), (-webkit-transform-3d) {
.carousel-inner > .item {
-webkit-transition: -webkit-transform .6s ease-in-out;
-o-transition: -o-transform .6s ease-in-out;
transition: transform .6s ease-in-out;
transition: -webkit-transform .6s ease-in-out;
transition: transform .6s ease-in-out;
transition: transform .6s ease-in-out, -webkit-transform .6s ease-in-out;

-webkit-backface-visibility: hidden;
backface-visibility: hidden;
Expand Down Expand Up @@ -6333,7 +6302,6 @@ button.close {
}
.carousel-control.left {
background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%);
background-image: -o-linear-gradient(left, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%);
background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, .5)), to(rgba(0, 0, 0, .0001)));
background-image: linear-gradient(to right, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);
Expand All @@ -6343,7 +6311,6 @@ button.close {
right: 0;
left: auto;
background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%);
background-image: -o-linear-gradient(left, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%);
background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, .0001)), to(rgba(0, 0, 0, .5)));
background-image: linear-gradient(to right, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);
Expand Down Expand Up @@ -6756,5 +6723,4 @@ button.close {
.hidden-print {
display: none !important;
}
}
/*# sourceMappingURL=bootstrap.css.map */
}
3 changes: 2 additions & 1 deletion css/font-awesome.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,8 @@
:root .fa-rotate-270,
:root .fa-flip-horizontal,
:root .fa-flip-vertical {
filter: none;
-webkit-filter: none;
filter: none;
}
.fa-stack {
position: relative;
Expand Down
Binary file modified images/default-thumbnail.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions inc/customizer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ function zillah_customize_register( $wp_customize ) {
$wp_customize->add_setting('zillah_sidebar_show', array(
'default' => false,
'sanitize_callback' => 'zillah_sanitize_checkbox',
'transport' => 'postMessage',
));

$wp_customize->add_control('zillah_sidebar_show', array(
Expand Down Expand Up @@ -114,6 +115,7 @@ function zillah_customize_register( $wp_customize ) {
$wp_customize->add_setting('zillah_home_slider_show', array(
'default' => 0,
'sanitize_callback' => 'zillah_sanitize_checkbox',
'transport' => 'postMessage',
));

$wp_customize->add_control('zillah_home_slider_show', array(
Expand Down
25 changes: 12 additions & 13 deletions js/customizer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,9 @@
// Slider
wp.customize( 'zillah_home_slider_show', function( value ) {
value.bind( function( to ) {
if( to !== '' ) {
if( to !== false ) {
$( '#home-carousel' ).removeClass( 'zillah-only-customizer' );
}
else {
} else {
$( '#home-carousel' ).addClass( 'zillah-only-customizer' );
}
} );
Expand All @@ -75,10 +74,9 @@
// Slider
wp.customize( 'zillah_tags_show', function( value ) {
value.bind( function( to ) {
if( to !== '' ) {
if( to !== false ) {
$( '.tags-links' ).removeClass( 'zillah-only-customizer' );
}
else {
} else {
$( '.tags-links' ).addClass( 'zillah-only-customizer' );
}
} );
Expand Down Expand Up @@ -117,13 +115,14 @@
// Sidebar
wp.customize( 'zillah_sidebar_show', function( value ) {
value.bind( function( to ) {
if( to !== '' ) {
$( '#secondary' ).removeClass( 'zillah-only-customizer' );
$( '.content-area' ).addClass( 'content-area-with-sidebar' );
}
else {
$( '#secondary' ).addClass( 'zillah-only-customizer' );
$( '.content-area' ).removeClass( 'content-area-with-sidebar' );
if( !$( 'body' ).hasClass( 'single-post' ) && !$( 'body' ).hasClass( 'page' ) ) {
if (to !== false) {
$('#secondary').removeClass('zillah-only-customizer');
$('.content-area').addClass('content-area-with-sidebar');
} else {
$('#secondary').addClass('zillah-only-customizer');
$('.content-area').removeClass('content-area-with-sidebar');
}
}
} );
} );
Expand Down
Loading

0 comments on commit 07c60ff

Please sign in to comment.