diff options
author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-02-07 12:48:43 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-02-07 12:48:43 +0000 |
commit | 3c64ad4c85366d2c82d178012f737043ce172334 (patch) | |
tree | 9f33afcd1a558f0db063e4dd3339e983e7cf2a33 /app/assets | |
parent | 6e73c3832e9983226d8fd7a6cc9b06e9ac71b2be (diff) | |
parent | a035bef5ee00ffff4534da89a4f4cd4c012c8f95 (diff) | |
download | gitlab-ce-3c64ad4c85366d2c82d178012f737043ce172334.tar.gz |
Merge branch '56543-project-lists-further-iteration-improvements' into 'master'
Resolve "Project lists: further iteration & improvements"
Closes #56543
See merge request gitlab-org/gitlab-ce!24855
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/pages/dashboard/projects/index.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/pages/explore/projects/index.js | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 17 |
3 files changed, 12 insertions, 9 deletions
diff --git a/app/assets/javascripts/pages/dashboard/projects/index.js b/app/assets/javascripts/pages/dashboard/projects/index.js index 8f98be79640..01001d4f3ff 100644 --- a/app/assets/javascripts/pages/dashboard/projects/index.js +++ b/app/assets/javascripts/pages/dashboard/projects/index.js @@ -1,7 +1,5 @@ import ProjectsList from '~/projects_list'; -import Star from '../../../star'; document.addEventListener('DOMContentLoaded', () => { new ProjectsList(); // eslint-disable-line no-new - new Star('.project-row'); // eslint-disable-line no-new }); diff --git a/app/assets/javascripts/pages/explore/projects/index.js b/app/assets/javascripts/pages/explore/projects/index.js index 8f98be79640..01001d4f3ff 100644 --- a/app/assets/javascripts/pages/explore/projects/index.js +++ b/app/assets/javascripts/pages/explore/projects/index.js @@ -1,7 +1,5 @@ import ProjectsList from '~/projects_list'; -import Star from '../../../star'; document.addEventListener('DOMContentLoaded', () => { new ProjectsList(); // eslint-disable-line no-new - new Star('.project-row'); // eslint-disable-line no-new }); diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 2342c284a5e..3eb02cd4358 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -946,6 +946,11 @@ pre.light-well { .flex-wrapper { min-width: 0; margin-top: -$gl-padding-8; // negative margin required for flex-wrap + flex: 1 1 100%; + + .project-title { + line-height: 20px; + } } p, @@ -984,14 +989,16 @@ pre.light-well { } .controls { - margin-top: $gl-padding-8; + @include media-breakpoint-down(xs) { + margin-top: $gl-padding-8; + } - @include media-breakpoint-down(md) { + @include media-breakpoint-up(sm) { margin-top: 0; } - @include media-breakpoint-down(xs) { - margin-top: $gl-padding-8; + @include media-breakpoint-up(lg) { + flex: 1 1 40%; } .icon-wrapper { @@ -1041,7 +1048,7 @@ pre.light-well { min-height: 40px; min-width: 40px; - .identicon.s64 { + .identicon.s48 { font-size: 16px; } } |