Skip to content
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/quality_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

- name: Install build dependencies
run : |
npm install -g node-pre-gyp jest
npm install -g node-pre-gyp jest@29.7.0

- name: Install dependencies
run: npm ci --legacy-peer-deps
Expand All @@ -36,4 +36,4 @@ jobs:
- name: Test
run: |
cd apps/browser/
yarn test
npm run test
2 changes: 1 addition & 1 deletion apps/browser/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bitwarden/browser",
"version": "2.4.1",
"version": "2.5.0",
"scripts": {
"build": "cross-env MANIFEST_VERSION=3 webpack",
"build:mv2": "webpack",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ <h2 bitTypography="h6" class="tw-font-semibold">
<app-header>
<div class="left">
<button type="button" (click)="back()">
<i class="icon-cozy icon-back" aria-hidden="true"></i>
<span class="header-icon"><i class="bwi bwi-angle-left" aria-hidden="true"></i></span>
</button>
</div>
<div class="center tw-font-bold">{{ "options" | i18n }}</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
<header>
<div class="left">
<button type="button" appBlurClick (click)="back()" title="{{ 'back_shortcut' | i18n }}">
<span class="header-icon" title="{{ 'back' | i18n }}"
><i class="icon-cozy icon-back"></i
></span>
<span class="header-icon"><i class="bwi bwi-angle-left" aria-hidden="true"></i></span>
</button>
</div>
<h1 class="center">
Expand Down
2 changes: 1 addition & 1 deletion apps/browser/src/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manifest_version": 2,
"name": "__MSG_extName__",
"short_name": "__MSG_appName__",
"version": "2.4.1",
"version": "2.5.0",
"description": "__MSG_extDesc__",
"default_locale": "en",
"author": "Twake Workplace",
Expand Down
2 changes: 1 addition & 1 deletion apps/browser/src/manifest.v3.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"minimum_chrome_version": "102.0",
"name": "__MSG_extName__",
"short_name": "__MSG_appName__",
"version": "2.4.1",
"version": "2.5.0",
"description": "__MSG_extDesc__",
"default_locale": "en",
"author": "Bitwarden Inc.",
Expand Down
5 changes: 2 additions & 3 deletions apps/browser/src/popup/scss/box.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,11 @@
}

