Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

add LastPass #2316

Merged
merged 1 commit into from
Jun 29, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 11 additions & 2 deletions app/extensions.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,8 @@ let generateBraveManifest = () => {

let defaultExtensions = {
OnePassword: 'aomjjhallfgjeglblehebfpbcfeobpgk',
Dashlane: 'fdjamakpfbbddfjaooikfcpapjohcfmg'
Dashlane: 'fdjamakpfbbddfjaooikfcpapjohcfmg',
LastPass: 'hdokiejnpimakedhajhdlcegeplioahd'
}

let backgroundPage = null
Expand All @@ -155,7 +156,8 @@ module.exports.init = () => {
}
})

process.on('chrome-browser-action-popup', function (extensionId, name, props, popup) {
process.on('chrome-browser-action-popup', function (extensionId, tabId, name, props, popup) {
// TODO(bridiver) find window from tabId
let win = BrowserWindow.getFocusedWindow()
if (!win) {
return
Expand Down Expand Up @@ -202,6 +204,13 @@ module.exports.init = () => {
disableExtension(defaultExtensions.OnePassword)
}

if (getSetting(settings.LAST_PASS_ENABLED)) {
installExtension(defaultExtensions.LastPass, getExtensionsPath('lastpass'))
enableExtension(defaultExtensions.LastPass)
} else {
disableExtension(defaultExtensions.LastPass)
}

if (getSetting(settings.DASHLANE_ENABLED)) {
installExtension(defaultExtensions.Dashlane, getExtensionsPath('dashlane'))
enableExtension(defaultExtensions.Dashlane)
Expand Down
3 changes: 2 additions & 1 deletion app/extensions/brave/locales/en-US/preferences.properties
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ pluginSettings=Plugin settings:
usePasswordManager=Use Brave's password manager
useOnePassword=Use 1Password (requires 1Password Application)
useDashlane=Use Dashlane (requires Dashlane Application)
useLastPass=Use LastPass (requires LastPass Application)
enableFlash=Enable Adobe Flash support (requires browser restart)
enableFlashSubtext=Flash support is experimental and requires Pepper Flash to be installed from
enableFlashSubtext=Flash support is experimental and requires Pepper Flash to be installed from
enableFlashSubtextLinux=Flash support is experimental and requires the pepperflashplugin-nonfree package.
managePasswords=Manage passwords...
sitePermissions=Saved site permissions:
Expand Down
Binary file added app/extensions/lastpass/150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 36 additions & 0 deletions app/extensions/lastpass/40_cs.js

Large diffs are not rendered by default.

Binary file added app/extensions/lastpass/44.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/extensions/lastpass/50.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/extensions/lastpass/Icon-32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/extensions/lastpass/Icon-48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/extensions/lastpass/Icon-64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
275 changes: 275 additions & 0 deletions app/extensions/lastpass/IntroTutorial/introTutorial.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,275 @@
/*
******* Dialog override *******
*/
#introTutorialWelcomeDialog {
min-height: 215px;
max-width: 550px;
min-width: 485px;
}
#introTutorialWelcomeDialog .intro-tutorial.container {
width: 520px;
padding-right: 15px;
padding-left: 15px;
margin: 0;
}

#introTutorialSelectSiteDialog,
#introTutorialCompleteDialog {
min-height: 215px;
max-width: 620px;
min-width: 485px;
}
#introTutorialWelcomeDialog .dialogContent,
#introTutorialSelectSiteDialog .dialogContent,
#introTutorialCompleteDialog .dialogContent {
padding-bottom: 0;
padding-top: 0;
padding-left: 0;
padding-right: 0;
}
.lp-grid.container {
width: 590px;
}
/*
******* Intro Tutorial Dialogs *******
*/
.intro-tutorial img {
vertical-align: middle;
}

.intro-tutorial .clickable {
cursor: pointer;
}
.intro-tutorial hr {
margin-top: 20px;
margin-bottom: 20px;
margin-left: -15px;
margin-right: -15px;
border: 0;
border-top: 1px solid #cdcdcd;
}
.intro-tutorial p {
font-size: 13px;
color: rgba(63, 63, 58, .6);
}
.intro-tutorial a {
text-decoration: none;
}
.intro-tutorial h1 {
text-transform: capitalize;
font-weight: lighter;
font-size: 26px;
line-height: 36px;
color: #3F3F3A;
}
.intro-tutorial h2 {
font-weight: 400;
font-size: 22px;
line-height: 36px;
}
.intro-tutorial h3 {
font-weight: normal;
font-size: 16px;
line-height: 24px;
}
.intro-tutorial h4 {
font-weight: 200;
font-size: 16px;
line-height: 32px;
margin-top: 15px;
margin-bottom: 15px;
}
.intro-tutorial h5 {
font-weight: 200;
font-size: 24px;
line-height: 48px;
margin-bottom: 5px;
}
.intro-tutorial .line-height-sm {
line-height: 24px;
}
.intro-tutorial .line-height-md {
line-height: 32px;
}
.intro-tutorial .line-height-lg {
line-height: 42px;
}
.intro-tutorial .btn-cursor {
cursor: pointer;
}
.intro-tutorial .btn {
/* Structure */
display: inline-block;
/*font-size: $font-size-base;*/
padding: 18.5px 25px;
width: 215px;
border-radius: 3px;
background: white;
/*line-height: $line-height-btn;*/
font-weight: normal;
box-shadow: 0 1px 2px rgba(34, 48, 58, .3);
border: 1px solid #b6b6b6;
zoom: 1;
white-space: nowrap;
vertical-align: middle;
text-align: center;
cursor: pointer;
-webkit-user-drag: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
box-sizing: border-box;
}
.intro-tutorial .btn:hover{
background-color: #f0f2f3;
}
.intro-tutorial .btn::-moz-focus-inner {
padding: 0;
border: 0;
}
.intro-tutorial .btn-short {
padding: 11px 25px;
}
.intro-tutorial .btn-primary {
border: 1px solid transparent;
color: white;
background: #D32D27;
box-shadow: 0 1px 2px rgba(34, 48, 58, .3);
}
.intro-tutorial .btn-primary:hover{
background: #D32D27;
color: white;
}
.intro-tutorial .btn-dark {
border: 1px solid transparent;
color: white;
background: #3F3F3A;
box-shadow: 0 1px 2px rgba(34, 48, 58, .3);
}
.intro-tutorial .btn-dark:hover{
background: #3F3F3A;
color: white;
}
.intro-tutorial .btn-close {
width: 12px;
height: 12px;
margin-top: 15px;
}
.intro-tutorial .bg-red {
background-color: #D32D27;
}
.intro-tutorial.bg-white {
background-color: white;
}
.intro-tutorial .bg-gray {
background-color: #F0F2F3;
}
.intro-tutorial .bg-dark {
background-color: #3F3F3A;
}
.intro-tutorial .congrats-header {
background-image: url('../images/vault_4.0/congrats-confetti.png');
background-position: 0 0;
padding-bottom: 39px;
font-weight: 100;
}
.intro-tutorial .congrats-footer {
margin-top: 30px;
margin-bottom: 15px;
}
.intro-tutorial .congrats h2 {
font-weight: 600;
}
.intro-tutorial .txt-white {
color: white;
}
.intro-tutorial .txt-red {
color: #D32D27;
}
.intro-tutorial .txt-gray {
color: rgb(130, 130, 130);
}
.intro-tutorial .txt-sm-transparent {
color: rgba(255, 255, 255, .7);
}
.intro-tutorial .txt-dark {
color: #3F3F3A;
}

.intro-tutorial .main-icon {
height: 200px;
margin-top: 10px;
margin-bottom: 5px;
margin-left: 45px;
}
.intro-tutorial .sm-icon {
height: 15px;
width: 15px;
}
.intro-tutorial .no-bottom-margin {
margin-bottom: 0;
-webkit-margin-after: 0;
-webkit-margin-end: 0;
}
.intro-tutorial .no-top-margin {
margin-top: 0;
-webkit-margin-before: 0;
-webkit-margin-start: 0;
}
.intro-tutorial .no-right-margin {
margin-right: 0;
}
.intro-tutorial .no-left-margin {
margin-left: 0;
}
.intro-tutorial .title-margin {
padding-left: 0;
margin-top: 30px;
margin-left: -10px;
}
.intro-tutorial .tile-margin {
margin-bottom: 20px;
}
.intro-tutorial .tile .overlay-text {
color: white;
position: absolute;
top: 93px;
bottom: 0;
left: 0;
right: 0;
margin: auto;
text-align: center;
vertical-align: middle;
background-color: #E67E22;
line-height: 40px;
font-size: 14px;
font-weight: lighter;
}
.intro-tutorial .tile .itemIcon {
height:131px;
}
.intro-tutorial .tile .launchButton {

margin-top: 0;
margin-bottom: 0;
margin-left: auto;
margin-right: auto;
top: 24px;
}
.intro-tutorial .tile:hover .itemInfo,
.intro-tutorial .tile.focus .itemInfo,
.intro-tutorial .tile.selected .itemInfo,
.intro-tutorial .tile:hover .itemIcon {
display: none;
}
.intro-tutorial .align-baseline {
vertical-align: baseline;
}
.intro-tutorial.spotlight-cover {
background-color: transparent;
z-index: 8;
width: 100%;
height: 100%;
position: absolute;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<div class="intro-tutorial lp-grid container">
<div class="row congrats-header">
<div class="col-12 content-pull-right">
<img id="btnClose" src="images/vault_4.0/Close_x.png" class="btn-cursor btn-close">
</div>
<div class="content-pull-center txt-white">
<h5 >Congratulations!</h5>
<div class="txt-sm-transparent" compoundtranslation>You've successfully added<span id="siteName"> your first Site </span>to your vault.</div>
</div>
</div>
<div class="row">
<h2 class="col-12 txt-dark no-bottom-margin">
Want to jumpstart access to all your sites?
</h2>
</div>
<div class="row">
<h4 class="col-12 txt-gray line-height-sm">
Fill your vault quickly by importing the sites you've saved to your browser or computer. Start enjoying the peace of mind knowing your passwords are secure.
</h4>
</div>
<div class="row txt-red congrats-footer align-baseline">
<div class="col-6">
<span class="btn-cursor align-baseline line-height-lg" id="noThanks">No thanks, I'll add sites manually</span>
</div>
<div class="col-6 content-pull-right">
<button id="downloadImporter" class="btn btn-primary btn-short">Download Importer</button>
</div>
</div>
</div>
Loading