mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
custom style
This commit is contained in:
parent
2d77a5e767
commit
7c710cd1ff
52
Gemfile.lock
52
Gemfile.lock
@ -79,7 +79,7 @@ GEM
|
||||
cocaine (~> 0.5.3)
|
||||
awrence (1.1.1)
|
||||
aws-eventstream (1.1.0)
|
||||
aws-partitions (1.385.0)
|
||||
aws-partitions (1.388.0)
|
||||
aws-sdk-core (3.109.1)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.239.0)
|
||||
@ -104,10 +104,10 @@ GEM
|
||||
debug_inspector (>= 0.0.1)
|
||||
blurhash (0.1.4)
|
||||
ffi (~> 1.10.0)
|
||||
bootsnap (1.4.8)
|
||||
bootsnap (1.4.9)
|
||||
msgpack (~> 1.0)
|
||||
brakeman (4.10.0)
|
||||
browser (4.2.0)
|
||||
browser (5.1.0)
|
||||
builder (3.2.4)
|
||||
bullet (6.1.0)
|
||||
activesupport (>= 3.0.0)
|
||||
@ -147,7 +147,7 @@ GEM
|
||||
activesupport (>= 4.0)
|
||||
elasticsearch (>= 2.0.0)
|
||||
elasticsearch-dsl
|
||||
chunky_png (1.3.12)
|
||||
chunky_png (1.3.14)
|
||||
cld3 (3.3.0)
|
||||
ffi (>= 1.1.0, < 1.12.0)
|
||||
climate_control (0.2.0)
|
||||
@ -207,12 +207,13 @@ GEM
|
||||
erubi (1.9.0)
|
||||
et-orbi (1.2.4)
|
||||
tzinfo
|
||||
excon (0.76.0)
|
||||
excon (0.78.0)
|
||||
fabrication (2.21.1)
|
||||
faker (2.14.0)
|
||||
i18n (>= 1.6, < 2)
|
||||
faraday (1.0.1)
|
||||
faraday (1.1.0)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
ruby2_keywords
|
||||
fast_blank (1.0.0)
|
||||
fastimage (2.2.0)
|
||||
ffi (1.10.0)
|
||||
@ -232,9 +233,9 @@ GEM
|
||||
fog-json (>= 1.0)
|
||||
ipaddress (>= 0.8)
|
||||
formatador (0.2.5)
|
||||
fugit (1.3.9)
|
||||
fugit (1.4.0)
|
||||
et-orbi (~> 1.1, >= 1.1.8)
|
||||
raabro (~> 1.3)
|
||||
raabro (~> 1.4)
|
||||
fuubar (2.5.0)
|
||||
rspec-core (~> 3.0)
|
||||
ruby-progressbar (~> 1.4)
|
||||
@ -382,7 +383,7 @@ GEM
|
||||
openssl-signature_algorithm (0.4.0)
|
||||
orm_adapter (0.5.0)
|
||||
ox (2.13.4)
|
||||
paperclip (6.0.0)
|
||||
paperclip (6.1.0)
|
||||
activemodel (>= 4.2.0)
|
||||
activesupport (>= 4.2.0)
|
||||
mime-types
|
||||
@ -424,11 +425,11 @@ GEM
|
||||
pry-rails (0.3.9)
|
||||
pry (>= 0.10.4)
|
||||
public_suffix (4.0.6)
|
||||
puma (5.0.2)
|
||||
puma (5.0.4)
|
||||
nio4r (~> 2.0)
|
||||
pundit (2.1.0)
|
||||
activesupport (>= 3.0.0)
|
||||
raabro (1.3.3)
|
||||
raabro (1.4.0)
|
||||
rack (2.2.3)
|
||||
rack-attack (6.3.1)
|
||||
rack (>= 1.0, < 3)
|
||||
@ -463,7 +464,7 @@ GEM
|
||||
rails-i18n (5.1.3)
|
||||
i18n (>= 0.7, < 2)
|
||||
railties (>= 5.0, < 6)
|
||||
rails-settings-cached (0.6.6)
|
||||
rails-settings-cached (0.7.2)
|
||||
rails (>= 4.2.0)
|
||||
railties (5.2.4.4)
|
||||
actionpack (= 5.2.4.4)
|
||||
@ -510,14 +511,14 @@ GEM
|
||||
chunky_png (~> 1.0)
|
||||
rqrcode_core (~> 0.1)
|
||||
rqrcode_core (0.1.2)
|
||||
rspec-core (3.9.3)
|
||||
rspec-support (~> 3.9.3)
|
||||
rspec-expectations (3.9.2)
|
||||
rspec-core (3.10.0)
|
||||
rspec-support (~> 3.10.0)
|
||||
rspec-expectations (3.10.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.9.0)
|
||||
rspec-mocks (3.9.1)
|
||||
rspec-support (~> 3.10.0)
|
||||
rspec-mocks (3.10.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.9.0)
|
||||
rspec-support (~> 3.10.0)
|
||||
rspec-rails (4.0.1)
|
||||
actionpack (>= 4.2)
|
||||
activesupport (>= 4.2)
|
||||
@ -529,7 +530,7 @@ GEM
|
||||
rspec-sidekiq (3.1.0)
|
||||
rspec-core (~> 3.0, >= 3.0.0)
|
||||
sidekiq (>= 2.4.0)
|
||||
rspec-support (3.9.3)
|
||||
rspec-support (3.10.0)
|
||||
rspec_junit_formatter (0.4.1)
|
||||
rspec-core (>= 2, < 4, != 2.12.0)
|
||||
rubocop (0.93.1)
|
||||
@ -541,7 +542,7 @@ GEM
|
||||
rubocop-ast (>= 0.6.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (>= 1.4.0, < 2.0)
|
||||
rubocop-ast (0.8.0)
|
||||
rubocop-ast (1.1.0)
|
||||
parser (>= 2.7.1.5)
|
||||
rubocop-rails (2.8.1)
|
||||
activesupport (>= 4.2.0)
|
||||
@ -550,6 +551,7 @@ GEM
|
||||
ruby-progressbar (1.10.1)
|
||||
ruby-saml (1.11.0)
|
||||
nokogiri (>= 1.5.10)
|
||||
ruby2_keywords (0.0.2)
|
||||
rufus-scheduler (3.6.0)
|
||||
fugit (~> 1.1, >= 1.1.6)
|
||||
safety_net_attestation (0.4.0)
|
||||
@ -573,7 +575,7 @@ GEM
|
||||
sidekiq (>= 3)
|
||||
thwait
|
||||
tilt (>= 1.4.0)
|
||||
sidekiq-unique-jobs (6.0.24)
|
||||
sidekiq-unique-jobs (6.0.25)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.5)
|
||||
sidekiq (>= 4.0, < 7.0)
|
||||
thor (>= 0.20, < 2.0)
|
||||
@ -658,7 +660,7 @@ GEM
|
||||
rack-proxy (>= 0.6.1)
|
||||
railties (>= 5.2)
|
||||
semantic_range (>= 2.3.0)
|
||||
webpush (0.3.8)
|
||||
webpush (1.0.0)
|
||||
hkdf (~> 0.2)
|
||||
jwt (~> 2.0)
|
||||
websocket-driver (0.7.3)
|
||||
@ -802,3 +804,9 @@ DEPENDENCIES
|
||||
webpacker (~> 5.2)
|
||||
webpush
|
||||
xorcist (~> 1.1)
|
||||
|
||||
RUBY VERSION
|
||||
ruby 2.6.6p146
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.4
|
||||
|
||||
@ -70,7 +70,7 @@ class LinkFooter extends React.PureComponent {
|
||||
const shouldWeDisplaySnow = (weekNumber > props.minimumWeekToShowSnow) && props.enableChristmasSnow;
|
||||
|
||||
this.state = {
|
||||
displayMoreLinks : displayMoreLinks,
|
||||
displayMoreLinks : props.displayMoreLinks,
|
||||
enableChristmasSnow: shouldWeDisplaySnow,
|
||||
theme : props.theme,
|
||||
};
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
|
||||
@import 'bliss/reset';
|
||||
@import 'bliss/messaging';
|
||||
@import 'bliss/general_overrides';
|
||||
@import 'bliss/basics';
|
||||
@import 'bliss/containers';
|
||||
@import 'bliss/lists';
|
||||
|
||||
59
app/javascript/styles/bliss/_general_overrides.scss
Normal file
59
app/javascript/styles/bliss/_general_overrides.scss
Normal file
@ -0,0 +1,59 @@
|
||||
.status__content{
|
||||
min-height: 5em;
|
||||
}
|
||||
.status__wrapper{
|
||||
border-left: solid 3px transparent;
|
||||
transition: 0.5s all ease;
|
||||
&:hover{
|
||||
transition: 0.2s all ease;
|
||||
border-left: solid 3px #528dc8;
|
||||
}
|
||||
}
|
||||
|
||||
.detailed-status__wrapper{
|
||||
border-left: solid 3px #528dc8;
|
||||
}
|
||||
.links-started__footer {
|
||||
li {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
a {
|
||||
display: inline-block;
|
||||
padding: .5em;
|
||||
text-decoration: none;
|
||||
|
||||
.fa{
|
||||
margin-right: 1ch;
|
||||
}
|
||||
&:visited {
|
||||
color: #528dc8;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.compose-form {
|
||||
.reply-indicator {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
.account-authorize--more-data {
|
||||
padding: 1em;
|
||||
color: white;
|
||||
margin-bottom: 1em;
|
||||
|
||||
a {
|
||||
margin-right: 1em;
|
||||
padding: 0.5em;
|
||||
color: white;
|
||||
}
|
||||
}
|
||||
.account--panel{
|
||||
margin-top:1em;
|
||||
}
|
||||
.account--panel__button{
|
||||
button{
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
49
db/schema.rb
49
db/schema.rb
@ -249,6 +249,13 @@ ActiveRecord::Schema.define(version: 2020_10_08_220312) do
|
||||
t.bigint "status_ids", array: true
|
||||
end
|
||||
|
||||
create_table "articles", force: :cascade do |t|
|
||||
t.string "title"
|
||||
t.text "text"
|
||||
t.datetime "created_at", null: false
|
||||
t.datetime "updated_at", null: false
|
||||
end
|
||||
|
||||
create_table "backups", force: :cascade do |t|
|
||||
t.bigint "user_id"
|
||||
t.string "dump_file_name"
|
||||
@ -464,12 +471,12 @@ ActiveRecord::Schema.define(version: 2020_10_08_220312) do
|
||||
end
|
||||
|
||||
create_table "ip_blocks", force: :cascade do |t|
|
||||
t.datetime "created_at", null: false
|
||||
t.datetime "updated_at", null: false
|
||||
t.datetime "expires_at"
|
||||
t.inet "ip", default: "0.0.0.0", null: false
|
||||
t.integer "severity", default: 0, null: false
|
||||
t.datetime "expires_at"
|
||||
t.text "comment", default: "", null: false
|
||||
t.datetime "created_at", null: false
|
||||
t.datetime "updated_at", null: false
|
||||
end
|
||||
|
||||
create_table "list_accounts", force: :cascade do |t|
|
||||
@ -520,7 +527,7 @@ ActiveRecord::Schema.define(version: 2020_10_08_220312) do
|
||||
t.integer "file_storage_schema_version"
|
||||
t.string "thumbnail_file_name"
|
||||
t.string "thumbnail_content_type"
|
||||
t.integer "thumbnail_file_size"
|
||||
t.bigint "thumbnail_file_size"
|
||||
t.datetime "thumbnail_updated_at"
|
||||
t.string "thumbnail_remote_url"
|
||||
t.index ["account_id"], name: "index_media_attachments_on_account_id"
|
||||
@ -817,6 +824,30 @@ ActiveRecord::Schema.define(version: 2020_10_08_220312) do
|
||||
t.index ["tag_id", "status_id"], name: "index_statuses_tags_on_tag_id_and_status_id", unique: true
|
||||
end
|
||||
|
||||
create_table "stream_entries", force: :cascade do |t|
|
||||
t.bigint "activity_id"
|
||||
t.string "activity_type"
|
||||
t.datetime "created_at", null: false
|
||||
t.datetime "updated_at", null: false
|
||||
t.boolean "hidden", default: false, null: false
|
||||
t.bigint "account_id"
|
||||
t.index ["account_id", "activity_type", "id"], name: "index_stream_entries_on_account_id_and_activity_type_and_id"
|
||||
t.index ["activity_id", "activity_type"], name: "index_stream_entries_on_activity_id_and_activity_type"
|
||||
end
|
||||
|
||||
create_table "subscriptions", force: :cascade do |t|
|
||||
t.string "callback_url", default: "", null: false
|
||||
t.string "secret"
|
||||
t.datetime "expires_at"
|
||||
t.boolean "confirmed", default: false, null: false
|
||||
t.datetime "created_at", null: false
|
||||
t.datetime "updated_at", null: false
|
||||
t.datetime "last_successful_delivery_at"
|
||||
t.string "domain"
|
||||
t.bigint "account_id", null: false
|
||||
t.index ["account_id", "callback_url"], name: "index_subscriptions_on_account_id_and_callback_url", unique: true
|
||||
end
|
||||
|
||||
create_table "system_keys", force: :cascade do |t|
|
||||
t.binary "key"
|
||||
t.datetime "created_at", null: false
|
||||
@ -855,6 +886,16 @@ ActiveRecord::Schema.define(version: 2020_10_08_220312) do
|
||||
t.index ["domain"], name: "index_unavailable_domains_on_domain", unique: true
|
||||
end
|
||||
|
||||
create_table "user_groups", force: :cascade do |t|
|
||||
t.string "name", null: false
|
||||
t.datetime "createdAt"
|
||||
t.string "visibility"
|
||||
t.integer "account_id"
|
||||
t.integer "creator_id"
|
||||
t.datetime "created_at", null: false
|
||||
t.datetime "updated_at", null: false
|
||||
end
|
||||
|
||||
create_table "user_invite_requests", force: :cascade do |t|
|
||||
t.bigint "user_id"
|
||||
t.text "text"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user