.box-header {
margin: 15px 10px 5px 10px;
padding: 0px 0px 4px 0;
margin: 8px;
padding: 0px;
display: flex;
font-size: $font-size-small;
text-transform: uppercase;
color: #95999d;
font-weight: bold;
@include themify($themes) {
color: themed("labelColor");
Expand Down
40 changes: 21 additions & 19 deletions apps/browser/src/popup/scss/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ $gray-silver: #d6d8da;
$text-muted: rgba($grey900, 0.48);
$text-muted-contrasted: rgba($grey900, 0.72);

$twake-text-color: rgba(28, 27, 31, 0.72);

$brand-primary: #297ef2;
$brand-primary-active: darken($brand-primary, 5%);
$brand-danger: #ea3f3f;
Expand All @@ -51,7 +53,7 @@ $brand-info-contrasted: #008281;
$brand-warning-contrasted: #a36800;
$brand-primary-accent-contrasted: darken($brand-primary-contrasted, 8%);

$background-color: #f5f6f7;
$background-color: #f3f6f9;
$background-color-alt: #ffffff;
$background-color-lighter: #5397f4;

Expand Down Expand Up @@ -107,16 +109,16 @@ $themes: (
boxBackgroundColor: $box-background-color,
boxBackgroundHoverColor: $box-background-hover-color,
boxBorderColor: $box-border-color,
tabBackgroundColor: #ffffff,
tabBackgroundHoverColor: $list-item-hover,
headerColor: #ffffff,
headerBackgroundColor: $brand-primary,
tabBackgroundColor: #f3f6f9,
tabBackgroundHoverColor: #f3f6f9,
headerColor: $twake-text-color,
headerBackgroundColor: #ffffff,
headerBackgroundHoverColor: rgba(255, 255, 255, 0.1),
headerBorderColor: $brand-primary,
headerInputBackgroundColor: lighten($brand-primary, 8%),
headerInputBackgroundFocusColor: lighten($brand-primary, 8%),
headerInputColor: #ffffff,
headerInputPlaceholderColor: lighten($brand-primary, 35%),
headerBorderColor: #f2f2f2,
headerInputBackgroundColor: #f3f6f9,
headerInputBackgroundFocusColor: #f3f6f9,
headerInputColor: $twake-text-color,
headerInputPlaceholderColor: rgba(134, 134, 135, 1),
listItemBackgroundHoverColor: $list-item-hover,
disabledIconColor: $list-icon-color,
disabledBoxOpacity: $disabled-box-opacity,
Expand Down Expand Up @@ -173,16 +175,16 @@ $themes: (
boxBackgroundColor: $box-background-color,
boxBackgroundHoverColor: $box-background-hover-color,
boxBorderColor: $box-border-color,
tabBackgroundColor: #ffffff,
tabBackgroundHoverColor: $list-item-hover,
headerColor: #ffffff,
headerBackgroundColor: $brand-primary-contrasted,
tabBackgroundColor: #f3f6f9,
tabBackgroundHoverColor: #f3f6f9,
headerColor: $twake-text-color,
headerBackgroundColor: #ffffff,
headerBackgroundHoverColor: rgba(255, 255, 255, 0.1),
headerBorderColor: $brand-primary-contrasted,
headerInputBackgroundColor: lighten($brand-primary-contrasted, 8%),
headerInputBackgroundFocusColor: lighten($brand-primary-contrasted, 8%),
headerInputColor: #ffffff,
headerInputPlaceholderColor: lighten($brand-primary-contrasted, 35%),
headerBorderColor: #f2f2f2,
headerInputBackgroundColor: #f3f6f9,
headerInputBackgroundFocusColor: #f3f6f9,
headerInputColor: $twake-text-color,
headerInputPlaceholderColor: rgba(134, 134, 135, 1),
listItemBackgroundHoverColor: $list-item-hover,
disabledIconColor: $list-icon-color,
disabledBoxOpacity: $disabled-box-opacity,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<button type="button" (click)="cancel()">{{ "cancel" | i18n }}</button>
-->
<button type="button" (click)="cancel()" title="{{ 'cancel_shortcut' | i18n }}">
<i class="icon-cozy icon-cross" aria-hidden="true"></i>
<span class="header-icon"><i class="bwi bwi-close" aria-hidden="true"></i></span>
</button>
<!-- end Cozy -->
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<button type="button" (click)="cancel()">{{ "cancel" | i18n }}</button>
-->
<button type="button" appBlurClick (click)="cancel()" title="{{ 'close_shortcut' | i18n }}">
<i class="icon-cozy icon-cross" aria-hidden="true"></i>
<span class="header-icon"><i class="bwi bwi-close" aria-hidden="true"></i></span>
</button>
<!-- end custo -->
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h1 class="sr-only">{{ "myVault" | i18n }}</h1>
</div>
<div class="right">
<button type="button" (click)="addCipher()" appA11yTitle="{{ 'addItem' | i18n }}">
<i class="icon-cozy icon-plus" aria-hidden="true"></i>
<span class="header-icon"><i class="bwi bwi-plus" aria-hidden="true"></i></span>
</button>
</div>
</app-header>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<header>
<div class="left">
<button type="button" (click)="back()" title="{{ 'back_shortcut' | i18n }}">
<span class="header-icon" title="{{ 'back' | i18n }}" style="margin-right: 0px">
<i class="icon-cozy icon-back" style="display: block"></i>
</span>
<span class="header-icon"><i class="bwi bwi-angle-left" aria-hidden="true"></i></span>
</button>
</div>
<h1 class="sr-only">{{ "myVault" | i18n }}</h1>
Expand Down Expand Up @@ -33,7 +31,7 @@ <h1 class="sr-only">{{ "myVault" | i18n }}</h1>
appA11yTitle="{{ 'addItem' | i18n }}"
*ngIf="type !== cipherType.Identity"
>
<i class="icon-cozy icon-plus" aria-hidden="true"></i>
<span class="header-icon"><i class="bwi bwi-plus" aria-hidden="true"></i></span>
</button>
</div>
</header>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<button type="button" (click)="close()">{{ "close" | i18n }}</button>
-->
<button type="button" appBlurClick (click)="close()" title="{{ 'close_shortcut' | i18n }}">
<i class="icon-cozy icon-cross" aria-hidden="true"></i>
<span class="header-icon"><i class="bwi bwi-close" aria-hidden="true"></i></span>
</button>
<!-- end custo -->
</div>
Expand All @@ -24,7 +24,7 @@ <h1 class="center">
title="{{ 'edit' | i18n }}"
appBlurClick
>
<i class="icon-cozy icon-pen" aria-hidden="true"></i>
<span class="header-icon"><i class="bwi bwi-pencil-square" aria-hidden="true"></i></span>
</button>
<!-- end custo -->
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<header>
<div class="left">
<button type="button" routerLink="/tabs/settings">
<span class="header-icon" title="{{ 'back' | i18n }}"
><i class="icon-cozy icon-back"></i
></span>
<span class="header-icon"><i class="bwi bwi-angle-left" aria-hidden="true"></i></span>
</button>
</div>
<h1 class="center">
Expand Down
4 changes: 1 addition & 3 deletions apps/browser/src/vault/popup/settings/sync.component.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<header>
<div class="left">
<button type="button" routerLink="/tabs/settings">
<span class="header-icon" title="{{ 'back' | i18n }}"
><i class="icon-cozy icon-back"></i
></span>
<span class="header-icon"><i class="bwi bwi-angle-left" aria-hidden="true"></i></span>
</button>
</div>
<h1 class="center">
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.