-
-
Notifications
You must be signed in to change notification settings - Fork 5.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Always use octicon-eye
on watch button
#30288
Conversation
This might appear odd but I think it's the right thing to do: On Github, the "Watch" button always has the open eye icon: <img width="177" alt="Screenshot 2024-04-05 at 08 26 48" src="https://github.com/go-gitea/gitea/assets/115237/0c1188d1-145b-4c6d-909f-2e1460499941"> <img width="179" alt="Screenshot 2024-04-05 at 08 26 40" src="https://github.com/go-gitea/gitea/assets/115237/e29d91fa-f122-4e10-9589-f79c1d612cf9"> On Gitea, while watching, the icon is this and this sometimes confuses me slightly, being used to above: <img width="158" alt="Screenshot 2024-04-05 at 08 29 08" src="https://github.com/go-gitea/gitea/assets/115237/3301021b-744e-409f-a9d8-887ec2772fdc"> After this PR, both states will use the same icon: <img width="145" alt="Screenshot 2024-04-05 at 08 26 27" src="https://github.com/go-gitea/gitea/assets/115237/8addfa5b-c009-4bdb-bfa1-4f3dfaffa4cd"> <img width="161" alt="Screenshot 2024-04-05 at 08 26 33" src="https://github.com/go-gitea/gitea/assets/115237/cef383e6-2cc0-460f-a4d3-83ebb321debe">
Hmm… I'm not sure if this is the correct course of action. |
The text does that for me. Being used to GitHub UI, when I look at the previous button I sometimes think I'm not watching because of the icon. Then I click it and only then it deems me that I was watching. I think the text is enough as an indicator. |
Backport #30288 by @silverwind This might appear odd but I think it's the right thing to do: On Github, the "Watch" button always has the open eye icon: <img width="177" alt="Screenshot 2024-04-05 at 08 26 48" src="https://github.com/go-gitea/gitea/assets/115237/0c1188d1-145b-4c6d-909f-2e1460499941"> <img width="179" alt="Screenshot 2024-04-05 at 08 26 40" src="https://github.com/go-gitea/gitea/assets/115237/e29d91fa-f122-4e10-9589-f79c1d612cf9"> On Gitea, while watching, the icon is this and this sometimes confuses me slightly, being used to above: <img width="158" alt="Screenshot 2024-04-05 at 08 29 08" src="https://github.com/go-gitea/gitea/assets/115237/3301021b-744e-409f-a9d8-887ec2772fdc"> After this PR, both states will use the same icon: <img width="145" alt="Screenshot 2024-04-05 at 08 26 27" src="https://github.com/go-gitea/gitea/assets/115237/8addfa5b-c009-4bdb-bfa1-4f3dfaffa4cd"> <img width="161" alt="Screenshot 2024-04-05 at 08 26 33" src="https://github.com/go-gitea/gitea/assets/115237/cef383e6-2cc0-460f-a4d3-83ebb321debe"> Co-authored-by: silverwind <[email protected]>
* giteaofficial/main: (26 commits) Fix oauth2 builtin application logic (go-gitea#30304) [skip ci] Updated licenses and gitignores Some NuGet package enhancements (go-gitea#30280) Fix and rewrite contrast color calculation, fix project-related bugs (go-gitea#30237) Add `--page-spacing` variable, fix admin dashboard notice (go-gitea#30302) Action view mobile improvements and fixes (go-gitea#30309) Fix checkboxes on mobile view, remove some dead css (go-gitea#30308) Clean up log messages (go-gitea#30313) Fix right-aligned input icons (go-gitea#30301) Refactor startup deprecation messages (go-gitea#30305) [skip ci] Updated translations via Crowdin Remove fomantic list module (go-gitea#30281) Markup color and font size fixes (go-gitea#30282) Fix code block style for code preview (go-gitea#30298) Always use `octicon-eye` on watch button (go-gitea#30288) Fix view commit link (go-gitea#30297) Add gap to commit status details (go-gitea#30284) Update JS dependencies and add new eslint rules (go-gitea#30279) Upgrade `golang.org/x/net` to v0.24.0 (go-gitea#30283) Commit-Dropdown: Show Author of commit if available (go-gitea#30272) ... # Conflicts: # templates/base/footer_content.tmpl
This might appear odd but I think it's the right thing to do: On Github, the "Watch" button always has the open eye icon: <img width="177" alt="Screenshot 2024-04-05 at 08 26 48" src="https://github.com/go-gitea/gitea/assets/115237/0c1188d1-145b-4c6d-909f-2e1460499941"> <img width="179" alt="Screenshot 2024-04-05 at 08 26 40" src="https://github.com/go-gitea/gitea/assets/115237/e29d91fa-f122-4e10-9589-f79c1d612cf9"> On Gitea, while watching, the icon is this and this sometimes confuses me slightly, being used to above: <img width="158" alt="Screenshot 2024-04-05 at 08 29 08" src="https://github.com/go-gitea/gitea/assets/115237/3301021b-744e-409f-a9d8-887ec2772fdc"> After this PR, both states will use the same icon: <img width="145" alt="Screenshot 2024-04-05 at 08 26 27" src="https://github.com/go-gitea/gitea/assets/115237/8addfa5b-c009-4bdb-bfa1-4f3dfaffa4cd"> <img width="161" alt="Screenshot 2024-04-05 at 08 26 33" src="https://github.com/go-gitea/gitea/assets/115237/cef383e6-2cc0-460f-a4d3-83ebb321debe">
Agree to revert. |
We can and should add tooltips or a dialog like GitHub to that button. |
It is but the meaning of the icon should show the current state, not the future state. Before that pr was:
So I could agree to chaning the icon if always shows the current state, not the action. I guess this invertion is what confused me. |
#30503 fixes it. I decided to not introduce the |
Fixes: #30514 Fixes: #30288 (comment) - Fix border-radius regression from #30475 - Fix and simplify hover state - Move the modal HTML so it does not interfere with the CSS - Make the star and unwatch text show on mobile. There is still plenty of space, below is iPhone 12 viewport size <img width="696" alt="Screenshot 2024-04-15 at 20 34 03" src="https://github.com/go-gitea/gitea/assets/115237/af90bb00-4671-4973-a255-8eb44ee6ba8d"> <img width="230" alt="Screenshot 2024-04-15 at 20 31 42" src="https://github.com/go-gitea/gitea/assets/115237/986ef533-7a01-4bb0-8dcd-fd19e4259e84"> <img width="233" alt="Screenshot 2024-04-15 at 20 31 47" src="https://github.com/go-gitea/gitea/assets/115237/5b825dd8-0ccc-4d56-9d8f-774abb935b68"> --------- Co-authored-by: Giteabot <[email protected]>
…ea#30503) Fixes: go-gitea#30514 Fixes: go-gitea#30288 (comment) - Fix border-radius regression from go-gitea#30475 - Fix and simplify hover state - Move the modal HTML so it does not interfere with the CSS - Make the star and unwatch text show on mobile. There is still plenty of space, below is iPhone 12 viewport size <img width="696" alt="Screenshot 2024-04-15 at 20 34 03" src="https://github.com/go-gitea/gitea/assets/115237/af90bb00-4671-4973-a255-8eb44ee6ba8d"> <img width="230" alt="Screenshot 2024-04-15 at 20 31 42" src="https://github.com/go-gitea/gitea/assets/115237/986ef533-7a01-4bb0-8dcd-fd19e4259e84"> <img width="233" alt="Screenshot 2024-04-15 at 20 31 47" src="https://github.com/go-gitea/gitea/assets/115237/5b825dd8-0ccc-4d56-9d8f-774abb935b68"> --------- Co-authored-by: Giteabot <[email protected]>
#30525) Backport of #30503 to v1.22, the only change excluded is the border-radius changes which aren't necessary on this branch because the button css was not migrated. Fixes: #30514 Fixes: #30288 (comment) - Fix border-radius regression from #30475 - Fix and simplify hover state - Move the modal HTML so it does not interfere with the CSS - Make the star and unwatch text show on mobile. There is still plenty of space, below is iPhone 12 viewport size <img width="696" alt="Screenshot 2024-04-15 at 20 34 03" src="https://github.com/go-gitea/gitea/assets/115237/af90bb00-4671-4973-a255-8eb44ee6ba8d"> <img width="230" alt="Screenshot 2024-04-15 at 20 31 42" src="https://github.com/go-gitea/gitea/assets/115237/986ef533-7a01-4bb0-8dcd-fd19e4259e84"> <img width="233" alt="Screenshot 2024-04-15 at 20 31 47" src="https://github.com/go-gitea/gitea/assets/115237/5b825dd8-0ccc-4d56-9d8f-774abb935b68">
This might appear odd but I think it's the right thing to do: On Github, the "Watch" button always has the open eye icon:
On Gitea, while watching, the icon is this and this sometimes confuses me slightly, being used to above:
After this PR, both states will use the same icon: