Skip to content

Commit f4a1eb6

Browse files
committed
Client: Tweak UI
1 parent ebb9bb0 commit f4a1eb6

6 files changed

+74
-25
lines changed

client/src/components/ComponentB.tsx

+26-4
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,22 @@
22
* ComponentC is a sample component.
33
* It is the only component of the Second SPA.
44
*/
5+
/** @jsx jsx */
6+
import { jsx, css } from "@emotion/react";
57
import * as React from "react";
6-
import { Header, Container, Menu } from "semantic-ui-react";
8+
import { Header, Icon, Container, Menu } from "semantic-ui-react";
79
import { BaseComponent } from "./BaseComponent";
810
import * as SPAs from "../../config/spa.config";
911

12+
const cssNav = css({
13+
marginRight: "2em",
14+
});
15+
16+
const cssIcon = css({
17+
transform: "translate(0%, -30%)",
18+
});
19+
20+
1021
const Description: React.FC = _props => {
1122
return (
1223
<section>
@@ -41,12 +52,23 @@ const Description: React.FC = _props => {
4152

4253
const Navigation: React.FC = _props => {
4354
return (
44-
<nav>
45-
<Menu vertical compact borderless className="nav_menu">
55+
<nav css={cssNav}>
56+
<Menu
57+
vertical
58+
size="large"
59+
className="nav_menu"
60+
>
4661
<Menu.Item>
4762
<Menu.Header>Go back to</Menu.Header>
4863
<Menu.Menu>
49-
<Menu.Item href={`/${SPAs.getNames()[0]}.html`}>First SPA</Menu.Item>
64+
<Menu.Item href={`/${SPAs.getNames()[0]}.html`}>
65+
First SPA
66+
<Icon
67+
name="object group outline"
68+
size="big"
69+
css={cssIcon}
70+
/>
71+
</Menu.Item>
5072
</Menu.Menu>
5173
</Menu.Item>
5274
</Menu>

client/src/components/Navigation.tsx

+27-8
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { jsx } from "@emotion/react";
77
import * as React from "react";
88
import { NavLink } from "react-router-dom";
9-
import { Menu } from "semantic-ui-react";
9+
import { Menu, Icon } from "semantic-ui-react";
1010
import * as SPAs from "../../config/spa.config";
1111
import styles from "../css/navigation.module.css";
1212

@@ -16,21 +16,40 @@ const cssStyle: Record<string, string> = {
1616

1717
export const Navigation: React.FC = _props => {
1818
return (
19-
<nav css={cssStyle.menu}>
20-
<Menu vertical className="nav_menu">
19+
<nav className={cssStyle.menu}>
20+
<Menu
21+
vertical
22+
size="large"
23+
className="nav_menu"
24+
>
2125
<Menu.Item>
2226
<Menu.Header>First SPA</Menu.Header>
2327
<Menu.Menu>
24-
<Menu.Item header as={NavLink} exact to="/" children="Overview" />
25-
<Menu.Item header as={NavLink} to="/a" children="ComponentA" />
26-
<Menu.Item header as={NavLink} to="/lighthouse" children="Lighthouse" />
27-
<Menu.Item header as={NavLink} to="/namelookup" children="NameLookup" />
28+
<Menu.Item header as={NavLink} exact to="/">
29+
Overview
30+
<Icon name="file alternate outline" size="large" />
31+
</Menu.Item>
32+
<Menu.Item header as={NavLink} to="/a">
33+
ComponentA
34+
<Icon name="cube" size="large" />
35+
</Menu.Item>
36+
<Menu.Item header as={NavLink} to="/lighthouse">
37+
Lighthouse
38+
<Icon name="tachometer alternate" size="large" />
39+
</Menu.Item>
40+
<Menu.Item header as={NavLink} to="/namelookup">
41+
NameLookup
42+
<Icon name="search" size="large" />
43+
</Menu.Item>
2844
</Menu.Menu>
2945
</Menu.Item>
3046
<Menu.Item>
3147
<Menu.Header>Second SPA</Menu.Header>
3248
<Menu.Menu>
33-
<Menu.Item href={`/${SPAs.getNames()[1]}.html`}>ComponentB</Menu.Item>
49+
<Menu.Item href={`/${SPAs.getNames()[1]}.html`}>
50+
ComponentB
51+
<Icon name="cube" size="large" />
52+
</Menu.Item>
3453
</Menu.Menu>
3554
</Menu.Item>
3655
</Menu>

client/src/css/app.css

+6
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,9 @@ that remains unmangled.
1515
margin-top: 2em;
1616
margin-bottom: 3em;
1717
}
18+
19+
@media only screen and (max-width: 767px) {
20+
.ui.text.justified.container {
21+
margin-left: 0 !important;
22+
}
23+
}

client/src/css/base-component.module.css

+12-12
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@ code {
66

77
.component_container {
88
display: flex;
9-
flex-flow: row nowrap;
9+
flex-flow: row wrap;
1010
align-items: flex-start;
1111
}
1212

13-
@media only screen and (max-width: 550px) {
14-
.component_container {
15-
display: flex;
16-
flex-flow: row wrap;
17-
align-items: flex-start;
18-
}
19-
}
20-
2113
.left_component {
2214
flex: initial;
23-
margin-bottom: 1rem;
24-
margin-left: 2rem;
15+
margin-bottom: 1em;
16+
margin-left: 2em;
2517
}
2618

2719
.right_component {
28-
flex: auto;
20+
flex: 0 1 auto;
21+
margin-left: 2em;
22+
}
23+
24+
@media only screen and (min-width: 1024px) {
25+
.right_component {
26+
flex: auto;
27+
margin-left: 2em;
28+
}
2929
}

client/src/css/navigation.module.css

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ in class selectors. No name collisions with third
55
party libraries or other components.
66
*/
77
.menu {
8-
margin-right: 1em;
8+
/* just a placeholder */
9+
margin-right: 0;
910
}

client/src/css/overview.module.css

+1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ party libraries or other components.
66
*/
77
.msg {
88
margin-top: 0 !important;
9+
hyphens: manual;
910
}

0 commit comments

Comments
 (0)