Skip to content

Commit befed87

Browse files
Qix-Qix-
committed
tweak workspace list style
1 parent da705f7 commit befed87

File tree

7 files changed

+237
-21
lines changed

7 files changed

+237
-21
lines changed

‎minimap-app/www-src/font/OFL.txt‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter)
2+
3+
This Font Software is licensed under the SIL Open Font License, Version 1.1.
4+
This license is copied below, and is also available with a FAQ at:
5+
http://scripts.sil.org/OFL
6+
7+
8+
-----------------------------------------------------------
9+
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
10+
-----------------------------------------------------------
11+
12+
PREAMBLE
13+
The goals of the Open Font License (OFL) are to stimulate worldwide
14+
development of collaborative font projects, to support the font creation
15+
efforts of academic and linguistic communities, and to provide a free and
16+
open framework in which fonts may be shared and improved in partnership
17+
with others.
18+
19+
The OFL allows the licensed fonts to be used, studied, modified and
20+
redistributed freely as long as they are not sold by themselves. The
21+
fonts, including any derivative works, can be bundled, embedded,
22+
redistributed and/or sold with any software provided that any reserved
23+
names are not used by derivative works. The fonts and derivatives,
24+
however, cannot be released under any other type of license. The
25+
requirement for fonts to remain under this license does not apply
26+
to any document created using the fonts or their derivatives.
27+
28+
DEFINITIONS
29+
"Font Software" refers to the set of files released by the Copyright
30+
Holder(s) under this license and clearly marked as such. This may
31+
include source files, build scripts and documentation.
32+
33+
"Reserved Font Name" refers to any names specified as such after the
34+
copyright statement(s).
35+
36+
"Original Version" refers to the collection of Font Software components as
37+
distributed by the Copyright Holder(s).
38+
39+
"Modified Version" refers to any derivative made by adding to, deleting,
40+
or substituting -- in part or in whole -- any of the components of the
41+
Original Version, by changing formats or by porting the Font Software to a
42+
new environment.
43+
44+
"Author" refers to any designer, engineer, programmer, technical
45+
writer or other person who contributed to the Font Software.
46+
47+
PERMISSION & CONDITIONS
48+
Permission is hereby granted, free of charge, to any person obtaining
49+
a copy of the Font Software, to use, study, copy, merge, embed, modify,
50+
redistribute, and sell modified and unmodified copies of the Font
51+
Software, subject to the following conditions:
52+
53+
1) Neither the Font Software nor any of its individual components,
54+
in Original or Modified Versions, may be sold by itself.
55+
56+
2) Original or Modified Versions of the Font Software may be bundled,
57+
redistributed and/or sold with any software, provided that each copy
58+
contains the above copyright notice and this license. These can be
59+
included either as stand-alone text files, human-readable headers or
60+
in the appropriate machine-readable metadata fields within text or
61+
binary files as long as those fields can be easily viewed by the user.
62+
63+
3) No Modified Version of the Font Software may use the Reserved Font
64+
Name(s) unless explicit written permission is granted by the corresponding
65+
Copyright Holder. This restriction only applies to the primary font name as
66+
presented to the users.
67+
68+
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
69+
Software shall not be used to promote, endorse or advertise any
70+
Modified Version, except to acknowledge the contribution(s) of the
71+
Copyright Holder(s) and the Author(s) or with their explicit written
72+
permission.
73+
74+
5) The Font Software, modified or unmodified, in part or in whole,
75+
must be distributed entirely under this license, and must not be
76+
distributed under any other license. The requirement for fonts to
77+
remain under this license does not apply to any document created
78+
using the Font Software.
79+
80+
TERMINATION
81+
This license becomes null and void if any of the above conditions are
82+
not met.
83+
84+
DISCLAIMER
85+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
86+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
87+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
88+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
89+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
90+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
91+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
92+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
93+
OTHER DEALINGS IN THE FONT SOFTWARE.

‎minimap-app/www-src/font/inter.ttf‎

55.2 KB
Binary file not shown.

‎minimap-app/www-src/js/component/Logo.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.root {
2+
fill: var(--mm-border);
3+
}

