863958ce09
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
7f1a0241c1
Add ability to disable login and mark accounts as memorial ( #5615 )
...
Fix #5597
2017-11-07 19:06:44 +01:00
70726e0f72
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
6c6c67b52b
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
c652eefd3c
Separate Follow/Unfollow and back buttons ( #5496 )
2017-10-27 19:14:11 +02:00
120fc4ef61
Theme: Windows 95
2017-10-26 23:22:48 -07:00
d3db08b69f
Merge remote-tracking branch 'origin/master' into gs-master
2017-10-26 09:18:27 -05:00
e6f7ccb786
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
afe5176ee8
Remove translateZ(0) on modal overlay ( #5478 )
2017-10-26 22:46:50 +09:00
2b753ac54f
Merge remote-tracking branch 'origin/master' into gs-master
2017-10-22 22:57:41 -05:00
067e4e2404
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
1a8b2157d0
Remove unnecessary translateZ(0) when doing scale() ( #5473 )
2017-10-19 18:27:55 +02:00
dd4f9f18cb
Merge tag 'v2.0.0' into gs-master
2017-10-18 11:52:04 -05:00
cd59b66680
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
845b2f4ad9
Fix scrolling of dropdown when offscreen ( #5434 )
2017-10-17 20:38:16 +02:00
24155c5890
Fix unwanted content warning gap in CSS ( #5436 )
...
Fix #5356
2017-10-17 20:07:44 +02:00
26b5013865
Fix dual toot button wrong behavior after compose re-design
2017-10-16 23:32:13 +02:00
c3ded60ec9
rem a comment
2017-10-16 22:12:38 +02:00
f1d386a3ad
double-decker tootbox
2017-10-16 22:10:14 +02:00
ec18363c3b
Merge remote-tracking branch 'origin/master' into gs-master
2017-10-16 01:29:02 -05:00
078319992b
1.6 changed files for unified avatar styling -- updated to restore unity
2017-10-15 21:14:21 -07:00
9aacf21af7
Adjust public hashtag pages ( #5357 )
2017-10-14 14:48:12 +02:00
f92d0bbda4
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
a438c1dc83
Doodle palette, options, fill tool ( #172 )
2017-10-14 00:58:38 +02:00
f1f6d8220a
Initial doodle support
2017-10-13 18:07:01 +02:00
132a22ace5
Merge remote-tracking branch 'upstream/master'
2017-10-11 21:27:17 +02:00
75e036b493
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
02827345ae
Merge upstream 2.0ish #165
2017-10-11 10:43:10 -07:00
4a09a62f98
Center error layout ( #5289 )
2017-10-09 20:51:36 +02:00
2f8dc023a5
improve static page metadata look
2017-10-08 10:46:59 +02:00
8279ea2f54
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
1e7e6413fc
Show buffering in video player ( #5261 )
2017-10-08 02:33:08 +02:00
b98cd0041b
Redesign public hashtag pages ( #5237 )
2017-10-07 20:00:35 +02:00
519c4c446a
Fix custom emoji in emoji picker, persist skin tone ( #5258 )
2017-10-07 19:02:30 +02:00
fb05013855
Basic static metadata styling
2017-10-06 22:22:34 -07:00
d33bc0c04f
Fix overflowing in web UI ( #5246 )
...
* Fix overflowing in web UI
* Revert fixing dropdown menu modal
2017-10-06 20:40:17 +02:00
32998720eb
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
4e822d41b9
adjust public profile pages 2 ( #5223 )
2017-10-04 22:49:36 +02:00
3d8d23515f
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
8d3ff887ab
Add placeholder text color to form of media attachments ( #5196 )
2017-10-03 13:10:57 +02:00
17572438f1
Search popout ( #5170 )
2017-10-02 18:24:05 +02:00
8537845323
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
a6873742e7
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
06ef1b0ac4
Reorganize preferences page ( #5161 )
2017-10-01 10:52:39 +02:00
c74512f7af
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
795e624d5d
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
282a126b3f
Merge remote-tracking branch 'origin/better-themeing' into merging-upstream
2017-09-28 09:20:59 +02:00
0cc795db6b
Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream
2017-09-28 09:18:35 +02:00
914c0465b1
Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream
2017-09-28 09:12:17 +02:00
3398d0e84c
Revert "Merge pull request #149 from glitch-soc/mojon-suggest"
...
This reverts commit b14d2a5ae641832d083e
2017-09-28 08:55:53 +02:00
aac16a82d6
Better themeing support!!
2017-09-25 19:24:32 -07:00
1767f9817c
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
6b0ea1e79c
Generate 500.html with assets:precompile, remove loading from Google Fonts ( #5067 )
2017-09-25 04:04:04 +02:00
9ad1bfbc18
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
ba676acb6e
Change mobile layout breakpoint from 1024px to 630px ( #5063 )
...
630px = Drawer + 1 Column
2017-09-24 01:25:07 +02:00
6a42ddd01c
Dropdown triangles a bit nicer, smoother scrolling on touch ( #5062 )
2017-09-24 00:40:10 +02:00
b8a3a45da1
Fix media gallery CSS ( #5064 )
2017-09-24 00:33:26 +02:00
3b79104d29
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
b65e03fd0f
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
2063f622df
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
da257754b5
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
4a0212bf2f
Add custom emojis to the emoji picker ( #5052 )
2017-09-23 05:40:28 +02:00
16a5d1450c
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
ba7fbb92a7
Remove "extra clickable spaces" made obsolete by status re-design
2017-09-23 00:33:35 +02:00
1325ec8b1d
applied blackle's fix for gallery offset with full-width media
2017-09-22 21:47:14 +02:00
f7810f56a1
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
123d22f3b8
Long display names now ellipsis properly
2017-09-21 16:55:32 -07:00
e1fc279dfd
Styling fixes for header redesign
2017-09-21 16:46:18 -07:00
93bd063524
Merge pull request #148 from glitch-soc/better-header
...
Improvements to status headers and content
2017-09-21 16:11:03 -05:00
77090376ca
fix : mobile style of /about/more ( #5034 )
2017-09-21 14:30:21 +02:00
b14d2a5ae6
Merge pull request #149 from glitch-soc/mojon-suggest
...
Emoji and Hashtag autocomplete
2017-09-20 23:02:23 -04:00
47bc505c25
Fixed notification appearance
2017-09-20 14:52:01 -07:00
0ddaea5d9d
add scrollbar to mojon suggestions list when too long
2017-09-20 21:53:08 +02:00
28e4e7b4a0
Remove unnecessary css property ( #5025 )
2017-09-20 15:26:22 +02:00
76fda20779
Improvements to status headers
2017-09-20 01:57:08 -07:00
7321cea33e
Fixed disabled boost SVG ( #106 )
2017-09-20 00:40:54 -07:00
4e4a803ee3
Fix custom emojis with non-1:1 aspect ratio being stretched ( #5017 )
2017-09-20 03:38:38 +02:00
57c5493d4e
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
6c31ded9f7
Add will-change to improve scrolling perf ( #5001 )
2017-09-18 23:29:15 +02:00
8585421eb1
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
8958d8c131
Re-center hidden media text vertical
2017-09-16 11:44:31 -05:00
b5ec3346fa
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
f55b76afba
Apply white-space: nowrap to account relationships icons
2017-09-14 07:37:39 -05:00
5d43556afd
Break out a separate mute modal with a hide-notifications checkbox.
2017-09-13 21:47:30 -05:00
baa806794f
Give video player fluid max-width ( #4935 )
2017-09-14 04:03:00 +02:00
fbec33df62
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
94fdf7da70
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
017738c604
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
67d9178007
Merge tag 'v1.6.0rc3' into sync/upstream
2017-09-09 14:28:08 -05:00
da3f22ee7d
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
2303725f7d
Add script to make embedded iframes autosize ( #4853 )
2017-09-09 16:23:44 +02:00
c268118e5b
Scrollable tables in settings pages ( #4857 )
...
* Scrollable tables in settings pages
* Add space before curly brace
2017-09-09 02:26:58 +02:00
3c816b0a77
Use <button> instead of <div role="button"> ( #4835 )
2017-09-07 16:18:41 +02:00
d4e8f77a8b
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
3c7f76265c
fix text position of NSFW for video file ( #4819 )
2017-09-06 13:55:47 +02:00
5a27eaae7c
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
6fcb8ac737
fix text position of NSFW in Safari (Mac/iPhone) ( #4570 )
2017-09-02 18:52:56 +02:00
f13b1b67f5
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
5a3e81e963
Add text color style for noscript link ( #4772 )
2017-09-02 14:02:15 +02:00
b4c5d3e0bf
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