diff --git a/app/assets/stylesheets/mixins/utils.css.sass b/app/assets/stylesheets/mixins/utils.css.sass index 2ef2e89..acd2370 100644 --- a/app/assets/stylesheets/mixins/utils.css.sass +++ b/app/assets/stylesheets/mixins/utils.css.sass @@ -1,8 +1,8 @@ @mixin light-box-shadow($amount: 0.1) - +box-shadow(inset 0px 1px 0px rgba(#fff, $amount)) + box-shadow: inset 0px 1px 0px rgba(#fff, $amount) @mixin dark-box-shadow($amount: 0.1) - +box-shadow(inset 0px -1px 0px rgba(#000, $amount)) + box-shadow: inset 0px -1px 0px rgba(#000, $amount) @mixin light-background-gradient($color: false, $amount: 5%) @if not $color diff --git a/app/assets/stylesheets/mods/index.css.sass b/app/assets/stylesheets/mods/index.css.sass index c68e23a..6d08b20 100644 --- a/app/assets/stylesheets/mods/index.css.sass +++ b/app/assets/stylesheets/mods/index.css.sass @@ -71,7 +71,6 @@ $mods-list-size: 12-$filter-size &-title font-weight: bold &-value - &-remove:before color: $color-washed-orange content: '✖' diff --git a/app/assets/stylesheets/partials/footer.css.sass b/app/assets/stylesheets/partials/footer.css.sass index be6bfae..ddb8258 100644 --- a/app/assets/stylesheets/partials/footer.css.sass +++ b/app/assets/stylesheets/partials/footer.css.sass @@ -3,7 +3,7 @@ background: $color-black // +light-box-shadow // border-top: solid 1px darken($color-black, 5%) // No. It needs to be 2 rhythms exactly - +box-shadow(inset 0 5px 5px rgba(#000, 0.1))//, 0 1px 0px rgba(#000, 0.07)) + box-shadow: inset 0 5px 5px rgba(#000, 0.1) //, 0 1px 0px rgba(#000, 0.07)) +dark-background-gradient(false, 15%) color: $color-white text-align: center diff --git a/app/assets/stylesheets/partials/header.css.sass b/app/assets/stylesheets/partials/header.css.sass index 22b23f6..38ac15d 100644 --- a/app/assets/stylesheets/partials/header.css.sass +++ b/app/assets/stylesheets/partials/header.css.sass @@ -11,7 +11,7 @@ position: relative background: $color-blue // +light-background-gradient($color-blue) - +box-shadow(inset 0px -0.20em 0px rgba(#000, 0.1)) // Bar on the bottom + box-shadow: inset 0px -0.20em 0px rgba(#000, 0.1) // Bar on the bottom background-image: asset-data-url('checkered-pattern.png') .logo diff --git a/app/assets/stylesheets/partials/search_bar.css.sass b/app/assets/stylesheets/partials/search_bar.css.sass index 59ac88d..dfdb8d6 100644 --- a/app/assets/stylesheets/partials/search_bar.css.sass +++ b/app/assets/stylesheets/partials/search_bar.css.sass @@ -36,7 +36,7 @@ color: $color-white background-color: $color-orangered +light-background-gradient - +box-shadow(none) // Override :hover + box-shadow: none // Override :hover +white-text-shadow // Little bar on to &:before diff --git a/app/assets/stylesheets/shared/btn.css.sass b/app/assets/stylesheets/shared/btn.css.sass index 8b7d8f0..f9ce7ab 100644 --- a/app/assets/stylesheets/shared/btn.css.sass +++ b/app/assets/stylesheets/shared/btn.css.sass @@ -10,7 +10,7 @@ border-radius: 2px background: $color-washed-orange +light-background-gradient - +box-shadow(inset 0px 3px 0px rgba(#fff, 0.15)) + box-shadow: inset 0px 3px 0px rgba(#fff, 0.15) // border-top: solid 0.1em $color-dark-orange // border-bottom: solid 0.1em $color-dark-orange color: $color-white diff --git a/app/assets/stylesheets/shared/inputs.css.sass b/app/assets/stylesheets/shared/inputs.css.sass index 0931f63..9791d30 100644 --- a/app/assets/stylesheets/shared/inputs.css.sass +++ b/app/assets/stylesheets/shared/inputs.css.sass @@ -19,7 +19,7 @@ select +appearance(none) // height: rhythm(1) background: $color-white - +box-shadow(inset 0px -10px 10px rgba(#000, 0.06)) + box-shadow: inset 0px -10px 10px rgba(#000, 0.06) background: image: $img-arrow-data repeat: no-repeat diff --git a/app/assets/stylesheets/shared/thumbnails.css.sass b/app/assets/stylesheets/shared/thumbnails.css.sass index 249637c..20b94ff 100644 --- a/app/assets/stylesheets/shared/thumbnails.css.sass +++ b/app/assets/stylesheets/shared/thumbnails.css.sass @@ -3,7 +3,7 @@ border-radius: $border-radius background: white // border: solid 1px darken($color-blue, 10%) - +box-shadow(0 1px 2px rgba(#000,0.2)) + box-shadow: 0 1px 2px rgba(#000,0.2) %thumbnail-hover +block diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 1680877..4734b55 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -2,9 +2,8 @@ %html %head %title= yield :title - / %link(href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet") - %script(src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js") = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true + %script(src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js") = csrf_meta_tags %link(rel="shortcut icon" href="/favicon.ico?v=2") %body{class: body_controller_classes}