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 src/app/apps/components/connector/connector.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ $info-height: $file-list-row-height;
}

&.connector-facebook {
background-color: #1877f2;
background-color: $facebook-brand;
.logo-img {
height: 2 * $grid-unit;
background-image: url('/assets/img/facebook/f-logo-white.png');
}
}

&.connector-familysearch {
background-color: #87ba41;
background-color: $familysearch-brand;
.logo-img {
background-image: url('/app/assets/img/familysearch/tree-name-logo.png');
}
Expand Down
7 changes: 4 additions & 3 deletions src/app/auth/components/or-divider/or-divider.component.scss
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
@import 'fonts';
@import 'colors';

.or-divider {
display: flex;
align-items: center;
text-align: center;
color: #ffffff;
color: $PR-brand-white;
margin: 24px 0;
}

.line {
flex-grow: 1;
height: 1px;
background-color: rgba(255, 255, 255, 0.32);
background-color: rgba($PR-brand-white, 0.32);
margin: 0 10px;
}

Expand All @@ -23,5 +24,5 @@
line-height: 16px;
letter-spacing: 2.24px;
padding: 0 10px;
color: rgba(255, 255, 255, 0.32);
color: rgba($PR-brand-white, 0.32);
}
24 changes: 12 additions & 12 deletions src/app/component-library/components/button/button.component.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@import 'variables';

@mixin darkButton($isLink: false) {
background-color: rgba(255, 255, 255, 0);
border: 1px solid rgba(255, 255, 255, 0.32);
background-color: rgba($PR-brand-white, 0);
border: 1px solid rgba($PR-brand-white, 0.32);

& > .button-text {
color: white;
color: $PR-brand-white;
margin: 0;
@include bodyMedium;

Expand All @@ -16,10 +16,10 @@
}

@mixin lightButton($isLink: false) {
background-color: $white;
border: 1px solid rgba(184, 187, 201, 1);
background-color: $PR-brand-white;
border: 1px solid rgba($PR-blue-200, 1);
& > .button-text {
color: rgba(19, 27, 74, 1);
color: rgba($PR-blue-900, 1);
margin: 0;
@include bodyMedium;

Expand All @@ -29,7 +29,7 @@
}

& > .icon {
color: rgba(19, 27, 74, 1);
color: rgba($PR-blue-900, 1);
}
}

Expand Down Expand Up @@ -60,14 +60,14 @@
}

& > .icon {
color: white;
color: $PR-brand-white;
}

&-primary {
&.button-light {
@include darkButton();
&:focus {
border: 2px solid white;
border: 2px solid $PR-brand-white;
}
}
&.button-dark {
Expand All @@ -79,12 +79,12 @@
&.button-light {
@include lightButton();
&:focus {
border: 2px solid black;
border: 2px solid $PR-brand-black;
}
}
&.button-dark {
@include darkButton();
border: 1px solid rgba(255, 255, 255, 0.32);
border: 1px solid rgba($PR-brand-white, 0.32);
}
}

Expand Down Expand Up @@ -118,7 +118,7 @@
}

