diff options
author | Phil Hughes <me@iamphill.com> | 2019-03-25 14:13:23 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-03-25 14:13:23 +0000 |
commit | 1f1e965be6bbc89f71984ce07fbf1b98d606c184 (patch) | |
tree | 9e0cc91ddb7b5919078651b5eeb15cf8b0e6cf1d | |
parent | 8bd43c60f3476113bf99958e9475776ff17c85bd (diff) | |
parent | ba060c80eb5c936baf4225af613bab218d9707f8 (diff) | |
download | gitlab-ce-1f1e965be6bbc89f71984ce07fbf1b98d606c184.tar.gz |
Merge branch '10638-secondary-css' into 'master'
Removes EE differences for secondary_navigation_elements
Closes gitlab-ee#10638
See merge request gitlab-org/gitlab-ce!26537
-rw-r--r-- | app/assets/stylesheets/framework/secondary_navigation_elements.scss | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/secondary_navigation_elements.scss b/app/assets/stylesheets/framework/secondary_navigation_elements.scss index 19640ab5986..31297b9d20c 100644 --- a/app/assets/stylesheets/framework/secondary_navigation_elements.scss +++ b/app/assets/stylesheets/framework/secondary_navigation_elements.scss @@ -181,6 +181,33 @@ margin: 0; width: 100%; } + + &.inline { + display: flex; + flex-flow: row wrap; + justify-content: space-between; + + > .btn, + > .btn-container, + > .dropdown, + > input, + > form { + flex: 1 1 auto; + margin: 0 0 10px; + margin-left: $gl-padding-top; + width: auto; + + &:first-child { + margin-left: 0; + float: none; + } + } + + .btn-full { + flex: 1 1 100%; + margin-left: 0; + } + } } } |