pleroma/pleroma-fe
0
0
Fork 0
Code Issues 343 Pull requests 27 Projects Releases Packages Wiki Activity

Fix styling of ToS panel for consistency #2511

Open
feld wants to merge 1 commit from gitlab-mr-iid-1244 into develop
pull from: gitlab-mr-iid-1244
merge into: pleroma:develop
Conversation 8 Commits 1 Files changed 2 +16 -8
feld commented 2020-10-01 22:33:26 +00:00
Owner
Copy link

#971

#971
feld commented 2020-10-01 22:33:38 +00:00
Author
Owner
Copy link

image

![image](/attachments/1d28fb81-0da0-4550-9251-3ea500128875)
image.png
156 KiB
shpuld commented 2020-10-02 06:35:13 +00:00
Owner
Copy link

I don't know if we want to do this, I don't think everyone uses the tos.html for strictly terms of service, which is why we might not want to hardcode a label for it like that. I can see plenty of people using it for generic about-information and rules more than ToS

I don't know if we want to do this, I don't think everyone uses the tos.html for strictly terms of service, which is why we might not want to hardcode a label for it like that. I can see plenty of people using it for generic about-information and rules more than ToS
shpuld commented 2020-10-02 06:37:21 +00:00
Owner
Copy link

for example, in my instance the panel works in the context of registration and about, but it would look weird with "Terms of Service" above it

image

for example, in my instance the panel works in the context of registration and about, but it would look weird with "Terms of Service" above it ![image](/attachments/3b28eb5d-db0c-4142-ab2b-4354371c507c)
image.png
335 KiB
hj commented 2020-10-02 09:41:26 +00:00
Owner
Copy link

base01-background

did you unearth it from 2017 or something

>`base01-background` did you unearth it from 2017 or something
hj commented 2020-10-02 09:43:24 +00:00
Owner
Copy link

panel-body does not belong within panel-heading

panel-body does not belong within panel-heading
hj commented 2020-10-02 09:46:12 +00:00
Owner
Copy link

I agree with that. I have "terms of service" written within it, but it comes after the logo, so it looks nicer like that. The duplication in @feld's screeshot (terms of service: terms of service: ....) also doesn't look right to me.

I agree with that. I have "terms of service" written within it, but it comes after the logo, so it looks nicer like that. The duplication in @feld's screeshot (terms of service: terms of service: ....) also doesn't look right to me.
feld commented 2020-10-06 16:17:29 +00:00
Author
Owner
Copy link

No, i just followed the template for other panels

No, i just followed the template for other panels
hj commented 2021-02-20 19:32:54 +00:00
Owner
Copy link

@feld ping

@feld ping
This pull request has changes conflicting with the target branch.
  • src/components/terms_of_service_panel/terms_of_service_panel.vue
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin gitlab-mr-iid-1244:gitlab-mr-iid-1244
git switch gitlab-mr-iid-1244

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch develop
git merge --no-ff gitlab-mr-iid-1244
git switch gitlab-mr-iid-1244
git rebase develop
git switch develop
git merge --ff-only gitlab-mr-iid-1244
git switch gitlab-mr-iid-1244
git rebase develop
git switch develop
git merge --no-ff gitlab-mr-iid-1244
git switch develop
git merge --squash gitlab-mr-iid-1244
git switch develop
git merge --ff-only gitlab-mr-iid-1244
git switch develop
git merge gitlab-mr-iid-1244
git push origin develop
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
BE Request

   
Backlog

   
Better behavior

   
Blocked by deps

   
Bug

   
Code Review

   
Discussion

   
Doing

   
Feature Request / Enhancement

   
In the shining bright future maybe

   
It's complicated

   
MS Edge

   
Mememoon (or other niche browsers)

   
Missing API

   
Missing feature

   
Missing l10n/i18n

   
NL1

Instance Admin Dashboard

  
NL2

Improved Mobile Experience

  
NL4

Improved instance customization and QoL options

  
Need to verify on develop

   
RELEASE BLOCKER

   
Reassign or Close

   
Refactor

   
Regression

   
Safari

   
To Do

   
User story

   
Waiting on godot

   
accessibility

https://git.pleroma.social/pleroma/pleroma-fe/-/snippets/7746

  
better documentation

   
chore

   
confirmed

   
easy ticket

   
incident

Denotes a disruption to IT services and the associated issues require immediate attention

  
l10n update

   
mastoapi

   
mobile

   
needs design

   
needs-info

   
needs-review

   
stupid
No labels
BE Request
Backlog
Better behavior
Blocked by deps
Bug
Code Review
Discussion
Doing
Feature Request / Enhancement
In the shining bright future maybe
It's complicated
MS Edge
Mememoon (or other niche browsers)
Missing API
Missing feature
Missing l10n/i18n
NL1
NL2
NL4
Need to verify on develop
RELEASE BLOCKER
Reassign or Close
Refactor
Regression
Safari
To Do
User story
Waiting on godot
accessibility
better documentation
chore
confirmed
easy ticket
incident
l10n update
mastoapi
mobile
needs design
needs-info
needs-review
stupid
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
pleroma/pleroma-fe!2511
No description provided.