Skip to content

Commit ebf9ffc

Browse files
authored
Merge pull request #9 from encryption4all/fix-design-improvements
Fix design improvements
2 parents 6717c11 + 0dca0ec commit ebf9ffc

9 files changed

Lines changed: 116 additions & 122 deletions

File tree

src/lib/components/Chip.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@
110110
111111
button.chip-default:hover:not(:disabled) {
112112
background-color: var(--pg-soft-background);
113-
border-color: var(--pg-accent-color);
114-
color: var(--pg-accent-color);
113+
border-color: var(--pg-primary);
114+
color: var(--pg-primary);
115115
box-shadow: 0 2px 4px rgba(48, 149, 222, 0.15);
116116
}
117117

src/lib/components/HelpToggle.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
.help-link {
9595
display: inline-block;
9696
font-size: 0.85rem;
97-
color: var(--pg-accent-color);
97+
color: var(--pg-primary);
9898
font-family: var(--pg-font-family);
9999
font-weight: 600;
100100
text-decoration: none;

src/lib/components/Tabs.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
z-index: -1;
5656
bottom: -3px;
5757
height: 0;
58-
border: 2px solid rgba(var(--pg-accent-color-rgb), 50%);
58+
border: 2px solid rgba(var(--pg-primary-rgb), 50%);
5959
border-radius: 10px;
6060
}
6161
}

