diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-10 22:45:19 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-10 22:45:19 +0000 |
| commit | 65f2ceb0d0fa4e1fd6633c85a2b155dce95ccc86 (patch) | |
| tree | 9d7a65ece891178212738cd36a1e31fb63dfd2f7 | |
| parent | 13cb9b0e377b066f7bc1af572d09f4055dada749 (diff) | |
| parent | e797f7100d32c5a3089f0c3c934b9bd8d1615e9b (diff) | |
| download | gitlab-ce-65f2ceb0d0fa4e1fd6633c85a2b155dce95ccc86.tar.gz | |
Merge branch '26435-show-project-avatars-on-mobile' into 'master'
Display project avatars on Admin Area and Projects pages for mobile views
See merge request !8506
| -rw-r--r-- | app/assets/stylesheets/framework/mobile.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 16 | ||||
| -rw-r--r-- | changelogs/unreleased/26435-show-project-avatars-on-mobile.yml | 4 |
3 files changed, 20 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/mobile.scss b/app/assets/stylesheets/framework/mobile.scss index 7eb9962ba33..92d687996e9 100644 --- a/app/assets/stylesheets/framework/mobile.scss +++ b/app/assets/stylesheets/framework/mobile.scss @@ -37,10 +37,6 @@ display: none; } - .project-avatar { - display: none; - } - .project-home-panel { padding-left: 0 !important; diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index e30d73886e1..9455ba3b98a 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -587,11 +587,21 @@ pre.light-well { .project-full-name { @include str-truncated; + + @media (max-width: $screen-xs-max) { + max-width: 50%; + } } .controls { line-height: $list-text-height; + .badge { + @media (max-width: $screen-xs-max) { + display: none; + } + } + a:hover { text-decoration: none; } @@ -605,6 +615,12 @@ pre.light-well { top: 2px; } } + + .description p { + @media (max-width: $screen-xs-max) { + max-width: 50%; + } + } } .bottom { diff --git a/changelogs/unreleased/26435-show-project-avatars-on-mobile.yml b/changelogs/unreleased/26435-show-project-avatars-on-mobile.yml new file mode 100644 index 00000000000..43afdf45013 --- /dev/null +++ b/changelogs/unreleased/26435-show-project-avatars-on-mobile.yml @@ -0,0 +1,4 @@ +--- +title: Display project avatars on Admin Area and Projects pages for mobile views +merge_request: +author: Ryan Harris |