3f16caaa50
Eliminate space around emoji ( #5474 )
...
* Eliminate space around emoji
* More improve emoji style
* Make more compatible with Twemoji
* Make scss-lint happy
* Make not modify normal emoji's behavior
* Decrease status__action-bar's margin-top to 5px
* Make the test be passed
* Revert "Make the test be passed"
This reverts commit 54a8c60e5907ef20a5ceb5ab2c86a933e06f3ece.
* Revert "Make not modify normal emoji's behavior"
This reverts commit 6a5bdf0c11df16ebd190cb3ab9d2e8f1349f435a.
2017-11-07 19:09:53 +01:00
1032f3994f
Add ability to disable login and mark accounts as memorial ( #5615 )
...
Fix #5597
2017-11-07 19:06:44 +01:00
8abe9e9058
don't display any descendants of .invisible ( #5567 )
...
* don't display any descendants of .invisible
* reduce the scope of selector
* remove some rules for image
* lint
2017-11-05 13:05:50 +01:00
512feab222
Add margin to account for Edge disappearing scrollbar ( #5522 )
...
* Add margin to account for Edge disappearing scrollbar
* Fix 16px margin for DMs and horizontal line
2017-10-30 00:11:32 +09:00
3e9236b343
Separate Follow/Unfollow and back buttons ( #5496 )
2017-10-27 19:14:11 +02:00
2827f852c0
Theme: Windows 95
2017-10-26 23:22:48 -07:00
dd28b94cf0
Merge remote-tracking branch 'origin/master' into gs-master
2017-10-26 09:18:27 -05:00
d556be2968
Fix column design broken with very long title ( #5493 )
...
* Fix #5314
* fix not beautiful code
* fix broken design with mobile view
* remove no longer needed code
2017-10-26 22:52:48 +09:00
02f7f3619a
Remove translateZ(0) on modal overlay ( #5478 )
2017-10-26 22:46:50 +09:00
4f01e6e8d5
Merge remote-tracking branch 'origin/master' into gs-master
2017-10-22 22:57:41 -05:00
d589dd7cd0
Compose buttons bar redesign + generalize dropdown ( #194 )
...
* Generalize compose dropdown for re-use
* wip stuffs
* new tootbox look and removed old doodle button files
* use the house icon for ...
2017-10-21 20:24:53 +02:00
8392ddbf87
Remove unnecessary translateZ(0) when doing scale() ( #5473 )
2017-10-19 18:27:55 +02:00
42e8c8eb0e
Merge tag 'v2.0.0' into gs-master
2017-10-18 11:52:04 -05:00
6e54719474
Make theme directory and Rename application.scss ( #5336 )
...
* Rename application.scss
* Move to 'default' directory
* Follow review
Move directory, and Rename "mastodon".
* Revert rename
* undo removal of newline
2017-10-18 05:20:07 +09:00
8b22a63ab0
Fix scrolling of dropdown when offscreen ( #5434 )
2017-10-17 20:38:16 +02:00
05686cc99d
Fix unwanted content warning gap in CSS ( #5436 )
...
Fix #5356
2017-10-17 20:07:44 +02:00
4421f6598f
Fix dual toot button wrong behavior after compose re-design
2017-10-16 23:32:13 +02:00
3d7de06db4
rem a comment
2017-10-16 22:12:38 +02:00
26f08f0791
double-decker tootbox
2017-10-16 22:10:14 +02:00
6cd5b3bbe5
Merge remote-tracking branch 'origin/master' into gs-master
2017-10-16 01:29:02 -05:00
56094cb4bd
1.6 changed files for unified avatar styling -- updated to restore unity
2017-10-15 21:14:21 -07:00
b3b4b5a2eb
Adjust public hashtag pages ( #5357 )
2017-10-14 14:48:12 +02:00
cdc22d23b9
Doodle improvements 2 ( #176 )
...
* Fix some doodle bugs and added Background color functionality
* added protections against accidental doodle erase, screen size changing
* resolve react warning about 'selected' on <option>
2017-10-14 12:24:35 +02:00
531dadad86
Doodle palette, options, fill tool ( #172 )
2017-10-14 00:58:38 +02:00
33e806217f
Initial doodle support
2017-10-13 18:07:01 +02:00
0bf9261e65
Merge remote-tracking branch 'upstream/master'
2017-10-11 21:27:17 +02:00
07ea625cb2
Fix styles of error pages ( #5335 )
...
Signed-off-by: Lynx Kotoura <admin@sanin.link>
Signed-off-by: Lynx Kotoura <admin@sanin.link>
2017-10-11 21:18:45 +02:00
8d6b9ba494
Merge upstream 2.0ish #165
2017-10-11 10:43:10 -07:00
1c6fc0e4ce
Center error layout ( #5289 )
2017-10-09 20:51:36 +02:00
92a3181dc6
improve static page metadata look
2017-10-08 10:46:59 +02:00
684001d729
Dynamically calculate card height for embeds instead of padding ( #5265 )
...
The padding trick was hard-coded to a 16:9 ratio, but we can use
width and height provided from OEmbed information and width
of the card itself to calculate a new height
2017-10-08 02:34:49 +02:00
292f3cd7e0
Show buffering in video player ( #5261 )
2017-10-08 02:33:08 +02:00
f486ef2666
Redesign public hashtag pages ( #5237 )
2017-10-07 20:00:35 +02:00
d2dee6ea43
Fix custom emoji in emoji picker, persist skin tone ( #5258 )
2017-10-07 19:02:30 +02:00
6610d57f91
Basic static metadata styling
2017-10-06 22:22:34 -07:00
5a2c7bd4ce
Fix overflowing in web UI ( #5246 )
...
* Fix overflowing in web UI
* Revert fixing dropdown menu modal
2017-10-06 20:40:17 +02:00
7db0f8dcb2
Implement hotkeys for web UI ( #5164 )
...
* Fix #2102 - Implement hotkeys
Hotkeys on status list:
- r to reply
- m to mention author
- f to favourite
- b to boost
- enter to open status
- p to open author's profile
- up or k to move up in the list
- down or j to move down in the list
- 1-9 to focus a status in one of the columns
- n to focus the compose textarea
- alt+n to start a brand new toot
- backspace to navigate back
* Add navigational hotkeys
The key g followed by:
- s: start
- h: home
- n: notifications
- l: local timeline
- t: federated timeline
- f: favourites
- u: own profile
- p: pinned toots
- b: blocked users
- m: muted users
* Add hotkey for focusing search, make escape un-focus compose/search
* Fix focusing notifications column, fix hotkeys in compose textarea
2017-10-06 01:07:59 +02:00
32e8a87830
adjust public profile pages 2 ( #5223 )
2017-10-04 22:49:36 +02:00
875d943c18
Add pagination in media modal ( #4343 )
...
* Add pagination in media modal
* Change array name
* Add an element class
* Avoid nested class
* Pull out the active class
* Use map instead of forEach
* Remove parentheses
2017-10-03 17:11:22 +02:00
ecacb15cd5
Add placeholder text color to form of media attachments ( #5196 )
2017-10-03 13:10:57 +02:00
4453c9a9f5
Search popout ( #5170 )
2017-10-02 18:24:05 +02:00
c567c87453
Toggle contain:strict on fullscreen ( #5159 )
...
* Toggle contain:strict on fullscreen
* Fix scss lint issue
* fix scss whitespace lint issue
2017-10-02 03:01:01 +02:00
cdad7977fc
Improve privacy dropdown, remove react-simple-dropdown dependency ( #5140 )
...
* Improve privacy dropdown, remove react-simple-dropdown dependency
* Animate privacy warning
* Fix react-router-scroll
2017-10-01 12:20:00 +02:00
0b3f1ec62a
Reorganize preferences page ( #5161 )
2017-10-01 10:52:39 +02:00
6e0659c838
Improve performance of modal and swipe animations ( #5135 )
...
* Improve performance of modal and swipe animations
* Fix eslint issues
2017-09-28 20:43:18 +02:00
4ec1771165
Add ability to specify alternative text for media attachments ( #5123 )
...
* Fix #117 - Add ability to specify alternative text for media attachments
- POST /api/v1/media accepts `description` straight away
- PUT /api/v1/media/:id to update `description` (only for unattached ones)
- Serialized as `name` of Document object in ActivityPub
- Uploads form adjusted for better performance and description input
* Add tests
* Change undo button blend mode to difference
2017-09-28 15:31:31 +02:00
daad07b1d5
Merge remote-tracking branch 'origin/better-themeing' into merging-upstream
2017-09-28 09:20:59 +02:00
83bda6c1a8
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
2017-09-28 09:18:35 +02:00
9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
2017-09-28 09:12:17 +02:00
8a24ad5828
Revert "Merge pull request #149 from glitch-soc/mojon-suggest"
...
This reverts commit fa3587645d15c9c2fd7e
2017-09-28 08:55:53 +02:00
86e617a839
Better themeing support!!
2017-09-25 19:24:32 -07:00
3b60832214
New error page graphic. Other error page improvements ( #5099 )
...
- 500.html generated with admin-set default locale if set
- Error page `<title>` includes Mastodon site title
- 500 title changed to "This page is not
correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A >)
- 500 content appended with "on our end" to make clear it's
not user's fault
2017-09-25 23:05:54 +02:00
2c8e3fbbfb
Generate 500.html with assets:precompile, remove loading from Google Fonts ( #5067 )
2017-09-25 04:04:04 +02:00
2f079573ed
In detail status view, display attachment uncropped if there's only one ( #5054 )
...
* In detail status view, display attachment uncropped if there's only one
* Make media spoiler the size of the media it hides, enable on static
2017-09-24 05:58:30 +02:00
dae0af1fd2
Change mobile layout breakpoint from 1024px to 630px ( #5063 )
...
630px = Drawer + 1 Column
2017-09-24 01:25:07 +02:00
5b8d0ad71b
Dropdown triangles a bit nicer, smoother scrolling on touch ( #5062 )
2017-09-24 00:40:10 +02:00
233258c61b
Fix media gallery CSS ( #5064 )
2017-09-24 00:33:26 +02:00
1924a71b5a
Make secondary toot button work nicer with file attachments & revert to the original behavior if it's disabled
2017-09-23 23:38:24 +02:00
67f8277526
Add secondary toot button (opt-in) ( #153 )
...
Add secondary toot button + other toot button enhancements.
Squashing so it's easy to revert if needed.
2017-09-23 23:11:02 +02:00
838f255fc2
Fix overflowing tabs in account__action-bar ( #5056 )
...
* Fix numbers in accounts columns
* Support edge compact-header
2017-09-23 21:06:16 +02:00
1e02ba111a
Add emoji autosuggest ( #5053 )
...
* Add emoji autosuggest
Some credit goes to glitch-soc/mastodon#149
* Remove server-side shortcode->unicode conversion
* Insert shortcode when suggestion is custom emoji
* Remove remnant of server-side emojis
* Update style of autosuggestions
* Fix wrong emoji filenames generated in autosuggest item
* Do not lazy load emoji picker, as that no longer works
* Fix custom emoji autosuggest
* Fix multiple "Custom" categories getting added to emoji index, only add once
2017-09-23 14:47:32 +02:00
66126f3021
Add custom emojis to the emoji picker ( #5052 )
2017-09-23 05:40:28 +02:00
846cd4e838
Switch from EmojiOne to Twemoji, different emoji picker ( #5046 )
...
* Switch from EmojiOne to Twemoji, different emoji picker
* Make emoji-mart use a local spritesheet
* Fix emojify test
* yarn manage:translations
2017-09-23 01:41:00 +02:00
169d83f532
Remove "extra clickable spaces" made obsolete by status re-design
2017-09-23 00:33:35 +02:00
31dd261375
applied blackle's fix for gallery offset with full-width media
2017-09-22 21:47:14 +02:00
034fab39ab
Make dropdowns render into portal, expand animation ( #5018 )
...
* Make dropdowns render into portal, expand animation
* Improve actions modal style
2017-09-22 04:59:17 +02:00
c2b479efec
Long display names now ellipsis properly
2017-09-21 16:55:32 -07:00
a94dc21c79
Styling fixes for header redesign
2017-09-21 16:46:18 -07:00
9512db920c
Merge pull request #148 from glitch-soc/better-header
...
Improvements to status headers and content
2017-09-21 16:11:03 -05:00
63819c848d
fix : mobile style of /about/more ( #5034 )
2017-09-21 14:30:21 +02:00
fa3587645d
Merge pull request #149 from glitch-soc/mojon-suggest
...
Emoji and Hashtag autocomplete
2017-09-20 23:02:23 -04:00
9ed51cecd0
Fixed notification appearance
2017-09-20 14:52:01 -07:00
cbf00168f1
add scrollbar to mojon suggestions list when too long
2017-09-20 21:53:08 +02:00
8cb4561145
Remove unnecessary css property ( #5025 )
2017-09-20 15:26:22 +02:00
769f62d96f
Improvements to status headers
2017-09-20 01:57:08 -07:00
003bfd094e
Fixed disabled boost SVG ( #106 )
2017-09-20 00:40:54 -07:00
b35406b700
Fix custom emojis with non-1:1 aspect ratio being stretched ( #5017 )
2017-09-20 03:38:38 +02:00
4aea3f88a6
Hide sensitive image in default on the public pages ( #5009 )
...
Additionally, this restores previous background / text color for media spoiler.
2017-09-19 16:03:45 +02:00
3d640dc8ac
Add will-change to improve scrolling perf ( #5001 )
2017-09-18 23:29:15 +02:00
4c14ff659b
Oauth code in input form and add description message ( #4986 )
...
* Oauth code in a input form and add description
* New authcode description
2017-09-17 15:23:44 +02:00
b0487488a7
Re-center hidden media text vertical
2017-09-16 11:44:31 -05:00
1e3b1d7211
Adjust landing pages 2 ( #4967 )
...
* Adjust landing pages 2
Fix styles of terms page
Remove action buttons from timeline in about page
Adjust styles of short description
Adjust form inputs
Set autocomplete off for username and email box in registration form. Remove line breakings.
* Revert removing action buttons
2017-09-16 18:39:11 +02:00
7ebd6ed03c
Apply white-space: nowrap to account relationships icons
2017-09-14 07:37:39 -05:00
4612f7caea
Break out a separate mute modal with a hide-notifications checkbox.
2017-09-13 21:47:30 -05:00
4f0597d579
Give video player fluid max-width ( #4935 )
2017-09-14 04:03:00 +02:00
2bbf987a0a
Redesign video player ( #4911 )
...
* Redesign video player
* Use new video player on static public pages too
* Use media gallery component on static public pages too
* Pause video when hiding it
* Full-screen sizing on WebKit
* Add aria labels to video player buttons
* Display link card on public status page
* Fix fullscreen from modal sizing issue
* Remove contain: strict property to fix fullscreen from columns
2017-09-14 03:39:10 +02:00
af10c9fbff
Add section for protocol specific information on the admin page ( #4910 )
...
This PR adds section for protocol specific information, then always show
both of OStatus and ActivityPub. Specifically, this will help admins to
check PuSH subscription status and unsubscribe manually, even `protocol`
has been changed.
This also includes below changes:
* Add `overflow: hidden` to prevent float leaking
* Add missing fields for ActivityPub
2017-09-12 23:06:10 +02:00
67ad453373
Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
...
Conflicts:
app/javascript/mastodon/features/getting_started/index.js
app/javascript/packs/public.js
app/javascript/styles/components.scss
2017-09-09 23:56:21 -05:00
514fc908a3
Merge tag 'v1.6.0rc3' into sync/upstream
2017-09-09 14:28:08 -05:00
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
6867681c7c
Add script to make embedded iframes autosize ( #4853 )
2017-09-09 16:23:44 +02:00
3c45d3963a
Scrollable tables in settings pages ( #4857 )
...
* Scrollable tables in settings pages
* Add space before curly brace
2017-09-09 02:26:58 +02:00
7d853b514a
Use <button> instead of <div role="button"> ( #4835 )
2017-09-07 16:18:41 +02:00
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
d8d2a54741
fix text position of NSFW for video file ( #4819 )
2017-09-06 13:55:47 +02:00
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
2a5d1d5a1b
fix text position of NSFW in Safari (Mac/iPhone) ( #4570 )
2017-09-02 18:52:56 +02:00
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
ba8fb2fd0f
Add text color style for noscript link ( #4772 )
2017-09-02 14:02:15 +02:00
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
nullkal
Eugen Rochko
MIYAGI Hikaru
Nolan Lawson
Herbert Kagumba
Andrew
David Yip
りんすき
Ondřej Hruška
YaQ
Matthew Walsh
Lynx Kotoura
kibigo!
PFM
Yamagishi Kazutoshi
syui
beatrix
TomoyaShibata
unarist
Lynx Kotoura
Surinna Curtis
voidSatisfaction
Cygnan