diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-07-20 12:32:05 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-07-20 12:32:05 +0000 |
commit | a920bf3834e870dbc1afabb043c962d26a9c9664 (patch) | |
tree | a4df034c8fdde976bd08eafd598d31e465cb4146 /app/assets/stylesheets | |
parent | 812bb8b4388662e2c471dd689421a64daaededfb (diff) | |
parent | a0838cd955577951c6fd7cf6a1f40814b8bee6f5 (diff) | |
download | gitlab-ce-a920bf3834e870dbc1afabb043c962d26a9c9664.tar.gz |
Merge branch '17810-fork-page-ux-is-outdated' into 'master'
Updated fork page UI
## What does this MR do?
Updates fork page to new UI.
## Are there points in the code the reviewer needs to double check?
:confused:
## Why was this MR needed?
'coz new forks page looks awesome, that's why!
## What are the relevant issue numbers?
Closes #17810.
## Screenshots (if relevant)
![Screen_Shot_2016-07-07_at_03.43.45](/uploads/d4be046d1a6b043f3691633b7ec396c6/Screen_Shot_2016-07-07_at_03.43.45.png)
[youtube video](https://youtu.be/YpXPCxWGCnY)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5007
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 57 |
1 files changed, 46 insertions, 11 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 63853335fb6..cc3aef5199e 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -333,18 +333,53 @@ a.deploy-project-label { } .fork-namespaces { - .fork-thumbnail { - text-align: center; - margin-bottom: $gl-padding; - - .caption { - padding: $gl-padding 0; - min-height: 30px; - } + .row { + -webkit-flex-wrap: wrap; + display: -webkit-flex; + display: flex; + flex-wrap: wrap; + justify-content: flex-start; + + .fork-thumbnail { + @include border-radius($border-radius-base); + background-color: $white-light; + border: 1px solid $border-white-light; + height: 202px; + margin: $gl-padding; + text-align: center; + width: 169px; + &:hover, &.forked { + background-color: $row-hover; + border-color: $row-hover-border; + } + .no-avatar { + width: 100px; + height: 100px; + background-color: $gray-light; + border: 1px solid $gray-dark; + margin: 0 auto; + @include border-radius(50%); + i { + font-size: 100px; + color: $gray-dark; + } + } + a { + display: block; + width: 100%; + height: 100%; + padding-top: $gl-padding; + color: $gl-gray; + .caption { + min-height: 30px; + padding: $gl-padding 0; + } + } - img { - @include border-radius(50%); - max-width: 100px; + img { + @include border-radius(50%); + max-width: 100px; + } } } } |