Skip to content

Commit

Permalink
Merged from gh-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
mendozagioo committed Sep 7, 2018
2 parents d61a461 + a04e2c4 commit 8066443
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ kramdown:
auto_ids: true

# Custom variables
current_version: 0.18.0
current_ruby_version: 0.18.0
current_version: 0.18.1
current_ruby_version: 0.18.1

plugins:
- jekyll-redirect-from
Expand Down
8 changes: 4 additions & 4 deletions css/cactu.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Cactu v0.18.0 (http://cactu.site/)
* Cactu v0.18.1 (http://cactu.site/)
* Copyright 2018 Giovanni Mendoza
* Licensed under MIT (https://github.com/mendozagioo/cactu/blob/master/LICENSE)
*/
Expand Down Expand Up @@ -1163,9 +1163,9 @@ select::-ms-expand {
margin-top: 0.25rem;
}

.form-group .checkbox + .checkbox,
.form-group .radio + .radio {
margin-left: 1rem;
.form-group .checkbox:not(:last-child),
.form-group .radio:not(:last-child) {
margin-right: 1rem;
}

input:not([type="checkbox"]):not([type="radio"]):not([type="range"]):not([type="file"]).valid,
Expand Down
4 changes: 2 additions & 2 deletions css/cactu.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cactu",
"version": "0.18.0",
"version": "0.18.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"
Expand Down
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.18.0 (http://cactu.site/)
* Cactu v0.18.1 (http://cactu.site/)
* Copyright 2018 Giovanni Mendoza
* Licensed under MIT (https://github.com/mendozagioo/cactu/blob/master/LICENSE)
*/
Expand Down
6 changes: 3 additions & 3 deletions scss/components/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@ select {
margin-top: $help-margin-top;
}

.checkbox + .checkbox,
.radio + .radio {
margin-left: 1rem;
.checkbox:not(:last-child),
.radio:not(:last-child) {
margin-right: 1rem;
}
}

Expand Down
2 changes: 1 addition & 1 deletion scss/components/_navbars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ $breakpoint-mobile: $tablet-size !default; // Set you breakpoint to get the
}

.show-menu {
&:last-child() {
&:last-child {
padding-bottom: $navbar-last-padding;
}
}
Expand Down

0 comments on commit 8066443

Please sign in to comment.