‎minimap-app/www-src/js/component/Logo.mjs‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
import * as Surplus from 'surplus';
2+
3+
import css from 'minimap/js/util/css.mjs';
4+
5+
import * as C from './Logo.css';
6+
7+
export default ({ className }) => (
8+
<svg
9+
width="100%"
10+
height="100%"
11+
viewBox="0 0 161 30"
12+
version="1.1"
13+
xmlns="http://www.w3.org/2000/svg"
14+
className={css(C.root, className)}
15+
>
16+
<defs>
17+
<rect
18+
x="0"
19+
y="0"
20+
width="7"
21+
height="30"
22+
id="mmlogo-bar"
23+
shapeRendering="crispEdges"
24+
/>
25+
<g id="mmlogo-m">
26+
<use href="#mmlogo-bar" />
27+
<use href="#mmlogo-bar" x="21" />
28+
<path d="M3,0H9L14,15L19,0H25L16,27H12Z" />
29+
</g>
30+
<g id="mmlogo-n">
31+
<use href="#mmlogo-bar" />
32+
<use href="#mmlogo-bar" x="14" />
33+
<path d="M3,0H9L14,15H17V30H14Z" />
34+
</g>
35+
<path
36+
d="M11.003,0.932L10.895,0.082L11.389,0L11.558,1.328L11.558,1.328C12.971,5.073 19.165,24.703 21,27.594L19.988,27.595C19.871,28.344 19.585,29.296 18.978,29.721C18.166,30.291 1.926,29.893 0,29.371C0.189,28.608 0.375,27.848 0.468,27.062C0.468,27.062 11.026,26.734 11.917,26.435C9.698,25.165 3.291,24.629 1.528,25.804C-0.494,20.019 6.879,1.101 11.003,0.932ZM20.784,27.267C20.795,26.451 13.447,25.641 12.712,26.439C12.996,25.266 11.414,2.256 11.237,1.921C10.22,11.512 9.16,24.167 12.337,26.351C13.057,26.458 13.65,26.922 14.367,27.059C15.537,27.282 16.736,27.279 17.929,27.258L17.929,27.258L20.784,27.267Z"
37+
id="mmlogo-ship"
38+
/>
39+
<g id="mmlogo-p">
40+
<use href="#mmlogo-bar" />
41+
<path d="M3,0H9C25,0,25,20,9,20H3ZM3,14H9C15.5,14,15.5,6,9,6H3Z" />
42+
</g>
43+
</defs>
44+
<use href="#mmlogo-m" x="0" />
45+
<use href="#mmlogo-bar" x="33" />
46+
<use href="#mmlogo-n" x="45" />
47+
<use href="#mmlogo-bar" x="71" />
48+
<use href="#mmlogo-m" x="83" />
49+
<use href="#mmlogo-ship" x="115.5" />
50+
<use href="#mmlogo-p" x="140" />
51+
</svg>
52+
);
53+
54+
export const LogoIconSquare = () => (
55+
<svg
56+
width="100%"
57+
height="100%"
58+
viewBox="0 0 40 40"
59+
version="1.1"
60+
xmlns="http://www.w3.org/2000/svg"
61+
className={C.root}
62+
>
63+
<defs>
64+
<path
65+
d="M11.003,0.932L10.895,0.082L11.389,0L11.558,1.328L11.558,1.328C12.971,5.073 19.165,24.703 21,27.594L19.988,27.595C19.871,28.344 19.585,29.296 18.978,29.721C18.166,30.291 1.926,29.893 0,29.371C0.189,28.608 0.375,27.848 0.468,27.062C0.468,27.062 11.026,26.734 11.917,26.435C9.698,25.165 3.291,24.629 1.528,25.804C-0.494,20.019 6.879,1.101 11.003,0.932ZM20.784,27.267C20.795,26.451 13.447,25.641 12.712,26.439C12.996,25.266 11.414,2.256 11.237,1.921C10.22,11.512 9.16,24.167 12.337,26.351C13.057,26.458 13.65,26.922 14.367,27.059C15.537,27.282 16.736,27.279 17.929,27.258L17.929,27.258L20.784,27.267Z"
66+
style={{ fill: 'black' }}
67+
id="mmicon-ship"
68+
/>
69+
<mask id="mmicon-ship-mask">
70+
<rect
71+
x="0"
72+
y="0"
73+
width="40"
74+
height="40"
75+
style={{ fill: 'white' }}
76+
/>
77+
<use href="#mmicon-ship" x="9.5" y="5" />
78+
</mask>
79+
</defs>
80+
<rect
81+
x="0"
82+
y="0"
83+
width="40"
84+
height="40"
85+
mask="url(#mmicon-ship-mask)"
86+
/>
87+
</svg>
88+
);
89+
90+
export const LogoIcon = () => (
91+
<svg
92+
width="100%"
93+
height="100%"
94+
viewBox="0 0 40 40"
95+
version="1.1"
96+
xmlns="http://www.w3.org/2000/svg"
97+
className={C.root}
98+
>
99+
<defs>
100+
<path
101+
d="M11.003,0.932L10.895,0.082L11.389,0L11.558,1.328L11.558,1.328C12.971,5.073 19.165,24.703 21,27.594L19.988,27.595C19.871,28.344 19.585,29.296 18.978,29.721C18.166,30.291 1.926,29.893 0,29.371C0.189,28.608 0.375,27.848 0.468,27.062C0.468,27.062 11.026,26.734 11.917,26.435C9.698,25.165 3.291,24.629 1.528,25.804C-0.494,20.019 6.879,1.101 11.003,0.932ZM20.784,27.267C20.795,26.451 13.447,25.641 12.712,26.439C12.996,25.266 11.414,2.256 11.237,1.921C10.22,11.512 9.16,24.167 12.337,26.351C13.057,26.458 13.65,26.922 14.367,27.059C15.537,27.282 16.736,27.279 17.929,27.258L17.929,27.258L20.784,27.267Z"
102+
id="mmicon-ship"
103+
/>
104+
</defs>
105+
<use href="#mmicon-ship" x="9.5" y="5" />
106+
</svg>
107+
);

