diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-31 12:09:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-31 12:09:18 +0300 |
| commit | fe98ad8383b9528553329a2a164173ba52c86168 (patch) | |
| tree | f9b0930f0c00d84904b0159cbe94eb06c034e1de | |
| parent | 8ac8716da0de5da9f63ac81a444fe81287c19b6b (diff) | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | app/assets/javascripts/awards_handler.js | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js index de10d5397df..0e403d023df 100644 --- a/app/assets/javascripts/awards_handler.js +++ b/app/assets/javascripts/awards_handler.js @@ -266,7 +266,7 @@ export class AwardsHandler { top: `${$addBtn.offset().top + $addBtn.outerHeight()}px`, }; // for xs screen we position the element on center - if (bp.getBreakpointSize() === 'xs') { + if (bp.getBreakpointSize() === 'xs' || bp.getBreakpointSize() === 'sm') { css.left = '5%'; } else if (position === 'right') { css.left = `${$addBtn.offset().left - $menu.outerWidth() + 20}px`; diff --git a/package.json b/package.json index e1e0b38c270..6dd3410e4d2 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@babel/plugin-syntax-import-meta": "^7.2.0", "@babel/preset-env": "^7.6.2", "@gitlab/svgs": "^1.88.0", - "@gitlab/ui": "8.8.0", + "@gitlab/ui": "8.10.0", "@gitlab/visual-review-tools": "1.5.1", "@sentry/browser": "^5.10.2", "@sourcegraph/code-host-integration": "^0.0.16", diff --git a/yarn.lock b/yarn.lock index df482045e9d..183053315b1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -737,10 +737,10 @@ resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.88.0.tgz#0a9b72e9591264fcac592ebf9944665c70f48de2" integrity sha512-ZgepCvZoB/lFdgttHtu8+9YlRZlVc9MnHDbbqcQCFBvrfOjY1wq12ikxnNbwKj8QNA47TRJvSS0TkHgMWYnbsA== -"@gitlab/ui@8.8.0": - version "8.8.0" - resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-8.8.0.tgz#c22b4dece89d224c525b3510970f3c61321a6765" - integrity sha512-fjAGSgfau28iq+Uhivc5OPwu3ZLUL25gFuW1rKeQFgnkVEaQ9IRvdM8RD9+kgXWUsccsrafQkz/nOUmp85o8yQ== +"@gitlab/ui@8.10.0": + version "8.10.0" + resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-8.10.0.tgz#885ea8fe695ccff859821bd4ad4cefbea086e3b6" + integrity sha512-bbq+7iiptsNUWtPBQs/ek5uDnkSQ7QGzJwddfZSvQPMuq+50fDSy3Gab1cwvZtSj1fSvAny0ksqbpQl1w+5AgA== dependencies: "@babel/standalone" "^7.0.0" "@gitlab/vue-toasted" "^1.3.0" |