github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 10:41:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix prettier

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2018-06-18 20:10:48 +02:00 committed by GitHub
parent 6f2c5ea1f2
commit 913d97e780
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/stylesheets/desktop/topic-post.scss
View File

@ -591,7 +591,12 @@ video {
.deleted {
.topic-body {
background-color: dark-light-diff( rgba($danger, 0.7), $secondary, 50%, -60%);
background-color: dark-light-diff(
rgba($danger, 0.7),
$secondary,
50%,
-60%
);
}
}
@ -670,7 +675,9 @@ $topic-avatar-width: 45px;
}
.gap {
width: calc( #{$topic-avatar-width} + #{$topic-body-width} + 2 * #{$topic-body-width-padding});
width: calc(
#{$topic-avatar-width} + #{$topic-body-width} + 2 * #{$topic-body-width-padding}
);
}
/* hide the reply border above the time gap notices */

7
app/assets/stylesheets/mobile/topic-post.scss
View File

@ -403,7 +403,12 @@ button.select-post {
.deleted {
.topic-body {
background-color: dark-light-diff( rgba($danger, 0.7), $secondary, 50%, -60%);
background-color: dark-light-diff(
rgba($danger, 0.7),
$secondary,
50%,
-60%
);
}
}

6
lib/tasks/docker.rake
View File

@ -45,7 +45,7 @@ task 'docker:test' do
@good &&= run_or_fail("eslint --ext .es6 plugins/#{ENV['SINGLE_PLUGIN']}")
puts "Listing prettier offenses in #{ENV['SINGLE_PLUGIN']}:"
@good &&= run_or_fail("prettier --loglevel=debug --list-different 'plugins/#{ENV['SINGLE_PLUGIN']}/**/*.scss' 'plugins/#{ENV['SINGLE_PLUGIN']}/**/*.es6'")
@good &&= run_or_fail("prettier --list-different 'plugins/#{ENV['SINGLE_PLUGIN']}/**/*.scss' 'plugins/#{ENV['SINGLE_PLUGIN']}/**/*.es6'")
else
@good &&= run_or_fail("bundle exec rubocop --parallel") unless ENV["SKIP_CORE"]
@good &&= run_or_fail("eslint app/assets/javascripts test/javascripts") unless ENV["SKIP_CORE"]
@ -53,12 +53,12 @@ task 'docker:test' do
unless ENV["SKIP_CORE"]
puts "Listing prettier offenses in core:"
@good &&= run_or_fail('prettier --loglevel=debug --list-different "app/assets/stylesheets/**/*.scss" "app/assets/javascripts/**/*.es6" "test/javascripts/**/*.es6"')
@good &&= run_or_fail('prettier --list-different "app/assets/stylesheets/**/*.scss" "app/assets/javascripts/**/*.es6" "test/javascripts/**/*.es6"')
end
unless ENV["SKIP_PLUGINS"]
puts "Listing prettier offenses in plugins:"
@good &&= run_or_fail('prettier --loglevel=debug --list-different "plugins/**/*.scss" "plugins/**/*.es6"')
@good &&= run_or_fail('prettier --list-different "plugins/**/*.scss" "plugins/**/*.es6"')
end
end
end