Skip to content

improved reconnect error page#872

Closed
iyashwantsaini wants to merge 6 commits intozulip:masterfrom
iyashwantsaini:newbranch
Closed

improved reconnect error page#872
iyashwantsaini wants to merge 6 commits intozulip:masterfrom
iyashwantsaini:newbranch

Conversation

@iyashwantsaini
Copy link
Collaborator

@iyashwantsaini iyashwantsaini commented Feb 26, 2020


What's this PR do?
Improved reconnect error page fixes #862

Any background context you want to provide?
Improved network.html and network.css

Screenshots?
You have tested this PR on:

  • Windows
  • Linux/Ubuntu
  • macOS

@zulipbot zulipbot added size: XL and removed size: L labels Feb 26, 2020
@akashnimare
Copy link
Member

@meyash hey, thanks for the contributing to the project. This looks nice. I think there is still a room for improvements for the content (list items, button alignment). Also, I would suggest please discuss the changes, ask for feedback etc in #desktop stream on https://chat.zulip.org/ and then open a PR. This will save a lot of your time :)

@iyashwantsaini
Copy link
Collaborator Author

@timabbott @vsvipul
request for a review

@akashnimare
Copy link
Member

I think there is still a room for improvements for the content (list items, button alignment)

@meyash can you try out some UI for this? Once done, we can merge this.

@iyashwantsaini
Copy link
Collaborator Author

@akashnimare
I have improved the list and buttons
net

@vsvipul
Copy link
Collaborator

vsvipul commented Feb 29, 2020

@meyash Doesn't look good enough. We need to keep it clean and make it look good simultaneously.

@iyashwantsaini
Copy link
Collaborator Author

@meyash Doesn't look good enough. We need to keep it clean and make it look good simultaneously.

Can you suggest some changes i can make?

@zulipbot
Copy link
Member

zulipbot commented Mar 1, 2020

Heads up @meyash, we just merged some commits that conflict with the changes your made in this pull request! You can review this repository's recent commits to see where the conflicts occur. Please rebase your feature branch against the upstream/master branch and resolve your pull request's merge conflicts accordingly.

@iyashwantsaini
Copy link
Collaborator Author

How can i fix the conflicts?

@vsvipul
Copy link
Collaborator

vsvipul commented Mar 1, 2020

@meyash Read a tutorial online on how to do so. Just google the words on how to do so.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Improve reconnect error page.

4 participants