diff --git a/Gemfile b/Gemfile index f0602dda..a401a7f5 100644 --- a/Gemfile +++ b/Gemfile @@ -14,8 +14,9 @@ gem 'mysql2', '~> 0.5.5' gem 'dotenv-rails', '~> 2.8', '>= 2.8.1' # For the asset pipeline: templates, CSS, JS, etc. +gem 'sprockets', '~> 4.2' gem 'haml', '~> 6.1', '>= 6.1.1' -gem 'sass-rails', '~> 5.0', '>= 5.0.7' +gem 'sass-rails', '~> 6.0' gem 'terser', '~> 1.1', '>= 1.1.17' gem 'react-rails', '~> 2.7', '>= 2.7.1' gem 'jsbundling-rails', '~> 1.1' diff --git a/Gemfile.lock b/Gemfile.lock index 7af2e132..2fddd763 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -115,6 +115,7 @@ GEM factory_girl_rails (4.9.0) factory_girl (~> 4.9.0) railties (>= 3.0.0) + ffi (1.15.5) globalid (1.1.0) activesupport (>= 5.0) globalize (6.2.1) @@ -256,16 +257,19 @@ GEM sanitize (6.0.2) crass (~> 1.0.2) nokogiri (>= 1.12.0) - sass (3.4.25) - sass-rails (5.0.8) - railties (>= 5.2.0) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) - sprockets (3.7.2) + sass-rails (6.0.0) + sassc-rails (~> 2.1, >= 2.1.1) + sassc (2.4.0) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt + sprockets (4.2.0) concurrent-ruby (~> 1.0) - rack (> 1, < 3) + rack (>= 2.2.4, < 4) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) @@ -324,7 +328,8 @@ DEPENDENCIES rspec-rails (~> 2.0.0.beta.22) rvm-capistrano (~> 1.5.6) sanitize (~> 6.0, >= 6.0.2) - sass-rails (~> 5.0, >= 5.0.7) + sass-rails (~> 6.0) + sprockets (~> 4.2) terser (~> 1.1, >= 1.1.17) web-console (~> 4.2) will_paginate (~> 4.0) diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 00000000..7b44d49c --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,5 @@ +//= link_tree ../images +//= link_tree ../javascripts .js +//= link_tree ../stylesheets .css +//= link_directory ../fonts .otf +//= link_tree ../builds diff --git a/app/assets/stylesheets/_layout.sass b/app/assets/stylesheets/_layout.sass index b208a022..c26f7a4d 100644 --- a/app/assets/stylesheets/_layout.sass +++ b/app/assets/stylesheets/_layout.sass @@ -1,8 +1,10 @@ @import "partials/icon" +@import "partials/clean/constants" +@import "partials/clean/mixins" @import fonts -@import url(//fonts.googleapis.com/css?family=Droid+Sans:400,700) -@import url(//fonts.googleapis.com/css?family=Droid+Serif:400,700,400italic) -@import url(//fonts.googleapis.com/css?family=Calligraffitti) +@import url("https://fonts.googleapis.com/css?family=Droid+Sans:400,700") +@import url("https://fonts.googleapis.com/css?family=Droid+Serif:400,700,400italic") +@import url("https://fonts.googleapis.com/css?family=Calligraffitti") /* Reset diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass index bd8f87e1..9401bfc8 100644 --- a/app/assets/stylesheets/application.css.sass +++ b/app/assets/stylesheets/application.css.sass @@ -18,7 +18,6 @@ @import items @import items/index @import items/show -@import outfits/edit @import outfits/index @import outfits/new @import outfits/show diff --git a/app/assets/stylesheets/campaigns/_show.sass b/app/assets/stylesheets/campaigns/_show.sass index c54bb308..e1066d01 100644 --- a/app/assets/stylesheets/campaigns/_show.sass +++ b/app/assets/stylesheets/campaigns/_show.sass @@ -1,3 +1,4 @@ +@import "partials/clean/constants" @import "partials/campaign-progress" @import "partials/outfit" @@ -198,7 +199,7 @@ body.campaigns-show, body.campaigns-current line-height: 100px margin: 4px 0 text-shadow: #335 2px 2px 1px - width: $container-width - 4px + width: 800px - 4px span +inline-block diff --git a/app/assets/stylesheets/closet_hangers/_index.sass b/app/assets/stylesheets/closet_hangers/_index.sass index 9d04d455..04ceb3d1 100644 --- a/app/assets/stylesheets/closet_hangers/_index.sass +++ b/app/assets/stylesheets/closet_hangers/_index.sass @@ -1,3 +1,5 @@ +@import "../partials/clean/constants" +@import "../partials/campaign-progress" @import "../partials/context_button" @import "../partials/icon" @import "../partials/secondary_nav" @@ -380,7 +382,7 @@ body.closet_hangers-index font-size: 85% padding: .5em 1em text-align: center - width: $container-width + width: 800px &.isStuck border-bottom: 1px solid $module-border-color diff --git a/app/assets/stylesheets/closet_hangers/_petpage.sass b/app/assets/stylesheets/closet_hangers/_petpage.sass index 06f5e342..5ac413c1 100644 --- a/app/assets/stylesheets/closet_hangers/_petpage.sass +++ b/app/assets/stylesheets/closet_hangers/_petpage.sass @@ -1,3 +1,7 @@ +@import "../partials/clean/constants" +@import "../partials/clean/mixins" +@import "../partials/secondary_nav" + body.closet_hangers-petpage +secondary-nav diff --git a/app/assets/stylesheets/closet_lists/_form.sass b/app/assets/stylesheets/closet_lists/_form.sass index 2c451ef9..2ec70c54 100644 --- a/app/assets/stylesheets/closet_lists/_form.sass +++ b/app/assets/stylesheets/closet_lists/_form.sass @@ -1,3 +1,5 @@ +@import "../partials/secondary_nav" + body.closet_lists-new, body.closet_lists-create, body.closet_lists-edit, body.closet_lists-update +secondary-nav diff --git a/app/assets/stylesheets/contributions/_index.sass b/app/assets/stylesheets/contributions/_index.sass index 020bc186..8ed7db80 100644 --- a/app/assets/stylesheets/contributions/_index.sass +++ b/app/assets/stylesheets/contributions/_index.sass @@ -1,3 +1,5 @@ +@import "../partials/clean/mixins" + body.contributions-index text-align: center diff --git a/app/assets/stylesheets/donations/_show.sass b/app/assets/stylesheets/donations/_show.sass index b1139bdf..59ade3a0 100644 --- a/app/assets/stylesheets/donations/_show.sass +++ b/app/assets/stylesheets/donations/_show.sass @@ -1,3 +1,6 @@ +@import "../partials/clean/constants" +@import "../partials/clean/mixins" + body.donations-show #thank-you border: 3px solid $module-border-color diff --git a/app/assets/stylesheets/fonts.sass b/app/assets/stylesheets/fonts.css.sass similarity index 100% rename from app/assets/stylesheets/fonts.sass rename to app/assets/stylesheets/fonts.css.sass diff --git a/app/assets/stylesheets/items/_show.sass b/app/assets/stylesheets/items/_show.sass index cbd77fdd..662f5b48 100644 --- a/app/assets/stylesheets/items/_show.sass +++ b/app/assets/stylesheets/items/_show.sass @@ -1,3 +1,6 @@ +@import "../partials/clean/constants" +@import "../partials/clean/mixins" + =grayscale // http://www.karlhorky.com/2012/06/cross-browser-image-grayscale-with-css.html filter: url("data:image/svg+xml;utf8,#grayscale") diff --git a/app/assets/stylesheets/neopets_page_import_tasks/_new.sass b/app/assets/stylesheets/neopets_page_import_tasks/_new.sass index e53ed225..2efbd0e7 100644 --- a/app/assets/stylesheets/neopets_page_import_tasks/_new.sass +++ b/app/assets/stylesheets/neopets_page_import_tasks/_new.sass @@ -1,5 +1,6 @@ -body.neopets_page_import_tasks-new, body.neopets_page_import_tasks-create +@import "../partials/clean/mixins" +body.neopets_page_import_tasks-new, body.neopets_page_import_tasks-create #title float: left diff --git a/app/assets/stylesheets/neopets_users/_form.sass b/app/assets/stylesheets/neopets_users/_form.sass index d1de9226..0e4209b8 100644 --- a/app/assets/stylesheets/neopets_users/_form.sass +++ b/app/assets/stylesheets/neopets_users/_form.sass @@ -1,3 +1,5 @@ +@import "../partials/secondary_nav" + body.neopets_users-new, body.neopets_users-create +secondary-nav diff --git a/app/assets/stylesheets/outfits/_edit.sass b/app/assets/stylesheets/outfits/_edit.sass deleted file mode 100644 index e469f49c..00000000 --- a/app/assets/stylesheets/outfits/_edit.sass +++ /dev/null @@ -1,904 +0,0 @@ -@import partials/jquery.jgrowl -@import partials/wardrobe - -@import "partials/context_button" -@import "partials/icon" -@import "partials/outfit" -@import star - -$object-padding: 6px -$nc-icon-size: 16px - -$preview-dimension: 380px -$sidebar-margin: 20px -$sidebar-width: 400px -$sidebar-unit-horizontal-padding: 24px -$sidebar-unit-inner-width: $sidebar-width - $sidebar-unit-horizontal-padding * 2 - -$outfit-thumbnail-size: 0 -$outfit-thumbnail-original-size: 100px -$outfit-thumbnail-margin: 12px -$outfit-header-padding: 24px -$outfit-content-width: $sidebar-unit-inner-width - $outfit-thumbnail-size - $outfit-thumbnail-margin - 32px -$outfit-content-inner-width: $outfit-content-width - $outfit-header-padding - -=active-mode - color: $text-color - font-weight: bold - -=sidebar-navbar-unselected - background: transparent - border-bottom: 1px solid $soft-border-color - font-weight: normal - -=sidebar-navbar-selected - background: white - border-bottom-color: white - font-weight: bold - -=sidebar-view-child - margin: - left: $sidebar-unit-horizontal-padding - right: $sidebar-unit-horizontal-padding - -body.outfits-edit - #preview-toolbar - margin-bottom: .5em - text-align: left - form - +inline-block - margin-right: 2em - #pet-info form - display: inline - #pet-state-form - font-size: 85% - &.hidden - visibility: hidden - #save-outfit-wrapper - float: right - button - display: none - #share-outfit - display: inline-block - &.loading - background: - image: image-url("loading.gif") - position: left center - repeat: no-repeat - padding-left: 20px - #save-outfit, #save-outfit-not-signed-in, #save-current-outfit, #save-outfit-finish - +loud-awesome-button-color - #current-outfit-permalink, #shared-outfit-permalink - display: none - margin-right: .25em - img - +icon - #shared-outfit-url - display: none - width: 15em - #preview - clear: both - #preview-swf - float: left - height: $preview-dimension - margin-bottom: 1em - position: relative - width: $preview-dimension - &.swf-adapter - #preview-image-container - display: none - &.image-adapter - #preview-swf-container - display: none - #preview-image-container - +wardrobe-image-wrapper - position: relative - &, img - height: 100% - width: 100% - #preview-swf-overlay - +opacity(0) - background: black - height: 100% - left: 0 - position: absolute - top: 0 - width: 100% - #preview-images-pending - background: black - background: rgba(0, 0, 0, 0.75) - bottom: 0 - color: white - font-size: 75% - padding: .5em - position: absolute - right: 0 - z-index: 1000 - &.waiting-on-0 - display: none - #preview-mode - margin-right: 1em - position: absolute - right: 100% - text-align: center - top: 0 - width: 7em - &.flash-active - #preview-mode-flash - +active-mode - &.image-active - #preview-mode-image - +active-mode - #preview-mode-note, #report-broken-image - display: block - // Phasing out the image download section. Not confident enough yet to - // *remove* it, depending on user feedback, but that's a TODO for down - // the road if hiding goes well. - // &.can-download - // #preview-download-image - // display: inline-block - #preview-mode-toggle - border-radius: .5em - border: 1px solid $module-border-color - color: $soft-text-color - font-size: 85% - list-style: none - margin: 0 auto .5em - text-align: center - width: 5em - li - border-top: 1px solid $soft-border-color - cursor: pointer - padding: .125em 0 - width: 100% - &:first-child - border-top: 0 - #preview-download-image - display: none - margin: 1em auto - h3 - font-size: 125% - margin-bottom: .5em - ul - list-style: none - button - font-size: 75% - width: 100% - #preview-mode - a - display: block - font-size: 75% - margin-top: .5em - text-align: center - text-decoration: none - width: 100% - em - font-style: normal - text-decoration: underline - #report-broken-image - display: none - - #preview-sidebar - float: left - height: $preview-dimension - margin-left: $sidebar-margin - margin-bottom: 1em - width: $container_width - $preview-dimension - $sidebar-margin - &.viewing-outfits - #preview-closet - display: none - #preview-outfits - display: block - &.sharing - #preview-closet - display: none - #preview-sharing - display: block - .sidebar-view - margin: 1.5em 0 - #preview-closet - ul - text-align: center - .object - background: $module-bg-color - img - +opacity(0.5) - &.worn - background: transparent - img - +opacity(1) - &.no-assets - background: $error-bg-color - color: $error-color - padding-bottom: 1.25em - .no-assets-message - display: block - .no-assets-message - background: $error-bg-color - #080808 - bottom: 0 - color: $error-color - #080808 - cursor: pointer - display: none - font-size: 85% - left: 0 - position: absolute - width: 100% - #no-assets-full-message - border-radius: 5px - background: $error-bg-color + #111111 - border: 1px solid $error-border-color + #111111 - color: $error-color + #111111 - font-size: 75% - left: -9999px - padding: .25em - position: absolute - top: -9999px - width: 30em - #preview-search - border-radius: 8px - border: 1px solid $soft-border-color - box-sizing: border-box - clear: both - margin-bottom: .5em - margin-top: 1em - padding: .25em 1em .25em - text-align: left - h2 - +inline-block - margin: 0 1em 0 0 - input - +inline-block - &[type=submit] - margin-right: 2em - &.advanced - #preview-search-basic - display: none - #preview-search-advanced - display: block - #preview-search-basic-main - clear: both - #preview-search.has-results #preview-search-basic-main, #preview-search-advanced-main - /* don't bounce the header around kthx */ - min-height: 180px - - #preview-search-advanced - display: none - - h2 - margin-right: 2em - - button - margin-right: 4em - - #preview-search-basic-link - font-size: 85% - - #preview-search-advanced-main - padding-left: 2em - - #preview-search-advanced-main > div - +inline-block - box-sizing: border-box - font-size: 87.5% - padding-left: 24px - padding-top: .5em - vertical-align: top - width: 32% - - li.text, li.select - label - +inline-block - - li.text label - display: block - - li.select label - width: 8em - - li.checkbox - list-style: none - margin-left: -24px - - &:nth-of-type(2), &:nth-of-type(3) - li:first-child - margin-bottom: .75em - - #preview-search-advanced-link, label[for=preview-search-autofilter] - +inline-block - font-size: 85% - margin-right: 1em - .preview-search-form-your-items - display: none - font-size: 85% - margin-right: 1em - #preview-search-form-pagination - +inline-block - float: right - margin-top: .5em - a, span - margin: 0 .25em - .current - font-weight: bold - #preview-search-form-loading - display: none - font: - size: 75% - style: italic - margin-left: 2em - #preview-search-form-no-results - display: none - .search-helper - font-family: inherit - .possible-error - display: none - &.big-picture - #preview-toolbar, #preview-sidebar, #preview-search - display: none - &.fullscreen - $fullscreen-search-border: 1px 1px 0 - height: 100% - #container - box-sizing: border-box - height: 100% - margin: 0 auto - min-width: 800px - padding-top: 2.5em - position: relative - width: 80% - #short-url-response - position: static - #preview - width: 100% - #preview-sidebar - float: right - margin: 0 - position: relative - width: $sidebar-width - &.viewing-saving-outfit - height: auto - max-height: 100% - #preview-search - bottom: 1.5em - left: 0 - overflow: auto - position: absolute - width: 100% - #footer - bottom: 0 - left: 0 - padding-top: 0 - position: absolute - width: 100% - ul, li, p, div - display: inline-block - vertical-align: middle - padding: 0 - > ul - margin-right: 2em - > p - margin: 0 - > ul, div, p - margin-top: 6px - - .object - font-size: 85% - padding: $object-padding - position: relative - ul - display: none - left: 0 - list-style: none - position: absolute - top: 0 - li - margin-bottom: .25em - a - +context-button - font-size: 100% - .unwear-item, .uncloset-item - display: none - &.worn - .wear-item - display: none - .unwear-item - display: block - &.closeted - .closet-item - display: none - .uncloset-item - display: block - &:hover - ul, .object-info - display: block - - // the difference between the horizontal edge of the object element and the - // image edge - $object-img-diff: ($object-width - $object-img-size) / 2 + $object-padding - - .nc-icon - background: image-url("nc.png") no-repeat - height: $nc-icon-size - position: absolute - right: $object-img-diff - text-indent: -9999px - top: $object-img-size - $nc-icon-size - width: $nc-icon-size - &:hover - +opacity(0.5) - - .object-info - border-radius: 12px - +opacity(0.75) - background: #aaa - color: #fff - display: none - height: 16px - position: absolute - right: $object-img-diff / 2 - top: 0 - width: 16px - span - font: - family: $text-font - weight: bold - position: relative - top: -2px - &:hover - +opacity(1) - - #preview-outfits - display: none - text-align: left - - $outfit-inner-size: 110px - $outfit-margin: 1px - $outfit-outer-size: $outfit-inner-size + ($outfit-margin * 2) - > ul - +outfits-list - +sidebar-view-child - background: image-url("loading.gif") no-repeat center top - display: none - font-family: $main-font - margin: 0 auto 1em - min-height: 16px - width: $outfit-outer-size * 3 - - &.loaded - background: transparent - - > li - height: $outfit-inner-size - margin: $outfit-margin - width: $outfit-inner-size - - $outfit-header-h-padding: 4px - $outfit-header-v-padding: 2px - $outfit-header-inner-width: $outfit-inner-size - (2 * $outfit-header-h-padding) - $outfit-header-inner-height: 12px - $outfit-header-outer-height: $outfit-header-inner-height + (2 * $outfit-header-v-padding) - header, footer, .outfit-delete-confirmation - font-size: $outfit-header-inner-height - padding: $outfit-header-v-padding $outfit-header-h-padding - width: $outfit-header-inner-width - - header - +opacity(0.75) - bottom: 0 - cursor: pointer - - footer, .outfit-delete-confirmation - display: none - - .outfit-delete-confirmation - +outfit-banner - +outfit-banner-background(rgb(255, 50, 50)) - text-align: center - top: 0 - - span - font-weight: bold - - $outfit-thumbnail-size: 150px - $outfit-thumbnail-h-offset: ($outfit-inner-size - $outfit-thumbnail-size) / 2 - $outfit-thumbnail-v-offset: $outfit-thumbnail-h-offset - ($outfit-header-outer-height / 4) - .outfit-thumbnail-wrapper - +opacity(.5) - background: - image: image-url("small_default.png") - position: center center - size: $outfit-inner-size $outfit-inner-size - cursor: pointer - height: $outfit-thumbnail-size - left: $outfit-thumbnail-h-offset - position: absolute - top: $outfit-thumbnail-v-offset - width: $outfit-thumbnail-size - z-index: 1 - - .outfit-thumbnail - display: none - - .outfit-star - bottom: 0 - margin-right: 4px - - .outfit-delete - float: right - - .outfit-rename-button - float: left - - .outfit-rename-button, .outfit-delete - font-size: 85% - text-decoration: none - - &:hover - text-decoration: underline - - .outfit-rename-form - display: none - - input - background: transparent - border: 1px solid white - width: 6em - - &:hover - header - +opacity(1) - - .outfit-thumbnail-wrapper - +opacity(0.75) - - footer - display: block - - &.active - header - +opacity(1) - font-weight: bold - - .outfit-thumbnail-wrapper - +opacity(1) - - &.confirming-deletion - footer - display: none - - .outfit-delete-confirmation - display: block - - &.renaming - .outfit-name - display: none - - .outfit-rename-form - display: inline - - &.thumbnail-available - background: transparent - - .outfit-thumbnail-wrapper - background-image: none - - .outfit-thumbnail - display: block - - &.loading - .outfit-star - background-image: image-url("loading_outfit_pane.gif") - - #preview-outfits-not-logged-in - text-align: center - - img - width: 100% - border: - color: $module-border-color - style: solid - width: 1px 0 - - figure - display: block - margin: 0 0 1em 0 - padding: 0 - - figcaption - display: block - font-weight: bold - - p - +sidebar-view-child - font-size: 85% - - #preview-outfits-log-in - +awesome-button - +loud-awesome-button-color - - #preview-sharing - display: none - - #preview-sharing-urls - +sidebar-view-child - display: none - margin: - bottom: 1em - top: 1em - - li - display: block - padding: .25em 0 - width: 100% - - label - display: inline-block - font-weight: bold - - input - display: block - width: 100% - - a - display: none - float: right - font-size: 75% - margin-top: .25em - margin-left: 1.5em - text-decoration: none - - &.zeroclipboard-is-active - font-weight: bold - - &.support-download - li a - display: block - - #preview-sharing-url-formats - +sidebar-view-child - user-select: none - // remove whitespace between inline-block elements - display: none - font-size: 0 - text-align: center - - li - +inline-block - - border: 1px solid $module-border-color - border-left-width: 0 - border-right-color: $soft-border-color - color: $soft-text-color - cursor: pointer - font-size: 12px - padding: 0 2em - - &.active - background: $module-bg-color - color: inherit - font-weight: bold - - &:first-child - border-top-left-radius: 5px - border-bottom-left-radius: 5px - border-left-width: 1px - - &:last-child - border-top-right-radius: 5px - border-bottom-right-radius: 5px - border-right-color: $module-border-color - - #preview-sharing-thumbnail-wrapper - border: 1px solid $soft-border-color - display: block - height: 150px - margin: 1em auto 0 - position: relative - width: 150px - - #preview-sharing-thumbnail-loading - height: 100% - left: 0 - position: absolute - top: 0 - width: 100% - - span - color: $soft-text-color - font-size: 85% - margin-top: -0.75em - position: absolute - text-align: center - top: 50% - width: 100% - - #preview-sharing-thumbnail, #preview-sharing-thumbnail-generating - display: none - - #preview-sharing-beta-note - +sidebar-view-child - +warning - font-size: 85% - margin-top: 1em - text-align: center - - &.urls-loaded - #preview-sharing-thumbnail-saving - display: none - - #preview-sharing-urls, #preview-sharing-url-formats, #preview-sharing-thumbnail-generating - display: block - - &.urls-loaded.thumbnail-loaded - #preview-sharing-thumbnail-loading - display: none - - #preview-sharing-thumbnail - display: block - - &.urls-loaded.thumbnail-available - #preview-sharing-thumbnail-loading - +opacity(0.85) - - #preview-sharing-thumbnail - display: block - - .preview-sidebar-nav - float: right - font-size: 85% - margin: - right: $sidebar-unit-horizontal-padding - top: 1em - - $sidebar-border-radius: 10px - $sidebar-navbar-inner-width: $sidebar-width - 2px - $sidebar-navbar-child-outer-width: floor($sidebar-navbar-inner-width / 3) - - #preview-sidebar - #preview-sidebar-navbar-closet - +sidebar-navbar-selected - - &.viewing-outfits, &.sharing - #preview-sidebar-navbar-closet - +sidebar-navbar-unselected - - &.viewing-outfits #preview-sidebar-navbar-outfits, &.sharing #preview-sidebar-navbar-sharing - +sidebar-navbar-selected - - #preview-sidebar-navbar - border-radius: $sidebar-border-radius $sidebar-border-radius 0 0 - +clearfix - +header-text - background: $module-bg-color - border: 1px solid $soft-border-color - border-bottom: 0 - font-size: 150% - - > div - +sidebar-navbar-unselected - cursor: pointer - float: left - border-left: 1px solid $soft-border-color - padding: .5em 0 - text-align: center - width: $sidebar-navbar-child-outer-width - - &:first-child - border-left: 0 - - #preview-sidebar-content - border-radius: 0 0 $sidebar-border-radius $sidebar-border-radius - border: 1px solid $soft-border-color - border-top: 0 - height: 300px - overflow: auto - - #save-success, #save-error, #outfit-not-found, #preview-sidebar-donation-request - +sidebar-view-child - display: none - margin: - top: 1em - text-align: center - - #preview-sidebar-donation-request - +notice - font-size: 85% - padding: 1em - - #preview-sidebar-donation-request-no-thanks - margin-left: 1em - - #save-success - +notice - - #save-error, #outfit-not-found - +error - - #userbar-session-message - +opacity(.5) - display: none - - #new-outfit-name - font: inherit - line-height: 1 - - #pet-type-form, #pet-state-form, #preview-swf, #preview-search - position: relative - - .control-overlay - height: 100% - left: 0 - position: absolute - top: 0 - width: 100% - z-index: 5 - - #preview-sidebar-nav-outfits, #save-outfit-signed-in - display: none - - form#save-outfit-form - +outfit-star-shifted - display: none - margin-right: 0 - padding: 0 - - .outfit-star, input, button - +inline-block - float: none - vertical-align: top - - .outfit-star - margin-top: .25em - - .outfit-url - font-size: 75% - - #preview-search-form-error - +error - padding: .25em .5em - - &.user-signed-in - #preview-sidebar-nav-outfits - display: block - #save-outfit - display: inline-block - #save-outfit-wrapper - &.active-outfit - #save-outfit - display: none - #save-current-outfit, #save-outfit-copy - display: inline-block - // Phasing out permalink. Shared outfit links have been straight-up - // removed, but this may stay depending on user feedback. Otherwise, - // removing it is TODO down the road. - // #current-outfit-permalink - // display: inline-block - &.saving-outfit - #save-outfit-form - display: block - #save-outfit, #save-current-outfit, #save-outfit-copy, #current-outfit-permalink, #shared-outfit-permalink, #share-outfit, #shared-outfit-url - display: none - .preview-search-form-your-items - +inline-block - #preview-outfits-not-logged-in - display: none - #preview-outfits-list - display: block - #advanced-search-log-in-link - display: none - - &.user-not-signed-in - #save-outfit-not-signed-in - display: inline-block - #preview-search-advanced - .must-log-in - color: #aca - - #save-outfit-wrapper.shared-outfit - #shared-outfit-permalink, #shared-outfit-url - display: inline-block - #current-outfit-permalink - display: none !important - - #prank-color-message - display: none - margin: 0 1em diff --git a/app/assets/stylesheets/partials/_assets-list.sass b/app/assets/stylesheets/partials/_assets-list.sass index 05a31fd0..441e7008 100644 --- a/app/assets/stylesheets/partials/_assets-list.sass +++ b/app/assets/stylesheets/partials/_assets-list.sass @@ -1,3 +1,6 @@ +@import "clean/constants" +@import "clean/mixins" + =assets-list li border-radius: .5em diff --git a/app/assets/stylesheets/partials/_campaign-progress.sass b/app/assets/stylesheets/partials/_campaign-progress.sass index f6a37269..9009f12d 100644 --- a/app/assets/stylesheets/partials/_campaign-progress.sass +++ b/app/assets/stylesheets/partials/_campaign-progress.sass @@ -1,3 +1,5 @@ +@import "clean/mixins" + // 2015 campaign blue // $campaign-border-color: #006 // $campaign-background-color: #eef diff --git a/app/assets/stylesheets/partials/_outfit.sass b/app/assets/stylesheets/partials/_outfit.sass index 41d672f6..4e3e2cff 100644 --- a/app/assets/stylesheets/partials/_outfit.sass +++ b/app/assets/stylesheets/partials/_outfit.sass @@ -1,3 +1,5 @@ +@import "clean/constants" +@import "clean/mixins" @import "outfits/star" =outfit diff --git a/app/assets/stylesheets/partials/clean/_mixins.sass b/app/assets/stylesheets/partials/clean/_mixins.sass index 54c4f0f4..e5fa738b 100644 --- a/app/assets/stylesheets/partials/clean/_mixins.sass +++ b/app/assets/stylesheets/partials/clean/_mixins.sass @@ -1,3 +1,5 @@ +@import "constants" + =clearfix overflow: hidden display: inline-block diff --git a/app/assets/stylesheets/pets/_bulk.sass b/app/assets/stylesheets/pets/_bulk.sass index 085d3448..d665d189 100644 --- a/app/assets/stylesheets/pets/_bulk.sass +++ b/app/assets/stylesheets/pets/_bulk.sass @@ -1,3 +1,6 @@ +@import "../partials/clean/constants" +@import "../partials/clean/mixins" + body.pets-bulk #needed-items-form, #bulk-pets-form text-align: center @@ -68,7 +71,17 @@ body.pets-bulk textarea +inline-block - @extend input[type=text] + + // NOTE: This was previously `@extend input[type=text]`, + // I copied it in from _layout.sass! + border-radius: 3px + background: #fff + border: 1px solid $input-border-color + color: $text-color + #444444 + padding: .25em + &:focus, &:active + color: inherit + display: inline font: inherit height: 1.5em @@ -96,10 +109,11 @@ body.pets-bulk &.failed background: $error-bg-color img - @extend .inline-image float: left height: 50px width: 50px + margin-right: 1em + vertical-align: middle &.js .noscript diff --git a/app/assets/stylesheets/print.sass b/app/assets/stylesheets/print.sass deleted file mode 100644 index 5e776f4b..00000000 --- a/app/assets/stylesheets/print.sass +++ /dev/null @@ -1,3 +0,0 @@ -@import blueprint - -+blueprint-print diff --git a/app/assets/stylesheets/static/_image_mode.sass b/app/assets/stylesheets/static/_image_mode.sass index 27d5df1c..5bc7f12d 100644 --- a/app/assets/stylesheets/static/_image_mode.sass +++ b/app/assets/stylesheets/static/_image_mode.sass @@ -1,3 +1,5 @@ +@import "../partials/clean/constants" + body.static-image_mode h2 margin: diff --git a/app/assets/stylesheets/swf_assets/_links.sass b/app/assets/stylesheets/swf_assets/_links.sass index 38b162b3..babe73b7 100644 --- a/app/assets/stylesheets/swf_assets/_links.sass +++ b/app/assets/stylesheets/swf_assets/_links.sass @@ -1,4 +1,4 @@ -@import partials/assets-list +@import "../partials/assets-list" body.swf_assets-links #swf-assets diff --git a/app/assets/stylesheets/users/_top_contributors.sass b/app/assets/stylesheets/users/_top_contributors.sass index 94d41b35..336b8d22 100644 --- a/app/assets/stylesheets/users/_top_contributors.sass +++ b/app/assets/stylesheets/users/_top_contributors.sass @@ -1,3 +1,5 @@ +@import "../partials/clean/constants" + body.users-top_contributors text-align: center diff --git a/vendor/cache/ffi-1.15.5.gem b/vendor/cache/ffi-1.15.5.gem new file mode 100644 index 00000000..a632047f Binary files /dev/null and b/vendor/cache/ffi-1.15.5.gem differ diff --git a/vendor/cache/sass-3.4.25.gem b/vendor/cache/sass-3.4.25.gem deleted file mode 100644 index 9eeb0bc6..00000000 Binary files a/vendor/cache/sass-3.4.25.gem and /dev/null differ diff --git a/vendor/cache/sass-rails-5.0.8.gem b/vendor/cache/sass-rails-5.0.8.gem deleted file mode 100644 index 4d22c136..00000000 Binary files a/vendor/cache/sass-rails-5.0.8.gem and /dev/null differ diff --git a/vendor/cache/sass-rails-6.0.0.gem b/vendor/cache/sass-rails-6.0.0.gem new file mode 100644 index 00000000..89aa8aef Binary files /dev/null and b/vendor/cache/sass-rails-6.0.0.gem differ diff --git a/vendor/cache/sassc-2.4.0.gem b/vendor/cache/sassc-2.4.0.gem new file mode 100644 index 00000000..a8e2e1f2 Binary files /dev/null and b/vendor/cache/sassc-2.4.0.gem differ diff --git a/vendor/cache/sassc-rails-2.1.2.gem b/vendor/cache/sassc-rails-2.1.2.gem new file mode 100644 index 00000000..a599113a Binary files /dev/null and b/vendor/cache/sassc-rails-2.1.2.gem differ diff --git a/vendor/cache/sprockets-3.7.2.gem b/vendor/cache/sprockets-3.7.2.gem deleted file mode 100644 index d74211a2..00000000 Binary files a/vendor/cache/sprockets-3.7.2.gem and /dev/null differ diff --git a/vendor/cache/sprockets-4.2.0.gem b/vendor/cache/sprockets-4.2.0.gem new file mode 100644 index 00000000..efc0662b Binary files /dev/null and b/vendor/cache/sprockets-4.2.0.gem differ