Skip to content

Commit

Permalink
Loading... 🌑
Browse files Browse the repository at this point in the history
abaicus committed Sep 3, 2018
1 parent 1ceadff commit 39d6c66
Showing 39 changed files with 813 additions and 112 deletions.
26 changes: 26 additions & 0 deletions .distignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
.git
.distignore
.gitignore
.travis.yml
.jshintrc
Gruntfile.js
grunt
phpcs.xml
node_modules
logs
package.json
bin
tests
phpunit.xml
npm-debug.log
dist
artifact
composer.json
composer.lock
key.enc
inc/admin/onboarding/assets/vue
inc/admin/onboarding/node_modules
inc/admin/onboarding/.eslintrc
inc/admin/onboarding/webpack.config.js
inc/admin/onboarding/package.json
inc/admin/onboarding/package-lock.json
7 changes: 4 additions & 3 deletions assets/css/customizer-style.css
Original file line number Diff line number Diff line change
@@ -21,10 +21,9 @@
#customize-theme-controls .customize-pane-child.accordion-section-content#sub-accordion-section-neve_typography_headings,
#customize-theme-controls .customize-pane-child.accordion-section-content#sub-accordion-section-neve_sidebar {
overflow: initial;
}.customize-control-checkbox-toggle {
}.customize-control-checkbox-toggle .checkbox-toggle-wrap {
border: 1px solid #ccc;
border-radius: 5px;
display: flex !important;
flex-direction: row;
align-items: center;
justify-content: space-between;
@@ -33,6 +32,8 @@
.customize-control-checkbox-toggle span {
margin-left: 20px;
font-weight: 600;
width: 65%;
display: inline-block;
}
.customize-control-checkbox-toggle input[type=checkbox] {
display: none;
@@ -43,10 +44,10 @@
width: 50px;
height: 25px;
background: grey;
display: block;
border-radius: 100px;
position: relative;
margin-right: 20px;
display: inline-block;
}

.customize-control-checkbox-toggle label:after {
2 changes: 1 addition & 1 deletion assets/css/customizer-style.min.css

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions assets/js/customizer-controls.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/js/customizer-controls.min.js

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions assets/js/script.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/js/script.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/js/src/1_navigation.js
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@
* Handle the responsive navigation toggle.
*/
'handleResponsiveNav': function () {
$( '.navbar-toggle' ).on( 'click', function () {
$( '.navbar-toggle' ).on( 'click touchstart', function () {
$( '.dropdown-open' ).removeClass( 'dropdown-open' );
$( '#nv-primary-navigation' ).toggleClass( 'responsive-opened' );
$( this ).toggleClass( 'active' );
7 changes: 5 additions & 2 deletions assets/js/src/2_blog.js
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@
if ( page >= NeveProperties.infiniteScrollMaxPages ) {
return false;
}
$( '.nv-loader' ).fadeIn( 1500, 'swing' );

var counter = $( 'article.layout-grid' ).length;
lock = true;
$.ajax( {
@@ -56,6 +56,9 @@
counter: counter,
nonce: NeveProperties.nonce
},
beforeSend: function () {
$( '.nv-loader' ).fadeIn( 1500, 'swing' );
},
success: function ( response ) {
if ( response ) {
$( '.nv-loader' ).fadeOut( 500, 'swing' );
@@ -70,7 +73,7 @@
page++;
lock = false;
}
}
},
} );
} );
},
4 changes: 3 additions & 1 deletion assets/scss/elements/_blog.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import 'blog/blogpost-meta';
@import 'blog/blogpost-index';
@import 'blog/infinite-scroll';
@import 'blog/infinite-scroll';
@import 'blog/blogpost-grid';
@import 'blog/blogpost-default-alt';
1 change: 1 addition & 0 deletions assets/scss/elements/_navigation.scss
Original file line number Diff line number Diff line change
@@ -2,5 +2,6 @@
@import "navigation/nav-toggle";
@import "navigation/nav-menu";
@import "navigation/nav-menu-centered";
@import "navigation/nav-menu-right";
@import "navigation/nav-search";
@import "navigation/nav-cart";
3 changes: 3 additions & 0 deletions assets/scss/elements/_top-bar.scss
Original file line number Diff line number Diff line change
@@ -6,6 +6,9 @@
.nv-top-bar-content {
display: flex;
flex: 1;
p {
margin-bottom: 0;
}
}

.nv-top-bar {
54 changes: 54 additions & 0 deletions assets/scss/elements/blog/_blogpost-default-alt.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
.layout-default, .layout-alternative {
display: flex;
align-items: flex-end;
}

@mixin blog-layout-default-alt--laptop() {
.layout-default, .layout-alternative {
.article-content-col .content {
display: flex;
align-items: center;
}
}

.layout-default .article-content-col .content {
flex-direction: row;
}

.layout-alternative .article-content-col .content {
flex-direction: row-reverse;
}

.non-grid-content {
display: flex;
flex-direction: column;
width: 100%;
.button {
align-self: flex-start;
margin-top: auto;
}
.excerpt-wrap {
padding: $spacing-sm 0;
}
}

.default-layout-content {
padding-left: $spacing;
}

.alternative-layout-content {
padding-right: $spacing;
}

.layout-default, .layout-alternative {
.nv-post-thumbnail-wrap {
max-width: 40%;
}
}
article.layout-alternative:nth-child(even) .article-content-col .content {
flex-direction: row;
.alternative-layout-content {
padding: 0 0 0 $spacing;
}
}
}
4 changes: 3 additions & 1 deletion assets/scss/elements/blog/_blogpost-grid.scss
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
.blog-article.layout-grid {}
.layout-grid > .article-content-col, .layout-grid > .article-content-col .content {
height: 100%;
}
11 changes: 7 additions & 4 deletions assets/scss/elements/blog/_blogpost-index.scss
Original file line number Diff line number Diff line change
@@ -21,8 +21,15 @@
margin-bottom: $spacing;
padding-bottom: $spacing;
border-bottom: $muted-border;
display: flex;
flex-direction: column;
.button {
margin-top: auto;
align-self: flex-start;
}
}


.excerpt-wrap {
padding: $spacing 0;
}
@@ -41,7 +48,3 @@
justify-content: center;
margin: $spacing-xs auto;
}

.layout-grid > .article-content-col, .layout-grid > .article-content-col .content {
height: 100%;
}
2 changes: 1 addition & 1 deletion assets/scss/elements/blog/_infinite-scroll.scss
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
width: 50px;
border-radius: 50%;
border: 2px solid $theme_color;
border-left: 1px solid transparent;
border-left: 1px solid transparent !important;
animation: spin;
-webkit-animation:spin 1s ease infinite;
-moz-animation:spin 1s ease infinite;
5 changes: 5 additions & 0 deletions assets/scss/elements/form-elements/_buttons.scss
Original file line number Diff line number Diff line change
@@ -9,4 +9,9 @@
//noinspection SassScssResolvedByNameOnly
@include button-secondary();
}
}