&-text {
color: white;
color: $PR-brand-white;
margin: 0;
@include bodyMedium;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@

.checkbox-container-enabled.checkbox-container-primary {
& > .checkbox {
border: 2.5px solid rgba(19, 27, 74, 1);
border: 2.5px solid rgba($PR-blue-900, 1);
transition: background-color 0.2s;
border-radius: 4px;
}
& > .checkbox::before,
& > .checkbox::after {
content: '';
position: absolute;
background-color: rgba(19, 27, 74, 1);
background-color: rgba($PR-blue-900, 1);
transition: opacity 0.2s;
opacity: 0;
border-radius: 2px;
Expand All @@ -71,21 +71,21 @@
}

& > label {
color: rgba(19, 27, 74, 1);
color: rgba($PR-blue-900, 1);
}
}

.checkbox-container-enabled.checkbox-container-secondary {
& > .checkbox {
border: 2.5px solid white;
border: 2.5px solid $PR-brand-white;
transition: background-color 0.2s;
border-radius: 4px;
}
& > .checkbox::before,
& > .checkbox::after {
content: '';
position: absolute;
background-color: white;
background-color: $PR-brand-white;
transition: opacity 0.2s;
opacity: 0;
border-radius: 2px;
Expand All @@ -99,22 +99,22 @@
}

& > label {
color: white;
color: $PR-brand-white;
}
}

.checkbox-container-disabled.checkbox-container-primary {
cursor: not-allowed;
& > .checkbox {
border: 1px solid #646464;
border: 1px solid $gray-dark;
transition: background-color 0.2s;
}

& > .checkbox::before,
& > .checkbox::after {
content: '';
position: absolute;
background-color: white;
background-color: $PR-brand-white;
transition: opacity 0.2s;
opacity: 0;
border-radius: 2px;
Expand All @@ -124,7 +124,7 @@

& > .checkbox {
background-color: $gray-light;
border: 1px solid #646464;
border: 1px solid $gray-dark;
}

& > .checkbox::before,
Expand All @@ -140,15 +140,15 @@
.checkbox-container-disabled.checkbox-container-secondary {
cursor: not-allowed;
& > .checkbox {
border: 1px solid #646464;
border: 1px solid $gray-dark;
transition: background-color 0.2s;
}

& > .checkbox::before,
& > .checkbox::after {
content: '';
position: absolute;
background-color: white;
background-color: $PR-brand-white;
transition: opacity 0.2s;
opacity: 0;
border-radius: 2px;
Expand All @@ -158,7 +158,7 @@

& > .checkbox {
background-color: $gray-light;
border: 1px solid #646464;
border: 1px solid $gray-dark;
}

& > .checkbox::before,
Expand All @@ -178,23 +178,23 @@ label {

.checkbox-container-enabled.checkbox-container-secondary.checkbox-container-secondary-onboarding {
& > .checkbox.checked {
border: 2.5px solid white;
border: 2.5px solid $PR-brand-white;
transition: background-color 0.2s;
border-radius: 4px;
background-color: white;
background-color: $PR-brand-white;
}
& > .checkbox.checked::before,
& > .checkbox.checked::after {
content: '';
position: absolute;
background-color: white;
background-color: $PR-brand-white;
transition: opacity 0.2s;
opacity: 0;
border-radius: 2px;
background: linear-gradient(
to right,
rgba(184, 67, 166, 1),
rgba(128, 0, 128, 1)
rgba($PR-brand-purple, 1)
);
}

Expand All @@ -206,6 +206,6 @@ label {
}

& > label {
color: white;
color: $PR-brand-white;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,17 @@
}

&-dark {
background: rgba(255, 255, 255, 0.08);
background: rgba($PR-brand-white, 0.08);
opacity: 0.8;
color: white;
border: 1px solid rgba(255, 255, 255, 0.16);
color: $PR-brand-white;
border: 1px solid rgba($PR-brand-white, 0.16);
&:focus {
background-color: $form-background-dark !important;
opacity: 1;
border: 1px solid $form-border;
}
&::placeholder {
color: white;
color: $PR-brand-white;
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
height: 20px;
border-radius: 25px;
position: relative;
background-color: rgba(255, 255, 255, 0.32);
background-color: rgba($PR-brand-white, 0.32);
transition: background-color 0.2s;

& > .toggle-knob {
width: 15px;
height: 15px;
background-color: $white;
background-color: $PR-brand-white;
border-radius: 50%;
position: absolute;
top: 2.5px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
$padding-x: $navbar-button-icon-padding;

.btn-alternate {
color: white;
color: $PR-brand-white;
margin-bottom: 0;
padding-left: $padding-x;
padding-right: $padding-x;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ $easing: $tweaked-ease;
display: block;
margin: 0 auto;
visibility: hidden;
background: white;
background: $PR-brand-white;
position: relative;

&.visible {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import 'colors';

@mixin flex {
display: flex;
align-items: center;
Expand All @@ -7,7 +9,7 @@
cursor: pointer;
display: flex;
justify-content: space-between;
border-bottom: 1px solid black;
border-bottom: 1px solid $PR-brand-black;
border-radius: 4px;
padding-bottom: 6px;

Expand All @@ -27,8 +29,8 @@
width: 211px;
height: fit-content;
box-shadow:
0px 2px 2px rgba(0, 0, 0, 0.24),
0px 0px 2px rgba(0, 0, 0, 0.12);
0px 2px 2px rgba($PR-brand-black, 0.24),
0px 0px 2px rgba($PR-brand-black, 0.12);
padding: 0.5rem 0;
margin-left: 3rem;
&-file-viewer {
Expand Down
4 changes: 3 additions & 1 deletion src/app/shared/components/audio/audio.component.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import 'colors';

:host {
position: absolute;
top: 0;
Expand All @@ -7,5 +9,5 @@
display: flex;
justify-content: center;
align-items: center;
background: white;
background: $PR-brand-white;
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pr-breadcrumb {
display: flex;
flex: 0 1 auto;
min-width: 0; // ✅ allow shrinking in flex layout
color: white;
color: $PR-brand-white;
white-space: normal;
word-break: break-word;
overflow-wrap: anywhere;
Expand All @@ -27,7 +27,7 @@ pr-breadcrumb {
}

a {
color: white;
color: $PR-brand-white;
text-decoration: none;

display: inline;
Expand Down Expand Up @@ -94,7 +94,7 @@ pr-breadcrumb {
.breadcrumb-shares-archives {
position: fixed;
top: $navbar-height-desktop;
background: white;
background: $PR-brand-white;
z-index: 100;
}
}
Loading