diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-02-03 02:01:33 +0100 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-02-03 16:14:11 +0100 |
| commit | faacb7853478704a37655361c23abffdfd47db6f (patch) | |
| tree | 8630a8243b1743a670ad4b35a883aa0917658d6c | |
| parent | ad5acec6e5aa1376e5711cdac531db8f9cca3d01 (diff) | |
| download | gitlab-ce-faacb7853478704a37655361c23abffdfd47db6f.tar.gz | |
Tried to align form input vertically with other elements for top nav
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 8 | ||||
| -rw-r--r-- | app/views/dashboard/_projects_head.html.haml | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index 6410656847f..252f84a6b48 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -84,11 +84,13 @@ > .btn { display: inline-block; margin-left: 10px; - margin-top: -3px; } input { + height: 34px; display: inline-block; + position: relative; + top: 1px; /* Medium devices (desktops, 992px and up) */ @media (min-width: $screen-md-min) { width: 200px; } @@ -105,10 +107,6 @@ } } - .dropdown-toggle.btn { - margin-top: -3px; - } - /* Hide on extra small devices (phones) */ @media (max-width: $screen-xs-max) { display: none; diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml index b6301f2238f..726f669b1d2 100644 --- a/app/views/dashboard/_projects_head.html.haml +++ b/app/views/dashboard/_projects_head.html.haml @@ -8,7 +8,7 @@ = nav_link(page: starred_dashboard_projects_path) do = link_to starred_dashboard_projects_path, title: 'Starred Projects', data: {placement: 'right'} do Starred Projects - = nav_link(page: [explore_root_path, trending_explore_projects_path, starred_explore_projects_path, explore_projects_path], html_options: { class: 'hidden-xs' }) do + = nav_link(page: [explore_root_path, trending_explore_projects_path, starred_explore_projects_path, explore_projects_path]) do = link_to explore_root_path, title: 'Explore', data: {placement: 'right'} do Explore Projects |