diff --git a/Gemfile b/Gemfile index f857cd6..30e41d9 100644 --- a/Gemfile +++ b/Gemfile @@ -49,7 +49,7 @@ gem 'sass', github: "nex3/sass", tag: '3.3.5' gem "compass", "~> 1.0.0.alpha.18" gem "compass-rails", github: "Compass/compass-rails" # gem 'oulu-rails', :path => '../oulu-rails' -gem 'oulu-rails', '~> 0.1.15', github: 'oulu/oulu-rails' +gem 'oulu-rails', '~> 0.1.18', github: 'oulu/oulu-rails' group :doc do # bundle exec rake doc:rails generates the API under doc/api. diff --git a/Gemfile.lock b/Gemfile.lock index 4f56ffb..5785f51 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,9 +39,9 @@ GIT GIT remote: git://github.com/oulu/oulu-rails.git - revision: 7ffd46a531d434be2e74d377e17381d756b090d1 + revision: 18b04cc54b7869630c89c5daafbec8951f506c96 specs: - oulu-rails (0.1.15) + oulu-rails (0.1.18) SassyLists breakpoint ceaser-easing @@ -414,7 +414,7 @@ DEPENDENCIES modernizr-rails nkss-rails! nokogiri - oulu-rails (~> 0.1.15)! + oulu-rails (~> 0.1.18)! owlcarousel-rails pg pry diff --git a/app/assets/stylesheets/blocks/home/_home-members.css.sass b/app/assets/stylesheets/blocks/home/_home-members.css.sass index 4415d7a..863c90f 100644 --- a/app/assets/stylesheets/blocks/home/_home-members.css.sass +++ b/app/assets/stylesheets/blocks/home/_home-members.css.sass @@ -6,7 +6,7 @@ +rem('padding-left', 96px) +rem('height', 80px) .home-members__member-name - +tauri + +tauri(bold) +text-block($sm, 1, .2) +rem('font-size', $sm) .home-members__member-icon-link diff --git a/app/assets/stylesheets/blocks/layouts/_articles-global-nav.css.sass b/app/assets/stylesheets/blocks/layouts/_articles-global-nav.css.sass index 3d8f312..9569626 100644 --- a/app/assets/stylesheets/blocks/layouts/_articles-global-nav.css.sass +++ b/app/assets/stylesheets/blocks/layouts/_articles-global-nav.css.sass @@ -3,7 +3,7 @@ .article-global-nav__logo +inline-block .article-global-nav__logo-link - +tauri + +tauri(bold) font-weight: bold text-decoration: none +text-block(30px, 30px) @@ -16,7 +16,7 @@ +inline-block(bottom) +rem('margin-right', 10px) .article-global-nav__link - +tauri + +tauri(bold) font-weight: bold text-decoration: none +text-block(16px, 30px) diff --git a/app/assets/stylesheets/blocks/layouts/_global-nav.css.sass b/app/assets/stylesheets/blocks/layouts/_global-nav.css.sass index a606309..005c705 100644 --- a/app/assets/stylesheets/blocks/layouts/_global-nav.css.sass +++ b/app/assets/stylesheets/blocks/layouts/_global-nav.css.sass @@ -52,7 +52,7 @@ text-align: center text-decoration: none +text-block(28px, 34px, 0px) - +tauri + +tauri(bold) font-weight: bold &:hover color: rgba(0, 0, 0, .4) @@ -68,7 +68,7 @@ font-weight: bold color: $gray-l text-align: right - +tauri + +tauri(bold) +text-block($lg, 1) &:hover color: darken($gray-l, 18%) diff --git a/app/assets/stylesheets/blocks/layouts/_hero.css.sass b/app/assets/stylesheets/blocks/layouts/_hero.css.sass index 136af37..cbea652 100644 --- a/app/assets/stylesheets/blocks/layouts/_hero.css.sass +++ b/app/assets/stylesheets/blocks/layouts/_hero.css.sass @@ -57,7 +57,7 @@ .hero__site-title +rem('font-size', 68px) - +tauri + +tauri(bold) +rem('margin-bottom', -5px) +rgba(rgba(255, 255, 255, .7), $blue-green-l, color) font-weight: bold @@ -74,7 +74,7 @@ +opacity(1) .hero__tag-line +text-block(30px) - +tauri + +tauri(bold) +rgba(rgba(255, 255, 255, .7), $blue-green-l, color) font-weight: bold @media screen and (max-width: #{$break-point}) diff --git a/app/assets/stylesheets/blocks/layouts/_page.css.sass b/app/assets/stylesheets/blocks/layouts/_page.css.sass index de6afa5..e708952 100644 --- a/app/assets/stylesheets/blocks/layouts/_page.css.sass +++ b/app/assets/stylesheets/blocks/layouts/_page.css.sass @@ -20,9 +20,8 @@ +text-block($xl, 3) +rem('width', 180px) text-align: center - +tauri + +tauri(bold) color: $black - font-weight: bold @media screen and (max-width: #{$break-point}) +text-block($lg, 2.4) width: auto diff --git a/app/assets/stylesheets/blocks/layouts/_side-column.css.sass b/app/assets/stylesheets/blocks/layouts/_side-column.css.sass index c97bba3..de9d418 100644 --- a/app/assets/stylesheets/blocks/layouts/_side-column.css.sass +++ b/app/assets/stylesheets/blocks/layouts/_side-column.css.sass @@ -15,8 +15,7 @@ +rem('padding-bottom', 20px) .side-column__first-heading text-align: center - +tauri + +tauri(800) +rem('font-size', $md) margin-bottom: 1.2em color: $white - font-weight: bold diff --git a/app/assets/stylesheets/blocks/pages/_article.css.sass b/app/assets/stylesheets/blocks/pages/_article.css.sass index ad4c2fc..9fbd935 100644 --- a/app/assets/stylesheets/blocks/pages/_article.css.sass +++ b/app/assets/stylesheets/blocks/pages/_article.css.sass @@ -66,7 +66,7 @@ .article__author-name display: block +rem('font-size', $lg) - +tauri + +tauri(bold) +inline-block margin-right: .6em .article__created-at