Merge branch 'master' of https://github.com/bitwarden/browser into feature/desktop-bridge

src/popup/accounts/register.component.html

@@ -82,7 +82,7 @@
         </div>
         <div class="box last" *ngIf="showTerms">
             <div class="box-content">
-                <div class="box-footer box-content-row checkbox">
+                <div class="box-content-row box-content-row-checkbox box-content-row-checkbox-left" appBoxRow>
                     <input type="checkbox" id="acceptPolicies" [(ngModel)]="acceptPolicies" name="AcceptPolicies">
                     <label for="acceptPolicies">
                         {{'acceptPolicies' | i18n}}<br>

src/popup/app.module.ts

@@ -102,6 +102,7 @@ import localePtPt from '@angular/common/locales/pt-PT';
 import localeRo from '@angular/common/locales/ro';
 import localeRu from '@angular/common/locales/ru';
 import localeSk from '@angular/common/locales/sk';
+import localeSr from '@angular/common/locales/sr';
 import localeSv from '@angular/common/locales/sv';
 import localeTh from '@angular/common/locales/th';
 import localeTr from '@angular/common/locales/tr';
@@ -138,6 +139,7 @@ registerLocaleData(localePtPt, 'pt-PT');
 registerLocaleData(localeRo, 'ro');
 registerLocaleData(localeRu, 'ru');
 registerLocaleData(localeSk, 'sk');
+registerLocaleData(localeSr, 'sr');
 registerLocaleData(localeSv, 'sv');
 registerLocaleData(localeTh, 'th');
 registerLocaleData(localeTr, 'tr');

src/popup/scss/box.scss

@@ -293,6 +293,14 @@
         }
     }
 
+    &.box-content-row-checkbox-left {
+        justify-content: flex-start;
+
+        > input {
+            margin: 0 15px 0 0;
+        }
+    }
+
     &.box-content-row-input {
         label {
             white-space: nowrap;

src/popup/scss/misc.scss

@@ -307,19 +307,3 @@ app-vault-icon {
 input[type="password"]::-ms-reveal {
     display: none;
 }
-
-.checkbox {
-        position: relative;
-        display: block;
-        padding-left: 18px;
-
-        label {
-            margin-bottom: 0;
-        }
-
-        input[type="checkbox"] {
-            position: absolute;
-            margin-top: 4px;
-            margin-left: -18px;
-        }
-    }

src/popup/services/services.module.ts

@@ -33,6 +33,7 @@ import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration
 import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
 import { PolicyService } from 'jslib/abstractions/policy.service';
 import { SearchService as SearchServiceAbstraction } from 'jslib/abstractions/search.service';
+import { SendService } from 'jslib/abstractions/send.service';
 import { SettingsService } from 'jslib/abstractions/settings.service';
 import { StateService as StateServiceAbstraction } from 'jslib/abstractions/state.service';
 import { StorageService } from 'jslib/abstractions/storage.service';
@@ -156,6 +157,7 @@ export function initFactory(i18nService: I18nService, storageService: StorageSer
         { provide: AppIdService, useFactory: getBgService<AppIdService>('appIdService'), deps: [] },
         { provide: AutofillService, useFactory: getBgService<AutofillService>('autofillService'), deps: [] },
         { provide: ExportService, useFactory: getBgService<ExportService>('exportService'), deps: [] },
+        { provide: SendService, useFactory: getBgService<SendService>('sendService'), deps: [] },
         {
             provide: VaultTimeoutService,
             useFactory: getBgService<VaultTimeoutService>('vaultTimeoutService'),