Whitelist fixes
parent
d8a41ae155
commit
becd1521b5
|
@ -3,3 +3,6 @@
|
|||
import 'font-awesome/css/font-awesome.css';
|
||||
|
||||
require.context('../images/', true);
|
||||
|
||||
//awoo customization
|
||||
import 'styles/whitelist.scss';
|
||||
|
|
|
@ -24,5 +24,3 @@
|
|||
@import 'mastodon/dashboard';
|
||||
@import 'mastodon/rtl';
|
||||
@import 'mastodon/accessibility';
|
||||
|
||||
@import 'whitelist.scss';
|
|
@ -88,5 +88,3 @@
|
|||
margin: 0 !important
|
||||
}
|
||||
}
|
||||
|
||||
@import 'whitelist.scss';
|
|
@ -1,15 +1,15 @@
|
|||
#whitelist {
|
||||
ul {
|
||||
columns: 3 250px;
|
||||
}
|
||||
ul {
|
||||
columns: 3 250px;
|
||||
}
|
||||
}
|
||||
|
||||
#whitelist-column {
|
||||
grid-row: 4;
|
||||
}
|
||||
|
||||
@media screen and (max-width: 415px) {
|
||||
#whitelist-column {
|
||||
grid-row: 4;
|
||||
grid-row: 5;
|
||||
}
|
||||
|
||||
@media screen and (max-width: 415px) {
|
||||
#whitelist-column {
|
||||
grid-row: 5;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -14,8 +14,7 @@ class DomainWhitelist < ApplicationRecord
|
|||
end
|
||||
|
||||
def self.silenced?(domain)
|
||||
whitelist = where(domain: domain)
|
||||
whitelist.exists? && whitelist[0].severity == :silence
|
||||
where(domain: domain, severity: silence).exists?
|
||||
end
|
||||
|
||||
before_validation :normalize_domain
|
||||
|
|
|
@ -6,4 +6,5 @@
|
|||
- @instance_presenter.whitelist.each do |site|
|
||||
.whitelist-site
|
||||
%li
|
||||
= link_to site.domain + (DomainWhitelist.silenced?(site.domain) ? ' (silenced)' : ''), 'https://' + site.domain
|
||||
= link_to site.domain, 'https://' + site.domain
|
||||
= raw(AllowDomainService.silenced?(site.domain) ? ' (silenced)' : '')
|
||||
|
|
Loading…
Reference in New Issue