Skip to content

Commit 55e36c5

Browse files
authored
Merge pull request #204 from processing/new-logos
New logos
2 parents de1499b + f6e1f03 commit 55e36c5

10 files changed

+89
-63
lines changed

src/components/Topbar.js

Lines changed: 46 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,60 @@ import * as css from './Topbar.module.css';
77
import LanguageSelector from './LanguageSelector';
88

99
import LogoProcessing from '../images/logo-processing.svg';
10-
import LogoP5js from '../images/logo-p5js.svg';
11-
import LogoFoundation from '../images/logo-processingfoundation.svg';
10+
import LogoProcessingFoundation from '../images/logo-processing-foundation.svg';
11+
import LogoProcessingAndroid from '../images/logo-processing-android.svg';
12+
import LogoProcessingPython from '../images/logo-processing-python.svg';
13+
14+
import LogoP5js from '../images/logo-p5js-original.svg';
1215

1316
export const items = [
1417
{
1518
className: css.foundation,
16-
name: 'Processing Foundation',
19+
name: (
20+
<>
21+
Processing
22+
<br /> Foundation
23+
</>
24+
),
1725
link: 'https://processingfoundation.org',
18-
logo: <LogoFoundation className={css.logo} />
26+
logo: <LogoProcessingFoundation className={css.logo} />,
27+
color: '#9c4bff'
1928
},
2029
{
2130
name: 'Processing',
2231
className: css.processing,
2332
link: 'https://processing.org',
24-
logo: <LogoProcessing className={css.logo} />
33+
logo: <LogoProcessing className={css.logo} />,
34+
color: '#0564ff'
2535
},
2636
{
2737
className: css.p5,
2838
name: 'p5.js',
2939
link: 'https://p5js.org/',
30-
logo: <LogoP5js className={css.logo} />
40+
logo: <LogoP5js className={css.logo} />,
41+
color: '#ED225D'
42+
},
43+
{
44+
name: (
45+
<>
46+
Processing
47+
<br /> Android
48+
</>
49+
),
50+
link: 'https://android.processing.org/',
51+
logo: <LogoProcessingAndroid className={css.logo} />,
52+
color: '#98C800'
53+
},
54+
{
55+
name: (
56+
<>
57+
Processing
58+
<br /> Python
59+
</>
60+
),
61+
link: 'https://py.processing.org/',
62+
logo: <LogoProcessingPython className={css.logo} />,
63+
color: '#2D9E97'
3164
}
3265
];
3366

@@ -45,8 +78,14 @@ const Topbar = ({ show }) => {
4578
<li key={key} className={classnames(css.item, item.className)}>
4679
<a className={css.itemLink} href={item.link}>
4780
{item.logo}
48-
<span>{item.name}</span>
81+
<span className={css.name} style={{ color: item.color }}>
82+
{item.name}
83+
</span>
4984
</a>
85+
<span
86+
className={css.itemBar}
87+
style={{ borderBottomColor: item.color }}
88+
/>
5089
</li>
5190
))}
5291
</ul>

src/components/Topbar.module.css

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
}
3030

3131
.menu {
32-
flex-basis: var(--col6);
3332
display: flex;
3433
align-items: center;
3534
}
@@ -41,57 +40,55 @@
4140
}
4241

4342
.item {
44-
display: flex;
45-
align-items: center;
4643
margin-right: 2rem;
4744
box-sizing: border-box;
4845
height: 100%;
4946
color: var(--processing-blue-mid);
5047
font-weight: 600;
51-
font-size: 0.85rem;
48+
font-size: 0.8rem;
5249
}
5350

54-
.item:hover {
55-
border-bottom: solid 4px var(--processing-blue-deep);
51+
.item a {
5652
padding-top: 4px;
53+
display: flex;
54+
height: calc(100% - 4px);
5755
}
5856
.item a,
5957
.item a:hover {
6058
color: inherit;
6159
}
62-
/*Styles for each logo */
63-
64-
.logo {
65-
margin-right: 5px;
66-
width: 27px;
67-
height: auto;
60+
.item .name {
61+
line-height: 1;
6862
}
69-
70-
.foundation {
71-
color: var(--foundation-mid);
63+
.itemBar {
64+
opacity: 0;
65+
border-bottom: solid 4px var(--processing-blue-deep);
66+
display: block;
67+
width: 100%;
68+
height: 0;
7269
}
73-
74-
.foundation:hover {
75-
border-color: var(--foundation-mid);
70+
.item:hover .itemBar {
71+
opacity: 1;
7672
}
7773

78-
.p5 {
79-
color: var(--p5-mid);
74+
/*Styles for each logo */
75+
76+
.logo {
77+
margin-right: 8px;
78+
width: 30px;
79+
height: auto;
8080
}
8181

82-
.p5:hover {
83-
border-color: var(--p5-mid);
82+
.foundation .logo {
83+
margin-top: 2px;
8484
}
8585

86-
.processing {
87-
color: var(--processing-blue-mid);
88-
& .logo {
89-
margin-top: 3px;
90-
}
86+
.processing .logo {
87+
margin-top: 4px;
9188
}
9289

93-
.processing:hover {
94-
border-color: var(--processing-blue-mid);
90+
.p5 .logo {
91+
width: 25px;
9592
}
9693

9794
.languageSelector {
@@ -104,6 +101,9 @@
104101
font-size: var(--text-small);
105102
}
106103
}
104+
.item .name {
105+
display: none;
106+
}
107107
}
108108

109109
@media (--small) {
@@ -117,10 +117,6 @@
117117
margin-right: var(--gutter-double);
118118
}
119119

120-
.item span {
121-
display: none;
122-
}
123-
124120
.logo {
125121
width: 26px;
126122
margin-right: 0px;

src/components/sketch/Sketch.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ const Sketch = ({ children }) => {
5353
if (window.localStorage) {
5454
const savedState = window.localStorage.getItem('sketch');
5555
if (savedState) {
56-
console.log('Loaded state from localStorage', savedState);
5756
setState(JSON.parse(savedState));
5857
} else {
5958
setState(initialState);

src/images/logo-p5js-dark.svg

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/images/logo-p5js-original.svg

Lines changed: 4 additions & 0 deletions
Loading
Lines changed: 5 additions & 0 deletions
Loading

src/images/logo-processing-dark.svg

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/images/logo-processing-python.svg

Lines changed: 5 additions & 0 deletions
Loading

src/images/logo-processingfoundation-dark.svg

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)