bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-19 17:53:39 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:bitwarden/browser into feature/safari-webext

Browse Source 
# Conflicts:
#	src/browser/safariApp.ts
#	src/safari/safari/SafariExtensionViewController.swift
#	src/services/browserPlatformUtils.service.ts
This commit is contained in:
Hinton
2021-01-13 14:21:45 +01:00
parent 303439533c 7e41e84c7d
commit db59f2791a
21 changed files with 202 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/popup/app-routing.animations.ts
View File

@@ -150,6 +150,9 @@ export const routerTransition = trigger('routerTransition', [
transition('view-cipher => clone-cipher', inSlideUp),
transition('clone-cipher => view-cipher, clone-cipher => tabs', outSlideDown),
transition('view-cipher => share-cipher', inSlideUp),
transition('share-cipher => view-cipher', outSlideDown),
transition('tabs => add-cipher', inSlideUp),
transition('add-cipher => tabs', outSlideDown),
@@ -159,9 +162,6 @@ export const routerTransition = trigger('routerTransition', [
transition('add-cipher => generator, edit-cipher => generator, clone-cipher => generator', inSlideUp),
transition('generator => add-cipher, generator => edit-cipher, generator => clone-cipher', outSlideDown),
transition('edit-cipher => share-cipher', inSlideUp),
transition('share-cipher => edit-cipher, share-cipher => view-cipher', outSlideDown),
transition('edit-cipher => attachments, edit-cipher => collections', inSlideLeft),
transition('attachments => edit-cipher, collections => edit-cipher', outSlideRight),