‎minimap-app/www-src/js/global.css‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44

55
@font-face {
66
font-family: Inter;
7-
src: local('Inter'), url('font/inter.ttf') format('truetype-variations');
8-
font-weight: 1 999;
7+
src: url('font/inter.ttf') format('truetype-variations');
8+
font-weight: 125 950;
9+
font-stretch: 75% 125%;
10+
font-style: oblique 0deg 20deg;
911
}
1012

1113
@keyframes pulse {

‎minimap-app/www-src/js/module/WorkspaceSelect.css‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
11
.root {
2-
border: 1px solid var(--mm-border);
32
box-sizing: border-box;
43
display: flex;
54
flex-direction: column;
6-
gap: 1rem;
75
}
86

9-
.root > h1 {
7+
.root h1 {
108
text-transform: uppercase;
11-
font-size: 1.5rem;
9+
font-size: 1.2rem;
1210
font-weight: 700;
1311
padding: 1rem;
1412
box-sizing: border-box;
15-
background: var(--mm-text);
13+
background: var(--mm-border);
1614
color: var(--mm-bg);
1715
}
1816

19-
.workspaceList {
17+
.logo-container {
18+
padding: 1rem 50% 1rem 0rem;
19+
}
20+
21+
.list-container {
22+
border: 1px solid var(--mm-border);
23+
}
24+
25+
.workspace-list {
2026
display: flex;
2127
flex-direction: column;
2228
padding: 0.5rem;
@@ -43,14 +49,12 @@
4349
}
4450

4551
.workspaceType {
46-
font-size: 1.25rem;
47-
font-weight: 700;
52+
font-weight: 900;
4853
margin-bottom: 0.5rem;
4954
}
5055

5156
.property > strong {
5257
display: inline-block;
5358
width: 9ch;
54-
font-weight: 900;
5559
text-align: left;
5660
}

‎minimap-app/www-src/js/module/WorkspaceSelect.mjs‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import * as Surplus from 'surplus';
22

33
import I from 'minimap/js/util/i18n.mjs';
44

5+
import Logo from 'minimap/js/component/Logo.mjs';
6+
57
import * as C from './WorkspaceSelect.css';
68

79
const TYPE_TAGS = {
@@ -25,16 +27,21 @@ const TYPE_TAGS = {
2527
export default ({ savedWorkspaces }) => {
2628
return (
2729
<div className={C.root}>
28-
<h1>{I`Select a workspace`}</h1>
29-
<div className={C.workspaceList}>
30-
{savedWorkspaces.map(workspace => {
31-
const TypeTag = TYPE_TAGS[workspace.type];
32-
return (
33-
<button className={C.workspace}>
34-
<TypeTag {...workspace} />
35-
</button>
36-
);
37-
})}
30+
<div className={C.logoContainer}>
31+
<Logo />
32+
</div>
33+
<div className={C.listContainer}>
34+
<h1>{I`Select a workspace`}</h1>
35+
<div className={C.workspaceList}>
36+
{savedWorkspaces.map(workspace => {
37+
const TypeTag = TYPE_TAGS[workspace.type];
38+
return (
39+
<button className={C.workspace}>
40+
<TypeTag {...workspace} />
41+
</button>
42+
);
43+
})}
44+
</div>
3845
</div>
3946
</div>
4047
);

0 commit comments

Comments
 (0)