Skip to content

Commit

Permalink
Upgraded 0.20.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mendozagioo committed Mar 4, 2019
2 parents 95dadfc + 468355d commit 2d9ba75
Show file tree
Hide file tree
Showing 9 changed files with 69 additions and 53 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
.bundle
.config
.yardoc
Gemfile
.jekyll-metadata
Gemfile.lock
InstalledFiles
_yardoc
Expand Down
2 changes: 1 addition & 1 deletion 404.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
layout: default
layout: home
---

<style type="text/css" media="screen">
Expand Down
4 changes: 2 additions & 2 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ markdown: kramdown
highlighter: rouge

# Custom variables
current_version: 0.20.0
current_ruby_version: 0.20.0
current_version: 0.20.1
current_ruby_version: 0.20.1

plugins:
- jekyll-redirect-from
Expand Down
11 changes: 9 additions & 2 deletions css/cactu.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Cactu v0.20.0 (http://cactu.site/)
* Cactu v0.20.1 (http://cactu.site/)
* Copyright 2018-2019 Giovanni Mendoza
* Licensed under MIT (https://github.com/mendozagioo/cactu/blob/master/LICENSE)
*/
Expand Down Expand Up @@ -604,7 +604,7 @@ blockquote {
cite {
display: block;
font-size: 80%;
color: #666c72;
color: #7a8793;
}

cite:before {
Expand Down Expand Up @@ -1188,6 +1188,13 @@ textarea::-webkit-input-placeholder {
opacity: 1;
}

input:not([type="checkbox"]):not([type="radio"]):not([type="range"]):-ms-input-placeholder,
select:-ms-input-placeholder,
textarea:-ms-input-placeholder {
color: #6c757d;
opacity: 1;
}

input:not([type="checkbox"]):not([type="radio"]):not([type="range"])::-ms-input-placeholder,
select::-ms-input-placeholder,
textarea::-ms-input-placeholder {
Expand Down
4 changes: 2 additions & 2 deletions css/cactu.min.css

Large diffs are not rendered by default.

87 changes: 48 additions & 39 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,43 +13,52 @@ const sassOpts = {
errLogToConsole: true
};

gulp.task('sass', () => gulp.src(cactuUrl)
.pipe(sass({
outputStyle: 'expanded'
}).on('error', sass.logError))
.pipe(autoprefixer({
browsers: ['last 2 versions'],
cascade: false
}))
.pipe(gulp.dest('./css'))
);

gulp.task('sass-compressed', () => gulp.src(cactuUrl)
.pipe(sass(sassOpts).on('error', sass.logError))
.pipe(autoprefixer({
browsers: ['last 2 versions'],
cascade: false
}))
.pipe(rename({
suffix: ".min"
}))
.pipe(gulp.dest('./css'))
);

gulp.task('sass-doc', () => gulp.src(docUrl)
.pipe(sass(sassOpts).on('error', sass.logError))
.pipe(autoprefixer({
browsers: ['last 2 versions'],
cascade: false
}))
.pipe(rename({
suffix: ".min"
}))
.pipe(gulp.dest('./assets/css'))
);

gulp.task('cactu-build', ['sass', 'sass-compressed']);

gulp.task('sass:watch', ['cactu-build', 'sass-doc'], () => {
gulp.watch([cactuUrl, docUrl], ['sass-doc']);
function styles() {
return gulp.src(cactuUrl)
.pipe(sass({
outputStyle: 'expanded'
}).on('error', sass.logError))
.pipe(autoprefixer({
browsers: ['last 2 versions'],
cascade: false
}))
.pipe(gulp.dest('./css'))
};

function docStyles() {
return gulp.src(docUrl)
.pipe(sass(sassOpts).on('error', sass.logError))
.pipe(autoprefixer({
browsers: ['last 2 versions'],
cascade: false
}))
.pipe(rename({
suffix: ".min"
}))
.pipe(gulp.dest('./assets/css'))
}

function compressedStyles() {
return gulp.src(cactuUrl)
.pipe(sass(sassOpts).on('error', sass.logError))
.pipe(autoprefixer({
browsers: ['last 2 versions'],
cascade: false
}))
.pipe(rename({
suffix: ".min"
}))
.pipe(gulp.dest('./css'))
}

gulp.task('sass', styles);

gulp.task('sass-doc', docStyles);

gulp.task('sass-compressed', compressedStyles);

gulp.task('cactu-build', gulp.parallel(styles, compressedStyles));

gulp.task('watch', () => {
gulp.watch([cactuUrl, docUrl], gulp.series(styles, compressedStyles, docStyles));
});
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "cactu",
"version": "0.20.0",
"version": "0.20.1",
"description": "A Sass framework to create webs easily, created to be simple, semantic, fast to learn, customizable, and scalable",
"scripts": {
"start": "gulp sass:watch | bundle exec jekyll serve"
"start": "gulp watch | bundle exec jekyll serve --watch"
},
"repository": {
"type": "git",
Expand All @@ -27,9 +27,9 @@
"homepage": "http://cactu.site",
"dependencies": {},
"devDependencies": {
"gulp": "^3.9.1",
"gulp": "^4.0.0",
"gulp-autoprefixer": "^6.0.0",
"gulp-rename": "^1.4.0",
"gulp-sass": "^4.0.1"
"gulp-sass": "^4.0.2"
}
}
2 changes: 1 addition & 1 deletion scss/cactu.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Cactu v0.20.0 (http://cactu.site/)
* Cactu v0.20.1 (http://cactu.site/)
* Copyright 2018-2019 Giovanni Mendoza
* Licensed under MIT (https://github.com/mendozagioo/cactu/blob/master/LICENSE)
*/
Expand Down
2 changes: 1 addition & 1 deletion scss/elements/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ blockquote {
cite {
display: block;
font-size: 80%;
color: $text-color + 50;
color: lighten($text-color, 30%);

&:before {
content: "\2014 \00A0";
Expand Down

0 comments on commit 2d9ba75

Please sign in to comment.