diff --git a/src-front/assets/fonts/BebasNeueRegular.woff b/src-front/assets/fonts/BebasNeueRegular.woff
old mode 100644
new mode 100755
diff --git a/src-front/assets/fonts/BebasNeueRegular.woff2 b/src-front/assets/fonts/BebasNeueRegular.woff2
old mode 100644
new mode 100755
diff --git a/src-front/assets/fonts/RobotoCondensed-Bold.ttf b/src-front/assets/fonts/RobotoCondensed-Bold.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..7fe31289ce91cbc8e94d23e5b01413dce22f682d
Binary files /dev/null and b/src-front/assets/fonts/RobotoCondensed-Bold.ttf differ
diff --git a/src-front/assets/fonts/RobotoCondensed-Bold.woff b/src-front/assets/fonts/RobotoCondensed-Bold.woff
new file mode 100755
index 0000000000000000000000000000000000000000..f39ae79daea315f92bdfab41f7d844401072274c
Binary files /dev/null and b/src-front/assets/fonts/RobotoCondensed-Bold.woff differ
diff --git a/src-front/assets/fonts/RobotoCondensed-Bold.woff2 b/src-front/assets/fonts/RobotoCondensed-Bold.woff2
new file mode 100755
index 0000000000000000000000000000000000000000..b2e2ce3160a916109080a5052416987f7221ac96
Binary files /dev/null and b/src-front/assets/fonts/RobotoCondensed-Bold.woff2 differ
diff --git a/src-front/assets/fonts/RobotoCondensed-Italic.ttf b/src-front/assets/fonts/RobotoCondensed-Italic.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..12216d678ec3b5c45727705eaad8e79d10ff4116
Binary files /dev/null and b/src-front/assets/fonts/RobotoCondensed-Italic.ttf differ
diff --git a/src-front/assets/fonts/RobotoCondensed-Light.ttf b/src-front/assets/fonts/RobotoCondensed-Light.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..43dd8f42bec90404439cdd5fe49f4acf8de920d7
Binary files /dev/null and b/src-front/assets/fonts/RobotoCondensed-Light.ttf differ
diff --git a/src-front/assets/fonts/RobotoCondensed-Light.woff b/src-front/assets/fonts/RobotoCondensed-Light.woff
new file mode 100755
index 0000000000000000000000000000000000000000..75187a9ff235cde20b5876ae199578d522410790
Binary files /dev/null and b/src-front/assets/fonts/RobotoCondensed-Light.woff differ
diff --git a/src-front/assets/fonts/RobotoCondensed-Light.woff2 b/src-front/assets/fonts/RobotoCondensed-Light.woff2
new file mode 100755
index 0000000000000000000000000000000000000000..bda9da957017217aaff21783d3f6c7b7a47c269f
Binary files /dev/null and b/src-front/assets/fonts/RobotoCondensed-Light.woff2 differ
diff --git a/src-front/assets/fonts/RobotoCondensed-Regular.ttf b/src-front/assets/fonts/RobotoCondensed-Regular.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..62dd61e5d0033f726c86fd74b00c7a1eb4a715c5
Binary files /dev/null and b/src-front/assets/fonts/RobotoCondensed-Regular.ttf differ
diff --git a/src-front/assets/fonts/RobotoCondensed-Regular.woff b/src-front/assets/fonts/RobotoCondensed-Regular.woff
new file mode 100755
index 0000000000000000000000000000000000000000..2943f336b1d59cc445fd0b85351c987f89a2b566
Binary files /dev/null and b/src-front/assets/fonts/RobotoCondensed-Regular.woff differ
diff --git a/src-front/assets/fonts/RobotoCondensed-Regular.woff2 b/src-front/assets/fonts/RobotoCondensed-Regular.woff2
new file mode 100755
index 0000000000000000000000000000000000000000..9f639c46ff5b5fb565f149c351cc61979ea9c9cd
Binary files /dev/null and b/src-front/assets/fonts/RobotoCondensed-Regular.woff2 differ
diff --git a/src-front/assets/scss/_fonts.scss b/src-front/assets/scss/_fonts.scss
index 1e3625459beced8f4dfe3d2a391085d150705c72..aac57eb6a83483b070ff76455d54bbb7836d048b 100755
--- a/src-front/assets/scss/_fonts.scss
+++ b/src-front/assets/scss/_fonts.scss
@@ -4,5 +4,38 @@
url('~assets/fonts/BebasNeueRegular.woff') format('woff');
font-weight: normal;
font-style: normal;
- font-display: auto;
+ //font-display: auto;
+ font-display: swap;
}
+@font-face {
+ font-family: 'Roboto Condensed';
+ font-style: normal;
+ font-weight: 300;
+ font-display: swap;
+ src:
+ url('~assets/fonts/RobotoCondensed-Light.woff2') format('woff2'),
+ url('~assets/fonts/RobotoCondensed-Light.woff') format('woff'),
+ url('~assets/fonts/RobotoCondensed-Light.ttf') format('truetype');
+ }
+
+@font-face {
+ font-family: 'Roboto Condensed';
+ font-style: normal;
+ font-weight: 400;
+ font-display: swap;
+ src:
+ url('~assets/fonts/RobotoCondensed-Regular.woff2') format('woff2'),
+ url('~assets/fonts/RobotoCondensed-Regular.woff') format('woff'),
+ url('~assets/fonts/RobotoCondensed-Regular.ttf') format('truetype');
+ }
+
+@font-face {
+ font-family: 'Roboto Condensed';
+ font-style: normal;
+ font-weight: 700;
+ font-display: swap;
+ src:
+ url('~assets/fonts/RobotoCondensed-Bold.woff2') format('woff2'),
+ url('~assets/fonts/RobotoCondensed-Bold.woff') format('woff'),
+ url('~assets/fonts/RobotoCondensed-Bold.ttf') format('truetype');
+ }
diff --git a/src-front/assets/scss_old/_base.scss b/src-front/assets/scss_old/_base.scss
deleted file mode 100644
index 82808f338bfd40fc6f74a5be6e8e25c06775fa33..0000000000000000000000000000000000000000
--- a/src-front/assets/scss_old/_base.scss
+++ /dev/null
@@ -1,82 +0,0 @@
-body {
- background: $color-white;
- font-family: $font-primary;
- font-size: 20px;
- color: $color-black;
- -webkit-font-smoothing: antialiased;
-
- padding: 0;
- margin: 0;
-
- position: relative;
-
- @media (max-width: 590px) {
- font-size: 17px;
- }
-}
-
-
-.container {
- margin: 0 auto;
- width: 92%;
- max-width: 1240px;
- position: relative;
-
- &--slim {
- max-width: 700px;
- }
-
- &--medium {
- max-width: 1010px;
- }
-}
-
-img {
- display: block;
-}
-
-button {
- text-decoration: none;
- background: none;
- text-transform: none;
- border: 0;
- margin: 0;
- padding: 0;
- outline: none;
- cursor: pointer;
-}
-
-input::placeholder {
- opacity: .8;
-}
-
-// Text highlight
-.is-highlighted {
- background: #ffcc00;
-}
-
-// Object not found
-.not-found {
- padding-top: 5%;
- padding-bottom: 10%;
- text-align: center;
-
- .button {
- margin: 0 auto;
- width: 150px;
- }
-}
-
-// Base page transitions
-.page-enter-active {
- transition: opacity 0.2s ease-out;
-}
-
-.page-leave-active {
- transition: opacity 0.2s ease-in;
-}
-
-.page-enter,
-.page-leave-active {
- opacity: 0;
-}
diff --git a/src-front/assets/scss_old/_fonts.scss b/src-front/assets/scss_old/_fonts.scss
deleted file mode 100644
index 1e3625459beced8f4dfe3d2a391085d150705c72..0000000000000000000000000000000000000000
--- a/src-front/assets/scss_old/_fonts.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-@font-face {
- font-family: 'Bebas Neue';
- src: url('~assets/fonts/BebasNeueRegular.woff2') format('woff2'),
- url('~assets/fonts/BebasNeueRegular.woff') format('woff');
- font-weight: normal;
- font-style: normal;
- font-display: auto;
-}
diff --git a/src-front/assets/scss_old/_mixins.scss b/src-front/assets/scss_old/_mixins.scss
deleted file mode 100644
index 0d65b186deb5f3c0cfcc8431e22eddde890e3262..0000000000000000000000000000000000000000
--- a/src-front/assets/scss_old/_mixins.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-// Transition mixins
-@mixin baseTransition {
- transition: all .25s ease-in-out;
-}
-
-// Input placeholder
-@mixin placeholder {
- &::-webkit-input-placeholder {
- @content;
- }
- &:-moz-placeholder {
- @content;
- }
- &::-moz-placeholder {
- @content;
- }
- &:-ms-input-placeholder {
- @content;
- }
-}
diff --git a/src-front/assets/scss_old/_typography.scss b/src-front/assets/scss_old/_typography.scss
deleted file mode 100644
index 4a98e16d838034c9cfae11818a3b98ceda088c77..0000000000000000000000000000000000000000
--- a/src-front/assets/scss_old/_typography.scss
+++ /dev/null
@@ -1,55 +0,0 @@
-h1, .like-h1,
-h2, .like-h2,
-h3, .like-h3,
-h4, .like-h4 {
- font-weight: 700;
- font-family: $font-secondary;
- margin: 0;
- padding: 0;
-}
-
-h1, .like-h1 {
- font-size: 50px;
-
- @media (max-width: 590px) {
- font-size: 40px;
- }
-
- @media (max-width: 420px) {
- font-size: 35px;
- }
-}
-
-h2, .like-h2 {
- font-size: 35px;
-}
-
-h3, .like-h3 {
- font-size: 30px;
-
- @media (max-width: 600px) {
- font-size: 26px;
- }
-}
-
-h4, .like-h4 {
- font-size: 20px;
-}
-
-p {
- margin: 0;
- padding: 0;
- font-family: $font-primary;
- font-weight: 300;
- font-size: 20px;
- line-height: 1.5;
-
- @media (max-width: 590px) {
- font-size: 17px;
- }
-}
-
-a {
- color: $color-black;
- text-decoration: none;
-}
diff --git a/src-front/assets/scss_old/_variables.scss b/src-front/assets/scss_old/_variables.scss
deleted file mode 100644
index 072a2ac2cdf332e6e9752f3d062f17526c838bac..0000000000000000000000000000000000000000
--- a/src-front/assets/scss_old/_variables.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-// Colors
-$color-white: #fff;
-$color-black: #000;
-
-$color-primary: #2d2d2d;
-$color-gray: #d8d8d8;
-
-// Fonts
-$font-primary: 'Roboto Condensed', sans-serif;
-$font-secondary: 'Bebas Neue', 'Roboto Condensed', sans-serif;
diff --git a/src-front/assets/scss_old/global.scss b/src-front/assets/scss_old/global.scss
deleted file mode 100644
index 097f502f4badea653761789a14e0ee048c02c525..0000000000000000000000000000000000000000
--- a/src-front/assets/scss_old/global.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@import 'variables';
-@import 'fonts';
-@import 'base';
-@import 'typography';
diff --git a/src-front/assets/scss_old/post-styles.scss b/src-front/assets/scss_old/post-styles.scss
deleted file mode 100644
index 61ff05b2b4a7f1912d497613814f44ce27e8f606..0000000000000000000000000000000000000000
--- a/src-front/assets/scss_old/post-styles.scss
+++ /dev/null
@@ -1,76 +0,0 @@
-.post-styles {
- h2 {
- margin-bottom: 25px;
- }
-
- h3 {
- margin-bottom: 10px;
- }
-
- p {
- font-weight: 300;
-
- margin-bottom: 20px;
- }
-
- hr {
- border: 0;
- width: 110%;
- margin-left: -5%;
- height: 6px;
- display: block;
- background: $color-black;
- margin-top: .9em;
- margin-bottom: .9em;
-
- @media (max-width: 900px) {
- width: 100%;
- margin-left: 0;
- }
- }
-
- blockquote {
- border-left: 4px solid $color-black;
- margin-left: 0;
- padding: 1% 4%;
- }
-
- img,
- iframe {
- width: 114%;
-
- margin-top: 45px;
- margin-left: -7%;
- margin-bottom: 80px;
-
- @media (max-width: 850px) {
- width: 100%;
-
- margin-left: 0;
- }
-
- @media (max-width: 850px) {
- margin-top: 30px;
- margin-bottom: 40px;
- }
- }
-
- iframe {
- height: 35vw;
- max-height: 550px;
-
- @media (max-width: 1000px) {
- height: 45vw;
- }
- }
-
- /*&--with-aside {
- img {
- @media (max-width: 1000px) {
- width: 100%;
-
- margin-left: 0;
- }
- }
- }*/
-}
diff --git a/src-front/nuxt.config.js b/src-front/nuxt.config.js
index 3b0797f7527377e1c38f910c98f0538e1292f554..60868b99d3afc60bdf79ff8bf19d4660e1727d3a 100755
--- a/src-front/nuxt.config.js
+++ b/src-front/nuxt.config.js
@@ -7,8 +7,9 @@ const appConfig = {
//apiUrl: 'https://admin.piratipracuji.cz/api/',
//apiUrl: 'http://192.168.1.106:5005',
//apiUrl: 'http://192.168.1.125:3001',
- apiUrl: 'https://redmineapi.mfnet.cz',
+ apiUrl: 'https://redmineapi.mfnet.cz/',
productionUrl: 'https://piratipracuji.mfnet.cz',
+ //productionUrl: 'https://piratiliberec.mfnet.cz',
googleAnalyticsId: 'UA-72526071-32',
sentryDns: 'https://69eede94c351441295a3282449be6335@sentry.io/1365349',
googleConsoleVerification: 'gJcie5kGIjJn_o5J6OHmQu9ZnrSFfssyjqGncMM4SOs',
@@ -49,7 +50,6 @@ module.exports = {
],
link: [
{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' },
- { rel: 'stylesheet', href: 'https://fonts.googleapis.com/css?family=Roboto+Condensed:300,400,700&subset=latin-ext' },
{ rel: 'script', href: 'https://unpkg.com/vue-masonry-css' },
]
},
@@ -64,6 +64,7 @@ module.exports = {
*/
css: [
'modern-normalize/modern-normalize.css',
+ //'@/assets/fonts/roboto.css',
'@/assets/scss/global.scss',
],