IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues 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

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

@ -576,7 +576,7 @@ video {
} }
} }
.open>.dropdown-menu { .open > .dropdown-menu {
display: block; display: block;
} }
@ -591,7 +591,12 @@ video {
.deleted { .deleted {
.topic-body { .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%
);
} }
} }
@ -627,7 +632,7 @@ blockquote {
/* quotes with attribution */ /* quotes with attribution */
.quote { .quote {
&>blockquote { & > blockquote {
.onebox-result { .onebox-result {
background-color: blend-primary-secondary(5%); background-color: blend-primary-secondary(5%);
} }
@ -641,8 +646,8 @@ blockquote {
background: blend-primary-secondary(5%); background: blend-primary-secondary(5%);
border-left: 5px solid $primary-low; border-left: 5px solid $primary-low;
} }
aside.quote>blockquote, aside.quote > blockquote,
aside.quote>.title { aside.quote > .title {
border-left: 0; border-left: 0;
} }
} }
@ -670,17 +675,19 @@ $topic-avatar-width: 45px;
} }
.gap { .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 */ /* hide the reply border above the time gap notices */
.time-gap+.topic-post .topic-body, .time-gap + .topic-post .topic-body,
.time-gap+.topic-post .topic-avatar { .time-gap + .topic-post .topic-avatar {
border-top: none; border-top: none;
} }
.time-gap+.topic-post .embedded-posts.top { .time-gap + .topic-post .embedded-posts.top {
border-bottom: 1px solid $primary-low; border-bottom: 1px solid $primary-low;
} }
@ -739,21 +746,21 @@ $topic-avatar-width: 45px;
line-height: $line-height-medium; line-height: $line-height-medium;
color: $primary; color: $primary;
transition: all linear 0.15s; transition: all linear 0.15s;
&>div { & > div {
margin-left: 26px; margin-left: 26px;
} }
} }
.dropdown-menu li>a:hover, .dropdown-menu li > a:hover,
.dropdown-menu .active>a, .dropdown-menu .active > a,
.dropdown-menu .active>a:hover { .dropdown-menu .active > a:hover {
color: $primary; color: $primary;
text-decoration: none; text-decoration: none;
background-color: $highlight-medium; background-color: $highlight-medium;
} }
.dropdown-menu .disabled>a, .dropdown-menu .disabled > a,
.dropdown-menu .disabled>a:hover { .dropdown-menu .disabled > a:hover {
text-decoration: none; text-decoration: none;
color: $primary; color: $primary;
background-color: $tertiary-low; background-color: $tertiary-low;
@ -766,7 +773,7 @@ $topic-avatar-width: 45px;
font-size: $font-up-2; font-size: $font-up-2;
} }
.open>.dropdown-menu { .open > .dropdown-menu {
display: block; display: block;
clear: both; clear: both;
} }

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

@ -1,6 +1,6 @@
/* hide the reply border above the time gap notices */ /* hide the reply border above the time gap notices */
.time-gap+.topic-post article { .time-gap + .topic-post article {
border-top: none; border-top: none;
} }
@ -61,7 +61,7 @@ span.badge-posts {
line-height: $line-height-medium; line-height: $line-height-medium;
} }
} }
button.like-count+button.toggle-like { button.like-count + button.toggle-like {
padding: 8px 9px 8px 4px; padding: 8px 9px 8px 4px;
} }
} }
@ -195,7 +195,7 @@ a.reply-to-tab {
color: dark-light-choose($primary-high, $secondary-low); color: dark-light-choose($primary-high, $secondary-low);
font-size: $font-up-1; font-size: $font-up-1;
} }
.avatar+a { .avatar + a {
float: left; float: left;
} }
} }
@ -329,7 +329,7 @@ iframe {
display: none; display: none;
} }
.open>.dropdown-menu { .open > .dropdown-menu {
display: block; display: block;
} }
@ -403,7 +403,12 @@ button.select-post {
.deleted { .deleted {
.topic-body { .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']}") @good &&= run_or_fail("eslint --ext .es6 plugins/#{ENV['SINGLE_PLUGIN']}")
puts "Listing prettier offenses in #{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 else
@good &&= run_or_fail("bundle exec rubocop --parallel") unless ENV["SKIP_CORE"] @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"] @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"] unless ENV["SKIP_CORE"]
puts "Listing prettier offenses in 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 end
unless ENV["SKIP_PLUGINS"] unless ENV["SKIP_PLUGINS"]
puts "Listing prettier offenses in 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 end
end end