Skip to content
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

Cleaner ui for admin, repo settings, and user settings page (#1269) #1270

Merged
merged 4 commits into from
Mar 15, 2017
Merged

Cleaner ui for admin, repo settings, and user settings page (#1269) #1270

merged 4 commits into from
Mar 15, 2017

Conversation

pgaskin
Copy link
Contributor

@pgaskin pgaskin commented Mar 15, 2017

I will post a video after I test it. https://transfer.sh/EYam0/newui.mp4

Please review this asap, because many templates have been modified, and I do not want any conflicts

\cc @bkcsoft @tboerger @lunny @strk

@tboerger tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 15, 2017
@pgaskin
Copy link
Contributor Author

pgaskin commented Mar 15, 2017

I have tested this throughly.

Also the changes on most templates are quite simple:

  1. Remove the grid and the grid column
  2. Move the navbar include above the container

Why the build failed

It is not my fault, I have tested this.

+ apk -U add openssh-client
fetch http://dl-cdn.alpinelinux.org/alpine/edge/main/x86_64/APKINDEX.tar.gz
ERROR: http://dl-cdn.alpinelinux.org/alpine/edge/main: temporary error (try again later)
WARNING: Ignoring APKINDEX.066df28d.tar.gz: No such file or directory
fetch http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz
ERROR: http://dl-cdn.alpinelinux.org/alpine/edge/community: temporary error (try again later)
WARNING: Ignoring APKINDEX.b53994b4.tar.gz: No such file or directory
fetch http://dl-cdn.alpinelinux.org/alpine/edge/testing/x86_64/APKINDEX.tar.gz
ERROR: http://dl-cdn.alpinelinux.org/alpine/edge/testing: temporary error (try again later)
WARNING: Ignoring APKINDEX.30e6f5af.tar.gz: No such file or directory
ERROR: unsatisfiable constraints:
  openssh-client (missing):
    required by: world[openssh-client]

@bkcsoft
Copy link
Member

bkcsoft commented Mar 15, 2017

LGTM (merge is blocked until alpine fixes their shit 😉 )

@tboerger tboerger added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Mar 15, 2017
@pgaskin
Copy link
Contributor Author

pgaskin commented Mar 15, 2017

A demo server: https://staging.geek1011.tk/ , but it will not always be up, so don't count on it.

@strk
Copy link
Member

strk commented Mar 15, 2017

LGTM

@tboerger tboerger added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Mar 15, 2017
@pgaskin
Copy link
Contributor Author

pgaskin commented Mar 15, 2017

@strk or @bkcsoft Can you merge this now?

@strk
Copy link
Member

strk commented Mar 15, 2017

Only owners can merge it :(

@strk
Copy link
Member

strk commented Mar 15, 2017

Oh, and "team maintainers" (@andreynering and @metalmatze) - I shall note that role (team maintainers) is not mentioned in the CONTRIBUTING file, so it's not really clear how they are elected (please feel free to file an issue to discuss this)

@bkcsoft
Copy link
Member

bkcsoft commented Mar 15, 2017

The owners or the team maintainers may invite the contributor.

@strk That role is mentioned, but not in any length, please make an issue 😉

@bkcsoft bkcsoft merged commit efbb895 into go-gitea:master Mar 15, 2017
@lunny lunny added this to the 1.2.0 milestone Mar 16, 2017
@lunny lunny added type/enhancement An improvement of existing functionality topic/ui Change the appearance of the Gitea UI labels Mar 16, 2017
@lunny
Copy link
Member

lunny commented Mar 16, 2017

fixed #1269

@Fastidious
Copy link

See:

screen shot 2017-03-15 at 21 34 37

Close attention to Organisations.

@pgaskin pgaskin deleted the patch-2 branch March 16, 2017 20:26
@bkcsoft
Copy link
Member

bkcsoft commented Mar 17, 2017

@Fastidious US writes "organisations", UK writes "organizations". #NotABug 😂

@Fastidious
Copy link

Fastidious commented Mar 17, 2017

@bkcsoft sorry, it is about the icon too close to the word (#certainlyabug), not the spelling of it (#ofcoursenotabug).

@plessbd
Copy link

plessbd commented Mar 17, 2017

#offtopic

@bkcsoft you have it backwards, American English: organizations, British English: organisations

http://writingexplained.org/organisation-vs-organization-difference

For a second I thought I had been spelling it "wrong" my whole life, same with grey and gray, I never know which one I am supposed to use...

And don't get me started on Aluminum vs Aluminium

English = Annoying

@Fastidious
Copy link

@plessbd thanks for the contribution. 😂 I wasn’t pointing out the spelling of a word, as explained above, but the fact that the Organizations’s icon is too close to the word itself.

@bkcsoft
Copy link
Member

bkcsoft commented Mar 21, 2017

@Fastidious Ooh that explains it 😆 In any case, I think it's just the icon being broken. Should probably be fixed though 🙂

@pgaskin
Copy link
Contributor Author

pgaskin commented Mar 22, 2017

Speaking of the new ui I did, GitHub just changed their search to a horizontal nav.

@strk
Copy link
Member

strk commented Mar 22, 2017

Damn, we lost the advantage ! :)

@somera somera mentioned this pull request Jan 17, 2020
7 tasks
@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. topic/ui Change the appearance of the Gitea UI type/enhancement An improvement of existing functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants