Skip to content

Commit

Permalink
Merge pull request #69 from peiche/remove-bower
Browse files Browse the repository at this point in the history
1.7.6
  • Loading branch information
peiche committed May 31, 2016
2 parents 8ee26dd + b058e8f commit 25c1206
Show file tree
Hide file tree
Showing 21 changed files with 4,061 additions and 363 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@ pip-log.txt
.mr.developer.cfg

assets/sass/plugins/aesop/_ai-core.scss
bower_components/
languages/
node_modules/
releases/
Expand All @@ -224,4 +223,3 @@ report/
gruntfile-hub.js
style.css
style.css.map
inc/class-tgm-plugin-activation.php
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).

**1.7.6**
- Removed all references to Bower.
- Updated to TGM Plugin Activation 2.5.1.
- Updated to Unslider 2.0.

**1.7.5**
- Updated to Font Awesome 4.6.
- Updated styles for Aesop Story Engine 1.7.5.
Expand Down
5 changes: 5 additions & 0 deletions README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,11 @@ You can download the latest from GitHub. Follow these steps to activate Cover:

== Changelog ==

= 1.7.6 =
* Removed all references to Bower.
* Updated to TGM Plugin Activation 2.5.1.
* Updated to Unslider 2.0.

= 1.7.5 =
* Updated to Font Awesome 4.6.
* Updated styles for Aesop Story Engine 1.7.5.
Expand Down
27 changes: 3 additions & 24 deletions assets/js/cover-unslider.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,9 @@ jQuery(document).ready(function() {

// init unslider
var unslider = jQuery('.featured-container').unslider({
fluid: true,
dots: true,
autoplay: false
infinite: true,
autoplay: false,
animateHeight: true
});

/**
* We need to make sure the slides' width is a percentage,
* not a pixel value. Supposedly setting 'fluid: true' does this,
* but we're going to fix it here. Otherwise, we have to reset
* the slider on resize, and that's a slippery slope.
*/
var $slides = jQuery('.featured-container li:not(.dot)'); // ignore the dots, which unslider has already created
var slide_num = $slides.length;
$slides.width((100 / slide_num) + '%');

// prev/next buttons
jQuery('.featured-arrow').bind('click', function() {
var fn = this.className.split(' ')[1];

// Either do unslider.data('unslider').next() or .prev() depending on the className
unslider.data('unslider')[fn]();
});

if (jQuery('.featured-container li').length > 1) {
jQuery('.featured-arrow').removeClass('hide');
}
});
2 changes: 1 addition & 1 deletion assets/sass/plugins/_aesop.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// imported with bower
// imported with npm
@import 'aesop/ai-core';

// global ase styles
Expand Down
268 changes: 6 additions & 262 deletions assets/sass/plugins/_jetpack.scss
Original file line number Diff line number Diff line change
@@ -1,262 +1,6 @@
/*--------------------------------------------------------------
Jetpack
--------------------------------------------------------------*/
/*--------------------------------------------------------------
Infinite Scroll
--------------------------------------------------------------*/

// NOTE necessary to target Jetpack infinite scroll handle
// scss-lint:disable IdSelector
body #infinite-handle { // increased specificity to override jetpack's css
padding: 30px 0 50px;
text-align: center;

span {
@include button($color-blue);

@include max-width($width-phone) {
display: block;
margin: auto;
width: 90%;
}
}
}
// scss-lint:enable IdSelector

// full-screen overlay spinner
body .infinite-loader { // increased specificity to override jetpack's css
height: 42px; // match height of button
margin: 50px auto;

.spinner {
animation: rotate .7s infinite linear;
border: 8px solid $color-light-gray-alt;
border-radius: 100%;
border-top-color: $color-blue;
height: 42px;
margin: auto;
// scss-lint:disable ImportantRule
position: static !important; // overrides inline style
width: 42px !important; // overrides inline style
// scss-lint:enable ImportantRule

> div {
display: none; // hide jetpack's default spinner parts
}
}
}

// NOTE necessary to target infinite scroll footer
// scss-lint:disable IdSelector
#infinite-footer {
display: none; // hide the infinite scroll footer
}
// scss-lint:enable IdSelector

