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
48 changes: 26 additions & 22 deletions components/AppConfirmationDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,18 @@
</span>
</div>

<h2
:id="titleId"
class="app-confirmation-dialog-title"
>
{{ title }}
</h2>
<div class="app-confirmation-dialog-body">
<h2
:id="titleId"
class="app-confirmation-dialog-title"
>
{{ title }}
</h2>

<p class="app-confirmation-dialog-message">
{{ message }}
</p>
<p class="app-confirmation-dialog-message">
{{ message }}
</p>
</div>

<div class="app-confirmation-dialog-actions">
<button
Expand Down Expand Up @@ -202,10 +204,10 @@ function handleWindowKeydown(event: KeyboardEvent) {

.app-confirmation-dialog {
position: relative;
width: min(44rem, 100%);
width: min(40rem, 100%);
display: grid;
gap: 1rem;
padding: 2rem 2.15rem 2.05rem;
gap: 30px;
padding: 30px;
background: #ffffff;
border-radius: 1.15rem;
box-shadow: 0 1.25rem 3rem rgba($text-navy, 0.18);
Expand All @@ -224,8 +226,8 @@ function handleWindowKeydown(event: KeyboardEvent) {
}

.app-confirmation-dialog-icon {
width: 4rem;
height: 4rem;
width: 50px;
height: 50px;
display: inline-flex;
align-items: center;
justify-content: center;
Expand All @@ -245,16 +247,20 @@ function handleWindowKeydown(event: KeyboardEvent) {
.app-confirmation-dialog-title {
margin: 0;
color: $text-navy;
font-family: var(--secondary-font-family);
font-size: clamp(1.9rem, 2.4vw, 2.3rem);
font-size: 20px;
font-weight: 700;
line-height: 1.12;
letter-spacing: -0.03em;
}

.app-confirmation-dialog-body {
display: grid;
gap: 15px;
}

.app-confirmation-dialog-message {
margin: 0;
color: rgba($secondary, 0.98);
color: $text-secondary;
font-size: 1rem;
line-height: 1.55;
}
Expand All @@ -268,11 +274,9 @@ function handleWindowKeydown(event: KeyboardEvent) {

.app-confirmation-dialog-secondary,
.app-confirmation-dialog-primary {
min-width: 10.5rem;
min-height: 3.25rem;
min-height: 40px;
font-size: 1rem;
font-weight: 700;
border-radius: 0.5rem;
font-weight: 600;
}

.app-confirmation-dialog-primary-default {
Expand Down Expand Up @@ -307,7 +311,7 @@ function handleWindowKeydown(event: KeyboardEvent) {
}

.app-confirmation-dialog-title {
font-size: 1.75rem;
font-size: 20px;
}

.app-confirmation-dialog-actions {
Expand Down
2 changes: 1 addition & 1 deletion components/AppIcon.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const classes = computed(() => ([
<style lang="scss">
.material-icons {
vertical-align: middle;
margin-top: -3px;
//margin-top: -3px;
Comment thread
faizm21 marked this conversation as resolved.

&.me-2 {
margin-right: 0.33em !important;
Expand Down
45 changes: 26 additions & 19 deletions components/project-wizard/StatusDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,29 +28,31 @@
<div class="project-wizard-status-dialog-icon-shell">
<span class="project-wizard-status-dialog-icon">
<app-icon
:variant="variant === 'success' ? 'check_circle' : 'error'"
:variant="variant === 'success' ? 'check_circle' : 'info'"
size="22"
no-margin
/>
</span>
</div>

<h2
:id="titleId"
class="project-wizard-status-dialog-title"
>
{{ title }}
</h2>
<div class="project-wizard-body">
<h2
:id="titleId"
class="project-wizard-status-dialog-title"
>
{{ title }}
</h2>

<p class="project-wizard-status-dialog-message">
{{ message }}
</p>
<p class="project-wizard-status-dialog-message">
{{ message }}
</p>
</div>

<div class="project-wizard-status-dialog-actions">
<button
v-if="secondaryActionLabel"
ref="secondaryActionRef"
class="btn btn-outline-secondary project-wizard-status-dialog-secondary"
class="btn btn-outline-secondary"
type="button"
@click="emit('secondary-action')"
>
Expand All @@ -59,7 +61,7 @@

<button
ref="primaryActionRef"
class="btn btn-primary project-wizard-status-dialog-primary"
class="btn btn-primary"
type="button"
@click="emit('primary-action')"
>
Expand Down Expand Up @@ -151,8 +153,8 @@ function handleWindowKeydown(event: KeyboardEvent) {
position: relative;
width: min(35.5rem, 100%);
display: grid;
gap: 1rem;
padding: 1.7rem 1.95rem 1.95rem;
gap: 30px;
padding: 30px;
background-color: #fff;
border-radius: 1rem;
box-shadow: 0 1rem 2.5rem rgba($text-navy, 0.18);
Expand All @@ -171,8 +173,8 @@ function handleWindowKeydown(event: KeyboardEvent) {
}

.project-wizard-status-dialog-icon {
width: 3.6rem;
height: 3.6rem;
width: 50px;
height: 50px;
display: inline-flex;
align-items: center;
justify-content: center;
Expand All @@ -192,15 +194,19 @@ function handleWindowKeydown(event: KeyboardEvent) {
.project-wizard-status-dialog-title {
margin: 0;
color: $text-navy;
font-family: var(--secondary-font-family);
font-size: 2rem;
font-size: 20px;
font-weight: 700;
line-height: 1.1;
}
Comment thread
faizm21 marked this conversation as resolved.

.project-wizard-body {
display: grid;
gap: 15px;
}

.project-wizard-status-dialog-message {
margin: 0;
color: rgba($secondary, 0.98);
color: $text-secondary;
font-size: 1rem;
line-height: 1.55;
overflow-wrap: anywhere;
Expand All @@ -211,6 +217,7 @@ function handleWindowKeydown(event: KeyboardEvent) {
align-items: center;
gap: 0.9rem;
padding-top: 0.35rem;
justify-content: flex-end;
}

.project-wizard-status-dialog-secondary,
Expand Down
28 changes: 15 additions & 13 deletions components/project-wizard/steps/AreaOfInterestStep.vue
Original file line number Diff line number Diff line change
Expand Up @@ -352,18 +352,19 @@ function onFileDrop(event: DragEvent) {
.project-wizard-area-captured {
display: flex;
flex-direction: column;
gap: 1rem;
gap: 1.2rem;
padding: 0.95rem 1rem;
background: #f3fcf8;
border: 1px solid #bcebdd;
background: #f6fcfa;
border: 1px solid #d4e4dd;
border-radius: 0.55rem;
border-left: 4px solid #349377;
}

.project-wizard-area-measurement {
display: inline-flex;
align-items: center;
gap: 0.65rem;
color: #195747;
color: $text-navy;
font-size: 0.88rem;
}

Expand All @@ -372,7 +373,7 @@ function onFileDrop(event: DragEvent) {
display: inline-flex;
align-items: flex-start;
gap: 0.65rem;
color: #195747;
color: $text-navy;
}

.project-wizard-area-captured-copy strong,
Expand Down Expand Up @@ -401,12 +402,13 @@ function onFileDrop(event: DragEvent) {
color: $text-navy;
background: #ffffff;
border: 1px solid rgba($text-navy, 0.14);
width: fit-content;
width: stretch;
justify-content: center;
}

.project-wizard-area-dropzone-shell {
border: 1px dashed rgba($text-navy, 0.28);
border-radius: 0.35rem;
border: 1px dashed #8A8FAD;
border-radius: 6px;
transition: border-color 0.2s ease, background-color 0.2s ease;
}

Expand All @@ -419,12 +421,13 @@ function onFileDrop(event: DragEvent) {
width: 100%;
display: grid;
justify-items: center;
gap: 0.55rem;
gap: 10px;
padding: 1.7rem 1rem;
text-align: center;
color: $text-navy;
background: transparent;
background: #fafafc;
border: 0;
border-radius: 6px;
}

.project-wizard-area-dropzone-icon {
Expand All @@ -434,13 +437,12 @@ function onFileDrop(event: DragEvent) {
}

.project-wizard-area-upload-icon {
width: 1.2rem;
height: 1.2rem;
width: 35px;
height: 35px;
display: block;
}

.project-wizard-area-dropzone-copy {
font-family: var(--secondary-font-family);
font-size: 1rem;
font-weight: 600;
line-height: 1.3;
Expand Down
1 change: 0 additions & 1 deletion components/project-wizard/steps/ReviewStep.vue
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,6 @@ function formatRole(role: WorkspaceRole): string {
gap: 0.55rem;
color: $text-secondary;
font-family: var(--primary-font-family);
font-size: 1.125rem;
font-style: normal;
font-weight: 400;
line-height: 1.625rem;
Expand Down
6 changes: 3 additions & 3 deletions components/project-wizard/steps/SettingsStep.vue
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ function onReviewRequiredChange(event: Event) {
.project-wizard-step-copy,
.project-wizard-settings-text {
margin: 0;
color: rgba($secondary, 0.95);
font-size: 0.95rem;
color: $text-secondary;
font-size: 14px;
line-height: 1.45;
}

Expand All @@ -186,7 +186,7 @@ function onReviewRequiredChange(event: Event) {
.project-wizard-settings-heading {
margin: 0;
color: $text-navy;
font-size: 0.98rem;
font-size: 16px;
font-weight: 700;
line-height: 1.3;
}
Expand Down
7 changes: 4 additions & 3 deletions components/workspace-project-details/AddContributorDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -269,12 +269,13 @@ function selectUser(userId: string) {

.project-detail-add-contributor-search-input {
padding-right: 2.5rem;
border-radius: 4px;
}

.project-detail-add-contributor-results {
min-height: 8rem;
border: 1px solid rgba($text-navy, 0.12);
border-radius: 0.75rem;
border-radius: 8px;
background: #ffffff;
overflow: hidden;
}
Expand Down Expand Up @@ -342,8 +343,8 @@ function selectUser(userId: string) {

.project-detail-add-contributor-user-copy strong {
color: $text-navy;
font-size: 0.96rem;
font-weight: 700;
font-size: 1rem;
font-weight: 600;
line-height: 1.25;
}

Expand Down
Loading
Loading