diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-03-15 15:53:42 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-15 15:53:42 +0000 |
| commit | 5c1f6f8cfcc30597ca3f9bea8ab4431049ed1bd6 (patch) | |
| tree | db674a9f4c5e992e6d69cf22af9003af08a1da3f /app/assets/stylesheets/pages/profile.scss | |
| parent | bbfe15491e496bad0b532b9607d3b380c98206c9 (diff) | |
| parent | 1714883107b7b8b8f2ef8c2836acc2866362738e (diff) | |
| download | gitlab-ce-5c1f6f8cfcc30597ca3f9bea8ab4431049ed1bd6.tar.gz | |
Merge branch 'revert-avatar-cropping' into 'master'
Revert the avatar cropping feature
Reverts !2951 since the added 'mini_magick' dependency should be replaced by client-side croppping
See merge request !3223
Diffstat (limited to 'app/assets/stylesheets/pages/profile.scss')
| -rw-r--r-- | app/assets/stylesheets/pages/profile.scss | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index 90094189b55..ecfe0e37c85 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -109,42 +109,6 @@ } } -.modal-profile-crop { - .modal-dialog { - width: 500px; - } - - .modal-body { - p { - display: table; - margin: auto; - overflow: hidden; - } - - img { - display: block; - max-width: 400px; - max-height: 400px; - } - - .cropper-bg { - background: none; - } - - .cropper-crop-box { - box-sizing: content-box; - border: 999px solid transparentize(#ccc, 0.5); - @include transform(translate(-999px, -999px)); - } - } -} - -@media (max-width: 520px) { - .modal-profile-crop .modal-dialog { - width: auto; - } -} - .key-list-item { .key-list-item-info { @media (min-width: $screen-sm-min) { |