tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
4,215 Commits 20 Branches 113 Tags 222 MiB
514fc908a3
Commit Graph

253 Commits

Author SHA1 Message Date
David Yip
514fc908a3 Merge tag 'v1.6.0rc3' into sync/upstream 2017-09-09 14:28:08 -05:00
David Yip
b9f7bc149b Merge branch 'origin/master' into sync/upstream 
Conflicts:
	app/javascript/mastodon/components/status_list.js
	app/javascript/mastodon/features/notifications/index.js
	app/javascript/mastodon/features/ui/components/modal_root.js
	app/javascript/mastodon/features/ui/components/onboarding_modal.js
	app/javascript/mastodon/features/ui/index.js
	app/javascript/styles/about.scss
	app/javascript/styles/accounts.scss
	app/javascript/styles/components.scss
	app/presenters/instance_presenter.rb
	app/services/post_status_service.rb
	app/services/reblog_service.rb
	app/views/about/more.html.haml
	app/views/about/show.html.haml
	app/views/accounts/_header.html.haml
	config/webpack/loaders/babel.js
	spec/controllers/api/v1/accounts/credentials_controller_spec.rb
 2017-09-09 14:27:47 -05:00
voidSatisfaction
13ffa3c59e Add Smartphone screen favourite back button and adjust styles (#4813) 
* Feat add get-back button on favourite columnHeader

* Style adjust nice looking get-back button

* Fix delete media query and add padding right

* fix: restore padding and add lastchild style for back-button
 2017-09-06 17:32:15 +02:00
PFM
d8d2a54741 fix text position of NSFW for video file (#4819) 2017-09-06 13:55:47 +02:00
Lynx Kotoura
4c3dd0b254 Adjust status embeds (#4808) 
* Adjust status embeds

Adjust styles of embed code. Adjust styles of embed pages. Fix overflow of embed-modal.

* Remove trailing whitespace

* Using width from the variable
 2017-09-05 12:31:24 +02:00
PFM
2a5d1d5a1b fix text position of NSFW in Safari (Mac/iPhone) (#4570) 2017-09-02 18:52:56 +02:00
Lynx Kotoura
cfe39fb58d Adjust settings pages (#4765) 
* views: Adjust heading positions

* Adjust settings pages

Adjust label. Adjust tables. Adjust admin/reports/* pages. Fix 2FA QR code style for narrow devices. Widen several pages. Increase contrast.

* Remove trailing whitespace
 2017-09-02 15:49:28 +02:00
Yamagishi Kazutoshi
ba8fb2fd0f Add text color style for noscript link (#4772) 2017-09-02 14:02:15 +02:00
Cygnan
a75aa62f5b Adjust padding on the public profile page (#4757) 
* Fix a style issue on the public profile page for some mobile browsers

Signed-off-by: Cygnan <email@cygnan.com>

* Set padding-bottom to 20px

Signed-off-by: Cygnan <email@cygnan.com>
 2017-09-01 21:01:23 +02:00
Eugen Rochko
7dc5035031 Make PreviewCard records reuseable between statuses (#4642) 
* Make PreviewCard records reuseable between statuses

**Warning!** Migration truncates preview_cards tablec

* Allow a wider thumbnail for link preview, display it in horizontal layout (#4648)

* Delete preview cards files before truncating

* Rename old table instead of truncating it

* Add mastodon:maintenance:remove_deprecated_preview_cards

* Ignore deprecated_preview_cards in schema definition

* Fix null behaviour
 2017-09-01 16:20:16 +02:00
Yamagishi Kazutoshi
2305f7c391 Use system's default font on non web UI pages (#4553) 
* Use system's default font on non web UI pages

* Remove import for Redirect
 2017-09-01 16:13:31 +02:00
Eugen Rochko
d1a78eba15 Embed modal (#4748) 
* Embed modal

* Proxy OEmbed requests from web UI
 2017-08-31 03:38:35 +02:00
Eugen Rochko
e95bdec7c5 Update status embeds (#4742) 
- Use statuses controller for embeds instead of stream entries controller
- Prefer /@:username/:id/embed URL for embeds
- Use /@:username as author_url in OEmbed
- Add follow link to embeds which opens web intent in new window
- Use redis cache in development
- Cache entire embed
 2017-08-30 10:23:43 +02:00
Lynx Kotoura
07994eed00 Adjust "signed in as" pages (#4720) 
* Adjust "signed in as" pages


Fix min-width


Set width of .account-header .name

To apply text-overflow and overflow settings
Set overflow for detailed-status__display-name

* Remove trailing whitespace
 2017-08-28 00:01:07 +02:00
Lynx Kotoura
bab9afaa09 Adjust public profile pages (#4713) 
* Adjust account-grid in public profiles

Full-width card on mobile UI. Set break-word for long name and ID. Fix margin.

* Reduce padding-bottom of public profiles

* Revive next prev buttons in mobile public profiles

In followers followees pages.

* Revert break-word for username

* Fix overflow of display_name

Need re-setting text-overflow and overflow in display: block;
 2017-08-27 23:59:51 +02:00
Eugen Rochko
26402ee2cb Adjust RTL styles (#4712) 2017-08-27 13:35:18 +02:00
Lynx Kotoura
8ecfdd8795 Set margin between character-counter and compose-form__buttons (#4698) 
For some languages publish translation is long.
 2017-08-26 14:23:20 +02:00
Lynx Kotoura
18f69fb964 Adjust styles of landing pages. (#4682) 
* Adjust about.scss

* Delete trailing whitespace.
 2017-08-25 17:19:35 +02:00
Damien Erambert
f72ed21cd6 Don't load Roboto webfont when system font is used in the app (#4591) 
* Don't load Roboto webfont when system font is used in the app

* remove trailing whitespace
 2017-08-24 19:28:49 +02:00
Lynx Kotoura
143b77e10d Increase contrast in landing pages (#4567) 
* Increase contrast in about and about/more page

* Lighten em color in landing pages

* Increase contrast in landing pages


Fix about.scss
 2017-08-21 21:59:03 +02:00
Eugen Rochko
4cbb638604 Fix visual line-break glitch with .invisible parts of links (#4655) 2017-08-21 17:59:34 +02:00
unarist
f26758dc01 Fix .information-board style for Safari (#4602) 
flex-basis: 0 allows make flexbox smaller than its contents on Safari <10.

https://github.com/philipwalton/flexbugs#1-minimum-content-sizing-of-flex-items-not-honored
 2017-08-20 20:45:44 +02:00
Eugen Rochko
ca7ea1aba9 Redesign public profiles (#4608) 
* Redesign public profiles

* Responsive design

* Change public profile status filtering defaults and add options

- No longer displays private/direct toots even if you are permitted access
- By default omits replies
- "With replies" option
- "Media only" option

* Redesign account grid cards

* Fix style issues
 2017-08-16 17:12:58 +02:00
Clworld
f814661fca Make share intent modal to make "signed in as" shown. (#4611) 
* Make share intent modal to make "signed in as" shown.

* fix glitch on mobile.
 2017-08-16 16:48:44 +02:00
Eugen Rochko
3c6503038e Add protocol handler. Handle follow intents (#4511) 
* Add protocol handler. Handle follow intents

* Add share intent

* Improve code in intents controller

* Adjust share form CSS
 2017-08-14 04:53:31 +02:00
Yamagishi Kazutoshi
d9a1fb134a Fix emoji picker scrollbar style (#4572) 2017-08-10 13:41:12 +02:00
TheInventrix
c9fd6f386c unify short description styling (#4548) 
apply same style class to the About description on both the landing page
and the about/more page
 2017-08-08 01:50:15 +02:00
Ondřej Hruška
4dc0ddc601 fix regression - collapse button not working 2017-08-07 22:46:24 +02:00
Ondřej Hruška
7a1ca8b0df Merge remote-tracking branch 'upstream/master' 2017-08-07 22:43:52 +02:00
Ondřej Hruška
b8791ae79b always put @handles on a new line. undo some needless changes from prev cmmt 2017-08-07 21:59:49 +02:00
Ondřej Hruška
b9a2ceca35 removed ellipsis from .display-name 2017-08-07 21:24:19 +02:00
Lynx Kotoura
a3e53bd442 Adjust tags and accounts page (#4534) 
* Adjust tag and accounts page

* Remove units from 0px paddings
 2017-08-07 20:33:06 +02:00
Sorin Davidoi
8eb6d171e6 feat: Cache status height to avoid expensive renders (#4439) 
* feat: Cache status height to avoid expensive renders

* feat: Escape content and emojify in reducers

* fix(css): Remove backface-visibility: hidden from .scrollable

* fix(statuses): Avoid creating DOMParses inside a loop
 2017-08-07 20:32:03 +02:00
Eugen Rochko
df605f0f8b Add "signed in as" header to some pages (#4523) 2017-08-05 04:24:58 +02:00
unarist
94e233e7b2 Fix column-back-button style for some browsers (#4484) 
Use `text-align: unset` instead of `text-align: start` which Edge doesn't support for now.

Also remove default margin on Safari.
 2017-08-02 13:09:37 +02:00
kibigo!
8150689b48 Merge upstream (#111) 2017-08-01 13:20:29 -07:00
Yamagishi Kazutoshi
8ccb3b96ab Re-add outline (#4474) 
* Re-add outline

* respect default of web browser
 2017-08-01 01:40:31 +02:00
unarist
82b4cf4acb Fix button overflow on confirmation modal for mobile (#4465) 2017-07-31 15:19:30 +02:00
Yamagishi Kazutoshi
bb85043f46 Disable sensitive button when with content warnings (#4460) 2017-07-31 05:06:56 +02:00
Sorin Davidoi
e44f03bc71 Improve accessibility (part 7) (#4457) 
* fix(media_modal): Keyboard navigation

* fix(column_back_button): Use native button

* fix(media_gallery): Keyboard navigation

* fix(status_content): Make CW content focusable
 2017-07-31 00:18:15 +02:00
Gô Shoemake
b61e3daf98 Multiple frontend support (#110) 
* Initial multiple frontend support

* Removed unnecessary require()

* Moved styles/images out of common
 2017-07-30 19:28:21 +02:00
Ondřej Hruška
6ff084dbbb Improved notifications cleaning UI with set operations (#109) 
* added notification cleaning drawer

* bugfix

* fully implemented set operations for notif cleaning

* i18n for notif cleaning drawer & improved logic slightly. Also added a confirm dialog

* - notif dismiss "overlay" now shoves the notif aside to avoid overlap
- added focus ring to header buttons
- removed notif overlay entirely from DOM if mode is disabled

* removed comment

* CSS tuning - inconsistent division lines fix
 2017-07-30 12:36:28 -04:00
Yamagishi Kazutoshi
29abc9438c Remove outline from focused toot (#4448) 
* Remove outline from focused toot

* change style
 2017-07-30 16:27:51 +02:00
Yamagishi Kazutoshi
f91284d230 Do not create empty a element when there is no e-mail (#4455) 
Empty a element is created when there is no business e-mail input.
 2017-07-30 16:24:18 +02:00
Lynx Kotoura
ea33cdc30b Set contact address in about/more as mailto link (#4450) 
* Set contact address as mailto link

To be able to copy long email address

* Set style for mailto link
 2017-07-30 12:56:04 +02:00
Damien Erambert
ea144ba302 Use a fainted text color for <hr> elements in the landing page (#4443) 
* Use a fainted text color for <hr> elements in the landing page

* remove trailing whitespace
 2017-07-29 21:20:52 +02:00
Eugen Rochko
b3c44e95a9 Improve actions modal style (#4423) 2017-07-28 15:30:53 +02:00
Lynx Kotoura
afb593b44e Fix protruded infomation board section in about/more page (#4415) 
* Fix protruded infomation board section

Set "flexwrap: wrap" for sections. Set upper and lower padding for each section, and adjust clearances around sections accordingly. Settings for viewport threshold 500px is no more needed.

* Fix mistake of reducing information-board padding

In according with this fix, additional padding setting  for maximum 840px width is no more needed.
 2017-07-28 13:34:44 +02:00
Sorin Davidoi
296bfa23aa fix(actions-modal): Inconsistent margins (#4418) 2017-07-28 13:34:06 +02:00
Yamagishi Kazutoshi
62a9da62a6 Fix column header in landing page (regression from #4405) (#4416) 2017-07-28 13:32:41 +02:00