@@ -56,17 +59,14 @@ const IndexPage = ({ data }) => {
{ news.map(({node}) => {
const title = node.frontmatter.title;
const date = node.frontmatter.date;
+ const html = node.html;
return (
- {title}{date}
+ {title}{date}
-
+
{Parser(html)}
)
diff --git a/src/pages/partners.js b/src/pages/partners.js
index 0e958bf..af40cbe 100644
--- a/src/pages/partners.js
+++ b/src/pages/partners.js
@@ -9,7 +9,6 @@ import inr_logo from "../images/partners/inr_logo.png"
import jetbrains_logo from "../images/partners/jetbrains.svg"
import jbr from "../images/partners/JBR.svg"
import SEO from "../components/seo"
-// import mtl_logo from "../images/partners/mtl_logo.png"
const PartnersPage = () => {
const intl = useIntl()
diff --git a/src/pages/projects/education.js b/src/pages/projects/education.js
index 474dc42..9d4b47b 100644
--- a/src/pages/projects/education.js
+++ b/src/pages/projects/education.js
@@ -1,6 +1,8 @@
import React from "react"
import { graphql } from "gatsby"
import { FormattedMessage, Link, useIntl, injectIntl } from "gatsby-plugin-intl"
+import Parser from "html-react-parser"
+
import Layout from "../../components/layout"
import SEO from "../../components/seo"
@@ -43,11 +45,7 @@ const SoftwarePage = ({ data }) => {
{title}
-
+
{Parser(node.html)}
diff --git a/src/pages/projects/math.js b/src/pages/projects/math.js
index 4546e05..01aa574 100644
--- a/src/pages/projects/math.js
+++ b/src/pages/projects/math.js
@@ -1,6 +1,8 @@
import React from "react"
import { graphql } from "gatsby"
import { FormattedMessage, Link, useIntl, injectIntl } from "gatsby-plugin-intl"
+import Parser from "html-react-parser"
+
import Layout from "../../components/layout"
import SEO from "../../components/seo"
@@ -42,11 +44,7 @@ const SoftwarePage = ({ data }) => {
{title}
-
+
{Parser(node.html)}
)
diff --git a/src/pages/projects/physics.js b/src/pages/projects/physics.js
index 74a65f1..26002dc 100644
--- a/src/pages/projects/physics.js
+++ b/src/pages/projects/physics.js
@@ -1,6 +1,7 @@
import React from "react"
import { graphql } from "gatsby"
import { FormattedMessage, Link, useIntl, injectIntl } from "gatsby-plugin-intl"
+import Parser from "html-react-parser"
import Layout from "../../components/layout"
import SEO from "../../components/seo"
@@ -42,11 +43,7 @@ const PhysicsPage = ({ data }) => {
{title}
-
+
{Parser(node.html)}
)
diff --git a/src/pages/projects/software.js b/src/pages/projects/software.js
index 8823029..dd220dc 100644
--- a/src/pages/projects/software.js
+++ b/src/pages/projects/software.js
@@ -1,6 +1,8 @@
import React from "react"
import { graphql } from "gatsby"
import { FormattedMessage, Link, useIntl, injectIntl } from "gatsby-plugin-intl"
+import Parser from "html-react-parser"
+
import Layout from "../../components/layout"
import SEO from "../../components/seo"
@@ -42,11 +44,7 @@ const SoftwarePage = ({ data }) => {
{title}
-
+
{Parser(node.html)}
)
diff --git a/src/pages/publications.js b/src/pages/publications.js
index 5289514..0f2bc23 100644
--- a/src/pages/publications.js
+++ b/src/pages/publications.js
@@ -1,6 +1,8 @@
import React from "react"
import { graphql } from "gatsby"
import { Link, useIntl, injectIntl } from "gatsby-plugin-intl"
+import Parser from "html-react-parser"
+
import Layout from "../components/layout"
import SEO from "../components/seo"
@@ -10,7 +12,6 @@ const PublicationsPage = ({ data }) => {
var publications = ""
if ( lang==="ru" ) { publications = data.ru_publications.edges; }
else if ( lang==="en" ) { publications = data.en_publications.edges; }
- console.log(publications)
return(
@@ -27,7 +28,7 @@ const PublicationsPage = ({ data }) => {
{title}
-
+ {Parser(node.html)}
>
)
})}
diff --git a/src/pages/quarks.js b/src/pages/quarks.js
index bc3d3f9..732cec3 100644
--- a/src/pages/quarks.js
+++ b/src/pages/quarks.js
@@ -1,8 +1,9 @@
import React from "react"
import { graphql } from "gatsby"
-import Layout from "../components/layout"
import { FormattedMessage, Link, useIntl, injectIntl } from "gatsby-plugin-intl"
+import Parser from "html-react-parser"
+import Layout from "../components/layout"
import SEO from "../components/seo"
const QuarksPage = ({ data }) => {
@@ -26,7 +27,7 @@ const QuarksPage = ({ data }) => {
{pubs.map(({node}) =>{
return(
-
+ {Parser(node.html)}
)
})}
diff --git a/src/styles/footer.css b/src/styles/footer.css
index 318a93c..056ccfe 100644
--- a/src/styles/footer.css
+++ b/src/styles/footer.css
@@ -1,17 +1,3 @@
-a {
- color: rgb(0, 86, 179);
- text-decoration: none;
-}
-
-a:hover {
- color: rgb(0, 86, 179);
- text-decoration: underline;
-}
-
-a:visited {
- color: rgb(0, 86, 179);
-}
-
footer {
background-color: rgb(245,245,245);
left: 0;
@@ -22,7 +8,9 @@ footer {
color: rgb(108, 117, 125);
font-family: Segoe UI;
font-size: 20px;
- text-decoration: none solid rgb(108, 117, 125);
-}
+ text-decoration: none solid rgb(108, 117, 125); }
-footer .container p { margin-bottom: 15px; }
\ No newline at end of file
+footer .container p { margin-bottom: 15px; }
+footer p a { color: rgb(0, 86, 179); text-decoration: none; }
+footer p a:hover { color: rgb(12, 65, 124); text-decoration: underline; }
+footer a:visited { color: rgb(0, 86, 179); }
\ No newline at end of file
diff --git a/src/styles/header.css b/src/styles/header.css
deleted file mode 100644
index 0efcc3d..0000000
--- a/src/styles/header.css
+++ /dev/null
@@ -1,82 +0,0 @@
-/* ------ navbar ------------------------------ */
-.navbar { height: 80px; }
-a.nav-link { margin-top: 25px; max-height: 62px; color: white; }
-a.nav-link:hover { background-color: rgb(20, 142, 161); }
-
-a.nav-link[data-rb-event-key="language"] { margin-left: 50px }
-a.nav-link[data-rb-event-key="language"]:hover { background-color: rgb(52,58,64); }
-a.nav-link[data-rb-event-key="language"] a { padding-bottom: 19px; }
-
-a.nav-link a:hover { color: white; text-decoration: none; }
-a[aria-current="page"] {
- color: white;
- background-color: rgb(20, 142, 161);
- padding-top: 12px; }
-
-a.nav-link a#active {
- color: white;
- background-color: rgb(20, 142, 161);
- padding-bottom: 23px;
- padding-right: 30px;
- padding-left: 30px; }
-
-a.nav-link a {
- padding: 12px;
- color: rgb(212, 212, 212);
- font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
- transition: 0s; }
-/* ------------------------------------------- */
-
-/* -------------- logo ----------------------- */
-img#logo { opacity: 0.7; margin-top: 20px;}
-img#logo:hover { opacity: 1;}
-a[aria-current="page"] img#logo { opacity: 1; margin-top: 20px; background-color: rgb(52,58,64); }
-/* ------------------------------------------- */
-
-/* ----- collapse show ---------------------- */
-@media(max-width: 769px) {
- img#logo { margin: 0 0px 0 20px; }
- a.nav-link a#active {
- color: white;
- background-color: rgb(20, 142, 161);
- padding-top: 11px;
- padding-bottom: 12px; }
-}
-
-button.navbar-toggler.collapsed { margin-top: 0px; margin-left: 15px; }
-button.navbar-toggler { margin-top: 0px; margin-left: 15px; }
-
-div#basic-navbar-nav.navbar-collapse.collapse.show {
- width: 100px;
- padding-bottom: 0px;
- text-align: center;
- background-color: rgb(52,58,64);
- margin-top: -0px; }
-button.navbar-toggler { background-color: rgb(20, 142, 161); }
-div#navbarSupportedContent.navbar-collapse.collapse.show img#logo{ margin: auto; }
-/* ------------------------------------------- */
-
-#navbarSupportedContent {
- width: 100%;
- max-width: 1880px;
- padding: 0;
- line-height: 30px;
- max-height: 56px;
- text-align: left; }
-
-.container {
- max-width: 1160px;
- width: 100%;
- margin: 0;
- padding: 0; }
-
-
-@media (max-width: 769px) {
- a[aria-current="page"] img#logo { margin-top: 0; margin-left: 0; padding-left: 15px }
- a[aria-current="page"] { padding-top: 0 }
- button.navbar-toggler { margin-top: 15px; }
- a.nav-link[data-rb-event-key="language"] a {
- padding-bottom: 12px;
- margin-right: 0;
- margin-left: -10px }
- }
\ No newline at end of file
diff --git a/src/styles/layout.css b/src/styles/layout.css
index d42ff97..1988af2 100644
--- a/src/styles/layout.css
+++ b/src/styles/layout.css
@@ -4,6 +4,7 @@ html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
height: 100%;
+ font-size: 1.08rem;
}
body {
height: 100%;
@@ -12,7 +13,6 @@ body {
-moz-osx-font-smoothing: grayscale;
}
-
.container {
max-width: 1160px;
width: 100%;
@@ -23,400 +23,20 @@ body {
font-weight: 400;
}
-main { margin-top: 17%; }
@media (max-width: 769px) {
main { margin-top: 6%; }
nav.navbar.navbar-expand-lg.navbar-light { width: 100%; padding: 0; } }
-img.gatsby-resp-image-image{
- max-width: 750px;
- max-height: 550px;
- margin-top: 500px;
-}
+img { max-width: 100%; margin-bottom: 1.45rem; }
-p p span.gatsby-resp-image-wrapper {
- max-width: 1160px;
-}
+h1 { font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; }
+h2 { font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; }
+h3 { font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; }
+h4 { font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; }
+h5 { font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; }
+h6 { font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; }
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-main,
-menu,
-nav,
-section,
-summary {
- display: block;
-}
-audio,
-canvas,
-progress,
-video {
- display: inline-block;
-}
-audio:not([controls]) {
- display: none;
- height: 0;
-}
-progress {
- vertical-align: baseline;
-}
-[hidden],
-template {
- display: none;
-}
-a {
- background-color: transparent;
- -webkit-text-decoration-skip: objects;
-}
-a:active,
-a:hover {
- outline-width: 0;
-}
-abbr[title] {
- border-bottom: none;
- text-decoration: underline;
- text-decoration: underline dotted;
-}
-b,
-strong {
- font-weight: inherit;
- font-weight: bolder;
-}
-dfn {
- font-style: italic;
-}
-h1 {
- font-size: 50px;
- margin: 0.67em 0;
-}
-mark {
- background-color: #ff0;
- color: #000;
-}
-small {
- font-size: 80%;
-}
-sub,
-sup {
- font-size: 75%;
- line-height: 0;
- position: relative;
- vertical-align: baseline;
-}
-sub {
- bottom: -0.25em;
-}
-sup {
- top: -0.5em;
-}
-img {
- border-style: none;
-}
-svg:not(:root) {
- overflow: hidden;
-}
-code,
-kbd,
-pre,
-samp {
- font-family: monospace, monospace;
- font-size: 1em;
-}
-figure {
- margin: 1em 40px;
-}
-hr {
- box-sizing: content-box;
- height: 0;
- overflow: visible;
-}
-button,
-input,
-optgroup,
-select,
-textarea {
- font: inherit;
- margin: 0;
-}
-optgroup {
- font-weight: 700;
-}
-button,
-input {
- overflow: visible;
-}
-button,
-select {
- text-transform: none;
-}
-[type="reset"],
-[type="submit"],
-button,
-html [type="button"] {
- -webkit-appearance: button;
-}
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner,
-button::-moz-focus-inner {
- border-style: none;
- padding: 0;
-}
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring,
-button:-moz-focusring {
- outline: 1px dotted ButtonText;
-}
-fieldset {
- border: 1px solid silver;
- margin: 0 2px;
- padding: 0.35em 0.625em 0.75em;
-}
-legend {
- box-sizing: border-box;
- color: inherit;
- display: table;
- max-width: 100%;
- padding: 0;
- white-space: normal;
-}
-textarea {
- overflow: auto;
-}
-[type="checkbox"],
-[type="radio"] {
- box-sizing: border-box;
- padding: 0;
-}
-[type="number"]::-webkit-inner-spin-button,
-[type="number"]::-webkit-outer-spin-button {
- height: auto;
-}
-[type="search"] {
- -webkit-appearance: textfield;
- outline-offset: -2px;
-}
-[type="search"]::-webkit-search-cancel-button,
-[type="search"]::-webkit-search-decoration {
- -webkit-appearance: none;
-}
-::-webkit-input-placeholder {
- color: inherit;
- opacity: 0.54;
-}
-::-webkit-file-upload-button {
- -webkit-appearance: button;
- font: inherit;
-}
-html {
- font: 112.5%/1.45em georgia, serif;
- box-sizing: border-box;
- overflow-y: scroll;
-}
-* {
- box-sizing: inherit;
-}
-*:before {
- box-sizing: inherit;
-}
-*:after {
- box-sizing: inherit;
-}
-body {
- color: hsla(0, 0%, 0%, 0.8);
- font-family: georgia, serif;
- font-weight: normal;
- word-wrap: break-word;
- font-kerning: normal;
- -moz-font-feature-settings: "kern", "liga", "clig", "calt";
- -ms-font-feature-settings: "kern", "liga", "clig", "calt";
- -webkit-font-feature-settings: "kern", "liga", "clig", "calt";
- font-feature-settings: "kern", "liga", "clig", "calt";
-}
-img {
- max-width: 100%;
- margin-left: 0;
- margin-right: 0;
- margin-top: 0;
- padding-bottom: 0;
- padding-left: 0;
- padding-right: 0;
- padding-top: 0;
- margin-bottom: 1.45rem;
-}
-h1 {
- margin-left: 0;
- margin-right: 0;
- margin-top: 0;
- padding-bottom: 0;
- padding-left: 0;
- padding-right: 0;
- padding-top: 0;
- margin-bottom: 15px;
- color: inherit;
- font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
- Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
- font-weight: 600;
- text-rendering: optimizeLegibility;
- font-size: 2.5rem;
- line-height: 1.1;
-}
-h2 {
- margin-left: 0;
- margin-right: 0;
- margin-top: 0;
- margin-bottom: 10px;
- padding-bottom: 0;
- padding-left: 0;
- padding-right: 0;
- padding-top: 0;
- color: inherit;
- font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
- Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
- font-weight: 600;
- text-rendering: optimizeLegibility;
- font-size: 1.75rem;
- line-height: 1.1;
-}
-h3 {
- margin-left: 0;
- margin-right: 0;
- margin-top: 0;
- padding-bottom: 0;
- padding-left: 0;
- padding-right: 0;
- padding-top: 0;
- margin-bottom: 5px;
- color: inherit;
- font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
- Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
- font-weight: 620;
- text-rendering: optimizeLegibility;
- font-size: 35px;
- line-height: 1.1;
-}
-h4 {
- margin-left: 0;
- margin-right: 0;
- margin-top: 0;
- padding-bottom: 0;
- padding-left: 0;
- padding-right: 0;
- padding-top: 0;
- margin-bottom: 1.45rem;
- color: inherit;
- font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
- Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
- font-weight: bold;
- text-rendering: optimizeLegibility;
- font-size: 1rem;
- line-height: 1.1;
-}
-h5 {
- margin-left: 0;
- margin-right: 0;
- margin-top: 0;
- padding-bottom: 0;
- padding-left: 0;
- padding-right: 0;
- padding-top: 0;
- margin-bottom: 1.45rem;
- color: inherit;
- font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
- Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
- font-weight: bold;
- text-rendering: optimizeLegibility;
- font-size: 0.85028rem;
- line-height: 1.1;
-}
-h6 {
- margin-left: 0;
- margin-right: 0;
- margin-top: 0;
- padding-bottom: 0;
- padding-left: 0;
- padding-right: 0;
- padding-top: 0;
- margin-bottom: 1.45rem;
- color: inherit;
- font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
- Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
- font-weight: bold;
- text-rendering: optimizeLegibility;
- font-size: 0.78405rem;
- line-height: 1.1;
-}
-hgroup {
- margin-left: 0;
- margin-right: 0;
- margin-top: 0;
- padding-bottom: 0;
- padding-left: 0;
- padding-right: 0;
- padding-top: 0;
- margin-bottom: 1.45rem;
-}
-ul {
- margin-left: 1.45rem;
- margin-right: 0;
- margin-top: 0;
- padding-bottom: 0;
- padding-left: 0;
- padding-right: 0;
- padding-top: 0;
- margin-bottom: 1.45rem;
- list-style-position: outside;
- list-style-image: none;
-}
-ol {
- margin-left: 1.45rem;
- margin-right: 0;
- margin-top: 0;
- padding-bottom: 0;
- padding-left: 0;
- padding-right: 0;
- padding-top: 0;
- margin-bottom: 1.45rem;
- list-style-position: outside;
- list-style-image: none;
-}
-dl {
- margin-left: 0;
- margin-right: 0;
- margin-top: 0;
- padding-bottom: 0;
- padding-left: 0;
- padding-right: 0;
- padding-top: 0;
- margin-bottom: 1.45rem;
-}
-dd {
- margin-left: 0;
- margin-right: 0;
- margin-top: 0;
- padding-bottom: 0;
- padding-left: 0;
- padding-right: 0;
- padding-top: 0;
- margin-bottom: 1.45rem;
-}
-p {
- margin-left: 0;
- margin-right: 0;
- margin-top: 0;
- padding-bottom: 0;
- padding-left: 0;
- padding-right: 0;
- padding-top: 0;
- margin-bottom: 1.45rem;
-}
figure {
margin-left: 0;
margin-right: 0;
@@ -427,19 +47,7 @@ figure {
padding-top: 0;
margin-bottom: 1.45rem;
}
-pre {
- margin-left: 0;
- margin-right: 0;
- margin-top: 0;
- margin-bottom: 1.45rem;
- font-size: 0.85rem;
- line-height: 1.42;
- background: hsla(0, 0%, 0%, 0.04);
- border-radius: 3px;
- overflow: auto;
- word-wrap: normal;
- padding: 1.45rem;
-}
+
table {
margin-left: 0;
margin-right: 0;
@@ -454,198 +62,9 @@ table {
border-collapse: collapse;
width: 100%;
}
-fieldset {
- margin-left: 0;
- margin-right: 0;
- margin-top: 0;
- padding-bottom: 0;
- padding-left: 0;
- padding-right: 0;
- padding-top: 0;
- margin-bottom: 1.45rem;
-}
-blockquote {
- margin-left: 1.45rem;
- margin-right: 1.45rem;
- margin-top: 0;
- padding-bottom: 0;
- padding-left: 0;
- padding-right: 0;
- padding-top: 0;
- margin-bottom: 1.45rem;
-}
-form {
- margin-left: 0;
- margin-right: 0;
- margin-top: 0;
- padding-bottom: 0;
- padding-left: 0;
- padding-right: 0;
- padding-top: 0;
- margin-bottom: 1.45rem;
-}
-noscript {
- margin-left: 0;
- margin-right: 0;
- margin-top: 0;
- padding-bottom: 0;
- padding-left: 0;
- padding-right: 0;
- padding-top: 0;
- margin-bottom: 1.45rem;
-}
-iframe {
- margin-left: 0;
- margin-right: 0;
- margin-top: 0;
- padding-bottom: 0;
- padding-left: 0;
- padding-right: 0;
- padding-top: 0;
- margin-bottom: 1.45rem;
-}
-hr {
- margin-left: 0;
- margin-right: 0;
- margin-top: 0;
- padding-bottom: 0;
- padding-left: 0;
- padding-right: 0;
- padding-top: 0;
- margin-bottom: calc(1.45rem - 1px);
- background: hsla(0, 0%, 0%, 0.2);
- border: none;
- height: 1px;
-}
-address {
- margin-left: 0;
- margin-right: 0;
- margin-top: 0;
- padding-bottom: 0;
- padding-left: 0;
- padding-right: 0;
- padding-top: 0;
- margin-bottom: 1.45rem;
-}
-b {
- font-weight: bold;
-}
-strong {
- font-weight: bold;
-}
-dt {
- font-weight: bold;
-}
-th {
- font-weight: bold;
-}
-li {
- margin-bottom: calc(1.45rem / 2);
-}
-ol li {
- padding-left: 0;
-}
-ul li {
- padding-left: 0;
-}
-li > ol {
- margin-left: 1.45rem;
- margin-bottom: calc(1.45rem / 2);
- margin-top: calc(1.45rem / 2);
-}
-li > ul {
- margin-left: 1.45rem;
- margin-bottom: calc(1.45rem / 2);
- margin-top: calc(1.45rem / 2);
-}
-blockquote *:last-child {
- margin-bottom: 0;
-}
-li *:last-child {
- margin-bottom: 0;
-}
-p *:last-child {
- margin-bottom: 0;
-}
-li > p {
- margin-bottom: calc(1.45rem / 2);
-}
-code {
- font-size: 0.85rem;
- line-height: 1.45rem;
-}
-kbd {
- font-size: 0.85rem;
- line-height: 1.45rem;
-}
-samp {
- font-size: 0.85rem;
- line-height: 1.45rem;
-}
-abbr {
- border-bottom: 1px dotted hsla(0, 0%, 0%, 0.5);
- cursor: help;
-}
-acronym {
- border-bottom: 1px dotted hsla(0, 0%, 0%, 0.5);
- cursor: help;
-}
-abbr[title] {
- border-bottom: 1px dotted hsla(0, 0%, 0%, 0.5);
- cursor: help;
- text-decoration: none;
-}
-thead {
- text-align: left;
-}
-td,
-th {
- text-align: left;
- border-bottom: 1px solid hsla(0, 0%, 0%, 0.12);
- font-feature-settings: "tnum";
- -moz-font-feature-settings: "tnum";
- -ms-font-feature-settings: "tnum";
- -webkit-font-feature-settings: "tnum";
- padding-left: 0.96667rem;
- padding-right: 0.96667rem;
- padding-top: 0.725rem;
- padding-bottom: calc(0.725rem - 1px);
-}
-th:first-child,
-td:first-child {
- padding-left: 0;
-}
-th:last-child,
-td:last-child {
- padding-right: 0;
-}
-tt,
-code {
- background-color: hsla(0, 0%, 0%, 0.04);
- border-radius: 3px;
- font-family: "SFMono-Regular", Consolas, "Roboto Mono", "Droid Sans Mono",
- "Liberation Mono", Menlo, Courier, monospace;
- padding: 0;
- padding-top: 0.2em;
- padding-bottom: 0.2em;
-}
-pre code {
- background: none;
- line-height: 1.42;
-}
-code:before,
-code:after,
-tt:before,
-tt:after {
- letter-spacing: -0.2em;
- content: " ";
-}
-pre code:before,
-pre code:after,
-pre tt:before,
-pre tt:after {
- content: "";
-}
+
+b, strong, dt, th { font-weight: bold; }
+
@media only screen and (max-width: 480px) {
html {
font-size: 100%;
diff --git a/src/styles/main.css b/src/styles/main.css
index bf620e3..dfb8edb 100644
--- a/src/styles/main.css
+++ b/src/styles/main.css
@@ -1,9 +1,8 @@
main { margin-top: 75px; }
+a#partner{ font-size: 1.8rem; }
/* ---- projects navbar ---------------------- */
-ul.nav.nav-tabs { margin-top: 75px; }
-a { font-size: 0.9rem; font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; }
-a#partner{ font-size: 1.8rem; }
+a { font-size: 0.98rem; font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; }
a.nav-link#project:hover {
padding-bottom: 7px;
color: rgb(0, 0, 0);
@@ -17,25 +16,45 @@ ul.nav-tabs a.nav-link, ul.nav-tabs a.nav-link.active {
/* ------------------------------------------- */
/* ------- news & main content ----------------------------- */
-h1 { font-size: 2.3rem; }
+h1 { font-size: 2.3rem; }
h2 { font-size: 1.75rem; }
h3 { font-size: 1.5rem; }
div.container main a { color: rgb(0, 86, 179); }
div.container main a:hover { color: rgb(1, 66, 136); text-decoration: underline; }
div.container main p a:visited {color: rgb(0, 86, 179); text-decoration: none; }
+li a { color: rgb(0,86,179) }
+li a:hover { color: rgb(1,66,136) }
+li a:visited { color: rgb(0,86,179) }
+
+h2 a { color: rgb(0,86,179) }
+h2 a:hover { color: rgb(1,66,136) }
+h2 a:visited { color: rgb(0,86,179) }
+
.jumbotron {
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
- padding: 60px 40px 30px 40px;
- margin-bottom: 35px;
+ padding: 60px 40px 10px 40px;
+ margin-bottom: 0px;
background-color: rgb(247,247,247);
- border: 1.5px solid rgb(219, 219, 219); }
+ border: 1.5px solid rgb(219, 219, 219);
+ border-bottom: 0;
+ border-radius: 5px 5px 0px 0px; }
+
+.aboutButton {
+ background-color: rgb(247,247,247);
+ padding-top: 5px;
+ padding-bottom: 25px;
+ margin-bottom: 25px;
+ border-bottom: 1.5px solid rgb(219, 219, 219);
+ border-left: 1.5px solid rgb(219, 219, 219);
+ border-right: 1.5px solid rgb(219, 219, 219); }
button#jt:hover { background-color: rgb(9, 110, 88); }
button#jt a { color: white; }
button#jt a:hover { text-decoration: none; }
button#jt {
+ margin-left: 50px;
font-size: 25px;
background-color: rgb(14, 156, 125);
border: rgb(0,99,99); }
diff --git a/src/styles/navbar.css b/src/styles/navbar.css
new file mode 100644
index 0000000..110a5fc
--- /dev/null
+++ b/src/styles/navbar.css
@@ -0,0 +1,87 @@
+nav#site-navbar.navbar.navbar-expand-lg.navbar-light.bg-dark.fixed-top { height: 75px; }
+
+div.mr-auto.navbar-nav a { font-size: 1rem; }
+img#logo { margin-bottom: 0; }
+a[href="/"] { padding-top: 1.5%; opacity: 0.75}
+a[href="/"]:hover { opacity: 1; }
+a[href="/"].activeBrand { opacity: 1; padding-top: 0}
+a.link-no-style[href="/"] { padding: 0; margin-top: 0 }
+
+a.link-no-style span[data-rb-event-key="news"].nav-link,
+a.link-no-style span[data-rb-event-key="about"].nav-link,
+a.link-no-style span[data-rb-event-key="projects"].nav-link,
+a.link-no-style span[data-rb-event-key="partners"].nav-link
+ { color: rgb(209, 209, 209); margin-left: 15px; margin-right: 10px; }
+
+ a.link-no-style { margin-top: 10px; }
+ a.active { margin-top: 10px; }
+
+a.link-no-style span[data-rb-event-key="news"].nav-link:hover,
+a.link-no-style span[data-rb-event-key="about"].nav-link:hover,
+a.link-no-style span[data-rb-event-key="projects"].nav-link:hover,
+a.link-no-style span[data-rb-event-key="partners"].nav-link:hover
+ { color: white; background-color: rgb(20, 142, 161); padding-bottom: 15px; }
+
+ a.active { background-color: rgb(20, 142, 161); margin-left: 15px; margin-right: 10px; margin-bottom: 8px;}
+ .navbar-light .navbar-nav a.active>.nav-link { color: white; }
+
+a.language.nav-link { margin-left: 50px; }
+a[data-rb-event-key="language"] div { margin-bottom: 8px; }
+a[data-rb-event-key="language"]:hover { background-color: rgb(52,58,64);}
+a[data-rb-event-key="language"] a { padding: 15px;}
+
+a#project { margin: 0; }
+
+div p a { color: rgb(0, 86, 179); }
+div p a:visited { color: rgb(0, 86, 179); }
+div p a:hover { color: rgb(1, 71, 145) }
+/* ------ navbar ------------------------------ */
+
+
+/* ----- collapse show ---------------------- */
+@media(max-width: 769px) {
+ a.activeBrand { margin: 0 0px 0 20px; padding-top: 0 }
+ a.nav-link a#active {
+ color: white;
+ background-color: rgb(20, 142, 161);
+ padding-top: 11px;
+ padding-bottom: 12px; }
+}
+
+/* button.navbar-toggler.collapsed { margin-top: 0px; margin-left: 15px; } */
+button.navbar-toggler { margin-top: 0px; margin-right: 17px; }
+
+div#basic-navbar-nav.navbar-collapse.collapse.show {
+ width: 100px;
+ padding-bottom: 0px;
+ text-align: center;
+ background-color: rgb(52,58,64);
+ margin-top: -0px; }
+button.navbar-toggler { background-color: rgb(20, 142, 161); }
+div#navbarSupportedContent.navbar-collapse.collapse.show img#logo{ margin: auto; }
+/* ------------------------------------------- */
+
+/* #navbarSupportedContent {
+ width: 100%;
+ max-width: 1880px;
+ padding: 0;
+ line-height: 30px;
+ max-height: 56px;
+ text-align: left; }
+
+.container {
+ max-width: 1160px;
+ width: 100%;
+ margin: 0;
+ padding: 0; } */
+
+
+/* @media (max-width: 769px) {
+ a[aria-current="page"] img#logo { margin-top: 0; margin-left: 0; padding-left: 15px }
+ a[aria-current="page"] { padding-top: 0 }
+ button.navbar-toggler { margin-top: 15px; }
+ a.nav-link[data-rb-event-key="language"] a {
+ padding-bottom: 12px;
+ margin-right: 0;
+ margin-left: -10px }
+ } */
\ No newline at end of file
diff --git a/static/_redirects b/static/_redirects
deleted file mode 100644
index 3589088..0000000
--- a/static/_redirects
+++ /dev/null
@@ -1,16 +0,0 @@
-/dataforge / #сайт dataforge 200
-/dataforge/news / # сайт dataforge/news 200
-
-/dataforge/docs/ / # 1... 200
-/dataforge/docs/meta / # 2... 200
-/dataforge/docs/framework / # 3... 200
-/dataforge/docs/data_flow / # 4... 200
-/dataforge/docs/envelopes / # 5... 200
-/dataforge/docs/storage / # 6... 200
-/dataforge/docs/control / # 7... 200
-/dataforge/docs/extensions / # 8... 200
-
-/dataforge/modules / # 200
-/dataforge/releases / # 200
-/dataforge/apps / # 200
-/dataforge/misc / # 200
\ No newline at end of file