Fix webpacker SCSS

This commit is contained in:
Kira 2019-11-24 06:18:02 -08:00
parent ab022003d2
commit b11d54a694
6 changed files with 1292 additions and 1024 deletions

View File

@ -25,17 +25,17 @@ div#c-moderator-post-queues {
width: 800px;
}
<% Danbooru.config.modqueue_quality_warning_tags.each do |tag| %>
&[data-tags~="<%= tag %>"] {
background-color: $modqueue-post-quality-warning-background;
}
<% end %>
<% Danbooru.config.modqueue_sample_warning_tags.each do |tag| %>
&[data-tags~="<%= tag %>"] {
background-color: $modqueue-post-sample-warning-background;
}
<% end %>
//<% Danbooru.config.modqueue_quality_warning_tags.each do |tag| %>
// &[data-tags~="<%= tag %>"] {
// background-color: $modqueue-post-quality-warning-background;
// }
//<% end %>
//
//<% Danbooru.config.modqueue_sample_warning_tags.each do |tag| %>
// &[data-tags~="<%= tag %>"] {
// background-color: $modqueue-post-sample-warning-background;
// }
//<% end %>
&[data-tags~=animated], &[data-file-ext=swf], &[data-file-ext=webm], &[data-file-ext=zip], &[data-file-ext=mp4] {
aside:before {

View File

@ -1,9 +1,11 @@
@import "../base/005_vars.scss";
div#c-users {
div#a-home {
.user-greeting { color:$user-home-greeting-color; cursor:help; }
span.user-greeting {
color: $user-home-greeting-color;
cursor: help;
}
div#c-users {
div#a-show {
.profile-container {
display: flex;
@ -57,6 +59,10 @@ div#c-users {
div.profile-stats {
width: 100%;
abbr {
cursor: help;
}
}
table.user-statistics {

View File

@ -7,7 +7,6 @@ require "pathname"
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
Pathname.new(__FILE__).realpath)
require "rubygems"
require "bundler/setup"
require "webpacker"

View File

@ -7,7 +7,6 @@ require "pathname"
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
Pathname.new(__FILE__).realpath)
require "rubygems"
require "bundler/setup"
require "webpacker"

View File

@ -1,7 +1,7 @@
{
"license": "MIT",
"dependencies": {
"@rails/webpacker": "^4.0.7",
"@rails/webpacker": "^4.2.0",
"debug-loader": "^0.0.1",
"expose-loader": "^0.7.5",
"jquery-ui": "^1.12.1",
@ -19,7 +19,7 @@
"eslint": "^5.3.0",
"eslint-loader": "^2.1.0",
"eslint-plugin-ignore-erb": "^0.1.1",
"webpack-dev-server": "^3.7.2"
"webpack-dev-server": "^3.9.0"
},
"scripts": {
"lint": "yarn run eslint --plugin eslint-plugin-ignore-erb --ext .js,.js.erb app/javascript/src/javascripts"

2276
yarn.lock

File diff suppressed because it is too large Load Diff