src/lib/components/filesharing/SendButton.svelte

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@
536536
right: 0;
537537
bottom: 0;
538538
background: rgba(3, 14, 23, 0.09);
539-
z-index: 999;
539+
z-index: 3;
540540
cursor: pointer;
541541
}
542542
@@ -548,7 +548,7 @@
548548
box-shadow: 0 8px 24px rgba(0, 0, 0, 0.15);
549549
padding: 1rem 1.5rem 1.5rem 1.5rem;
550550
width: var(--popup-width);
551-
z-index: 10000;
551+
z-index: 4;
552552
}
553553
554554
.popup-content {
@@ -610,7 +610,7 @@
610610
position: fixed;
611611
inset: 0;
612612
background: rgba(0, 0, 0, 0.4);
613-
z-index: 9999;
613+
z-index: 3;
614614
}
615615
616616
.mobile-bottom-sheet {
@@ -622,7 +622,7 @@
622622
border-radius: var(--pg-border-radius-lg) var(--pg-border-radius-lg) 0 0;
623623
box-shadow: 0 -4px 24px rgba(0, 0, 0, 0.15);
624624
padding: 1.5rem;
625-
z-index: 10000;
625+
z-index: 4;
626626
}
627627
628628
.bottom-sheet-content {

src/lib/components/header/Hamburger.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
margin: 0;
110110
width: 100%;
111111
height: 100%;
112-
z-index: 1000;
112+
z-index: 4;
113113
}
114114
115115
.hamburger-menu.open {

src/lib/global.scss

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ body {
2222
margin: 0;
2323
overflow-x: hidden;
2424
background: var(--pg-general-background);
25+
z-index: -5;
2526
}
2627

2728
:root {
@@ -162,8 +163,8 @@ input.pg-input:focus,
162163
select.pg-input:focus,
163164
textarea.pg-input:focus {
164165
outline: none;
165-
border-color: var(--pg-accent-color);
166-
box-shadow: 0 0 0 3px rgba(var(--pg-accent-color-rgb), 0.1);
166+
border-color: var(--pg-primary);
167+
box-shadow: 0 0 0 3px rgba(var(--pg-primary-rgb), 0.1);
167168
}
168169

169170
input.pg-input:invalid:not(:focus):not(:placeholder-shown),
@@ -183,14 +184,6 @@ textarea.pg-input:disabled {
183184
box-sizing: border-box;
184185
}
185186

186-
.lazyload {
187-
opacity: 0;
188-
}
189-
190-
.lazyloading {
191-
opacity: 1;
192-
transition: opacity 250ms;
193-
}
194187

195188
h1,
196189
h2,
@@ -208,10 +201,12 @@ label, td, tr, summary {
208201

209202
p {
210203
font-size: 16px;
204+
margin-top: 0.25em;
205+
margin-bottom: 0.25em;
211206
}
212207

213208
a {
214-
text-decoration-color: var(--pg-accent-color);
209+
text-decoration-color: var(--pg-primary);
215210
}
216211

217212
h2 {
@@ -328,9 +323,10 @@ h3 {
328323
inline-size: 350px;
329324
overflow-wrap: break-word;
330325
margin-bottom: 0;
326+
z-index: 0;
331327

332328
span {
333-
background-color: transparent;
329+
background-color: var(--pg-general-background);
334330
padding-right: 10px;
335331
}
336332

@@ -341,7 +337,7 @@ h3 {
341337
left: 0;
342338
right: 50px;
343339
height: 4px;
344-
background-color: var(--pg-accent-color);
340+
background-color: var(--pg-primary);
345341
border-radius: 3.5px;
346342
z-index: -1;
347343
}

src/routes/about/+page.svelte

Lines changed: 40 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
import aboutImg from '$lib/assets/images/about.svg'
44
</script>
55

6-
<div class="about-container">
7-
<div class="about-content">
8-
<h2 class="page-title"><span>{$_('about.title')}</span></h2>
9-
10-
<div class="content-grid">
6+
<div class="page-wrapper">
7+
<div class="grid-container">
8+
<div class="grid-item header">
9+
<h2><span>{$_('about.title')}</span></h2>
1110
<div class="text-content">
1211
<h3>{$_('about.subtitle1')}</h3>
1312
<p>
@@ -22,70 +21,54 @@
2221
{$_('about.subpar3')}
2322
</p>
2423
</div>
25-
26-
<div class="image-content">
27-
<img
28-
src={aboutImg}
29-
alt="about"
30-
class="invert"
31-
/>
32-
33-
</div>
24+
</div>
25+
<div class="grid-item content-box">
26+
<img
27+
src={aboutImg}
28+
alt="about"
29+
class="invert"
30+
/>
3431
<div id="team">
35-
<h3>{$_('about.team.header')}</h3>
36-
<p>
37-
{@html $_('about.team.par')}
38-
</p>
32+
<h3>{$_('about.team.header')}</h3>
33+
<p>
34+
{@html $_('about.team.par')}
35+
</p>
3936
</div>
4037
</div>
4138
</div>
4239
</div>
4340

4441
<style lang="scss">
45-
.image-content{
46-
display: flex;
47-
justify-content: center
48-
}
49-
50-
img {
51-
width: 100%;
52-
}
53-
.about-container {
42+
.page-wrapper {
43+
height: 100%;
5444
display: flex;
45+
align-items: center;
5546
justify-content: center;
56-
align-items: flex-start;
57-
width: 100%;
58-
height: calc(100vh - 52px - 0.5rem - 1rem);
59-
overflow-y: auto;
60-
padding: 2rem 1rem;
61-
}
62-
63-
.about-content {
64-
max-width: 1100px;
65-
width: 100%;
6647
}
6748
68-
.page-title {
69-
text-align: center;
70-
margin-bottom: 2rem;
49+
.grid-item {
50+
height: 100%;
51+
display: flex;
52+
flex-direction: column;
7153
}
7254
73-
.content-grid {
55+
.grid-container {
7456
display: grid;
75-
grid-template-columns: 1fr 1fr;
76-
gap: 4rem;
57+
grid-template-columns: repeat(2, minmax(0, 550px));
58+
height: auto;
7759
align-items: start;
60+
overflow-y: auto;
7861
}
7962
80-
.text-content {
81-
text-align: left;
63+
img {
64+
width: 90%;
65+
margin-bottom: 1rem;
66+
}
8267
68+
.text-content {
8369
h3 {
8470
margin-top: 1.5rem;
8571
margin-bottom: 0.5rem;
86-
font-size: 1.1rem;
87-
font-weight: 700;
88-
color: var(--pg-text);
8972
}
9073
9174
h3:first-child {
@@ -99,19 +82,17 @@
9982
}
10083
}
10184
102-
.image-content {
103-
text-align: left;
104-
105-
img {
106-
max-width: 100%;
107-
height: auto;
108-
}
85+
.content-box {
86+
height: 100%;
87+
display: flex;
88+
flex-direction: column;
89+
justify-content: space-evenly;
10990
}
11091
11192
#team {
112-
border: 1px dashed var(--pg-text);
113-
border-radius: 16px;
114-
padding: 1.5rem 2rem;
93+
border: 1px dashed black;
94+
border-radius: 8px;
95+
padding: 20px;
11596
11697
h3 {
11798
margin-top: 0;
@@ -126,17 +107,8 @@
126107
}
127108
128109
@media only screen and (max-width: 800px) {
129-
.about-container {
130-
padding: 1rem 0.5rem;
131-
}
132-
133-
.about-content {
134-
width: 96%;
135-
}
136-
137-
.content-grid {
110+
.grid-container {
138111
grid-template-columns: 1fr;
139-
gap: 2rem;
140112
}
141113
}
142114
</style>

0 commit comments

Comments
 (0)