Tidy sass partials, remove breakpoint

This commit is contained in:
Oliver Davies 2017-03-18 22:47:15 +00:00
parent 23dea217cb
commit 349fe12d0d
8 changed files with 23 additions and 29 deletions

View file

@ -1,3 +0,0 @@
@import 'code'
@import 'layout'
@import 'typography'

View file

@ -1,7 +0,0 @@
@import 'availability'
@import 'badges'
@import 'content-types/blog-post'
@import 'content-types/talk'
@import 'footer'
@import 'meetups'
@import 'testimonials'

View file

@ -6,12 +6,10 @@
color: #777 color: #777
&__image &__image
@extend .img-circle
@extend .pull-right
height: 75px height: 75px
margin: 0 0 10px 10px margin: 0 0 10px 10px
width: 75px width: 75px
+breakpoint($screen-sm) +until($screen-sm)
height: 90px height: 90px
width: 90px width: 90px

View file

@ -1,6 +0,0 @@
@import 'about'
@import 'blog-list'
@import 'blog-post'
@import 'experience'
@import 'projects'
@import 'talk'

View file

@ -17,6 +17,8 @@
margin-left: 1.5em margin-left: 1.5em
margin-top: 25px margin-top: 25px
max-width: 25% max-width: 25%
+desktop
max-width: 15%
img img
height: auto height: auto
@ -24,7 +26,3 @@
p:last-of-type p:last-of-type
margin-bottom: 0 margin-bottom: 0
+breakpoint(30rem)
&__logo
max-width: 15%

View file

@ -1,8 +1,23 @@
@import '../../vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap' @import '../../vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap'
@import '../../vendor/bower_components/compass-breakpoint/stylesheets/breakpoint'
@import 'base' @import 'base'
@import 'mixins' @import 'mixins'
@import 'base/all'
@import 'components/all' @import 'base/layout'
@import 'pages/all' @import 'base/typography'
@import 'base/code'
@import 'components/availability'
@import 'components/badges'
@import 'components/content-types/blog-post'
@import 'components/content-types/talk'
@import 'components/footer'
@import 'components/meetups'
@import 'components/testimonials'
@import 'pages/about'
@import 'pages/blog-list'
@import 'pages/blog-post'
@import 'pages/experience'
@import 'pages/projects'
@import 'pages/talk'

View file

@ -2,7 +2,6 @@
"name": "oliverdavies.uk", "name": "oliverdavies.uk",
"devDependencies": { "devDependencies": {
"bootstrap-sass": "~3.3.6", "bootstrap-sass": "~3.3.6",
"compass-breakpoint": "breakpoint-sass#~2.6.1",
"font-awesome": "fontawesome#~4.5.0", "font-awesome": "fontawesome#~4.5.0",
"jquery2": "^2.0.0", "jquery2": "^2.0.0",
"prism": "prismjs#^1.6.0" "prism": "prismjs#^1.6.0"

View file

@ -95,7 +95,7 @@ use: [posts]
<h2 class="testimonial__name">{{ testimonial.name }}</h2> <h2 class="testimonial__name">{{ testimonial.name }}</h2>
{% if testimonial.image %} {% if testimonial.image %}
<img class="testimonial__image" src="{{ site.url }}/assets/images/testimonials/{{ testimonial.image }}" alt="{{ testimonial.name }}"/> <img class="testimonial__image pull-right img-circle" src="{{ site.url }}/assets/images/testimonials/{{ testimonial.image }}" alt="{{ testimonial.name }}"/>
{% endif %} {% endif %}
{% if testimonial.role and company.name is not defined %} {% if testimonial.role and company.name is not defined %}