From 5fa8e91eebc9c18acaa124366cd9153ae3b42626 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Mon, 29 Mar 2021 23:00:58 +0300 Subject: [PATCH] fix styles --- gatsby-config.js | 1 + package.json | 2 + src/components/footer.js | 2 +- src/components/layout.js | 9 +- .../magprog/assets}/fonts/FontAwesome.otf | Bin .../assets}/fonts/fontawesome-webfont.eot | Bin .../assets/fonts/fontawesome-webfont.svg | 2672 ++++++++++ .../assets}/fonts/fontawesome-webfont.ttf | Bin .../assets}/fonts/fontawesome-webfont.woff | Bin .../assets}/fonts/fontawesome-webfont.woff2 | Bin .../magprog/assets/sass/base/_page.scss | 47 + .../magprog/assets/sass/base/_reset.scss | 76 + .../magprog/assets/sass/base/_typography.scss | 200 + .../assets/sass/components/_actions.scss | 101 + .../magprog/assets/sass/components/_box.scss | 26 + .../assets/sass/components/_button.scss | 106 + .../assets/sass/components/_contact.scss | 21 + .../assets/sass/components/_features.scss | 98 + .../magprog/assets/sass/components/_form.scss | 236 + .../magprog/assets/sass/components/_icon.scss | 57 + .../assets/sass/components/_icons.scss | 31 + .../assets/sass/components/_image.scss | 60 + .../magprog/assets/sass/components/_list.scss | 56 + .../magprog/assets/sass/components/_menu.scss | 36 + .../magprog/assets/sass/components/_row.scss | 31 + .../assets/sass/components/_section.scss | 41 + .../assets/sass/components/_split.scss | 91 + .../assets/sass/components/_spotlights.scss | 131 + .../assets/sass/components/_table.scss | 81 + .../assets/sass/components/_wrapper.scss | 139 + .../magprog/assets/sass/font-awesome.min.css | 4 + .../magprog/assets/sass/images/intro.svg | 25 + .../magprog/assets/sass/layout/_footer.scss | 38 + .../magprog/assets/sass/layout/_header.scss | 98 + .../magprog/assets/sass/layout/_intro.scss | 33 + .../magprog/assets/sass/layout/_sidebar.scss | 205 + .../magprog/assets/sass/layout/_wrapper.scss | 30 + .../assets/sass/libs/_breakpoints.scss | 223 + .../magprog/assets/sass/libs/_functions.scss | 87 + .../magprog/assets/sass/libs/_html-grid.scss | 146 + .../magprog/assets/sass/libs/_mixins.scss | 63 + .../magprog/assets/sass/libs/_vars.scss | 49 + .../magprog/assets/sass/libs/_vendor.scss | 336 ++ .../magprog/assets/sass/magprog-noscript.scss | 57 + .../magprog/assets/sass/magprog.scss | 81 + .../magprog/common/MagProgLayout.js | 23 +- src/components/navBar.js | 2 +- src/content/ru/magprog/mentors/Pshenichnov.md | 22 + src/content/ru/magprog/mentors/Shagalov.md | 22 + src/content/ru/magprog/team/nozik.md | 16 +- src/content/ru/magprog/team/svetlichnii.md | 6 +- src/images/magprog/mentors/Pshenichnov.jpg | Bin 0 -> 151486 bytes src/images/magprog/mentors/Shagalov.jpg | Bin 0 -> 5743041 bytes src/pages/about.js | 2 +- src/pages/index.js | 2 +- src/pages/magprog/index.js | 14 +- src/pages/partners.js | 2 +- src/styles/{footer.css => footer.scss} | 22 +- src/styles/{layout.css => layout.scss} | 84 +- src/styles/{main.css => main.scss} | 265 +- src/styles/navbar.css | 110 - src/styles/navbar.scss | 113 + static/magprog/css/fontawesome-all.min.css | 5 - static/magprog/css/images/intro.svg | 24 - static/magprog/css/main.css | 3911 -------------- static/magprog/css/noscript.css | 43 - static/magprog/fonts/fontawesome-webfont.svg | 2671 ---------- static/magprog/js/breakpoints.min.js | 2 - static/magprog/js/browser.min.js | 2 - static/magprog/js/jquery.min.js | 2 - static/magprog/js/jquery.scrollex.min.js | 2 - static/magprog/js/jquery.scrolly.min.js | 2 - static/magprog/js/main.js | 196 - static/magprog/js/util.js | 593 --- static/magprog/webfonts/fa-brands-400.eot | Bin 129352 -> 0 bytes static/magprog/webfonts/fa-brands-400.svg | 3442 ------------ static/magprog/webfonts/fa-brands-400.ttf | Bin 129048 -> 0 bytes static/magprog/webfonts/fa-brands-400.woff | Bin 87352 -> 0 bytes static/magprog/webfonts/fa-brands-400.woff2 | Bin 74508 -> 0 bytes static/magprog/webfonts/fa-regular-400.eot | Bin 34388 -> 0 bytes static/magprog/webfonts/fa-regular-400.svg | 803 --- static/magprog/webfonts/fa-regular-400.ttf | Bin 34092 -> 0 bytes static/magprog/webfonts/fa-regular-400.woff | Bin 16804 -> 0 bytes static/magprog/webfonts/fa-regular-400.woff2 | Bin 13580 -> 0 bytes static/magprog/webfonts/fa-solid-900.eot | Bin 192116 -> 0 bytes static/magprog/webfonts/fa-solid-900.svg | 4649 ----------------- static/magprog/webfonts/fa-solid-900.ttf | Bin 191832 -> 0 bytes static/magprog/webfonts/fa-solid-900.woff | Bin 98020 -> 0 bytes static/magprog/webfonts/fa-solid-900.woff2 | Bin 75440 -> 0 bytes yarn.lock | 7 +- 90 files changed, 6203 insertions(+), 16682 deletions(-) rename {static/magprog => src/components/magprog/assets}/fonts/FontAwesome.otf (100%) rename {static/magprog => src/components/magprog/assets}/fonts/fontawesome-webfont.eot (100%) create mode 100644 src/components/magprog/assets/fonts/fontawesome-webfont.svg rename {static/magprog => src/components/magprog/assets}/fonts/fontawesome-webfont.ttf (100%) rename {static/magprog => src/components/magprog/assets}/fonts/fontawesome-webfont.woff (100%) rename {static/magprog => src/components/magprog/assets}/fonts/fontawesome-webfont.woff2 (100%) create mode 100644 src/components/magprog/assets/sass/base/_page.scss create mode 100644 src/components/magprog/assets/sass/base/_reset.scss create mode 100644 src/components/magprog/assets/sass/base/_typography.scss create mode 100644 src/components/magprog/assets/sass/components/_actions.scss create mode 100644 src/components/magprog/assets/sass/components/_box.scss create mode 100644 src/components/magprog/assets/sass/components/_button.scss create mode 100644 src/components/magprog/assets/sass/components/_contact.scss create mode 100644 src/components/magprog/assets/sass/components/_features.scss create mode 100644 src/components/magprog/assets/sass/components/_form.scss create mode 100644 src/components/magprog/assets/sass/components/_icon.scss create mode 100644 src/components/magprog/assets/sass/components/_icons.scss create mode 100644 src/components/magprog/assets/sass/components/_image.scss create mode 100644 src/components/magprog/assets/sass/components/_list.scss create mode 100644 src/components/magprog/assets/sass/components/_menu.scss create mode 100644 src/components/magprog/assets/sass/components/_row.scss create mode 100644 src/components/magprog/assets/sass/components/_section.scss create mode 100644 src/components/magprog/assets/sass/components/_split.scss create mode 100644 src/components/magprog/assets/sass/components/_spotlights.scss create mode 100644 src/components/magprog/assets/sass/components/_table.scss create mode 100644 src/components/magprog/assets/sass/components/_wrapper.scss create mode 100644 src/components/magprog/assets/sass/font-awesome.min.css create mode 100644 src/components/magprog/assets/sass/images/intro.svg create mode 100644 src/components/magprog/assets/sass/layout/_footer.scss create mode 100644 src/components/magprog/assets/sass/layout/_header.scss create mode 100644 src/components/magprog/assets/sass/layout/_intro.scss create mode 100644 src/components/magprog/assets/sass/layout/_sidebar.scss create mode 100644 src/components/magprog/assets/sass/layout/_wrapper.scss create mode 100644 src/components/magprog/assets/sass/libs/_breakpoints.scss create mode 100644 src/components/magprog/assets/sass/libs/_functions.scss create mode 100644 src/components/magprog/assets/sass/libs/_html-grid.scss create mode 100644 src/components/magprog/assets/sass/libs/_mixins.scss create mode 100644 src/components/magprog/assets/sass/libs/_vars.scss create mode 100644 src/components/magprog/assets/sass/libs/_vendor.scss create mode 100644 src/components/magprog/assets/sass/magprog-noscript.scss create mode 100644 src/components/magprog/assets/sass/magprog.scss create mode 100644 src/content/ru/magprog/mentors/Pshenichnov.md create mode 100644 src/content/ru/magprog/mentors/Shagalov.md create mode 100644 src/images/magprog/mentors/Pshenichnov.jpg create mode 100644 src/images/magprog/mentors/Shagalov.jpg rename src/styles/{footer.css => footer.scss} (77%) rename src/styles/{layout.css => layout.scss} (71%) rename src/styles/{main.css => main.scss} (61%) delete mode 100644 src/styles/navbar.css create mode 100644 src/styles/navbar.scss delete mode 100644 static/magprog/css/fontawesome-all.min.css delete mode 100644 static/magprog/css/images/intro.svg delete mode 100644 static/magprog/css/main.css delete mode 100644 static/magprog/css/noscript.css delete mode 100644 static/magprog/fonts/fontawesome-webfont.svg delete mode 100644 static/magprog/js/breakpoints.min.js delete mode 100644 static/magprog/js/browser.min.js delete mode 100644 static/magprog/js/jquery.min.js delete mode 100644 static/magprog/js/jquery.scrollex.min.js delete mode 100644 static/magprog/js/jquery.scrolly.min.js delete mode 100644 static/magprog/js/main.js delete mode 100644 static/magprog/js/util.js delete mode 100644 static/magprog/webfonts/fa-brands-400.eot delete mode 100644 static/magprog/webfonts/fa-brands-400.svg delete mode 100644 static/magprog/webfonts/fa-brands-400.ttf delete mode 100644 static/magprog/webfonts/fa-brands-400.woff delete mode 100644 static/magprog/webfonts/fa-brands-400.woff2 delete mode 100644 static/magprog/webfonts/fa-regular-400.eot delete mode 100644 static/magprog/webfonts/fa-regular-400.svg delete mode 100644 static/magprog/webfonts/fa-regular-400.ttf delete mode 100644 static/magprog/webfonts/fa-regular-400.woff delete mode 100644 static/magprog/webfonts/fa-regular-400.woff2 delete mode 100644 static/magprog/webfonts/fa-solid-900.eot delete mode 100644 static/magprog/webfonts/fa-solid-900.svg delete mode 100644 static/magprog/webfonts/fa-solid-900.ttf delete mode 100644 static/magprog/webfonts/fa-solid-900.woff delete mode 100644 static/magprog/webfonts/fa-solid-900.woff2 diff --git a/gatsby-config.js b/gatsby-config.js index 8178534..696b96f 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -59,5 +59,6 @@ module.exports = { redirectComponent: require.resolve(`./src/components/redirect.js`), }, }, + 'gatsby-plugin-sass', ], } \ No newline at end of file diff --git a/package.json b/package.json index edf9f49..fb91213 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,8 @@ "react-intl": "^5.13.5", "react-scrollspy": "^3.4.3", "redux": "4.0.5", + "gatsby-plugin-sass": "^4.1.0", + "node-sass": "^5.0.0", "smoothscroll-polyfill": "^0.4.4", "vertical-timeline-component-for-react": "1.0.7" }, diff --git a/src/components/footer.js b/src/components/footer.js index eba6a7e..0b26c2e 100644 --- a/src/components/footer.js +++ b/src/components/footer.js @@ -1,5 +1,5 @@ import React from "react" -import "../styles/footer.css" +import "../styles/footer.scss" const NpmFooter = () => (