summaryrefslogtreecommitdiff
path: root/print/resources
diff options
context:
space:
mode:
Diffstat (limited to 'print/resources')
-rw-r--r--print/resources/fonts/FiraSansCondensed-Light.woffbin0 -> 227416 bytes
-rw-r--r--print/resources/fonts/FiraSansLight.woffbin0 -> 78348 bytes
-rw-r--r--print/resources/fonts/barlow-bold.ttf (renamed from print/resources/barlow-bold.ttf)bin46252 -> 46252 bytes
-rw-r--r--print/resources/fonts/barlow-condensed-bold.ttf (renamed from print/resources/barlow-condensed-bold.ttf)bin47944 -> 47944 bytes
-rw-r--r--print/resources/fonts/barlow-condensed-extra-bold.ttf (renamed from print/resources/barlow-condensed-extra-bold.ttf)bin48160 -> 48160 bytes
-rw-r--r--print/resources/fonts/barlow-extra-bold.ttf (renamed from print/resources/barlow-extra-bold.ttf)bin48808 -> 48808 bytes
-rw-r--r--print/resources/fonts/barlow.ttf (renamed from print/resources/barlow.ttf)bin45476 -> 45476 bytes
-rw-r--r--print/resources/fonts/barlow_condensed.ttf (renamed from print/resources/barlow_condensed.ttf)bin45476 -> 45476 bytes
-rw-r--r--print/resources/ru.css21
-rw-r--r--print/resources/style.css33
10 files changed, 36 insertions, 18 deletions
diff --git a/print/resources/fonts/FiraSansCondensed-Light.woff b/print/resources/fonts/FiraSansCondensed-Light.woff
new file mode 100644
index 00000000..42bdafe1
--- /dev/null
+++ b/print/resources/fonts/FiraSansCondensed-Light.woff
Binary files differ
diff --git a/print/resources/fonts/FiraSansLight.woff b/print/resources/fonts/FiraSansLight.woff
new file mode 100644
index 00000000..a489c599
--- /dev/null
+++ b/print/resources/fonts/FiraSansLight.woff
Binary files differ
diff --git a/print/resources/barlow-bold.ttf b/print/resources/fonts/barlow-bold.ttf
index af272404..af272404 100644
--- a/print/resources/barlow-bold.ttf
+++ b/print/resources/fonts/barlow-bold.ttf
Binary files differ
diff --git a/print/resources/barlow-condensed-bold.ttf b/print/resources/fonts/barlow-condensed-bold.ttf
index cb5e617c..cb5e617c 100644
--- a/print/resources/barlow-condensed-bold.ttf
+++ b/print/resources/fonts/barlow-condensed-bold.ttf
Binary files differ
diff --git a/print/resources/barlow-condensed-extra-bold.ttf b/print/resources/fonts/barlow-condensed-extra-bold.ttf
index d9352f09..d9352f09 100644
--- a/print/resources/barlow-condensed-extra-bold.ttf
+++ b/print/resources/fonts/barlow-condensed-extra-bold.ttf
Binary files differ
diff --git a/print/resources/barlow-extra-bold.ttf b/print/resources/fonts/barlow-extra-bold.ttf
index 45456d4b..45456d4b 100644
--- a/print/resources/barlow-extra-bold.ttf
+++ b/print/resources/fonts/barlow-extra-bold.ttf
Binary files differ
diff --git a/print/resources/barlow.ttf b/print/resources/fonts/barlow.ttf
index 7885fbf8..7885fbf8 100644
--- a/print/resources/barlow.ttf
+++ b/print/resources/fonts/barlow.ttf
Binary files differ
diff --git a/print/resources/barlow_condensed.ttf b/print/resources/fonts/barlow_condensed.ttf
index 7885fbf8..7885fbf8 100644
--- a/print/resources/barlow_condensed.ttf
+++ b/print/resources/fonts/barlow_condensed.ttf
Binary files differ
diff --git a/print/resources/ru.css b/print/resources/ru.css
new file mode 100644
index 00000000..4699a49a
--- /dev/null
+++ b/print/resources/ru.css
@@ -0,0 +1,21 @@
+@font-face {
+ font-family: 'FiraSans';
+ font-style: normal;
+ font-weight: 400;
+ src: url(fonts/FiraSansLight.woff) format('woff');
+}
+
+@font-face {
+ font-family: 'FiraSans Condensed';
+ font-style: normal;
+ font-weight: 400;
+ src: url(fonts/FiraSansCondensed-Light.woff) format('woff');
+}
+
+body {
+ font-family: 'FiraSans', sans-serif;
+}
+
+.condensed {
+ font-family: 'FiraSans Condensed', sans-serif;
+}
diff --git a/print/resources/style.css b/print/resources/style.css
index 79e34db8..ca3d393f 100644
--- a/print/resources/style.css
+++ b/print/resources/style.css
@@ -1,45 +1,43 @@
@font-face {
- font-family: 'Barlow Condensed';
- font-style: normal;
- font-weight: 400;
- src: url(barlow_condensed.ttf) format('truetype');
-}
-
-@font-face {
font-family: 'Barlow';
font-style: normal;
font-weight: 400;
- src: url(barlow.ttf) format('truetype');
+ src: url(fonts/barlow.ttf) format('truetype');
}
-
@font-face {
font-family: 'Barlow';
font-style: normal;
font-weight: 700;
- src: url(barlow-bold.ttf) format('truetype');
+ src: url(fonts/barlow-bold.ttf) format('truetype');
}
@font-face {
font-family: 'Barlow';
font-style: normal;
font-weight: 800;
- src: url(barlow-extra-bold.ttf) format('truetype');
+ src: url(fonts/barlow-extra-bold.ttf) format('truetype');
}
+@font-face {
+ font-family: 'Barlow Condensed';
+ font-style: normal;
+ font-weight: 400;
+ src: url(fonts/barlow_condensed.ttf) format('truetype');
+}
@font-face {
font-family: 'Barlow Condensed';
font-style: normal;
font-weight: 700;
- src: url(barlow-condensed-bold.ttf) format('truetype');
+ src: url(fonts/barlow-condensed-bold.ttf) format('truetype');
}
@font-face {
font-family: 'Barlow Condensed';
font-style: normal;
font-weight: 800;
- src: url(barlow-condensed-extra-bold.ttf) format('truetype');
+ src: url(fonts/barlow-condensed-extra-bold.ttf) format('truetype');
}
body {
@@ -51,6 +49,10 @@ body {
margin-bottom: 5mm;
}
+.condensed {
+ font-family: "Barlow Condensed", sans-serif;
+}
+
* {
box-sizing: border-box;
}
@@ -475,7 +477,6 @@ body {
display: -ms-flexbox; /* IE 10 */
width: calc(100% - 50mm);
height: 50%;
- font-family: "Barlow Condensed", sans-serif;
font-size: 10pt;
}
@@ -610,7 +611,6 @@ body {
color: white;
display: inline-block;
font-size: 16px;
- font-family: "Barlow", sans-serif;
padding-left: 3px;
padding-right: 3px;
margin: 0px 1px 0px 1px;
@@ -647,8 +647,6 @@ body {
}
.color-swatch {
- font-family: "Barlow", sans-serif;
-
/* white text on dark colors doesn't print well unless it's bold */
font-weight: 700;
font-size: 12pt;
@@ -946,7 +944,6 @@ body {
right: 1em;
top: 1em;
color: red;
- font-family: "Barlow", sans-serif;
font-size: 12pt;
}