.infinite-scroll .posts-navigation, // Older / Newer Posts Navigation (always hidden)
.infinite-scroll.neverending .site-footer { // Theme Footer (when set to scrolling)
display: none;
}

// When Infinite Scroll has reached its end we need to re-display elements that were hidden (via .neverending) before
.infinity-end.neverending .site-footer {
display: block;
}

/*--------------------------------------------------------------
Related Posts
--------------------------------------------------------------*/

// NOTE necessary to target related posts
// scss-lint:disable IdSelector
.entry-content #jp-relatedposts {
@include site-width;
}
// scss-lint:enable IdSelector

.jp-relatedposts-post {
transition: opacity .2s; // I reject your reality, and substitute my own!
}

/*--------------------------------------------------------------
Likes
--------------------------------------------------------------*/

.entry-content .jetpack-likes-widget-wrapper {
width: $width-medium;
}

/*--------------------------------------------------------------
Top Posts & Pages Widget
--------------------------------------------------------------*/

// Image List
.widgets-list-layout {
.bump-view {
border: 0;
padding: 0;

.widgets-list-layout-blavatar {
margin-right: 20px;
transition: all .2s ease-in-out;
}
}

li {
border-bottom: 1px solid $color-medium-gray;
margin-bottom: 20px;
padding-bottom: 20px;

&:hover .bump-view {
color: $color-light-gray-alt3;

.widgets-list-layout-blavatar {
opacity: .8;
}
}
}

/*
* I would like nothing better than to use this instead:
*
* &-links {
*
* Unfortunately, that results in the same level of specificity as defined by Jetpack's styles,
* which, because the plugin's CSS is loaded after Cover's, overrides it.
* As a result, we have to increase the specificity if we don't want to resort to using !important everywhere.
*/
.widgets-list-layout-links {
float: none;
width: auto;
}
}

/*--------------------------------------------------------------
Image Grid
--------------------------------------------------------------*/
.widget-grid-view-image {
width: 33.33%;

@include max-width($width-phone) {
width: 50%;
}

.bump-view,
&:nth-child(even) .bump-view {
border: 0;
margin: 0;
opacity: .8;

&:hover {
opacity: 1;
}
}

a[title] {
position: relative;

&::after {
@include rem(font-size, 14px);
background-image: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, .5));
bottom: 0;
color: $color-white;
content: attr(title);
padding: 10px;
position: absolute;
width: 100%;
}
}

img {
display: block;
width: 100%;
}
}

/*--------------------------------------------------------------
Featured Content
--------------------------------------------------------------*/
.featured-container {
position: relative;

ul {
list-style: none;
margin: 0;
}

a,
a:hover,
a:visited {
color: $color-white;
}

.dots {
bottom: 0;
display: none;
left: 0;
margin: 0;
position: absolute;
right: 0;
text-align: center;
z-index: $z-index-cover;
}

&.has-dots .dots {
@include max-width($width-medium) {
display: block;
}
}

.dot {
border: 3px solid $color-white;
border-radius: 50%;
cursor: pointer;
display: inline-block;
height: 20px;
margin: 0 10px;
opacity: .5;
text-indent: -9999px;
width: 20px;

&.active {
background-color: $color-white;
opacity: 1;
}
}

.featured-arrow {
bottom: 0;
cursor: pointer;
position: absolute;
text-align: center;
top: 0;
width: $featured-content-arrow-size;
z-index: $z-index-cover;

@include max-width($width-medium) {
display: none;
}

&.prev {
left: 0;
}

&.next {
right: 0;
}

.fa {
@include rem(font-size, $featured-content-arrow-size);
bottom: 0;
color: $color-white;
height: $featured-content-arrow-size;
left: 0;
line-height: $featured-content-arrow-size;
margin: auto;
position: absolute;
right: 0;
top: 0;
width: $featured-content-arrow-size;
}
}
}
@import 'jetpack/infinitescroll';
@import 'jetpack/relatedposts';
@import 'jetpack/likes';
@import 'jetpack/topposts';
@import 'jetpack/imagegrid';
@import 'jetpack/featured';
Loading

0 comments on commit 25c1206

Please sign in to comment.