diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-23 08:53:31 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-23 08:53:31 +0000 |
| commit | 615257b91c250da4dd28ed12e5b7a858115c75d4 (patch) | |
| tree | 0ded2b3ffb327072b0598f2952497a7004932265 /app/views | |
| parent | f189c36d8d352deccbd37b8ae92ca0c539e330c3 (diff) | |
| parent | 95e2ca76309bab95384e502ca6b9e4f20711e5f0 (diff) | |
| download | gitlab-ce-615257b91c250da4dd28ed12e5b7a858115c75d4.tar.gz | |
Merge branch 'animation-sidebar' into 'master'
Animation of Sidebar (video in here)
Edited the CSS of header and sidebar; added a new div of gitlab-logo-container to the html to make things easier.
The transition-duration is set to 0.3s and when the nav bar expands, it opens up over the text, essentially revealing hidden text.
[animation-sidebar-2.mov](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b15996a256d6bed03a19c68549d116e4/animation-sidebar-2.mov)
/cc @JobV @nicolas2
See merge request !849
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 3 | ||||
| -rw-r--r-- | app/views/layouts/header/_public.html.haml | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 1403b86f377..b3cd7b0e37b 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -3,7 +3,8 @@ .header-logo = link_to root_path, class: 'home', title: 'Dashboard', id: 'js-shortcuts-home', data: {toggle: 'tooltip', placement: 'bottom'} do = brand_header_logo - %h3 GitLab + .gitlab-text-container + %h3 GitLab .header-content %button.navbar-toggle{type: 'button'} %span.sr-only Toggle navigation diff --git a/app/views/layouts/header/_public.html.haml b/app/views/layouts/header/_public.html.haml index 2c5884a5b6d..15c2e292be3 100644 --- a/app/views/layouts/header/_public.html.haml +++ b/app/views/layouts/header/_public.html.haml @@ -3,7 +3,8 @@ .header-logo = link_to explore_root_path, class: "home" do = brand_header_logo - %h3 GitLab + .gitlab-text-container + %h3 GitLab .header-content - unless current_controller?('sessions') .pull-right |