Просмотр исходного кода

Merge 9949efaf45cf1c9d15f44b5bf6bfb69bae855727 into ee987843180d3941e799cddff4e53ba3886988ff

cfhirai 7 лет назад
Родитель
Сommit
86d205abd9

+ 1 - 1
Dockerfile Просмотреть файл

@@ -15,7 +15,7 @@ USER audiogram
15 15
 WORKDIR /home/audiogram
16 16
 
17 17
 # Clone repo
18
-RUN git clone https://github.com/nypublicradio/audiogram.git
18
+RUN git clone https://github.com/cfhirai/audiogram.git
19 19
 WORKDIR /home/audiogram/audiogram
20 20
 
21 21
 # Install dependencies

BIN
settings/backgrounds/Distillations_1280x720.jpg Просмотреть файл


BIN
settings/backgrounds/amish1280.jpg Просмотреть файл


BIN
settings/backgrounds/amish640.jpg Просмотреть файл


BIN
settings/backgrounds/subway.jpg Просмотреть файл


+ 28 - 4
settings/themes.json Просмотреть файл

@@ -9,8 +9,8 @@
9 9
     "waveTop": 150,
10 10
     "waveBottom": 420,
11 11
     "captionTop": 470,
12
-    "captionFont": "300 52px 'Source Sans Pro'",
13
-    "captionLineHeight": 52,
12
+    "captionFont": "300 48px 'Source Sans Pro'",
13
+    "captionLineHeight": 48,
14 14
     "captionLineSpacing": 7,
15 15
     "captionLeft": 200,
16 16
     "captionRight": 1080
@@ -33,11 +33,35 @@
33 33
     "captionTop": 60,
34 34
     "captionRight": 1220,
35 35
     "captionLeft": 640,
36
-    "backgroundImage": "subway.jpg",
36
+    "backgroundImage": "amish1280.jpg",
37 37
     "foregroundColor": "#fc0",
38 38
     "waveBottom": 660,
39 39
     "waveTop": 320
40 40
   },
41
+  "Distillations logo rect red wave white top right text": {
42
+    "captionAlign": "right",
43
+    "captionTop": 60,
44
+    "captionRight": 1220,
45
+    "captionLeft": 640,
46
+    "backgroundImage": "Distillations_1280x720.jpg",
47
+    "foregroundColor": "#fff",
48
+    "waveColor": "#cf0920",
49
+    "waveBottom": 660,
50
+    "waveTop": 320
51
+  },
52
+  "Distillations logo square red wave white text": {
53
+    "width": 640,
54
+    "height": 640,
55
+    "samplesPerFrame": 64,
56
+    "waveTop": 20,
57
+    "waveBottom": 300,
58
+    "captionTop": 340,
59
+    "captionLeft": 20,
60
+    "captionRight": 620,
61
+    "waveColor": "#cf0920",
62
+    "foregroundColor": "#fff",
63
+    "backgroundImage": "Distillations_640x640.jpg"
64
+  },
41 65
   "Bars": {
42 66
     "pattern": "bars",
43 67
     "foregroundColor": "#d84a4a"
@@ -100,6 +124,6 @@
100 124
     "captionLeft": 20,
101 125
     "captionRight": 620,
102 126
     "foregroundColor": "#0eb8ba",
103
-    "backgroundImage": "nyc.png"
127
+    "backgroundImage": "amish640.png"
104 128
   }
105 129
 }