Skip to content

Commit e01ad8d

Browse files
html, css, and js update
1 parent 6627862 commit e01ad8d

File tree

8 files changed

+414
-35
lines changed

8 files changed

+414
-35
lines changed

.idea/MarxProject.iml

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/workspace.xml

+260
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/style.css

+53
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,46 @@
11
/* ADD YOUR STYLES HERE */
22

3+
4+
5+
/* PAGE STYLES */
6+
7+
#overall {
8+
background-image: url("../img/Marx2.jpg");
9+
background-size: 100%;
10+
}
11+
12+
#CoverPage {
13+
background: rgba(250, 250, 250, 0.6);
14+
}
15+
16+
/* intro */
17+
#intro {
18+
background: rgba(250, 250, 250, 0.7);
19+
}
20+
21+
/* topic 1 */
22+
#martini-one {
23+
background: rgba(240, 240, 240, 0.8);
24+
}
25+
26+
/* topic 2 */
27+
#martini-two {
28+
background: rgba(240, 240, 240, 0.9);
29+
}
30+
31+
/* topic 3 */
32+
#martini-three {
33+
background: rgba(225, 225, 225, 0.95);
34+
}
35+
36+
/* dashboard */
37+
#dashboard {
38+
background: rgba(225, 225, 225, 0.95);
39+
}
40+
41+
42+
/* FONT STYLES */
43+
344
h1 {
445
text-align: center;
546
font-family: 'Crimson Text', serif;
@@ -10,6 +51,18 @@ h1 {
1051
color: black;
1152
}
1253

54+
h2 {
55+
font-family: 'Lora', 'Helvetica Neue', Helvetica, Arial, sans-serif;
56+
text-align: center;
57+
font-weight: lighter;
58+
font-size: 36px;
59+
color: #727272;
60+
margin-bottom: 3%;
61+
}
62+
63+
64+
65+
1366
#MarxChart {
1467
/*background: rgba(0, 97, 0, 0.53);*/
1568
width: 100%;

img/Marx.jpeg

392 KB
Loading

img/Marx2.jpg

961 KB
Loading

js/main.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ var y = d3.scaleLinear()
3737

3838

3939
// get the data
40-
d3.csv("data/words.csv", function(error, data) {
40+
d3.csv("../data/words.csv", function(error, data) {
4141
if (error) {throw error;}
4242

4343

0 commit comments

Comments
 (0)