diff --git a/assets/sass/_base.sass b/assets/sass/_base.sass index 95a99723..61200ebf 100644 --- a/assets/sass/_base.sass +++ b/assets/sass/_base.sass @@ -10,9 +10,6 @@ main border-bottom: 1px solid text-decoration: none - img - @extend .img-responsive - p img margin: 1.5em 0 diff --git a/assets/sass/_mixins.sass b/assets/sass/_mixins.sass index bad400ed..53f97ee0 100644 --- a/assets/sass/_mixins.sass +++ b/assets/sass/_mixins.sass @@ -1,35 +1,35 @@ -=from($device) - @media screen and (min-width: $device) - @content +// =from($device) +// @media screen and (min-width: $device) +// @content -=until($device) - @media screen and (max-width: $device - 1px) - @content +// =until($device) +// @media screen and (max-width: $device - 1px) +// @content -=mobile - @media screen and (max-width: $screen-tablet - 1px) - @content +// =mobile +// @media screen and (max-width: $screen-tablet - 1px) +// @content -=tablet - @media screen and (min-width: $screen-tablet) - @content +// =tablet +// @media screen and (min-width: $screen-tablet) +// @content -=tablet-only - @media screen and (min-width: $screen-tablet) and (max-width: $screen-desktop - 1px) - @content +// =tablet-only +// @media screen and (min-width: $screen-tablet) and (max-width: $screen-desktop - 1px) +// @content -=touch - @media screen and (max-width: $screen-desktop - 1px) - @content +// =touch +// @media screen and (max-width: $screen-desktop - 1px) +// @content -=desktop - @media screen and (min-width: $screen-desktop) - @content +// =desktop +// @media screen and (min-width: $screen-desktop) +// @content -=desktop-only - @media screen and (min-width: $screen-desktop) and (max-width: $screen-lg - 1px) - @content +// =desktop-only +// @media screen and (min-width: $screen-desktop) and (max-width: $screen-lg - 1px) +// @content -=widescreen - @media screen and (min-width: $screen-lg) - @content +// =widescreen +// @media screen and (min-width: $screen-lg) +// @content diff --git a/assets/sass/main.sass b/assets/sass/main.sass index 3da967ee..2981ad7d 100644 --- a/assets/sass/main.sass +++ b/assets/sass/main.sass @@ -1,4 +1,4 @@ -@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap' +@import 'node_modules/bulma/bulma' @import 'base' @import 'mixins' diff --git a/assets/sass/pages/_blog.sass b/assets/sass/pages/_blog.sass index 74666913..765521a1 100644 --- a/assets/sass/pages/_blog.sass +++ b/assets/sass/pages/_blog.sass @@ -1,5 +1,3 @@ -@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix' - .page--blog__list ul.posts list-style: none diff --git a/assets/sass/pages/_experience.sass b/assets/sass/pages/_experience.sass index b0db7e99..9ee361fb 100644 --- a/assets/sass/pages/_experience.sass +++ b/assets/sass/pages/_experience.sass @@ -1,9 +1,7 @@ -@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix' -@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables' @import '../mixins' .experience-item - margin-bottom: $padding-large-vertical * 3 + // margin-bottom: $padding-large-vertical * 3 +clearfix .experience-item-website diff --git a/assets/sass/pages/_post.sass b/assets/sass/pages/_post.sass index f8d082d1..cca6fdab 100644 --- a/assets/sass/pages/_post.sass +++ b/assets/sass/pages/_post.sass @@ -1,5 +1,3 @@ -@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix' - .post-pager clear: both margin-top: 2em diff --git a/assets/sass/pages/_project.sass b/assets/sass/pages/_project.sass index 6f9ec3be..4a92b125 100644 --- a/assets/sass/pages/_project.sass +++ b/assets/sass/pages/_project.sass @@ -1,4 +1,3 @@ -@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables' @import '../mixins' .project-company diff --git a/assets/sass/pages/_talk.sass b/assets/sass/pages/_talk.sass index 6e0cff5e..9764d734 100644 --- a/assets/sass/pages/_talk.sass +++ b/assets/sass/pages/_talk.sass @@ -1,4 +1,3 @@ -@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables' @import '../mixins' .talk-full h1 diff --git a/assets/sass/pages/_testimonials.sass b/assets/sass/pages/_testimonials.sass index af0be536..1b3eaf47 100644 --- a/assets/sass/pages/_testimonials.sass +++ b/assets/sass/pages/_testimonials.sass @@ -1,5 +1,3 @@ -@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix' -@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables' @import '../mixins' .testimonial @@ -10,7 +8,3 @@ height: 75px margin: 0 0 10px 10px width: 75px - - +until($screen-sm) - height: 90px - width: 90px