diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-10-17 07:20:52 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-10-17 07:20:52 +0000 |
| commit | 09a7da7222d535948eadcf53c821360b037f7f6b (patch) | |
| tree | 15d0844efcb97db1eeb5cac5b42b54ca6b4d4bac /app/views/devise/shared/_tabs_normal.html.haml | |
| parent | 43973223af6755c8213e639e616bc788d7c0493c (diff) | |
| parent | cb8654e85650ba6107031cc978d882f4b2f272cf (diff) | |
| download | gitlab-ce-09a7da7222d535948eadcf53c821360b037f7f6b.tar.gz | |
Merge remote-tracking branch 'upstream/master' into pipeline-emails
* upstream/master: (148 commits)
Fix broken rspec in compare text
Added logic to handle a revision input that does not exist in the menu
Fix broken Spinach tests caused by changes in !6550
Convert CHANGELOG to Markdown
Fix active tab test for branches page
Fix merge requests feature tests
Wait for ajax call in merge request unsubscribe test
Fix 500 error when creating mileston from group page
Fix 404 when group path has dot in the name
Add the tech writers usernames in the doc_sytleguide doc
Fix broken SCSS linter errors due to missing newlines
Fix Hash syntax to work for both Ruby 2.1 and 2.3
Fix Spinach merge request diff failures
remove ashley since she no longer works here
Revert "Improve tabbing usability for sign in page"
Don't use member properties in users_spec, and remove loading ref.
Clean up stray Sign up ref.
Back off the array spreading, bc poltergeist freaks out.
Convert dispatcher to es6.
Add exists to users routes and fix endpoint.
...
Diffstat (limited to 'app/views/devise/shared/_tabs_normal.html.haml')
| -rw-r--r-- | app/views/devise/shared/_tabs_normal.html.haml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/views/devise/shared/_tabs_normal.html.haml b/app/views/devise/shared/_tabs_normal.html.haml new file mode 100644 index 00000000000..79b1d447a92 --- /dev/null +++ b/app/views/devise/shared/_tabs_normal.html.haml @@ -0,0 +1,5 @@ +%ul.nav-links.new-session-tabs.nav-tabs{ role: 'tablist'} + %li.active{ role: 'presentation' } + %a{ href: '#login-pane', data: { toggle: 'tab' }, role: 'tab'} Sign in + %li{ role: 'presentation'} + %a{ href: '#register-pane', data: { toggle: 'tab' }, role: 'tab'} Register |