button, input[type=button].btn {
@include button();
@include button-primary();
}
33 changes: 33 additions & 0 deletions assets/scss/elements/navigation/_nav-menu-right.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
.nav-right .site-logo {
justify-content: flex-end;
}

.nav-right .navbar-toggle-wrapper {
justify-content: flex-start;
}

.nav-right .nv-nav-header {
flex-direction: row-reverse;
}

@mixin nav-menu-right--laptop() {
.nv-nav-wrap.nav-right {
flex-direction: row-reverse;
justify-content: center;
}

.nav-right #nv-primary-navigation {
margin-left: 0;
margin-right: auto;
}

.nav-right .nv-nav-cart {
right: inherit;
left: 0;
}

.nav-right #nv-primary-navigation > .menu-item-has-children > .sub-menu {
left :0;
right: inherit;
}
}
5 changes: 4 additions & 1 deletion assets/scss/elements/navigation/_nav-menu.scss
Original file line number Diff line number Diff line change
@@ -107,6 +107,9 @@
}
> li {
width: inherit;
&.menu-item-has-children:last-child {
padding-right: $spacing-sm;
}
> a {
padding: $spacing-sm 0;
display: block;
@@ -125,7 +128,7 @@
color: $link_hover_color;
}
> .caret-wrap .caret {
border-color: $link_hover_color;
color: $link_hover_color;
}
}

5 changes: 5 additions & 0 deletions assets/scss/elements/navigation/_nav-toggle.scss
Original file line number Diff line number Diff line change
@@ -20,6 +20,11 @@
.navbar-toggle {
border: none;
background: none;
cursor: pointer;
&:hover {
box-shadow: none;
transform: none;
}
}

.navbar-toggle.active {
4 changes: 3 additions & 1 deletion assets/scss/main/_media-queries.scss
Original file line number Diff line number Diff line change
@@ -18,9 +18,11 @@
@include nav-search--laptop();
@include nav-cart--laptop();
@include top-bar--laptop();
@include nav-menu-right--laptop();
@include blog-layout-default-alt--laptop();
}

@media (min-width: #{$desktop}) {
@include grid-container--desktop();
@include grid-container--desktop();
@include grid--desktop();
}
8 changes: 5 additions & 3 deletions assets/scss/main/_mixins.scss
Original file line number Diff line number Diff line change
@@ -45,16 +45,18 @@
border: 1px solid transparent;
border-radius: .25rem;
text-transform: uppercase;
&:hover {
transform: translateY(-1px);
box-shadow: 0 7px 14px rgba(50,50,93,.1), 0 3px 6px rgba(0,0,0,.08);
}
}

@mixin button-secondary() {
border: 1px solid $theme_color;
background-color: #fff;
background-color: transparent;
font-weight: 600;
color: $theme_color;
&:hover {
transform: translateY(-1px);
box-shadow: 0 7px 14px rgba(50,50,93,.1), 0 3px 6px rgba(0,0,0,.08);
background-color: $theme_color;
color: #fff;
}
Loading

0 comments on commit 39d6c66

Please sign in to comment.