nyastodon/app/javascript/styles/mastodon
Thibaut Girka bf94a43496 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/oauth/authorized_applications_controller.rb
  Two changes too close to each other
- app/controllers/settings/sessions_controller.rb
- app/lib/user_settings_decorator.rb
  Two changes too close to each other
- app/models/media_attachment.rb
  New changes too close to glitch-soc only changes.
- app/models/user.rb
  Two changes too close to each other.
- app/services/remove_status_service.rb
  Kept direct timeline code which had been removed upstream.
- app/views/settings/preferences/show.html.haml
  Two changes too close to each other.
- config/locales/en.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/ja.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/pl.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/simple_form.en.yml
  Introduction of a new string too close to glitch-soc-only's “skin”
- config/locales/simple_form.pl.yml
  Introduction of a new string too close to glitch-soc-only's “skin”
- config/settings.yml
  Reverted upstream's decision of enabling posting application by default.
2019-02-10 21:10:09 +01:00
..
_mixins.scss Allow joining several hashtags in a single column (#8904) 2018-11-05 18:53:25 +01:00
about.scss Apply style for .landing-page strong (#9892) 2019-01-21 20:03:44 +01:00
accessibility.scss Add a few black emojis that are to have a white outline (#8597) 2018-09-10 18:26:47 +02:00
accounts.scss Add featured hashtags to profiles (#9755) 2019-02-04 04:25:59 +01:00
admin.scss Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
basics.scss Separate font-family into variable (#8763) 2018-09-23 20:41:24 +02:00
boost.scss Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
compact_header.scss Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
components.scss Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
containers.scss Fix new hashtag page's items not being full-width on mobile (#9852) 2019-01-18 20:58:11 +01:00
dashboard.scss Redesign admin instances area (#9645) 2019-01-08 13:39:49 +01:00
emoji_picker.scss Adjust emoji-mart-anchor-bar for environments that use display scaling (#7772) 2018-06-09 22:20:57 +02:00
footer.scss Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00
forms.scss Fix slightly cropped font on settings page dropdowns when using system font (#9839) 2019-01-17 23:28:30 +01:00
introduction.scss Add new first-time tutorial (#9531) 2018-12-17 11:07:17 +01:00
lists.scss Restore vanilla components 2017-11-17 19:29:16 -08:00
modal.scss Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
reset.scss Fix Firefox scrollbar color regression in #9210 (#9908) 2019-01-24 13:32:23 +01:00
rtl.scss RTL: fix toot privacy preferences radio buttonss (#9146) 2018-10-30 00:49:29 +01:00
stream_entries.scss undo part of PR 8202 to fix RTL (#8979) 2018-10-15 04:39:20 +02:00
tables.scss Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
variables.scss Separate font-family into variable (#8763) 2018-09-23 20:41:24 +02:00
widgets.scss Add featured hashtags to profiles (#9755) 2019-02-04 04:25:59 +01:00