diff options
| author | Simon Knox <psimyn@gmail.com> | 2017-11-02 00:20:59 +0300 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2017-11-02 00:20:59 +0300 |
| commit | ad2d796353d8ba434810694bf11daf867489cbb6 (patch) | |
| tree | 89162b118862eb8552e5095b49fa16f83ba0bcef /app/assets/stylesheets/framework | |
| parent | 8dade803dc64608908019137563e1c6323af0c51 (diff) | |
| parent | e54dd249aa7abcdd2c6c888f45399028cb64bb97 (diff) | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 2518-saved-configuration-for-issue-board
Diffstat (limited to 'app/assets/stylesheets/framework')
| -rw-r--r-- | app/assets/stylesheets/framework/animations.scss | 7 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 9 |
2 files changed, 14 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/animations.scss b/app/assets/stylesheets/framework/animations.scss index 81439c0d2fe..1b944831082 100644 --- a/app/assets/stylesheets/framework/animations.scss +++ b/app/assets/stylesheets/framework/animations.scss @@ -23,11 +23,16 @@ @include webkit-prefix(animation-duration, 2s); } - &.spin { + &.spin-cw { transform-origin: center; animation: spin 4s linear infinite; } + &.spin-ccw { + transform-origin: center; + animation: spin 4s linear infinite reverse; + } + &.flipOutX, &.flipOutY, &.bounceIn, diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index dbd990f84c1..8819a0c20f4 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -209,7 +209,6 @@ padding: 24px 0 0; .nav-links { - justify-content: center; width: 100%; float: none; @@ -217,6 +216,14 @@ float: none; } } + + li:first-child { + margin-left: auto; + } + + li:last-child { + margin-right: auto; + } } .group-info { |