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

Commit

Permalink
Merge branch 'release/1.1.0'
Browse files Browse the repository at this point in the history
* release/1.1.0:
  Changelog for 1.1.0
  Fix header spacing issue
  Fix compatability issues with Craft 3.1.
  Require craftcms/cms at ^3.1.0 in prep for LP fix
  • Loading branch information
joshangell committed Feb 19, 2019
2 parents 28eaa1b + 7ba2bd2 commit 26c2704
Show file tree
Hide file tree
Showing 10 changed files with 3,557 additions and 192 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p

## Unreleased


## 1.1.0 - 2019-02-19

### Fixed
- Fixed an issue introduced due to the LivePreview changes in Craft 3.1 ([#7](https://github.com/angell-co/Portal/issues/7)).


## 1.0.6 - 2019-01-28

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
}
],
"require": {
"craftcms/cms": "^3.0.15"
"craftcms/cms": "^3.1.0"
},
"autoload": {
"psr-4": {
Expand Down
6 changes: 5 additions & 1 deletion src/assetbundles/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ var gulp = require('gulp'),
sass = require('gulp-sass');

gulp.task('livepreview_js', function() {
return gulp.src(['node_modules/js-cookie/src/js.cookie.js','src/LivePreview.js'])
return gulp.src([
'node_modules/js-cookie/src/js.cookie.js',
'node_modules/arrive/src/arrive.js',
'src/LivePreview.js'
])
.pipe(uglify())
.pipe(concat('LivePreview.min.js'))
.pipe(gulp.dest('livepreview/dist/js/'));
Expand Down
2 changes: 1 addition & 1 deletion src/assetbundles/livepreview/dist/css/LivePreview.min.css

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

Loading

0 comments on commit 26c2704

Please sign in to comment.