Regenerate patch and use Sass to combine all selectors

This commit is contained in:
Daniel García 2019-02-17 14:30:37 +01:00
parent c7b38d1dbf
commit c02738beb0
No known key found for this signature in database
GPG key ID: FC8A7D14C3CD543A

View file

@ -1,4 +1,5 @@
index 90aad7df..95ceff61 100644
diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts
index f1b5b392..2bfc2f2e 100644
--- a/src/app/services/services.module.ts
+++ b/src/app/services/services.module.ts
@@ -120,20 +120,16 @@ const notificationsService = new NotificationsService(userService, syncService,
@ -26,6 +27,7 @@ index 90aad7df..95ceff61 100644
apiService.setUrls({
base: isDev ? null : window.location.origin,
api: isDev ? 'http://localhost:4000' : null,
diff --git a/src/app/settings/two-factor-u2f.component.ts b/src/app/settings/two-factor-u2f.component.ts
index 5560c476..a9b954a8 100644
--- a/src/app/settings/two-factor-u2f.component.ts
+++ b/src/app/settings/two-factor-u2f.component.ts
@ -37,33 +39,40 @@ index 5560c476..a9b954a8 100644
}], [], (data: any) => {
this.ngZone.run(() => {
this.u2fListening = false;
index 5c114af5..6839385d 100644
diff --git a/src/scss/styles.scss b/src/scss/styles.scss
index 3df655fd..7e57cffe 100644
--- a/src/scss/styles.scss
+++ b/src/scss/styles.scss
@@ -1,5 +1,28 @@
@@ -1,5 +1,34 @@
@import "../css/webfonts.css";
+/**** START Bitwarden_RS CHANGES ****/
+/* This combines all selectors extending it into one */
+%bwrs-hide { display: none !important; }
+
+/* This allows searching for the combined style in the browsers dev-tools (look into the head tag) */
+#bwrs-hide, head { @extend %bwrs-hide; }
+
+/* Hide any link pointing to billing */
+a[href$="/settings/billing"] {display: none !important; }
+a[href$="/settings/billing"] { @extend %bwrs-hide; }
+
+/* Hide Two-Factor menu in Organization settings */
+app-org-settings a[href$="/settings/two-factor"] { display: none !important; }
+app-org-settings a[href$="/settings/two-factor"] { @extend %bwrs-hide; }
+
+/* Hide 2FA Duo button */
+ul.list-group.list-group-2fa > li:nth-child(3) button { display: none !important; }
+ul.list-group.list-group-2fa > li:nth-child(3) button { @extend %bwrs-hide; }
+
+/* Hide 2FA Email button */
+ul.list-group.list-group-2fa > li:nth-child(5) button { display: none !important; }
+ul.list-group.list-group-2fa > li:nth-child(5) button { @extend %bwrs-hide; }
+
+/* Hide organization plans */
+app-create-organization > form > div.form-check { display: none !important; }
+app-create-organization > form > h2.mt-5 { display: none !important; }
+app-create-organization > form > div.form-check { @extend %bwrs-hide; }
+app-create-organization > form > h2.mt-5 { @extend %bwrs-hide; }
+
+/* Hide Tax Info in Organization settings */
+app-org-account > div.secondary-header.border-0.mb-0:nth-child(3) { display: none !important; }
+app-org-account > p { display: none !important; }
+app-org-account > a.btn.btn-outline-secondary { display: none !important; }
+app-org-account > div.secondary-header.border-0.mb-0:nth-child(3) { @extend %bwrs-hide; }
+app-org-account > p { @extend %bwrs-hide; }
+app-org-account > a.btn.btn-outline-secondary { @extend %bwrs-hide; }
+/**** END Bitwarden_RS CHANGES ****/
+
$primary: #3c8dbc;