Skip to content

Commit 89c6499

Browse files
Add current year
1 parent 28ee869 commit 89c6499

File tree

4 files changed

+52
-8
lines changed

4 files changed

+52
-8
lines changed

app/resources/index.css

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ul, ol {
4545
left: 0;
4646
right: 0;
4747
height: 72px;
48-
padding: 16px;
48+
padding: 16px 72px 0 16px;
4949
box-sizing: border-box;
5050
background-color: white;
5151
z-index: 100;
@@ -168,6 +168,13 @@ ul, ol {
168168
cursor: pointer;
169169
}
170170

171+
.current-year {
172+
position: absolute;
173+
right: 16px;
174+
top: 25%;
175+
color: rgba(0, 0, 0, 0.54);
176+
}
177+
171178
.years-labels {
172179
list-style: none;
173180
font-size: 11px;

app/src/cljs/cup/app.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
{:name "Gertrude Stein"
5959
:link "https://en.wikipedia.org/wiki/Gertrude_Stein"
6060
:avatar "img/stein.png"
61-
:color "#00BCD4"
61+
:color "#9C27B0"
6262
:locations {
6363
"1874-1877" "Allegheny, Pennsylvania"
6464
"1877-1877" "Vienna"

design/mockup/index.css

Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ ul, ol {
2222
text-shadow: 0 0 3px rgba(0, 0, 0, 0.5);
2323
color: white;
2424
width: 165px;
25+
z-index: 2;
2526
}
2627

2728
.about-project h1 {
@@ -44,7 +45,7 @@ ul, ol {
4445
left: 0;
4546
right: 0;
4647
height: 72px;
47-
padding: 16px;
48+
padding: 16px 72px 0 16px;
4849
box-sizing: border-box;
4950
background-color: white;
5051
z-index: 100;
@@ -54,9 +55,15 @@ ul, ol {
5455
.people-bar {
5556
position: relative;
5657
margin-left: 16px;
57-
max-width: 210px;
58+
max-width: 178px;
5859
z-index: 2;
5960
}
61+
62+
.people-bar ul {
63+
padding: 0;
64+
margin: 0;
65+
}
66+
6067
.people-bar ul li {
6168
display: block;
6269
}
@@ -72,15 +79,17 @@ ul, ol {
7279
height: 40px;
7380
overflow: hidden;
7481
box-shadow: 1px 1px 4px 0 rgba(0, 0, 0, 0.35);
82+
cursor: pointer;
83+
position: relative;
7584
}
7685

7786
.person:hover {
7887
width: auto;
7988
}
8089

8190
.person.open {
82-
width: auto;
83-
width: 210px;
91+
width: 178px;
92+
z-index: 99;
8493
}
8594

8695
.person img {
@@ -93,13 +102,21 @@ ul, ol {
93102
.person .data {
94103
display: inline-block;
95104
vertical-align: middle;
96-
margin-right: 16px;
105+
margin: 0 16px 0 8px;
97106
}
98107

99108
.person .name {
100109
font-size: 11px;
101110
color: rgba(0, 0, 0, 0.54);
102111
text-transform: uppercase;
112+
display: block;
113+
line-height: 14px;
114+
}
115+
116+
.person .location {
117+
display: block;
118+
line-height: 14px;
119+
color: rgba(0, 0, 0, 0.3);
103120
}
104121

105122
.person.joyce {
@@ -130,13 +147,32 @@ ul, ol {
130147
border-color: #FF9800;
131148
}
132149

133-
div.person-marker {
150+
.mapboxgl-popup-content div.person {
151+
position: absolute;
152+
top: -56px;
153+
left: -18px;
154+
display: none;
155+
}
156+
157+
.mapboxgl-popup-content:hover div.person {
158+
display: block;
159+
}
160+
161+
.person-marker {
134162
display: block;
135163
width: 8px;
136164
height: 8px;
137165
border-radius: 4px;
138166
padding: 0;
139167
position: relative;
168+
cursor: pointer;
169+
}
170+
171+
.current-year {
172+
position: absolute;
173+
right: 16px;
174+
top: 25%;
175+
color: rgba(0, 0, 0, 0.54);
140176
}
141177

142178
.years-labels {

design/mockup/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ <h1>About this project</h1>
107107
<li style="left:881.0135135135135px">1946</li>
108108
<li style="left:948.7837837837839px">1951</li>
109109
</ol>
110+
<span class="current-year">1921</span>
110111
</div>
111112
</body>
112113
</html>

0 commit comments

Comments
 (0)