Re-format

This commit is contained in:
Alexander Nozik 2021-03-23 22:34:47 +03:00
parent d5d98f1057
commit 82db874c9c
25 changed files with 2516 additions and 1610 deletions

View File

@ -49,6 +49,7 @@ module.exports = {
icon: `src/images/icon.png`, // This path is relative to the root of the site. icon: `src/images/icon.png`, // This path is relative to the root of the site.
}, },
}, },
`gatsby-plugin-netlify-cms`,
{ {
resolve: `gatsby-plugin-react-intl`, resolve: `gatsby-plugin-react-intl`,
options: { options: {

View File

@ -3,18 +3,18 @@ import "../styles/footer.css"
const Footer = () => ( const Footer = () => (
<footer> <footer>
<div className = "container" style = {{textAlign: `left`,}}> <div className="container" style={{textAlign: `left`,}}>
<p> <p>
© 2016 mipt-npm group | Built with © 2016 mipt-npm group | Built with
{` `} {` `}
<a href = "https://www.gatsbyjs.org">Gatsby framework</a> <a href="https://www.gatsbyjs.org">Gatsby framework</a>
{` `} {` `}
and and
{` `} {` `}
<a href = "https://getbootstrap.com/">Bootstrap styles</a> <a href="https://getbootstrap.com/">Bootstrap styles</a>
</p> </p>
</div> </div>
</footer> </footer>
) )
export default Footer export default Footer

View File

@ -2,36 +2,36 @@ import React from "react"
import {changeLocale, IntlContextConsumer} from "gatsby-plugin-react-intl" import {changeLocale, IntlContextConsumer} from "gatsby-plugin-react-intl"
const languageName = { const languageName = {
ru: "Russian", ru: "Russian",
en: "English", en: "English",
} }
const Language = () => { const Language = () => {
return ( return (
<div> <div>
<IntlContextConsumer> <IntlContextConsumer>
{({ languages, language: currentLocale }) => {({languages, language: currentLocale}) =>
languages.map(language => ( languages.map(language => (
<a <a
href={language} href={language}
key={language} key={language}
onClick={() => changeLocale(language)} onClick={() => changeLocale(language)}
style={{ style={{
color: currentLocale === language ? `white` : `rgb(170,172,173)`, color: currentLocale === language ? `white` : `rgb(170,172,173)`,
backgroundColor: currentLocale === language ? `#db4446`: ``, backgroundColor: currentLocale === language ? `#db4446` : ``,
marginLeft: -11, marginLeft: -11,
margin: 10, margin: 10,
cursor: `pointer`, cursor: `pointer`,
opacity: 1 opacity: 1
}} }}
> >
{languageName[language]} {languageName[language]}
</a> </a>
)) ))
} }
</IntlContextConsumer> </IntlContextConsumer>
</div> </div>
) )
} }
export default Language export default Language

View File

@ -10,22 +10,23 @@ import "../styles/layout.css"
import "../styles/main.css" import "../styles/main.css"
import "katex/dist/katex.min.css" import "katex/dist/katex.min.css"
const Layout = ({ children }) => { const Layout = ({children}) => {
const intl = useIntl(); const intl = useIntl();
const lang = intl.locale; const lang = intl.locale;
return ( return (
<> <>
<Navbar /> <Navbar/>
<SEO lang={lang} title={intl.formatMessage({ id: "title" })} /> <SEO lang={lang} title={intl.formatMessage({id: "title"})}/>
<div className = "container"> <div className="container">
<main>{children}</main> <main>{children}</main>
</div> </div>
<Footer/> <Footer/>
</> </>
)} )
}
Layout.propTypes = { Layout.propTypes = {
children: PropTypes.node.isRequired, children: PropTypes.node.isRequired,
} }
export default injectIntl(Layout) export default injectIntl(Layout)

View File

@ -11,49 +11,51 @@ import "../styles/navbar.css"
import logo from "../images/index/logo_white.png" import logo from "../images/index/logo_white.png"
const CustomNavbar = () => { const CustomNavbar = () => {
const { location } = history; const {location} = history;
var active = ["", "", "", ""] let active = ["", "", "", ""]
active[0] = location.pathname.includes('/news/') ? 'active': "link-no-style"; active[0] = location.pathname.includes('/news/') ? 'active' : "link-no-style";
active[1] = location.pathname.includes('/about/') ? 'active': "link-no-style"; active[1] = location.pathname.includes('/about/') ? 'active' : "link-no-style";
active[2] = location.pathname.includes('/projects/') ? 'active': "link-no-style"; active[2] = location.pathname.includes('/projects/') ? 'active' : "link-no-style";
active[3] = location.pathname.includes('/partners/') ? 'active': "link-no-style"; active[3] = location.pathname.includes('/partners/') ? 'active' : "link-no-style";
var activeBrand = location.pathname === "/ru/" || location.pathname === "/en/" ? 'activeBrand': "link-no-style"; let activeBrand = location.pathname === "/ru/" || location.pathname === "/en/" ? 'activeBrand' : "link-no-style";
const intl = useIntl(); const intl = useIntl();
const lang = intl.locale; const lang = intl.locale;
return ( return (
<> <>
<SEO lang={lang} title={intl.formatMessage({ id: "title" })} /> <SEO lang={lang} title={intl.formatMessage({id: "title"})}/>
<Navbar bg="dark" expand="lg" id="site-navbar" fixed="top"> <Navbar bg="dark" expand="lg" id="site-navbar" fixed="top">
<Container> <Container>
<Link to="/" className={activeBrand}> <Link to="/" className={activeBrand}>
<Navbar.Brand as="span"><img src={logo} height="50px" alt="npm logo" id="logo"/></Navbar.Brand> <Navbar.Brand as="span"><img src={logo} height="50px" alt="npm logo" id="logo"/></Navbar.Brand>
</Link> </Link>
<Navbar.Toggle aria-controls="basic-navbar-nav" /> <Navbar.Toggle aria-controls="basic-navbar-nav"/>
<Navbar.Collapse id="basic-navbar-nav"> <Navbar.Collapse id="basic-navbar-nav">
<Nav className="mr-auto" activeKey={location.pathname}> <Nav className="mr-auto" activeKey={location.pathname}>
<Link to="/news" className={active[0]}> {/* news */} <Link to="/news" className={active[0]}> {/* news */}
<Nav.Link as="span" eventKey="news"><FormattedMessage id="header.news"/></Nav.Link> <Nav.Link as="span" eventKey="news"><FormattedMessage id="header.news"/></Nav.Link>
</Link> </Link>
<Link to="/about" className={active[1]}> {/* about */} <Link to="/about" className={active[1]}> {/* about */}
<Nav.Link as="span" eventKey="about"><FormattedMessage id="header.group"/></Nav.Link> <Nav.Link as="span" eventKey="about"><FormattedMessage id="header.group"/></Nav.Link>
</Link> </Link>
<Link to="/projects/physics" className={active[2]}> <Link to="/projects/physics" className={active[2]}>
<Nav.Link as="span" eventKey="projects"><FormattedMessage id="header.projects"/></Nav.Link> <Nav.Link as="span" eventKey="projects"><FormattedMessage
</Link> id="header.projects"/></Nav.Link>
<Link to="/partners" className={active[3]}> {/* partners */} </Link>
<Nav.Link as="span" eventKey="partners"><FormattedMessage id="header.partners"/></Nav.Link> <Link to="/partners" className={active[3]}> {/* partners */}
</Link> <Nav.Link as="span" eventKey="partners"><FormattedMessage
<Link> id="header.partners"/></Nav.Link>
<Nav.Link eventKey="language" className="language"><Language/></Nav.Link> </Link>
</Link> <Link>
</Nav> <Nav.Link eventKey="language" className="language"><Language/></Nav.Link>
</Navbar.Collapse> </Link>
</Container> </Nav>
</Navbar> </Navbar.Collapse>
</> </Container>
) </Navbar>
</>
)
} }
export default injectIntl(CustomNavbar) export default injectIntl(CustomNavbar)

View File

@ -2,8 +2,8 @@ import React from "react"
import {injectIntl} from "gatsby-plugin-react-intl" import {injectIntl} from "gatsby-plugin-react-intl"
import SEO from "./seo" import SEO from "./seo"
const Redirect = ({ intl }) => { const Redirect = ({intl}) => {
return <SEO title={`${intl.formatMessage({ id: "title" })}`} /> return <SEO title={`${intl.formatMessage({id: "title"})}`}/>
} }
export default injectIntl(Redirect) export default injectIntl(Redirect)

View File

@ -1,60 +1,60 @@
import React from "react" import React from "react"
import PropTypes from "prop-types" import PropTypes from "prop-types"
import Helmet from "react-helmet" import Helmet from "react-helmet"
import { useStaticQuery, graphql } from "gatsby" import {graphql, useStaticQuery} from "gatsby"
const SEO = ({ description, lang, meta, title }) => { const SEO = ({description, lang, meta, title}) => {
const { site } = useStaticQuery( const {site} = useStaticQuery(
graphql` graphql`
query { query {
site { site {
siteMetadata { siteMetadata {
title title
description description
} }
} }
} }
` `
) )
const metaDescription = description || site.siteMetadata.description const metaDescription = description || site.siteMetadata.description
return ( return (
<Helmet <Helmet
htmlAttributes={{ htmlAttributes={{
lang, lang,
}} }}
title={title} title={title}
titleTemplate={site.siteMetadata.title} titleTemplate={site.siteMetadata.title}
meta={[ meta={[
{ {
name: `description`, name: `description`,
content: metaDescription, content: metaDescription,
}, },
{ {
property: `og:title`, property: `og:title`,
content: title, content: title,
}, },
{ {
property: `og:description`, property: `og:description`,
content: metaDescription, content: metaDescription,
}, },
].concat(meta)} ].concat(meta)}
/> />
) )
} }
SEO.defaultProps = { SEO.defaultProps = {
lang: `ru`, lang: `ru`,
meta: [], meta: [],
description: ``, description: ``,
} }
SEO.propTypes = { SEO.propTypes = {
description: PropTypes.string, description: PropTypes.string,
lang: PropTypes.string, lang: PropTypes.string,
meta: PropTypes.arrayOf(PropTypes.object), meta: PropTypes.arrayOf(PropTypes.object),
title: PropTypes.string.isRequired, title: PropTypes.string.isRequired,
} }
export default SEO export default SEO

View File

@ -8,83 +8,86 @@ import {Timeline, TimelineItem} from 'vertical-timeline-component-for-react'
import Navbar from "../navBar" import Navbar from "../navBar"
import Footer from "../footer" import Footer from "../footer"
const NewsTemplate = ( props ) => { const NewsTemplate = (props) => {
const intl = useIntl() const intl = useIntl()
const lang = intl.locale const lang = intl.locale
var news = "" var news = ""
if ( lang==="ru" ) { news = props.data.ru_news.edges} if (lang === "ru") {
else if ( lang==="en" ) { news = props.data.en_news.edges; } news = props.data.ru_news.edges
} else if (lang === "en") {
news = props.data.en_news.edges;
}
const next = props.pageContext.next const next = props.pageContext.next
const prev = props.pageContext.prev const prev = props.pageContext.prev
return ( return (
<> <>
<Navbar /> <Navbar/>
<Timeline lineColor={'#ddd'} animate={false}> <Timeline lineColor={'#ddd'} animate={false}>
{news.map(({node}) => ( {news.map(({node}) => (
<TimelineItem <TimelineItem
key={node.frontmatter.date} key={node.frontmatter.date}
dateText={node.frontmatter.date} dateText={node.frontmatter.date}
style={{ color: '#e86971' }} > style={{color: '#e86971'}}>
<h2>{node.frontmatter.title}</h2> <h2>{node.frontmatter.title}</h2>
<div>{Parser(node.html)}</div> <div>{Parser(node.html)}</div>
</TimelineItem> </TimelineItem>
))} ))}
</Timeline> </Timeline>
<nav style={{ display: 'flex', justifyContent: 'space-between', marginLeft: `15%` }}> <nav style={{display: 'flex', justifyContent: 'space-between', marginLeft: `15%`}}>
<div> <div>
{prev && <Link to={`/${prev}`}><h1 style={{padding: 10, color: `red`}}>{`<`}---</h1> </Link>} {prev && <Link to={`/${prev}`}><h1 style={{padding: 10, color: `red`}}>{`<`}---</h1></Link>}
</div> </div>
<div style={{ justifySelf: 'flex-end', marginRight: `10%`}}> <div style={{justifySelf: 'flex-end', marginRight: `10%`}}>
{next && <Link to={`/${next}`} ><h1 style={{padding: 10, color: `red`}}>---></h1></Link>} {next && <Link to={`/${next}`}><h1 style={{padding: 10, color: `red`}}>---></h1></Link>}
</div> </div>
</nav> </nav>
<Footer/> <Footer/>
</> </>
) )
} }
export default injectIntl(NewsTemplate) export default injectIntl(NewsTemplate)
export const query = graphql` export const query = graphql`
query NewsQuery($limit: Int!, $skip: Int!) { query NewsQuery($limit: Int!, $skip: Int!) {
ru_news: allMarkdownRemark( ru_news: allMarkdownRemark(
filter: {frontmatter: {content_type: {eq: "post"}, published: {eq: true}, language: {eq: "ru"}}}, filter: {frontmatter: {content_type: {eq: "post"}, published: {eq: true}, language: {eq: "ru"}}},
sort: {fields: [frontmatter___date], order: DESC}, sort: {fields: [frontmatter___date], order: DESC},
limit: $limit limit: $limit
skip: $skip skip: $skip
) { ) {
edges { edges {
node { node {
frontmatter { frontmatter {
title title
slug slug
date(formatString: "DD.MM.YYYY") date(formatString: "DD.MM.YYYY")
}
html
}
} }
html
}
} }
}
en_news: allMarkdownRemark( en_news: allMarkdownRemark(
filter: {frontmatter: {content_type: {eq: "post"}, published: {eq: true}, language: {eq: "en"}}}, filter: {frontmatter: {content_type: {eq: "post"}, published: {eq: true}, language: {eq: "en"}}},
sort: {fields: [frontmatter___date], order: DESC}, sort: {fields: [frontmatter___date], order: DESC},
limit: $limit limit: $limit
skip: $skip skip: $skip
) { ) {
edges { edges {
node { node {
frontmatter { frontmatter {
title title
slug slug
date(formatString: "DD.MM.YYYY") date(formatString: "DD.MM.YYYY")
}
html
}
} }
html
}
} }
} }
}
` `

File diff suppressed because one or more lines are too long

View File

@ -2,118 +2,120 @@
<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg <svg
xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#" xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1" version="1.1"
id="Layer_1" id="Layer_1"
x="0px" x="0px"
y="0px" y="0px"
viewBox="0 0 123.87808 113.09572" viewBox="0 0 123.87808 113.09572"
xml:space="preserve" xml:space="preserve"
sodipodi:docname="npm-logo-no-text.svg" sodipodi:docname="npm-logo-no-text.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)" inkscape:version="0.92.3 (2405546, 2018-03-11)"
width="123.87808" width="123.87808"
height="113.09572"><metadata height="113.09572"><metadata
id="metadata70"><rdf:RDF><cc:Work id="metadata70"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title></dc:title></cc:Work></rdf:RDF></metadata>
id="defs68"> <defs
id="defs68">
</defs><sodipodi:namedview </defs>
pagecolor="#ffffff" <sodipodi:namedview
bordercolor="#666666" pagecolor="#ffffff"
borderopacity="1" bordercolor="#666666"
objecttolerance="10" borderopacity="1"
gridtolerance="10" objecttolerance="10"
guidetolerance="10" gridtolerance="10"
inkscape:pageopacity="0" guidetolerance="10"
inkscape:pageshadow="2" inkscape:pageopacity="0"
inkscape:window-width="1858" inkscape:pageshadow="2"
inkscape:window-height="1057" inkscape:window-width="1858"
id="namedview66" inkscape:window-height="1057"
showgrid="false" id="namedview66"
inkscape:zoom="4.2597403" showgrid="false"
inkscape:cx="133.1942" inkscape:zoom="4.2597403"
inkscape:cy="34.087578" inkscape:cx="133.1942"
inkscape:window-x="-8" inkscape:cy="34.087578"
inkscape:window-y="-8" inkscape:window-x="-8"
inkscape:window-maximized="1" inkscape:window-y="-8"
inkscape:current-layer="Layer_1" inkscape:window-maximized="1"
fit-margin-top="10" inkscape:current-layer="Layer_1"
fit-margin-left="12" fit-margin-top="10"
fit-margin-right="8" fit-margin-left="12"
fit-margin-bottom="10" /> fit-margin-right="8"
<style fit-margin-bottom="10"/>
type="text/css" <style
id="style2"> type="text/css"
id="style2">
.st0{fill:#003DA6;} .st0{fill:#003DA6;}
.st1{enable-background:new ;} .st1{enable-background:new ;}
</style> </style>
<g <g
id="svg8" id="svg8"
inkscape:version="0.92.3 (2405546, 2018-03-11)" inkscape:version="0.92.3 (2405546, 2018-03-11)"
sodipodi:docname="npm-logo.svg" sodipodi:docname="npm-logo.svg"
transform="translate(-18.121919,8.1957201)"> transform="translate(-18.121919,8.1957201)">
<sodipodi:namedview <sodipodi:namedview
bordercolor="#666666" bordercolor="#666666"
borderopacity="1.0" borderopacity="1.0"
fit-margin-bottom="0" fit-margin-bottom="0"
fit-margin-left="0" fit-margin-left="0"
fit-margin-right="0" fit-margin-right="0"
fit-margin-top="0" fit-margin-top="0"
id="base" id="base"
inkscape:current-layer="layer1" inkscape:current-layer="layer1"
inkscape:cx="178.17652" inkscape:cx="178.17652"
inkscape:cy="37.927645" inkscape:cy="37.927645"
inkscape:document-units="mm" inkscape:document-units="mm"
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:window-height="1057" inkscape:window-height="1057"
inkscape:window-maximized="1" inkscape:window-maximized="1"
inkscape:window-width="1858" inkscape:window-width="1858"
inkscape:window-x="-8" inkscape:window-x="-8"
inkscape:window-y="-8" inkscape:window-y="-8"
inkscape:zoom="1.979899" inkscape:zoom="1.979899"
pagecolor="#ffffff" pagecolor="#ffffff"
showgrid="false"> showgrid="false">
</sodipodi:namedview> </sodipodi:namedview>
<path <path
class="st0" class="st0"
d="m 126.2,60.6 h -5.8 -5.6 -59.3 c -1.8,0 -3.3,1.5 -3.3,3.3 0,1.8 1.5,3.3 3.3,3.3 h 56.3 C 105.2,79.5 92.3,87.7 78.1,88.2 61.7,88.8 46.3,79 39.9,63.9 33.5,48.8 37.1,31 48.9,19.6 60.8,8.2 78.7,5.2 93.6,12.2 95.3,13 97.2,12.3 98,10.6 98.8,8.9 98.1,7 96.4,6.2 79.1,-2 58.1,1.5 44.3,14.8 30.5,28.1 26.3,48.9 33.8,66.5 c 7.3,17.1 24.4,28.4 42.9,28.4 0.5,0 1.1,0 1.6,0 17.8,-0.6 33.7,-11.6 40.9,-27.7 h 6.9 c 1.8,0 3.3,-1.5 3.3,-3.3 0,-1.8 -1.4,-3.3 -3.2,-3.3 z" d="m 126.2,60.6 h -5.8 -5.6 -59.3 c -1.8,0 -3.3,1.5 -3.3,3.3 0,1.8 1.5,3.3 3.3,3.3 h 56.3 C 105.2,79.5 92.3,87.7 78.1,88.2 61.7,88.8 46.3,79 39.9,63.9 33.5,48.8 37.1,31 48.9,19.6 60.8,8.2 78.7,5.2 93.6,12.2 95.3,13 97.2,12.3 98,10.6 98.8,8.9 98.1,7 96.4,6.2 79.1,-2 58.1,1.5 44.3,14.8 30.5,28.1 26.3,48.9 33.8,66.5 c 7.3,17.1 24.4,28.4 42.9,28.4 0.5,0 1.1,0 1.6,0 17.8,-0.6 33.7,-11.6 40.9,-27.7 h 6.9 c 1.8,0 3.3,-1.5 3.3,-3.3 0,-1.8 -1.4,-3.3 -3.2,-3.3 z"
id="path5" id="path5"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
style="fill:#003da6" /> style="fill:#003da6"/>
</g> </g>
<g <g
style="enable-background:new" style="enable-background:new"
id="g14" id="g14"
class="st1" class="st1"
transform="translate(-18.121919,8.1957201)"> transform="translate(-18.121919,8.1957201)">
<path <path
style="fill:#003da6" style="fill:#003da6"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
id="path8" id="path8"
d="m 61.3,25.4 c 0.8,-3.6 2.6,-5.1 6.2,-5.1 h 2.2 L 70.4,38 h 0.3 l 2.7,-12.5 c 0.8,-3.6 2.6,-5.1 6.2,-5.1 h 0.9 L 73.8,51.9 C 73,55.5 71.2,57 67.6,57 H 65.4 L 64.7,39.3 h -0.3 l -2.7,12.5 c -0.8,3.6 -2.6,5.1 -6.2,5.1 h -0.9 z" d="m 61.3,25.4 c 0.8,-3.6 2.6,-5.1 6.2,-5.1 h 2.2 L 70.4,38 h 0.3 l 2.7,-12.5 c 0.8,-3.6 2.6,-5.1 6.2,-5.1 h 0.9 L 73.8,51.9 C 73,55.5 71.2,57 67.6,57 H 65.4 L 64.7,39.3 h -0.3 l -2.7,12.5 c -0.8,3.6 -2.6,5.1 -6.2,5.1 h -0.9 z"
class="st0" /> class="st0"/>
<path <path
style="fill:#003da6" style="fill:#003da6"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
id="path10" id="path10"
d="m 83.7,25.4 c 0.8,-3.6 2.6,-5.1 6.2,-5.1 h 11.8 L 97.6,39.4 C 96.8,43 95,44.5 91.4,44.5 H 87 l -1.6,7.3 c -0.8,3.6 -2.6,5.1 -6.2,5.1 H 77 Z m 5,15 c 0.6,0 1.4,-0.4 1.7,-1.8 l 2.7,-12.5 c 0.3,-1.3 -0.3,-1.8 -1,-1.8 h -0.9 l -3.4,16.1 z" d="m 83.7,25.4 c 0.8,-3.6 2.6,-5.1 6.2,-5.1 h 11.8 L 97.6,39.4 C 96.8,43 95,44.5 91.4,44.5 H 87 l -1.6,7.3 c -0.8,3.6 -2.6,5.1 -6.2,5.1 H 77 Z m 5,15 c 0.6,0 1.4,-0.4 1.7,-1.8 l 2.7,-12.5 c 0.3,-1.3 -0.3,-1.8 -1,-1.8 h -0.9 l -3.4,16.1 z"
class="st0" /> class="st0"/>
<path <path
style="fill:#003da6" style="fill:#003da6"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
id="path12" id="path12"
d="m 122.5,25.4 c 1.2,-3 2.3,-5.1 6.2,-5.1 h 5.3 l -6.7,31.5 c -0.8,3.6 -2.6,5.1 -6.2,5.1 h -2.2 l 4.9,-23 h -0.3 l -6.7,17.9 c -1.2,3 -2.3,5.1 -6.2,5.1 H 109 l 1.1,-23 h -0.3 L 106,51.8 c -0.8,3.6 -2.6,5.1 -6.2,5.1 h -2.2 l 6.7,-31.5 c 0.8,-3.6 2.6,-5.1 6.2,-5.1 h 4.4 L 114.3,46 Z" d="m 122.5,25.4 c 1.2,-3 2.3,-5.1 6.2,-5.1 h 5.3 l -6.7,31.5 c -0.8,3.6 -2.6,5.1 -6.2,5.1 h -2.2 l 4.9,-23 h -0.3 l -6.7,17.9 c -1.2,3 -2.3,5.1 -6.2,5.1 H 109 l 1.1,-23 h -0.3 L 106,51.8 c -0.8,3.6 -2.6,5.1 -6.2,5.1 h -2.2 l 6.7,-31.5 c 0.8,-3.6 2.6,-5.1 6.2,-5.1 h 4.4 L 114.3,46 Z"
class="st0" /> class="st0"/>
</g> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

View File

@ -2,299 +2,298 @@
<!-- Created with Inkscape (http://www.inkscape.org/) --> <!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg <svg
xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#" xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="75.24453mm"
width="75.24453mm" height="30.48mm"
height="30.48mm" viewBox="0 0 266.61448 108"
viewBox="0 0 266.61448 108" id="svg2"
id="svg2" version="1.1"
version="1.1" inkscape:version="0.91 r13725"
inkscape:version="0.91 r13725" sodipodi:docname="logo3.svg">
sodipodi:docname="logo3.svg"> <defs
<defs id="defs4"/>
id="defs4" /> <sodipodi:namedview
<sodipodi:namedview id="base"
id="base" pagecolor="#ffffff"
pagecolor="#ffffff" bordercolor="#666666"
bordercolor="#666666" borderopacity="1.0"
borderopacity="1.0" inkscape:pageopacity="0.0"
inkscape:pageopacity="0.0" inkscape:pageshadow="2"
inkscape:pageshadow="2" inkscape:zoom="0.35"
inkscape:zoom="0.35" inkscape:cx="139.73585"
inkscape:cx="139.73585" inkscape:cy="111.14286"
inkscape:cy="111.14286" inkscape:document-units="px"
inkscape:document-units="px" inkscape:current-layer="layer1"
inkscape:current-layer="layer1" showgrid="false"
showgrid="false" fit-margin-top="0"
fit-margin-top="0" fit-margin-left="0"
fit-margin-left="0" fit-margin-right="0"
fit-margin-right="0" fit-margin-bottom="0"
fit-margin-bottom="0" inkscape:window-width="1440"
inkscape:window-width="1440" inkscape:window-height="791"
inkscape:window-height="791" inkscape:window-x="0"
inkscape:window-x="0" inkscape:window-y="1"
inkscape:window-y="1" inkscape:window-maximized="1"/>
inkscape:window-maximized="1" /> <metadata
<metadata id="metadata7">
id="metadata7"> <rdf:RDF>
<rdf:RDF> <cc:Work
<cc:Work rdf:about="">
rdf:about=""> <dc:format>image/svg+xml</dc:format>
<dc:format>image/svg+xml</dc:format> <dc:type
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> <dc:title></dc:title>
<dc:title></dc:title> </cc:Work>
</cc:Work> </rdf:RDF>
</rdf:RDF> </metadata>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-235.26415,-535.50506)">
<g <g
id="g3553" inkscape:label="Layer 1"
transform="translate(97.478614,500.70506)"> inkscape:groupmode="layer"
<g id="layer1"
id="g3466"> transform="translate(-235.26415,-535.50506)">
<g <g
id="g3468"> id="g3553"
<path transform="translate(97.478614,500.70506)">
id="path3470"
d="m 259.2,102.9 8.6,0 c 2.5,0 4.4,0.7 5.7,2 1,1 1.5,2.4 1.5,3.9 l 0,0.1 c 0,3.3 -2.3,5.2 -5.4,5.8 l 6.1,8.2 -2.8,0 -5.8,-7.8 -5.7,0 0,7.8 -2.3,0 0,-20 z m 8.3,10.2 c 3,0 5.1,-1.5 5.1,-4.1 l 0,-0.1 c 0,-2.5 -1.9,-3.9 -5.1,-3.9 l -6.2,0 0,8.1 6.2,0 z"
class="st0"
inkscape:connector-curvature="0"
style="fill:#7f8185" />
<path
id="path3472"
d="m 278.1,102.9 14.4,0 0,2.1 -12.2,0 0,6.8 10.9,0 0,2.1 -10.9,0 0,7 12.3,0 0,2.1 -14.6,0 0,-20.1 z"
class="st0"
inkscape:connector-curvature="0"
style="fill:#7f8185" />
<path
id="path3474"
d="m 294.2,120 1.4,-1.7 c 2.1,1.9 4.1,2.8 6.8,2.8 2.7,0 4.4,-1.4 4.4,-3.4 l 0,-0.1 c 0,-1.9 -1,-2.9 -5.2,-3.8 -4.6,-1 -6.7,-2.5 -6.7,-5.8 l 0,-0.1 c 0,-3.1 2.8,-5.4 6.6,-5.4 2.9,0 5,0.8 7,2.5 l -1.3,1.7 c -1.9,-1.5 -3.7,-2.2 -5.8,-2.2 -2.6,0 -4.2,1.4 -4.2,3.2 l 0,0.1 c 0,1.9 1,2.9 5.4,3.9 4.4,1 6.5,2.6 6.5,5.6 l 0,0.1 c 0,3.4 -2.8,5.6 -6.8,5.6 -3.1,0.1 -5.7,-0.9 -8.1,-3 z"
class="st0"
inkscape:connector-curvature="0"
style="fill:#7f8185" />
<path
id="path3476"
d="m 312.1,102.9 14.4,0 0,2.1 -12.2,0 0,6.8 10.9,0 0,2.1 -10.9,0 0,7 12.3,0 0,2.1 -14.6,0 0,-20.1 z"
class="st0"
inkscape:connector-curvature="0"
style="fill:#7f8185" />
<path
id="path3478"
d="m 336.9,102.8 2.1,0 9.1,20.1 -2.4,0 -2.3,-5.3 -10.9,0 -2.4,5.3 -2.3,0 9.1,-20.1 z m 5.5,12.7 -4.5,-10.1 -4.6,10.1 9.1,0 z"
class="st0"
inkscape:connector-curvature="0"
style="fill:#7f8185" />
<path
id="path3480"
d="m 350.3,102.9 8.6,0 c 2.5,0 4.4,0.7 5.7,2 1,1 1.5,2.4 1.5,3.9 l 0,0.1 c 0,3.3 -2.3,5.2 -5.4,5.8 l 6.1,8.2 -2.8,0 -5.8,-7.8 -5.7,0 0,7.8 -2.3,0 0,-20 z m 8.4,10.2 c 3,0 5.1,-1.5 5.1,-4.1 l 0,-0.1 c 0,-2.5 -1.9,-3.9 -5.1,-3.9 l -6.2,0 0,8.1 6.2,0 z"
class="st0"
inkscape:connector-curvature="0"
style="fill:#7f8185" />
<path
id="path3482"
d="m 367.9,112.9 0,0 c 0,-5.7 4.2,-10.4 10.1,-10.4 3.6,0 5.8,1.3 7.8,3.2 l -1.5,1.7 c -1.7,-1.6 -3.6,-2.7 -6.3,-2.7 -4.4,0 -7.7,3.6 -7.7,8.2 l 0,0.1 c 0,4.6 3.3,8.2 7.7,8.2 2.7,0 4.5,-1.1 6.4,-2.9 l 1.5,1.5 c -2.1,2.1 -4.4,3.5 -8,3.5 -5.8,-0.1 -10,-4.6 -10,-10.4 z"
class="st0"
inkscape:connector-curvature="0"
style="fill:#7f8185" />
<path
id="path3484"
d="m 388.3,102.9 2.3,0 0,8.9 11.5,0 0,-8.9 2.3,0 0,20 -2.3,0 0,-9 -11.5,0 0,9 -2.3,0 0,-20 z"
class="st0"
inkscape:connector-curvature="0"
style="fill:#7f8185" />
</g>
</g>
<g
id="g3486">
<g
id="g3488">
<linearGradient
y2="44.0951"
x2="321.7406"
y1="126.4287"
x1="177.1855"
gradientUnits="userSpaceOnUse"
id="SVGID_1_">
<stop
id="stop3491"
style="stop-color:#29ABE2"
offset="0" />
<stop
id="stop3493"
style="stop-color:#9F77A6"
offset="1" />
</linearGradient>
<path
id="path3495"
d="m 328.6,44.2 c 0,-3.9 -3.2,-7.1 -7.1,-7.1 -1.4,0 -2.6,0.4 -3.7,1 l 0,0 -165.4,98.1 0,0 c -1.2,0.6 -2,1.8 -2,3.2 0,1.9 1.6,3.4 3.5,3.4 0.6,0 1.1,-0.1 1.5,-0.4 l 0,0 0,0 c 0,0 0.1,0 0.1,-0.1 L 324.4,50.5 c 0.3,-0.1 0.6,-0.3 0.8,-0.5 l 0,0 0,0 c 2.1,-1.1 3.4,-3.3 3.4,-5.8 z"
class="st1"
inkscape:connector-curvature="0"
style="fill:url(#SVGID_1_)" />
<linearGradient
y2="41.634102"
x2="314.04889"
y1="61.826199"
x1="197.13831"
gradientUnits="userSpaceOnUse"
id="SVGID_2_">
<stop
id="stop3498"
style="stop-color:#EA0E7D"
offset="0" />
<stop
id="stop3500"
style="stop-color:#9F77A6"
offset="1" />
</linearGradient>
<path
id="path3502"
d="m 328.6,41.9 c 0,-3.9 -3.2,-7.1 -7.1,-7.1 -0.3,0 -0.5,0 -0.8,0 l 0,0 -124.8,17.1 c -5.5,0.3 -9.8,5.1 -9.5,10.6 0.3,5.5 5.1,9.8 10.6,9.5 0.9,-0.1 1.7,-0.2 2.6,-0.5 L 322.4,48.9 c 0.3,0 0.5,-0.1 0.8,-0.1 l 0,0 0,0 c 3.1,-0.8 5.4,-3.6 5.4,-6.9 z"
class="st2"
inkscape:connector-curvature="0"
style="fill:url(#SVGID_2_)" />
<linearGradient
y2="125.0705"
x2="230.92149"
y1="58.7272"
x1="192.67439"
gradientUnits="userSpaceOnUse"
id="SVGID_3_">
<stop
id="stop3505"
style="stop-color:#EA0E7D"
offset="0" />
<stop
id="stop3507"
style="stop-color:#5D2E8E"
offset="1" />
</linearGradient>
<path
id="path3509"
d="m 243.7,124.9 c -0.1,-2.6 -0.9,-4.9 -2.2,-6.9 L 206,58.3 l 0,0 c -1.5,-4 -5.5,-6.7 -10,-6.4 -5.5,0.3 -9.8,5.1 -9.5,10.6 0,0.8 0.2,1.6 0.4,2.4 l 0,0 0,0 c 0.4,1.2 0.9,2.3 1.7,3.3 l 30.6,61.8 c 0.3,0.8 0.7,1.5 1.2,2.2 l 0,0 0,0 c 2.3,3.5 6.4,5.8 10.9,5.7 7,-0.2 12.5,-6 12.4,-13 z"
class="st3"
inkscape:connector-curvature="0"
style="fill:url(#SVGID_3_)" />
<linearGradient
y2="125.9293"
x2="232.12759"
y1="66.953903"
x1="142.7599"
gradientUnits="userSpaceOnUse"
id="SVGID_4_">
<stop
id="stop3512"
style="stop-color:#4AC7F4"
offset="0" />
<stop
id="stop3514"
style="stop-color:#5D2E8E"
offset="1" />
</linearGradient>
<path
id="path3516"
d="m 243.7,124.9 c -0.1,-4.3 -2.3,-8 -5.6,-10.2 l 0,0 0,0 c -0.6,-0.4 -1.3,-0.8 -2,-1.1 L 144.5,63 l 0,0 c -0.8,-0.4 -1.7,-0.7 -2.6,-0.6 -2.4,0.2 -4.3,2.3 -4.1,4.8 0.1,1.5 1,2.7 2.1,3.4 l 82,63.5 c 2.4,2.4 5.7,3.9 9.4,3.8 7,-0.2 12.5,-6 12.4,-13 z"
class="st4"
inkscape:connector-curvature="0"
style="fill:url(#SVGID_4_)" />
</g>
<g
id="g3518">
<rect
id="rect3520"
height="51.299999"
width="51.299999"
y="71.699997"
x="187.89999" />
<g
id="g3522">
<rect
id="rect3524"
height="3.2"
width="19.200001"
class="st5"
y="113.3"
x="192.3"
style="fill:#ffffff" />
<g <g
id="g3526"> id="g3466">
<path <g
id="path3528" id="g3468">
d="m 192.1,85.2 1.5,-1.4 c 0.4,0.5 0.8,0.8 1.3,0.8 0.6,0 0.9,-0.4 0.9,-1.2 l 0,-5.3 2.3,0 0,5.3 c 0,1.1 -0.3,1.8 -0.8,2.4 -0.5,0.5 -1.3,0.8 -2.3,0.8 -1.5,0 -2.3,-0.6 -2.9,-1.4 z" <path
class="st5" id="path3470"
inkscape:connector-curvature="0" d="m 259.2,102.9 8.6,0 c 2.5,0 4.4,0.7 5.7,2 1,1 1.5,2.4 1.5,3.9 l 0,0.1 c 0,3.3 -2.3,5.2 -5.4,5.8 l 6.1,8.2 -2.8,0 -5.8,-7.8 -5.7,0 0,7.8 -2.3,0 0,-20 z m 8.3,10.2 c 3,0 5.1,-1.5 5.1,-4.1 l 0,-0.1 c 0,-2.5 -1.9,-3.9 -5.1,-3.9 l -6.2,0 0,8.1 6.2,0 z"
style="fill:#ffffff" /> class="st0"
<path inkscape:connector-curvature="0"
id="path3530" style="fill:#7f8185"/>
d="m 198.7,78.1 6.7,0 0,2 -4.4,0 0,1.3 4,0 0,1.8 -4,0 0,1.3 4.5,0 0,2 -6.8,0 0,-8.4 z" <path
class="st5" id="path3472"
inkscape:connector-curvature="0" d="m 278.1,102.9 14.4,0 0,2.1 -12.2,0 0,6.8 10.9,0 0,2.1 -10.9,0 0,7 12.3,0 0,2.1 -14.6,0 0,-20.1 z"
style="fill:#ffffff" /> class="st0"
<path inkscape:connector-curvature="0"
id="path3532" style="fill:#7f8185"/>
d="m 208.4,80.1 -2.5,0 0,-2 7.3,0 0,2 -2.5,0 0,6.3 -2.3,0 0,-6.3 z" <path
class="st5" id="path3474"
inkscape:connector-curvature="0" d="m 294.2,120 1.4,-1.7 c 2.1,1.9 4.1,2.8 6.8,2.8 2.7,0 4.4,-1.4 4.4,-3.4 l 0,-0.1 c 0,-1.9 -1,-2.9 -5.2,-3.8 -4.6,-1 -6.7,-2.5 -6.7,-5.8 l 0,-0.1 c 0,-3.1 2.8,-5.4 6.6,-5.4 2.9,0 5,0.8 7,2.5 l -1.3,1.7 c -1.9,-1.5 -3.7,-2.2 -5.8,-2.2 -2.6,0 -4.2,1.4 -4.2,3.2 l 0,0.1 c 0,1.9 1,2.9 5.4,3.9 4.4,1 6.5,2.6 6.5,5.6 l 0,0.1 c 0,3.4 -2.8,5.6 -6.8,5.6 -3.1,0.1 -5.7,-0.9 -8.1,-3 z"
style="fill:#ffffff" /> class="st0"
<path inkscape:connector-curvature="0"
id="path3534" style="fill:#7f8185"/>
d="m 192.3,88.4 4.3,0 c 1.1,0 1.8,0.3 2.3,0.7 0.3,0.3 0.5,0.8 0.5,1.4 l 0,0 c 0,1 -0.5,1.5 -1.3,1.9 1,0.3 1.7,0.9 1.7,2 l 0,0 c 0,1.4 -1.2,2.3 -3.2,2.3 l -4.3,0 0,-8.3 z m 4.8,2.6 c 0,-0.5 -0.4,-0.7 -1.1,-0.7 l -1.5,0 0,1.5 1.5,0 c 0.7,-0.1 1.1,-0.3 1.1,-0.8 l 0,0 z m -0.8,2.3 -1.8,0 0,1.5 1.8,0 c 0.7,0 1.1,-0.3 1.1,-0.8 l 0,0 c 0,-0.4 -0.3,-0.7 -1.1,-0.7 z" <path
class="st5" id="path3476"
inkscape:connector-curvature="0" d="m 312.1,102.9 14.4,0 0,2.1 -12.2,0 0,6.8 10.9,0 0,2.1 -10.9,0 0,7 12.3,0 0,2.1 -14.6,0 0,-20.1 z"
style="fill:#ffffff" /> class="st0"
<path inkscape:connector-curvature="0"
id="path3536" style="fill:#7f8185"/>
d="m 200.1,88.4 4,0 c 1.3,0 2.2,0.3 2.7,0.9 0.5,0.5 0.7,1.1 0.7,1.9 l 0,0 c 0,1.3 -0.7,2.1 -1.7,2.6 l 2,2.9 -2.7,0 -1.7,-2.5 -1,0 0,2.5 -2.3,0 0,-8.3 z m 3.9,4 c 0.8,0 1.2,-0.4 1.2,-1 l 0,0 c 0,-0.7 -0.5,-1 -1.3,-1 l -1.5,0 0,2 1.6,0 z" <path
class="st5" id="path3478"
inkscape:connector-curvature="0" d="m 336.9,102.8 2.1,0 9.1,20.1 -2.4,0 -2.3,-5.3 -10.9,0 -2.4,5.3 -2.3,0 9.1,-20.1 z m 5.5,12.7 -4.5,-10.1 -4.6,10.1 9.1,0 z"
style="fill:#ffffff" /> class="st0"
<path inkscape:connector-curvature="0"
id="path3538" style="fill:#7f8185"/>
d="m 210.2,88.3 2.2,0 3.6,8.4 -2.5,0 -0.6,-1.5 -3.2,0 -0.6,1.5 -2.4,0 3.5,-8.4 z m 2,5.1 -0.9,-2.4 -0.9,2.4 1.8,0 z" <path
class="st5" id="path3480"
inkscape:connector-curvature="0" d="m 350.3,102.9 8.6,0 c 2.5,0 4.4,0.7 5.7,2 1,1 1.5,2.4 1.5,3.9 l 0,0.1 c 0,3.3 -2.3,5.2 -5.4,5.8 l 6.1,8.2 -2.8,0 -5.8,-7.8 -5.7,0 0,7.8 -2.3,0 0,-20 z m 8.4,10.2 c 3,0 5.1,-1.5 5.1,-4.1 l 0,-0.1 c 0,-2.5 -1.9,-3.9 -5.1,-3.9 l -6.2,0 0,8.1 6.2,0 z"
style="fill:#ffffff" /> class="st0"
<path inkscape:connector-curvature="0"
id="path3540" style="fill:#7f8185"/>
d="m 216.3,88.4 2.3,0 0,8.4 -2.3,0 0,-8.4 z" <path
class="st5" id="path3482"
inkscape:connector-curvature="0" d="m 367.9,112.9 0,0 c 0,-5.7 4.2,-10.4 10.1,-10.4 3.6,0 5.8,1.3 7.8,3.2 l -1.5,1.7 c -1.7,-1.6 -3.6,-2.7 -6.3,-2.7 -4.4,0 -7.7,3.6 -7.7,8.2 l 0,0.1 c 0,4.6 3.3,8.2 7.7,8.2 2.7,0 4.5,-1.1 6.4,-2.9 l 1.5,1.5 c -2.1,2.1 -4.4,3.5 -8,3.5 -5.8,-0.1 -10,-4.6 -10,-10.4 z"
style="fill:#ffffff" /> class="st0"
<path inkscape:connector-curvature="0"
id="path3542" style="fill:#7f8185"/>
d="m 219.2,88.4 2.2,0 3.4,4.4 0,-4.4 2.3,0 0,8.4 -2,0 -3.6,-4.6 0,4.6 -2.3,0 0,-8.4 z" <path
class="st5" id="path3484"
inkscape:connector-curvature="0" d="m 388.3,102.9 2.3,0 0,8.9 11.5,0 0,-8.9 2.3,0 0,20 -2.3,0 0,-9 -11.5,0 0,9 -2.3,0 0,-20 z"
style="fill:#ffffff" /> class="st0"
<path inkscape:connector-curvature="0"
id="path3544" style="fill:#7f8185"/>
d="m 227.2,95.5 1.3,-1.5 c 0.8,0.7 1.7,1 2.7,1 0.6,0 1,-0.2 1,-0.6 l 0,0 c 0,-0.4 -0.3,-0.5 -1.4,-0.8 -1.8,-0.4 -3.2,-0.9 -3.2,-2.6 l 0,0 c 0,-1.6 1.2,-2.7 3.2,-2.7 1.4,0 2.5,0.4 3.4,1.1 L 233,91 c -0.8,-0.5 -1.6,-0.8 -2.3,-0.8 -0.6,0 -0.8,0.2 -0.8,0.5 l 0,0 c 0,0.4 0.3,0.5 1.5,0.8 1.9,0.4 3.1,1 3.1,2.6 l 0,0 c 0,1.7 -1.3,2.7 -3.4,2.7 -1.5,0.1 -2.9,-0.4 -3.9,-1.3 z" </g>
class="st5" </g>
inkscape:connector-curvature="0" <g
style="fill:#ffffff" /> id="g3486">
<g
id="g3488">
<linearGradient
y2="44.0951"
x2="321.7406"
y1="126.4287"
x1="177.1855"
gradientUnits="userSpaceOnUse"
id="SVGID_1_">
<stop
id="stop3491"
style="stop-color:#29ABE2"
offset="0"/>
<stop
id="stop3493"
style="stop-color:#9F77A6"
offset="1"/>
</linearGradient>
<path
id="path3495"
d="m 328.6,44.2 c 0,-3.9 -3.2,-7.1 -7.1,-7.1 -1.4,0 -2.6,0.4 -3.7,1 l 0,0 -165.4,98.1 0,0 c -1.2,0.6 -2,1.8 -2,3.2 0,1.9 1.6,3.4 3.5,3.4 0.6,0 1.1,-0.1 1.5,-0.4 l 0,0 0,0 c 0,0 0.1,0 0.1,-0.1 L 324.4,50.5 c 0.3,-0.1 0.6,-0.3 0.8,-0.5 l 0,0 0,0 c 2.1,-1.1 3.4,-3.3 3.4,-5.8 z"
class="st1"
inkscape:connector-curvature="0"
style="fill:url(#SVGID_1_)"/>
<linearGradient
y2="41.634102"
x2="314.04889"
y1="61.826199"
x1="197.13831"
gradientUnits="userSpaceOnUse"
id="SVGID_2_">
<stop
id="stop3498"
style="stop-color:#EA0E7D"
offset="0"/>
<stop
id="stop3500"
style="stop-color:#9F77A6"
offset="1"/>
</linearGradient>
<path
id="path3502"
d="m 328.6,41.9 c 0,-3.9 -3.2,-7.1 -7.1,-7.1 -0.3,0 -0.5,0 -0.8,0 l 0,0 -124.8,17.1 c -5.5,0.3 -9.8,5.1 -9.5,10.6 0.3,5.5 5.1,9.8 10.6,9.5 0.9,-0.1 1.7,-0.2 2.6,-0.5 L 322.4,48.9 c 0.3,0 0.5,-0.1 0.8,-0.1 l 0,0 0,0 c 3.1,-0.8 5.4,-3.6 5.4,-6.9 z"
class="st2"
inkscape:connector-curvature="0"
style="fill:url(#SVGID_2_)"/>
<linearGradient
y2="125.0705"
x2="230.92149"
y1="58.7272"
x1="192.67439"
gradientUnits="userSpaceOnUse"
id="SVGID_3_">
<stop
id="stop3505"
style="stop-color:#EA0E7D"
offset="0"/>
<stop
id="stop3507"
style="stop-color:#5D2E8E"
offset="1"/>
</linearGradient>
<path
id="path3509"
d="m 243.7,124.9 c -0.1,-2.6 -0.9,-4.9 -2.2,-6.9 L 206,58.3 l 0,0 c -1.5,-4 -5.5,-6.7 -10,-6.4 -5.5,0.3 -9.8,5.1 -9.5,10.6 0,0.8 0.2,1.6 0.4,2.4 l 0,0 0,0 c 0.4,1.2 0.9,2.3 1.7,3.3 l 30.6,61.8 c 0.3,0.8 0.7,1.5 1.2,2.2 l 0,0 0,0 c 2.3,3.5 6.4,5.8 10.9,5.7 7,-0.2 12.5,-6 12.4,-13 z"
class="st3"
inkscape:connector-curvature="0"
style="fill:url(#SVGID_3_)"/>
<linearGradient
y2="125.9293"
x2="232.12759"
y1="66.953903"
x1="142.7599"
gradientUnits="userSpaceOnUse"
id="SVGID_4_">
<stop
id="stop3512"
style="stop-color:#4AC7F4"
offset="0"/>
<stop
id="stop3514"
style="stop-color:#5D2E8E"
offset="1"/>
</linearGradient>
<path
id="path3516"
d="m 243.7,124.9 c -0.1,-4.3 -2.3,-8 -5.6,-10.2 l 0,0 0,0 c -0.6,-0.4 -1.3,-0.8 -2,-1.1 L 144.5,63 l 0,0 c -0.8,-0.4 -1.7,-0.7 -2.6,-0.6 -2.4,0.2 -4.3,2.3 -4.1,4.8 0.1,1.5 1,2.7 2.1,3.4 l 82,63.5 c 2.4,2.4 5.7,3.9 9.4,3.8 7,-0.2 12.5,-6 12.4,-13 z"
class="st4"
inkscape:connector-curvature="0"
style="fill:url(#SVGID_4_)"/>
</g>
<g
id="g3518">
<rect
id="rect3520"
height="51.299999"
width="51.299999"
y="71.699997"
x="187.89999"/>
<g
id="g3522">
<rect
id="rect3524"
height="3.2"
width="19.200001"
class="st5"
y="113.3"
x="192.3"
style="fill:#ffffff"/>
<g
id="g3526">
<path
id="path3528"
d="m 192.1,85.2 1.5,-1.4 c 0.4,0.5 0.8,0.8 1.3,0.8 0.6,0 0.9,-0.4 0.9,-1.2 l 0,-5.3 2.3,0 0,5.3 c 0,1.1 -0.3,1.8 -0.8,2.4 -0.5,0.5 -1.3,0.8 -2.3,0.8 -1.5,0 -2.3,-0.6 -2.9,-1.4 z"
class="st5"
inkscape:connector-curvature="0"
style="fill:#ffffff"/>
<path
id="path3530"
d="m 198.7,78.1 6.7,0 0,2 -4.4,0 0,1.3 4,0 0,1.8 -4,0 0,1.3 4.5,0 0,2 -6.8,0 0,-8.4 z"
class="st5"
inkscape:connector-curvature="0"
style="fill:#ffffff"/>
<path
id="path3532"
d="m 208.4,80.1 -2.5,0 0,-2 7.3,0 0,2 -2.5,0 0,6.3 -2.3,0 0,-6.3 z"
class="st5"
inkscape:connector-curvature="0"
style="fill:#ffffff"/>
<path
id="path3534"
d="m 192.3,88.4 4.3,0 c 1.1,0 1.8,0.3 2.3,0.7 0.3,0.3 0.5,0.8 0.5,1.4 l 0,0 c 0,1 -0.5,1.5 -1.3,1.9 1,0.3 1.7,0.9 1.7,2 l 0,0 c 0,1.4 -1.2,2.3 -3.2,2.3 l -4.3,0 0,-8.3 z m 4.8,2.6 c 0,-0.5 -0.4,-0.7 -1.1,-0.7 l -1.5,0 0,1.5 1.5,0 c 0.7,-0.1 1.1,-0.3 1.1,-0.8 l 0,0 z m -0.8,2.3 -1.8,0 0,1.5 1.8,0 c 0.7,0 1.1,-0.3 1.1,-0.8 l 0,0 c 0,-0.4 -0.3,-0.7 -1.1,-0.7 z"
class="st5"
inkscape:connector-curvature="0"
style="fill:#ffffff"/>
<path
id="path3536"
d="m 200.1,88.4 4,0 c 1.3,0 2.2,0.3 2.7,0.9 0.5,0.5 0.7,1.1 0.7,1.9 l 0,0 c 0,1.3 -0.7,2.1 -1.7,2.6 l 2,2.9 -2.7,0 -1.7,-2.5 -1,0 0,2.5 -2.3,0 0,-8.3 z m 3.9,4 c 0.8,0 1.2,-0.4 1.2,-1 l 0,0 c 0,-0.7 -0.5,-1 -1.3,-1 l -1.5,0 0,2 1.6,0 z"
class="st5"
inkscape:connector-curvature="0"
style="fill:#ffffff"/>
<path
id="path3538"
d="m 210.2,88.3 2.2,0 3.6,8.4 -2.5,0 -0.6,-1.5 -3.2,0 -0.6,1.5 -2.4,0 3.5,-8.4 z m 2,5.1 -0.9,-2.4 -0.9,2.4 1.8,0 z"
class="st5"
inkscape:connector-curvature="0"
style="fill:#ffffff"/>
<path
id="path3540"
d="m 216.3,88.4 2.3,0 0,8.4 -2.3,0 0,-8.4 z"
class="st5"
inkscape:connector-curvature="0"
style="fill:#ffffff"/>
<path
id="path3542"
d="m 219.2,88.4 2.2,0 3.4,4.4 0,-4.4 2.3,0 0,8.4 -2,0 -3.6,-4.6 0,4.6 -2.3,0 0,-8.4 z"
class="st5"
inkscape:connector-curvature="0"
style="fill:#ffffff"/>
<path
id="path3544"
d="m 227.2,95.5 1.3,-1.5 c 0.8,0.7 1.7,1 2.7,1 0.6,0 1,-0.2 1,-0.6 l 0,0 c 0,-0.4 -0.3,-0.5 -1.4,-0.8 -1.8,-0.4 -3.2,-0.9 -3.2,-2.6 l 0,0 c 0,-1.6 1.2,-2.7 3.2,-2.7 1.4,0 2.5,0.4 3.4,1.1 L 233,91 c -0.8,-0.5 -1.6,-0.8 -2.3,-0.8 -0.6,0 -0.8,0.2 -0.8,0.5 l 0,0 c 0,0.4 0.3,0.5 1.5,0.8 1.9,0.4 3.1,1 3.1,2.6 l 0,0 c 0,1.7 -1.3,2.7 -3.4,2.7 -1.5,0.1 -2.9,-0.4 -3.9,-1.3 z"
class="st5"
inkscape:connector-curvature="0"
style="fill:#ffffff"/>
</g>
</g>
</g>
</g> </g>
</g>
</g> </g>
</g>
</g> </g>
</g> <style
<style id="style3464"
id="style3464" type="text/css">
type="text/css"> .st0{fill:#7F8185;}
.st0{fill:#7F8185;} .st1{fill:url(#SVGID_1_);}
.st1{fill:url(#SVGID_1_);} .st2{fill:url(#SVGID_2_);}
.st2{fill:url(#SVGID_2_);} .st3{fill:url(#SVGID_3_);}
.st3{fill:url(#SVGID_3_);} .st4{fill:url(#SVGID_4_);}
.st4{fill:url(#SVGID_4_);} .st5{fill:#FFFFFF;}
.st5{fill:#FFFFFF;} </style>
</style>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 16 KiB

View File

@ -1,62 +1,66 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0px"
width="120.1px" height="130.2px" viewBox="0 0 120.1 130.2" style="enable-background:new 0 0 120.1 130.2;" xml:space="preserve" y="0px"
> width="120.1px" height="130.2px" viewBox="0 0 120.1 130.2" style="enable-background:new 0 0 120.1 130.2;"
xml:space="preserve"
>
<g> <g>
<linearGradient id="XMLID_2_" gradientUnits="userSpaceOnUse" x1="31.8412" y1="120.5578" x2="110.2402" y2="73.24"> <linearGradient id="XMLID_2_" gradientUnits="userSpaceOnUse" x1="31.8412" y1="120.5578" x2="110.2402" y2="73.24">
<stop offset="0" style="stop-color:#FCEE39"/> <stop offset="0" style="stop-color:#FCEE39"/>
<stop offset="1" style="stop-color:#F37B3D"/> <stop offset="1" style="stop-color:#F37B3D"/>
</linearGradient> </linearGradient>
<path id="XMLID_3041_" style="fill:url(#XMLID_2_);" d="M118.6,71.8c0.9-0.8,1.4-1.9,1.5-3.2c0.1-2.6-1.8-4.7-4.4-4.9 <path id="XMLID_3041_" style="fill:url(#XMLID_2_);" d="M118.6,71.8c0.9-0.8,1.4-1.9,1.5-3.2c0.1-2.6-1.8-4.7-4.4-4.9
c-1.2-0.1-2.4,0.4-3.3,1.1l0,0l-83.8,45.9c-1.9,0.8-3.6,2.2-4.7,4.1c-2.9,4.8-1.3,11,3.6,13.9c3.4,2,7.5,1.8,10.7-0.2l0,0l0,0 c-1.2-0.1-2.4,0.4-3.3,1.1l0,0l-83.8,45.9c-1.9,0.8-3.6,2.2-4.7,4.1c-2.9,4.8-1.3,11,3.6,13.9c3.4,2,7.5,1.8,10.7-0.2l0,0l0,0
c0.2-0.2,0.5-0.3,0.7-0.5l78-54.8C117.3,72.9,118.4,72.1,118.6,71.8L118.6,71.8L118.6,71.8z"/> c0.2-0.2,0.5-0.3,0.7-0.5l78-54.8C117.3,72.9,118.4,72.1,118.6,71.8L118.6,71.8L118.6,71.8z"/>
<linearGradient id="XMLID_3_" gradientUnits="userSpaceOnUse" x1="48.3607" y1="6.9083" x2="119.9179" y2="69.5546"> <linearGradient id="XMLID_3_" gradientUnits="userSpaceOnUse" x1="48.3607" y1="6.9083" x2="119.9179" y2="69.5546">
<stop offset="0" style="stop-color:#EF5A6B"/> <stop offset="0" style="stop-color:#EF5A6B"/>
<stop offset="0.57" style="stop-color:#F26F4E"/> <stop offset="0.57" style="stop-color:#F26F4E"/>
<stop offset="1" style="stop-color:#F37B3D"/> <stop offset="1" style="stop-color:#F37B3D"/>
</linearGradient> </linearGradient>
<path id="XMLID_3049_" style="fill:url(#XMLID_3_);" d="M118.8,65.1L118.8,65.1L55,2.5C53.6,1,51.6,0,49.3,0 <path id="XMLID_3049_" style="fill:url(#XMLID_3_);" d="M118.8,65.1L118.8,65.1L55,2.5C53.6,1,51.6,0,49.3,0
c-4.3,0-7.7,3.5-7.7,7.7v0c0,2.1,0.8,3.9,2.1,5.3l0,0l0,0c0.4,0.4,0.8,0.7,1.2,1l67.4,57.7l0,0c0.8,0.7,1.8,1.2,3,1.3 c-4.3,0-7.7,3.5-7.7,7.7v0c0,2.1,0.8,3.9,2.1,5.3l0,0l0,0c0.4,0.4,0.8,0.7,1.2,1l67.4,57.7l0,0c0.8,0.7,1.8,1.2,3,1.3
c2.6,0.1,4.7-1.8,4.9-4.4C120.2,67.3,119.7,66,118.8,65.1z"/> c2.6,0.1,4.7-1.8,4.9-4.4C120.2,67.3,119.7,66,118.8,65.1z"/>
<linearGradient id="XMLID_4_" gradientUnits="userSpaceOnUse" x1="52.9467" y1="63.6407" x2="10.5379" y2="37.1562"> <linearGradient id="XMLID_4_" gradientUnits="userSpaceOnUse" x1="52.9467" y1="63.6407" x2="10.5379" y2="37.1562">
<stop offset="0" style="stop-color:#7C59A4"/> <stop offset="0" style="stop-color:#7C59A4"/>
<stop offset="0.3852" style="stop-color:#AF4C92"/> <stop offset="0.3852" style="stop-color:#AF4C92"/>
<stop offset="0.7654" style="stop-color:#DC4183"/> <stop offset="0.7654" style="stop-color:#DC4183"/>
<stop offset="0.957" style="stop-color:#ED3D7D"/> <stop offset="0.957" style="stop-color:#ED3D7D"/>
</linearGradient> </linearGradient>
<path id="XMLID_3042_" style="fill:url(#XMLID_4_);" d="M57.1,59.5C57,59.5,17.7,28.5,16.9,28l0,0l0,0c-0.6-0.3-1.2-0.6-1.8-0.9 <path id="XMLID_3042_" style="fill:url(#XMLID_4_);" d="M57.1,59.5C57,59.5,17.7,28.5,16.9,28l0,0l0,0c-0.6-0.3-1.2-0.6-1.8-0.9
c-5.8-2.2-12.2,0.8-14.4,6.6c-1.9,5.1,0.2,10.7,4.6,13.4l0,0l0,0C6,47.5,6.6,47.8,7.3,48c0.4,0.2,45.4,18.8,45.4,18.8l0,0 c-5.8-2.2-12.2,0.8-14.4,6.6c-1.9,5.1,0.2,10.7,4.6,13.4l0,0l0,0C6,47.5,6.6,47.8,7.3,48c0.4,0.2,45.4,18.8,45.4,18.8l0,0
c1.8,0.8,3.9,0.3,5.1-1.2C59.3,63.7,59,61,57.1,59.5z"/> c1.8,0.8,3.9,0.3,5.1-1.2C59.3,63.7,59,61,57.1,59.5z"/>
<linearGradient id="XMLID_5_" gradientUnits="userSpaceOnUse" x1="52.1736" y1="3.7019" x2="10.7706" y2="37.8971"> <linearGradient id="XMLID_5_" gradientUnits="userSpaceOnUse" x1="52.1736" y1="3.7019" x2="10.7706" y2="37.8971">
<stop offset="0" style="stop-color:#EF5A6B"/> <stop offset="0" style="stop-color:#EF5A6B"/>
<stop offset="0.364" style="stop-color:#EE4E72"/> <stop offset="0.364" style="stop-color:#EE4E72"/>
<stop offset="1" style="stop-color:#ED3D7D"/> <stop offset="1" style="stop-color:#ED3D7D"/>
</linearGradient> </linearGradient>
<path id="XMLID_3057_" style="fill:url(#XMLID_5_);" d="M49.3,0c-1.7,0-3.3,0.6-4.6,1.5L4.9,28.3c-0.1,0.1-0.2,0.1-0.2,0.2l-0.1,0 <path id="XMLID_3057_" style="fill:url(#XMLID_5_);" d="M49.3,0c-1.7,0-3.3,0.6-4.6,1.5L4.9,28.3c-0.1,0.1-0.2,0.1-0.2,0.2l-0.1,0
l0,0c-1.7,1.2-3.1,3-3.9,5.1C-1.5,39.4,1.5,45.9,7.3,48c3.6,1.4,7.5,0.7,10.4-1.4l0,0l0,0c0.7-0.5,1.3-1,1.8-1.6l34.6-31.2l0,0 l0,0c-1.7,1.2-3.1,3-3.9,5.1C-1.5,39.4,1.5,45.9,7.3,48c3.6,1.4,7.5,0.7,10.4-1.4l0,0l0,0c0.7-0.5,1.3-1,1.8-1.6l34.6-31.2l0,0
c1.8-1.4,3-3.6,3-6.1v0C57.1,3.5,53.6,0,49.3,0z"/> c1.8-1.4,3-3.6,3-6.1v0C57.1,3.5,53.6,0,49.3,0z"/>
<g id="XMLID_3008_"> <g id="XMLID_3008_">
<rect id="XMLID_3033_" x="34.6" y="37.4" style="fill:#000000;" width="51" height="51"/> <rect id="XMLID_3033_" x="34.6" y="37.4" style="fill:#000000;" width="51" height="51"/>
<rect id="XMLID_3032_" x="39" y="78.8" style="fill:#FFFFFF;" width="19.1" height="3.2"/> <rect id="XMLID_3032_" x="39" y="78.8" style="fill:#FFFFFF;" width="19.1" height="3.2"/>
<g id="XMLID_3009_"> <g id="XMLID_3009_">
<path id="XMLID_3030_" style="fill:#FFFFFF;" d="M38.8,50.8l1.5-1.4c0.4,0.5,0.8,0.8,1.3,0.8c0.6,0,0.9-0.4,0.9-1.2l0-5.3l2.3,0 <path id="XMLID_3030_" style="fill:#FFFFFF;" d="M38.8,50.8l1.5-1.4c0.4,0.5,0.8,0.8,1.3,0.8c0.6,0,0.9-0.4,0.9-1.2l0-5.3l2.3,0
l0,5.3c0,1-0.3,1.8-0.8,2.3c-0.5,0.5-1.3,0.8-2.3,0.8C40.2,52.2,39.4,51.6,38.8,50.8z"/> l0,5.3c0,1-0.3,1.8-0.8,2.3c-0.5,0.5-1.3,0.8-2.3,0.8C40.2,52.2,39.4,51.6,38.8,50.8z"/>
<path id="XMLID_3028_" style="fill:#FFFFFF;" d="M45.3,43.8l6.7,0v1.9l-4.4,0V47l4,0l0,1.8l-4,0l0,1.3l4.5,0l0,2l-6.7,0 <path id="XMLID_3028_" style="fill:#FFFFFF;" d="M45.3,43.8l6.7,0v1.9l-4.4,0V47l4,0l0,1.8l-4,0l0,1.3l4.5,0l0,2l-6.7,0
L45.3,43.8z"/> L45.3,43.8z"/>
<path id="XMLID_3026_" style="fill:#FFFFFF;" d="M55,45.8l-2.5,0l0-2l7.3,0l0,2l-2.5,0l0,6.3l-2.3,0L55,45.8z"/> <path id="XMLID_3026_" style="fill:#FFFFFF;"
<path id="XMLID_3022_" style="fill:#FFFFFF;" d="M39,54l4.3,0c1,0,1.8,0.3,2.3,0.7c0.3,0.3,0.5,0.8,0.5,1.4v0 d="M55,45.8l-2.5,0l0-2l7.3,0l0,2l-2.5,0l0,6.3l-2.3,0L55,45.8z"/>
<path id="XMLID_3022_" style="fill:#FFFFFF;" d="M39,54l4.3,0c1,0,1.8,0.3,2.3,0.7c0.3,0.3,0.5,0.8,0.5,1.4v0
c0,1-0.5,1.5-1.3,1.9c1,0.3,1.6,0.9,1.6,2v0c0,1.4-1.2,2.3-3.1,2.3l-4.3,0L39,54z M43.8,56.6c0-0.5-0.4-0.7-1-0.7l-1.5,0l0,1.5 c0,1-0.5,1.5-1.3,1.9c1,0.3,1.6,0.9,1.6,2v0c0,1.4-1.2,2.3-3.1,2.3l-4.3,0L39,54z M43.8,56.6c0-0.5-0.4-0.7-1-0.7l-1.5,0l0,1.5
l1.4,0C43.4,57.3,43.8,57.1,43.8,56.6L43.8,56.6z M43,59l-1.8,0l0,1.5H43c0.7,0,1.1-0.3,1.1-0.8v0C44.1,59.2,43.7,59,43,59z"/> l1.4,0C43.4,57.3,43.8,57.1,43.8,56.6L43.8,56.6z M43,59l-1.8,0l0,1.5H43c0.7,0,1.1-0.3,1.1-0.8v0C44.1,59.2,43.7,59,43,59z"/>
<path id="XMLID_3019_" style="fill:#FFFFFF;" d="M46.8,54l3.9,0c1.3,0,2.1,0.3,2.7,0.9c0.5,0.5,0.7,1.1,0.7,1.9v0 <path id="XMLID_3019_" style="fill:#FFFFFF;" d="M46.8,54l3.9,0c1.3,0,2.1,0.3,2.7,0.9c0.5,0.5,0.7,1.1,0.7,1.9v0
c0,1.3-0.7,2.1-1.7,2.6l2,2.9l-2.6,0l-1.7-2.5h-1l0,2.5l-2.3,0L46.8,54z M50.6,58c0.8,0,1.2-0.4,1.2-1v0c0-0.7-0.5-1-1.2-1 c0,1.3-0.7,2.1-1.7,2.6l2,2.9l-2.6,0l-1.7-2.5h-1l0,2.5l-2.3,0L46.8,54z M50.6,58c0.8,0,1.2-0.4,1.2-1v0c0-0.7-0.5-1-1.2-1
l-1.5,0v2H50.6z"/> l-1.5,0v2H50.6z"/>
<path id="XMLID_3016_" style="fill:#FFFFFF;" d="M56.8,54l2.2,0l3.5,8.4l-2.5,0l-0.6-1.5l-3.2,0l-0.6,1.5l-2.4,0L56.8,54z <path id="XMLID_3016_" style="fill:#FFFFFF;" d="M56.8,54l2.2,0l3.5,8.4l-2.5,0l-0.6-1.5l-3.2,0l-0.6,1.5l-2.4,0L56.8,54z
M58.8,59l-0.9-2.3L57,59L58.8,59z"/> M58.8,59l-0.9-2.3L57,59L58.8,59z"/>
<path id="XMLID_3014_" style="fill:#FFFFFF;" d="M62.8,54l2.3,0l0,8.3l-2.3,0L62.8,54z"/> <path id="XMLID_3014_" style="fill:#FFFFFF;" d="M62.8,54l2.3,0l0,8.3l-2.3,0L62.8,54z"/>
<path id="XMLID_3012_" style="fill:#FFFFFF;" d="M65.7,54l2.1,0l3.4,4.4l0-4.4l2.3,0l0,8.3l-2,0L68,57.8l0,4.6l-2.3,0L65.7,54z" <path id="XMLID_3012_" style="fill:#FFFFFF;"
/> d="M65.7,54l2.1,0l3.4,4.4l0-4.4l2.3,0l0,8.3l-2,0L68,57.8l0,4.6l-2.3,0L65.7,54z"
<path id="XMLID_3010_" style="fill:#FFFFFF;" d="M73.7,61.1l1.3-1.5c0.8,0.7,1.7,1,2.7,1c0.6,0,1-0.2,1-0.6v0 />
<path id="XMLID_3010_" style="fill:#FFFFFF;" d="M73.7,61.1l1.3-1.5c0.8,0.7,1.7,1,2.7,1c0.6,0,1-0.2,1-0.6v0
c0-0.4-0.3-0.5-1.4-0.8c-1.8-0.4-3.1-0.9-3.1-2.6v0c0-1.5,1.2-2.7,3.2-2.7c1.4,0,2.5,0.4,3.4,1.1l-1.2,1.6 c0-0.4-0.3-0.5-1.4-0.8c-1.8-0.4-3.1-0.9-3.1-2.6v0c0-1.5,1.2-2.7,3.2-2.7c1.4,0,2.5,0.4,3.4,1.1l-1.2,1.6
c-0.8-0.5-1.6-0.8-2.3-0.8c-0.6,0-0.8,0.2-0.8,0.5v0c0,0.4,0.3,0.5,1.4,0.8c1.9,0.4,3.1,1,3.1,2.6v0c0,1.7-1.3,2.7-3.4,2.7 c-0.8-0.5-1.6-0.8-2.3-0.8c-0.6,0-0.8,0.2-0.8,0.5v0c0,0.4,0.3,0.5,1.4,0.8c1.9,0.4,3.1,1,3.1,2.6v0c0,1.7-1.3,2.7-3.4,2.7
C76.1,62.5,74.7,62,73.7,61.1z"/> C76.1,62.5,74.7,62,73.7,61.1z"/>

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

View File

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<!-- Creator: CorelDRAW X8 --> <!-- Creator: CorelDRAW X8 -->
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1832px" height="664px" version="1.1" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" <svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1832px" height="664px" version="1.1"
viewBox="0 0 1832 665" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd"
> viewBox="0 0 1832 665"
>
<defs> <defs>
<style type="text/css"> <style type="text/css">
<![CDATA[ <![CDATA[
@ -15,62 +16,85 @@ viewBox="0 0 1832 665"
]]> ]]>
</style> </style>
</defs> </defs>
<g id="Слой_x0020_1"> <g id="Слой_x0020_1">
<metadata id="CorelCorpID_0Corel-Layer"/> <metadata id="CorelCorpID_0Corel-Layer"/>
<g id="_644004624"> <g id="_644004624">
<g> <g>
<polygon class="fil0" points="0,329 46,319 167,587 112,579 "/> <polygon class="fil0" points="0,329 46,319 167,587 112,579 "/>
<polygon class="fil0" points="49,212 95,198 132,279 85,291 "/> <polygon class="fil0" points="49,212 95,198 132,279 85,291 "/>
<polygon class="fil1" points="0,329 85,291 132,279 46,319 "/> <polygon class="fil1" points="0,329 85,291 132,279 46,319 "/>
<polygon class="fil0" points="208,567 251,546 288,631 233,623 "/> <polygon class="fil0" points="208,567 251,546 288,631 233,623 "/>
<polygon class="fil2" points="46,319 132,279 251,546 167,588 "/> <polygon class="fil2" points="46,319 132,279 251,546 167,588 "/>
<polygon class="fil2" points="475,118 537,89 646,334 586,367 "/> <polygon class="fil2" points="475,118 537,89 646,334 586,367 "/>
<polygon class="fil2" points="95,198 176,162 211,241 132,279 "/> <polygon class="fil2" points="95,198 176,162 211,241 132,279 "/>
<polygon class="fil2" points="141,84 346,0 379,73 176,162 "/> <polygon class="fil2" points="141,84 346,0 379,73 176,162 "/>
<polygon class="fil2" points="524,399 586,367 618,439 558,475 "/> <polygon class="fil2" points="524,399 586,367 618,439 558,475 "/>
<polygon class="fil2" points="379,73 442,45 475,118 412,146 "/> <polygon class="fil2" points="379,73 442,45 475,118 412,146 "/>
<polygon class="fil0" points="436,135 475,118 586,367 544,372 "/> <polygon class="fil0" points="436,135 475,118 586,367 544,372 "/>
<polygon class="fil0" points="479,405 524,399 558,475 511,476 "/> <polygon class="fil0" points="479,405 524,399 558,475 511,476 "/>
<polygon class="fil1" points="49,212 127,178 176,162 95,198 "/> <polygon class="fil1" points="49,212 127,178 176,162 95,198 "/>
<polygon class="fil1" points="241,525 275,509 329,507 251,546 "/> <polygon class="fil1" points="241,525 275,509 329,507 251,546 "/>
<polygon class="fil1" points="479,405 544,372 586,367 524,399 "/> <polygon class="fil1" points="479,405 544,372 586,367 524,399 "/>
<polygon class="fil1" points="355,563 511,476 558,475 365,586 "/> <polygon class="fil1" points="355,563 511,476 558,475 365,586 "/>
<polygon class="fil0" points="321,612 365,586 400,665 340,655 "/> <polygon class="fil0" points="321,612 365,586 400,665 340,655 "/>
<polygon class="fil0" points="95,105 141,84 176,162 127,178 "/> <polygon class="fil0" points="95,105 141,84 176,162 127,178 "/>
<polygon class="fil0" points="339,91 379,73 412,146 368,157 "/> <polygon class="fil0" points="339,91 379,73 412,146 368,157 "/>
<polygon class="fil2" points="365,586 558,475 588,542 400,665 "/> <polygon class="fil2" points="365,586 558,475 588,542 400,665 "/>
<polygon class="fil2" points="251,546 329,507 365,586 288,631 "/> <polygon class="fil2" points="251,546 329,507 365,586 288,631 "/>
<polygon class="fil1" points="378,71 400,61 442,45 379,73 "/> <polygon class="fil1" points="378,71 400,61 442,45 379,73 "/>
<polygon class="fil1" points="473,113 492,105 537,89 475,118 "/> <polygon class="fil1" points="473,113 492,105 537,89 475,118 "/>
</g> </g>
<g> <g>
<polygon class="fil3" points="1281,524 1213,524 1271,230 1174,230 1186,170 1445,170 1434,230 1339,230 "/> <polygon class="fil3" points="1281,524 1213,524 1271,230 1174,230 1186,170 1445,170 1434,230 1339,230 "/>
<path class="fil3" d="M1509 171l204 0 -70 353 -67 0 58 -294 -78 0 -51 187c-8,32 -18,52 -29,67 -17,26 -50,37 -77,39 -15,1 -22,1 -41,1l-2 -63c13,1 27,-1 29,-1 54,-8 63,-56 86,-144l38 -145z"/> <path class="fil3"
<path class="fil4" d="M1795 30c6,0 12,1 18,4 6,3 11,8 14,14 3,6 5,12 5,18 0,7 -2,13 -5,18 -3,6 -8,11 -13,14 -6,3 -12,5 -19,5 -6,0 -12,-2 -18,-5 -6,-3 -10,-8 -14,-14 -3,-5 -4,-11 -4,-18 0,-6 1,-12 4,-18 4,-6 8,-11 14,-14 6,-3 12,-4 18,-4zm0 6c-5,0 -10,1 -15,4 -5,2 -8,6 -11,11 -3,5 -4,10 -4,15 0,6 1,11 4,16 2,4 6,8 11,11 5,3 10,4 15,4 6,0 11,-2 15,-4 5,-3 9,-7 12,-11 3,-5 4,-10 4,-16 0,-5 -2,-10 -4,-15 -3,-5 -7,-9 -12,-11 -5,-3 -10,-4 -15,-4zm-16 50l0 -39 14 0c4,0 8,0 10,1 2,1 3,2 5,4 1,2 2,4 2,6 0,2 -1,5 -3,7 -2,2 -5,4 -9,4 2,0 3,1 4,2 1,1 3,4 6,8l4 7 -7 0 -4 -6c-3,-5 -5,-8 -7,-9 -1,-1 -2,-2 -5,-2l-3 0 0 17 -7 0 0 0zm7 -22l7 0c4,0 7,0 8,-1 1,-1 2,-3 2,-5 0,-1 -1,-2 -1,-3 -1,-1 -2,-2 -3,-2 -1,0 -3,-1 -6,-1l-7 0 0 12z"/> d="M1509 171l204 0 -70 353 -67 0 58 -294 -78 0 -51 187c-8,32 -18,52 -29,67 -17,26 -50,37 -77,39 -15,1 -22,1 -41,1l-2 -63c13,1 27,-1 29,-1 54,-8 63,-56 86,-144l38 -145z"/>
<polygon class="fil3" points="949,523 885,523 873,229 791,523 730,523 828,171 924,171 934,418 1047,171 1144,171 1103,523 1041,523 1079,231 "/> <path class="fil4"
<g> d="M1795 30c6,0 12,1 18,4 6,3 11,8 14,14 3,6 5,12 5,18 0,7 -2,13 -5,18 -3,6 -8,11 -13,14 -6,3 -12,5 -19,5 -6,0 -12,-2 -18,-5 -6,-3 -10,-8 -14,-14 -3,-5 -4,-11 -4,-18 0,-6 1,-12 4,-18 4,-6 8,-11 14,-14 6,-3 12,-4 18,-4zm0 6c-5,0 -10,1 -15,4 -5,2 -8,6 -11,11 -3,5 -4,10 -4,15 0,6 1,11 4,16 2,4 6,8 11,11 5,3 10,4 15,4 6,0 11,-2 15,-4 5,-3 9,-7 12,-11 3,-5 4,-10 4,-16 0,-5 -2,-10 -4,-15 -3,-5 -7,-9 -12,-11 -5,-3 -10,-4 -15,-4zm-16 50l0 -39 14 0c4,0 8,0 10,1 2,1 3,2 5,4 1,2 2,4 2,6 0,2 -1,5 -3,7 -2,2 -5,4 -9,4 2,0 3,1 4,2 1,1 3,4 6,8l4 7 -7 0 -4 -6c-3,-5 -5,-8 -7,-9 -1,-1 -2,-2 -5,-2l-3 0 0 17 -7 0 0 0zm7 -22l7 0c4,0 7,0 8,-1 1,-1 2,-3 2,-5 0,-1 -1,-2 -1,-3 -1,-1 -2,-2 -3,-2 -1,0 -3,-1 -6,-1l-7 0 0 12z"/>
<path class="fil3" d="M1398 578c-4,0 -8,2 -10,4 -3,2 -5,6 -6,10 -1,3 0,7 2,9 2,3 5,4 9,4 4,0 8,-1 11,-4 3,-2 5,-6 6,-9 0,-5 -1,-8 -3,-11 -2,-2 -5,-3 -9,-3zm3 -11c7,0 12,2 16,7 4,5 5,11 4,18 -2,6 -5,12 -11,17 -6,5 -12,8 -19,8 -7,0 -12,-3 -16,-8 -4,-5 -6,-11 -4,-17 1,-7 5,-13 11,-18 6,-5 12,-7 19,-7l0 0z"/> <polygon class="fil3"
<polygon class="fil3" points="1329,568 1311,591 1321,615 1308,615 1303,602 1293,615 1280,615 1299,591 1290,568 1303,568 1307,580 1317,568 "/> points="949,523 885,523 873,229 791,523 730,523 828,171 924,171 934,418 1047,171 1144,171 1103,523 1041,523 1079,231 "/>
<polygon class="fil3" points="1239,578 1232,615 1221,615 1229,578 1216,578 1218,568 1254,568 1252,578 "/> <g>
<polygon class="fil3" points="1091,568 1082,615 1071,615 1080,568 "/> <path class="fil3"
<polygon class="fil3" points="1117,568 1097,591 1109,615 1096,615 1085,593 1086,589 1104,568 "/> d="M1398 578c-4,0 -8,2 -10,4 -3,2 -5,6 -6,10 -1,3 0,7 2,9 2,3 5,4 9,4 4,0 8,-1 11,-4 3,-2 5,-6 6,-9 0,-5 -1,-8 -3,-11 -2,-2 -5,-3 -9,-3zm3 -11c7,0 12,2 16,7 4,5 5,11 4,18 -2,6 -5,12 -11,17 -6,5 -12,8 -19,8 -7,0 -12,-3 -16,-8 -4,-5 -6,-11 -4,-17 1,-7 5,-13 11,-18 6,-5 12,-7 19,-7l0 0z"/>
<path class="fil3" d="M1059 601l8 6c0,1 -1,1 -3,3 -5,4 -11,6 -18,6 -7,0 -13,-2 -17,-7 -4,-4 -5,-10 -3,-17 1,-7 5,-13 10,-18 6,-5 13,-7 20,-7 7,0 15,3 17,10l-10 6c-2,-2 -4,-5 -10,-5 -3,0 -7,1 -10,4 -3,2 -5,6 -6,10 -1,3 0,7 2,10 2,2 5,3 8,4 3,0 7,-1 10,-3 1,-1 2,-2 2,-2z"/> <polygon class="fil3"
<polygon class="fil3" points="1014,615 1003,615 1007,597 994,597 991,615 980,615 989,568 1000,568 996,587 1009,588 1013,568 1024,568 "/> points="1329,568 1311,591 1321,615 1308,615 1303,602 1293,615 1280,615 1299,591 1290,568 1303,568 1307,580 1317,568 "/>
<path class="fil4" d="M1538 568l16 0 -2 10 -14 0c-1,0 -2,2 -3,3l-6 34 -11 0 7 -37c1,-6 7,-10 13,-10l0 0z"/> <polygon class="fil3"
<path class="fil3" d="M1467 568l-23 0c-7,0 -11,4 -13,10 -1,7 -3,18 -5,25 0,1 -1,2 -3,2l-3 0 -2 10 4 0c5,0 7,1 11,-2 3,-3 4,-9 5,-14l4 -21 12 0 -7 38 10 0 10 -48 0 0z"/> points="1239,578 1232,615 1221,615 1229,578 1216,578 1218,568 1254,568 1252,578 "/>
<polygon class="fil3" points="886,615 875,615 881,587 862,615 851,615 861,568 872,568 866,595 885,568 895,568 "/> <polygon class="fil3" points="1091,568 1082,615 1071,615 1080,568 "/>
<polygon class="fil3" points="930,626 919,626 921,615 894,615 903,568 914,568 906,605 919,605 927,568 938,568 930,605 934,605 "/> <polygon class="fil3" points="1117,568 1097,591 1109,615 1096,615 1085,593 1086,589 1104,568 "/>
<polygon class="fil3" points="765,615 754,615 760,585 745,615 735,615 732,584 726,615 715,615 724,568 741,568 744,595 758,568 775,568 "/> <path class="fil3"
<path class="fil3" d="M852 568l-23 0c-10,0 -12,5 -13,10l-3 18c-1,2 -2,5 -2,6 -1,1 -3,3 -5,3l-1 0 -4 21 11 0 2 -11 19 0 2 -10 -15 0c1,-1 3,-5 3,-7l4 -20 12 0 -8 37 4 0 -2 11 10 0 5 -21 -4 0 8 -37 0 0z"/> d="M1059 601l8 6c0,1 -1,1 -3,3 -5,4 -11,6 -18,6 -7,0 -13,-2 -17,-7 -4,-4 -5,-10 -3,-17 1,-7 5,-13 10,-18 6,-5 13,-7 20,-7 7,0 15,3 17,10l-10 6c-2,-2 -4,-5 -10,-5 -3,0 -7,1 -10,4 -3,2 -5,6 -6,10 -1,3 0,7 2,10 2,2 5,3 8,4 3,0 7,-1 10,-3 1,-1 2,-2 2,-2z"/>
<polygon class="fil3" points="972,615 961,615 967,587 948,615 937,615 947,568 958,568 952,595 971,568 982,568 "/> <polygon class="fil3"
<polygon class="fil3" points="1150,615 1140,615 1145,587 1127,615 1116,615 1125,568 1136,568 1131,595 1149,568 1160,568 "/> points="1014,615 1003,615 1007,597 994,597 991,615 980,615 989,568 1000,568 996,587 1009,588 1013,568 1024,568 "/>
<polygon class="fil3" points="1587,615 1576,615 1581,587 1563,615 1552,615 1561,568 1572,568 1567,595 1585,568 1596,568 "/> <path class="fil4"
<polygon class="fil3" points="1628,615 1617,615 1623,587 1604,615 1594,615 1603,568 1614,568 1609,595 1627,568 1638,568 "/> d="M1538 568l16 0 -2 10 -14 0c-1,0 -2,2 -3,3l-6 34 -11 0 7 -37c1,-6 7,-10 13,-10l0 0z"/>
<path class="fil4" d="M1269 568l16 0 -2 10 -13 0c-3,0 -3,1 -4,4l-1 4 15 0 -2 10 -15 0 -1 6c0,1 0,3 2,3l14 0 -2 10 -17 0c-6,0 -9,-5 -8,-10l5 -27c1,-6 7,-10 13,-10z"/> <path class="fil3"
<polygon class="fil3" points="1360,615 1349,615 1353,597 1340,597 1336,615 1326,615 1335,568 1346,568 1342,587 1355,588 1359,568 1370,568 "/> d="M1467 568l-23 0c-7,0 -11,4 -13,10 -1,7 -3,18 -5,25 0,1 -1,2 -3,2l-3 0 -2 10 4 0c5,0 7,1 11,-2 3,-3 4,-9 5,-14l4 -21 12 0 -7 38 10 0 10 -48 0 0z"/>
<path class="fil3" d="M1495 578c-5,0 -8,2 -11,4 -3,2 -5,6 -6,10 -1,3 0,7 2,9 2,3 5,4 9,4 5,0 8,-1 11,-4 3,-2 5,-6 6,-9 1,-5 0,-8 -3,-11 -2,-2 -5,-3 -8,-3zm2 -11c7,0 12,2 16,7 4,5 5,11 4,18 -1,6 -5,12 -11,17 -5,5 -12,8 -19,8 -7,0 -12,-3 -16,-8 -4,-5 -5,-11 -4,-17 2,-7 5,-13 11,-18 6,-5 13,-7 20,-7l-1 0z"/> <polygon class="fil3"
<path class="fil4" d="M1178 568l16 0 -2 10 -13 0c-3,0 -4,1 -4,4l-1 4 15 0 -2 10 -15 0 -1 6c0,1 0,3 2,3l14 0 -2 10 -17 0c-6,0 -10,-5 -9,-10l6 -27c1,-6 7,-10 13,-10z"/> points="886,615 875,615 881,587 862,615 851,615 861,568 872,568 866,595 885,568 895,568 "/>
<path class="fil4" d="M791 568l16 0 -2 10 -13 0c-2,0 -3,1 -4,4l-1 4 15 0 -2 10 -15 0 -1 6c0,1 0,3 2,3l14 0 -2 10 -16 0c-7,0 -10,-5 -9,-10l5 -27c1,-6 7,-10 13,-10z"/> <polygon class="fil3"
points="930,626 919,626 921,615 894,615 903,568 914,568 906,605 919,605 927,568 938,568 930,605 934,605 "/>
<polygon class="fil3"
points="765,615 754,615 760,585 745,615 735,615 732,584 726,615 715,615 724,568 741,568 744,595 758,568 775,568 "/>
<path class="fil3"
d="M852 568l-23 0c-10,0 -12,5 -13,10l-3 18c-1,2 -2,5 -2,6 -1,1 -3,3 -5,3l-1 0 -4 21 11 0 2 -11 19 0 2 -10 -15 0c1,-1 3,-5 3,-7l4 -20 12 0 -8 37 4 0 -2 11 10 0 5 -21 -4 0 8 -37 0 0z"/>
<polygon class="fil3"
points="972,615 961,615 967,587 948,615 937,615 947,568 958,568 952,595 971,568 982,568 "/>
<polygon class="fil3"
points="1150,615 1140,615 1145,587 1127,615 1116,615 1125,568 1136,568 1131,595 1149,568 1160,568 "/>
<polygon class="fil3"
points="1587,615 1576,615 1581,587 1563,615 1552,615 1561,568 1572,568 1567,595 1585,568 1596,568 "/>
<polygon class="fil3"
points="1628,615 1617,615 1623,587 1604,615 1594,615 1603,568 1614,568 1609,595 1627,568 1638,568 "/>
<path class="fil4"
d="M1269 568l16 0 -2 10 -13 0c-3,0 -3,1 -4,4l-1 4 15 0 -2 10 -15 0 -1 6c0,1 0,3 2,3l14 0 -2 10 -17 0c-6,0 -9,-5 -8,-10l5 -27c1,-6 7,-10 13,-10z"/>
<polygon class="fil3"
points="1360,615 1349,615 1353,597 1340,597 1336,615 1326,615 1335,568 1346,568 1342,587 1355,588 1359,568 1370,568 "/>
<path class="fil3"
d="M1495 578c-5,0 -8,2 -11,4 -3,2 -5,6 -6,10 -1,3 0,7 2,9 2,3 5,4 9,4 5,0 8,-1 11,-4 3,-2 5,-6 6,-9 1,-5 0,-8 -3,-11 -2,-2 -5,-3 -8,-3zm2 -11c7,0 12,2 16,7 4,5 5,11 4,18 -1,6 -5,12 -11,17 -5,5 -12,8 -19,8 -7,0 -12,-3 -16,-8 -4,-5 -5,-11 -4,-17 2,-7 5,-13 11,-18 6,-5 13,-7 20,-7l-1 0z"/>
<path class="fil4"
d="M1178 568l16 0 -2 10 -13 0c-3,0 -4,1 -4,4l-1 4 15 0 -2 10 -15 0 -1 6c0,1 0,3 2,3l14 0 -2 10 -17 0c-6,0 -10,-5 -9,-10l6 -27c1,-6 7,-10 13,-10z"/>
<path class="fil4"
d="M791 568l16 0 -2 10 -13 0c-2,0 -3,1 -4,4l-1 4 15 0 -2 10 -15 0 -1 6c0,1 0,3 2,3l14 0 -2 10 -16 0c-7,0 -10,-5 -9,-10l5 -27c1,-6 7,-10 13,-10z"/>
</g> </g>
</g> </g>
</g> </g>

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

View File

@ -1,58 +1,62 @@
{ {
"title": "NPM Group", "title": "NPM Group",
"language": "ru", "language": "ru",
"description": "Лаборатория методов ядерной физики", "description": "Лаборатория методов ядерно-физических экспериментов",
"header": { "header": {
"news": "Новости", "news": "Новости",
"group": "Лаборатория", "group": "Лаборатория",
"projects": "Проекты", "projects": "Проекты",
"partners": "Партнёры" }, "partners": "Партнёры"
},
"notfound": { "notfound": {
"header": "404: СТРАНИЦА НЕ НАЙДЕНА", "header": "404: СТРАНИЦА НЕ НАЙДЕНА",
"description": "Вы перешли по несуществующему пути" }, "description": "Вы перешли по несуществующему пути"
},
"jumbotron": { "jumbotron": {
"labintro": "Лаборатория методов ядерно-физических экспериментов", "labintro": "Лаборатория методов ядерно-физических экспериментов",
"lead": "Особенности нашего подхода к решению научных задач сегодняшнего времени: ", "lead": "Особенности нашего подхода к решению научных задач сегодняшнего времени: ",
"list": "<ul><li>Лаборатория была создана на базе МФТИ, что позволяет привлекать большое количество заинтересованных лиц из числа студентов.<\/li><li>Благодаря совмещению научной работы с образовательным процессом мы обеспечиваем преемственность научного опыта.<\/li><li>Структура нашей лаборатории позволяет принимать участие в экспериментах мирового уровня даже студентам младших курсов.<\/li><li>Мы применяем самые современные методы в работе на физических экспериментах.<\/li><\/ul><p \/>", "list": "<ul><li>Лаборатория была создана на базе МФТИ, что позволяет привлекать большое количество заинтересованных лиц из числа студентов.<\/li><li>Благодаря совмещению научной работы с образовательным процессом мы обеспечиваем преемственность научного опыта.<\/li><li>Структура нашей лаборатории позволяет принимать участие в экспериментах мирового уровня даже студентам младших курсов.<\/li><li>Мы применяем самые современные методы в работе на физических экспериментах.<\/li><\/ul><p \/>",
"about": "О нашей лаборатории" }, "about": "О нашей лаборатории"
},
"more": { "more": {
"nuclear_title": "Ядерная физика", "nuclear_title": "Ядерная физика",
"nuclear_body": "Лаборатория принимает участие в нескольких международных экспериментах в области физики частиц, таких как эксперимент по безнейтринному двойному бета-распаду GERDA, эксперимент по поиску массы нейтрино Троицк ню-масс и так далее.", "nuclear_body": "Лаборатория принимает участие в нескольких международных экспериментах в области физики частиц, таких как эксперимент по безнейтринному двойному бета-распаду GERDA, эксперимент по поиску массы нейтрино Троицк ню-масс и так далее.",
"nuclear_more": "Подробнее »", "nuclear_more": "Подробнее »",
"education_title": "Образование", "education_title": "Образование",
"education_body": "В задачи лаборатории входит разработка новых образовательных программ по физике и методике проведения физического эксперимента, а также совершенствование существующей методической и информационной базы в МФТИ и академических институтах.", "education_body": "В задачи лаборатории входит разработка новых образовательных программ по физике и методике проведения физического эксперимента, а также совершенствование существующей методической и информационной базы в МФТИ и академических институтах.",
"education_more": "Подробнее »", "education_more": "Подробнее »",
"software_title": "Компьютерные методы", "software_title": "Компьютерные методы",
"software_body": "Одним из основных направлений деятельности является разработка вычислительных методов и открытого программного обеспечения для использования в образовании и научной деятельности.", "software_body": "Одним из основных направлений деятельности является разработка вычислительных методов и открытого программного обеспечения для использования в образовании и научной деятельности.",
"software_more": "Подробнее »", "software_more": "Подробнее »",
"news": "Последние новости"
"news": "Последние новости" }, },
"about": { "about": {
"title": "Лаборатория методики ядерно-физического эксперимента", "title": "Лаборатория методики ядерно-физического эксперимента",
"descr": "Группа была создана в 2015 году на базе кафедры общей физики МФТИ, нескольких лабораторий ИЯИ РАН и при поддержке лаборатории физики высоких энергий МФТИ. Цель создания - разработка методов для проведения и анализа данных экспериментов в области физики частиц и ядерной физики. Помимо этого участники группы занимаются внедрением современных информационных технологий в экспериментальную физику и образование.", "descr": "Группа была создана в 2015 году на базе кафедры общей физики МФТИ, нескольких лабораторий ИЯИ РАН и при поддержке лаборатории физики высоких энергий МФТИ. Цель создания - разработка методов для проведения и анализа данных экспериментов в области физики частиц и ядерной физики. Помимо этого участники группы занимаются внедрением современных информационных технологий в экспериментальную физику и образование.",
"pubs": { "pubs": {
"title": "Публикации", "title": "Публикации",
"available1": "Публикации группы доступны на ", "available1": "Публикации группы доступны на ",
"available2": "отдельной странице" }, "available2": "отдельной странице"
},
"contacts": { "contacts": {
"title": "Контактная информация", "title": "Контактная информация",
"mail": "Электронный адрес: ", "mail": "Электронный адрес: ",
"telegram": "Телеграм канал: " } "telegram": "Телеграм канал: "
}, }
},
"partners": { "partners": {
"mipt": { "mipt": {
"title_fund": "Кафедра общей физики МФТИ", "title_fund": "Кафедра общей физики МФТИ",
"description_fund": "Кафедра общей физики является основной точкой соприкосновения для ученых и преподавателей с одной стороны и студентов с другой стороны. Тесное сотрудничество с кафдерой является залогом постоянного притока молодых сотрудников, а также постоянного самосовершенствования членов группы, работающих со студентами.", "description_fund": "Кафедра общей физики является основной точкой соприкосновения для ученых и преподавателей с одной стороны и студентов с другой стороны. Тесное сотрудничество с кафдерой является залогом постоянного притока молодых сотрудников, а также постоянного самосовершенствования членов группы, работающих со студентами.",
"title_energy": "Лаборатория физики высоких энергий МФТИ", "title_energy": "Лаборатория физики высоких энергий МФТИ",
"description_energy": "Тесное сотрудничество с лабораторией физики высоких энергий позволяет осуществлять прямой контакт между образованием и научным сообществом, не выходя за рамки МФТИ." }, "description_energy": "Тесное сотрудничество с лабораторией физики высоких энергий позволяет осуществлять прямой контакт между образованием и научным сообществом, не выходя за рамки МФТИ."
"jb": { "description": "Лаборатория активно сотрудничает с компанией JetBrains во внедрении языка Kotlin в научном программировании, преподавании Kotlin и разработке библиотек на Kotlin." }, },
"jbr": { "description": "Группа разработки программного обеспечения входит в международное научное объединение JetBrains Research." }, "jb": {
"description": "Лаборатория активно сотрудничает с компанией JetBrains во внедрении языка Kotlin в научном программировании, преподавании Kotlin и разработке библиотек на Kotlin."
},
"jbr": {
"description": "Группа разработки программного обеспечения входит в международное научное объединение JetBrains Research."
},
"ras": { "ras": {
"title_exp": "Отдел экспериментальной физики ИЯИ РАН", "title_exp": "Отдел экспериментальной физики ИЯИ РАН",
"description_exp": "Ведется очень плотное сотруднничество с ОЭФ ИЯИ РАН в рамках коллабораций Troitsk nu-mass и KATRIN, а также в плане подготовки квалифицированных кадров для работы на эксперименте NICA и в других ускорительных экспериментах. В рамках сотрудничества реализуются как научные так и образовательные задачи.", "description_exp": "Ведется очень плотное сотруднничество с ОЭФ ИЯИ РАН в рамках коллабораций Troitsk nu-mass и KATRIN, а также в плане подготовки квалифицированных кадров для работы на эксперименте NICA и в других ускорительных экспериментах. В рамках сотрудничества реализуются как научные так и образовательные задачи.",
@ -61,27 +65,30 @@
"title_education": "Научно-образовательный центр ИЯИ РАН", "title_education": "Научно-образовательный центр ИЯИ РАН",
"description_education": "Часть студентов, участвующих в группе обучается в научно-образовательном центре ИЯИ РАН.", "description_education": "Часть студентов, участвующих в группе обучается в научно-образовательном центре ИЯИ РАН.",
"title_iki": "ИКИ РАН", "title_iki": "ИКИ РАН",
"description_iki": "Группа участвует в математическом моделировании электрических разрядов в атмосфере." } "description_iki": "Группа участвует в математическом моделировании электрических разрядов в атмосфере."
}
}, },
"physics": { "physics": {
"bc_title": "Физика", "bc_title": "Физика",
"title": "Ядерная физика", "title": "Ядерная физика",
"description": "Традиционно к ядерной физике относят не только исследования, связанные со структурой атомного ядра и ядерными реакциями, но и всю физику элементарных частиц, а также отчасти некоторые разделы астрофизики и космологии. В настоящее время усилия нашей группы сосредоточены в области так называемых неускорительных экспериментов в физике элементарных частиц." }, "description": "Традиционно к ядерной физике относят не только исследования, связанные со структурой атомного ядра и ядерными реакциями, но и всю физику элементарных частиц, а также отчасти некоторые разделы астрофизики и космологии. В настоящее время усилия нашей группы сосредоточены в области так называемых неускорительных экспериментов в физике элементарных частиц."
},
"education": { "education": {
"bc_title": "Образование", "bc_title": "Образование",
"title": "Образование", "title": "Образование",
"description": "Образовательные проекты в побласти ядерной физики и методов проведения и анализа результатов физического эксперимента являются одним из ключевых направлений деятельности группы.", "description": "Образовательные проекты в побласти ядерной физики и методов проведения и анализа результатов физического эксперимента являются одним из ключевых направлений деятельности группы.",
"course1": "Подробная информация доступна на ", "course1": "Подробная информация доступна на ",
"course2": "странице курса" }, "course2": "странице курса"
},
"math": { "math": {
"bc_title": "Математика", "bc_title": "Математика",
"title": "Математические методы", "title": "Математические методы",
"description": "Математическое моделирование физических процессов и математические методы анализа данных являются неотъемлимой частью современной экспериментальной физики. Постоянно возникает потребность как в совершенствовании существующих методов, так и в разработке принципиально новых подходов." }, "description": "Математическое моделирование физических процессов и математические методы анализа данных являются неотъемлимой частью современной экспериментальной физики. Постоянно возникает потребность как в совершенствовании существующих методов, так и в разработке принципиально новых подходов."
},
"software": { "software": {
"bc_title": "Программное обеспечение", "bc_title": "Программное обеспечение",
"title": "Научное программное обеспечение", "title": "Научное программное обеспечение",
"description": "Современные эксперименты в физике частиц немыслимы без специального программного обеспечения, которое требуется как на этапе проведения эксперимента и сбора данных, так и при обработке результатов. Разработка научного программного обеспечения является дополнительным, но существенным направлением работы группы." }, "description": "Современные эксперименты в физике частиц немыслимы без специального программного обеспечения, которое требуется как на этапе проведения эксперимента и сбора данных, так и при обработке результатов. Разработка научного программного обеспечения является дополнительным, но существенным направлением работы группы."
},
"quarks": "Физика" "quarks": "Физика"
} }

View File

@ -4,16 +4,17 @@ import {FormattedMessage, injectIntl, useIntl} from "gatsby-plugin-react-intl"
import SEO from "../components/seo" import SEO from "../components/seo"
const NotFoundPage = () => { const NotFoundPage = () => {
const intl = useIntl() const intl = useIntl()
const lang = intl.locale const lang = intl.locale
return( return (
<Layout> <Layout>
<SEO lang={lang} title={intl.formatMessage({ id: "title" })} /> <SEO lang={lang} title={intl.formatMessage({id: "title"})}/>
<div style={{minHeight: `95vh`}}> <div style={{minHeight: `95vh`}}>
<h1 style={{textAlign: `center`, paddingTop: `300px`}}><FormattedMessage id="notfound.header"/></h1> <h1 style={{textAlign: `center`, paddingTop: `300px`}}><FormattedMessage id="notfound.header"/></h1>
<p style={{textAlign: `center`}}><FormattedMessage id="notfound.description"/></p> <p style={{textAlign: `center`}}><FormattedMessage id="notfound.description"/></p>
</div> </div>
</Layout> </Layout>
)} )
}
export default injectIntl(NotFoundPage) export default injectIntl(NotFoundPage)

View File

@ -7,93 +7,99 @@ import Layout from "../components/layout"
import SEO from "../components/seo" import SEO from "../components/seo"
import "../styles/main.css" import "../styles/main.css"
const AboutPage = ({ data }) => { const AboutPage = ({data}) => {
const intl = useIntl() const intl = useIntl()
const lang = intl.locale const lang = intl.locale
var members = "" var members = ""
if ( lang==="ru" ) { members = data.ru_members.edges; } if (lang === "ru") {
else if ( lang==="en" ) { members = data.en_members.edges; } members = data.ru_members.edges;
return( } else if (lang === "en") {
<Layout> members = data.en_members.edges;
<SEO lang={lang} title={intl.formatMessage({ id: "title" })} /> }
<h1 style = {{marginTop: `20px`}}><FormattedMessage id="about.title" /></h1> return (
<p style = {{marginTop: `0px`}}><FormattedMessage id="about.descr" /></p> <Layout>
<SEO lang={lang} title={intl.formatMessage({id: "title"})}/>
<h1 style={{marginTop: `20px`}}><FormattedMessage id="about.title"/></h1>
<p style={{marginTop: `0px`}}><FormattedMessage id="about.descr"/></p>
<h2 id="publications"><FormattedMessage id="about.pubs.title" /></h2> <h2 id="publications"><FormattedMessage id="about.pubs.title"/></h2>
<p style = {{marginTop: `0px`, marginBottom: `0px`}}><FormattedMessage id="about.pubs.available1"/><Link to="/publications"><FormattedMessage id="about.pubs.available2"/></Link></p> <p style={{marginTop: `0px`, marginBottom: `0px`}}><FormattedMessage id="about.pubs.available1"/><Link
to="/publications"><FormattedMessage id="about.pubs.available2"/></Link></p>
<h2 id="contacts"><FormattedMessage id="about.contacts.title" /></h2> <h2 id="contacts"><FormattedMessage id="about.contacts.title"/></h2>
<p style = {{marginTop: `0px`, marginBottom: `0px`}}><FormattedMessage id="about.contacts.mail" /><a href='mailto&#58;&#110;p&#109;&#64;m%&#54;&#57;%70&#116;&#46;ru'>npm&#64;mip&#116;&#46;ru</a></p> <p style={{marginTop: `0px`, marginBottom: `0px`}}><FormattedMessage id="about.contacts.mail"/><a
<p style = {{marginTop: `0px`}}><FormattedMessage id="about.contacts.telegram" /><a href="https://t.me/mipt_npm">https://t.me/mipt_npm</a></p> href='mailto&#58;&#110;p&#109;&#64;m%&#54;&#57;%70&#116;&#46;ru'>npm&#64;mip&#116;&#46;ru</a></p>
<p style={{marginTop: `0px`}}><FormattedMessage id="about.contacts.telegram"/><a
href="https://t.me/mipt_npm">https://t.me/mipt_npm</a></p>
{/* ------------------------------ */} {/* ------------------------------ */}
{ members.map(({node}) => { {members.map(({node}) => {
const name = node.frontmatter.title; const name = node.frontmatter.title;
const photo = node.frontmatter.photo; const photo = node.frontmatter.photo;
const path = "../../images/members/" const path = "../../images/members/"
if (photo === null) if (photo === null)
return( return (
<div> <div>
<hr/> <hr/>
<div className = "row"> <div className="row">
<div className = "col-lg-2"></div> <div className="col-lg-2"></div>
<div className = "col-lg-10"> <div className="col-lg-10">
<h2>{name}</h2> <h2>{name}</h2>
<div>{Parser(node.html)}</div> <div>{Parser(node.html)}</div>
</div> </div>
</div> </div>
</div> </div>
) )
else else
return ( return (
<div> <div>
<hr/> <hr/>
<div className = "row"> <div className="row">
<div className = "col-lg-2"> <div className="col-lg-2">
<img src={path+photo} alt=" "/> <img src={path + photo} alt=" "/>
</div> </div>
<div className = "col-lg-10"> <div className="col-lg-10">
<h2>{name}</h2> <h2>{name}</h2>
<div>{Parser(node.html)}</div> <div>{Parser(node.html)}</div>
</div> </div>
</div> </div>
</div> </div>
) )
})} })}
</Layout> </Layout>
) )
} }
export default injectIntl(AboutPage) export default injectIntl(AboutPage)
export const query = graphql` export const query = graphql`
query { query {
ru_members: allMarkdownRemark(filter: {frontmatter: {content_type: {eq: "member"}, published: {eq: true}, language: {eq: "ru"}}}, ru_members: allMarkdownRemark(filter: {frontmatter: {content_type: {eq: "member"}, published: {eq: true}, language: {eq: "ru"}}},
sort: {fields: frontmatter___order, order: ASC}) { sort: {fields: frontmatter___order, order: ASC}) {
edges{ edges{
node { node {
html html
frontmatter { frontmatter {
title title
photo photo
language language
}
}
}
} }
}
}
}
en_members: allMarkdownRemark(filter: {frontmatter: {content_type: {eq: "member"}, published: {eq: true}, language: {eq: "en"}}}, en_members: allMarkdownRemark(filter: {frontmatter: {content_type: {eq: "member"}, published: {eq: true}, language: {eq: "en"}}},
sort: {fields: frontmatter___order, order: ASC}) { sort: {fields: frontmatter___order, order: ASC}) {
edges{ edges{
node { node {
html html
frontmatter { frontmatter {
title title
photo photo
language language
}
}
}
} }
} }`
}
}
}`

View File

@ -13,83 +13,96 @@ import SEO from "../components/seo"
const PartnersPage = () => { const PartnersPage = () => {
const intl = useIntl() const intl = useIntl()
const lang = intl.locale const lang = intl.locale
return( return (
<Layout> <Layout>
<SEO lang={lang} title={intl.formatMessage({ id: "title" })} /> <SEO lang={lang} title={intl.formatMessage({id: "title"})}/>
<div className="media" style={{marginTop: `30px`}}>
<div className="media-body">
<h1><a aria-label="MIPT general physics"
href="https://mipt.ru/education/chair/physics/"><FormattedMessage
id="partners.mipt.title_fund"/></a></h1>
<p><FormattedMessage id="partners.mipt.description_fund"/></p>
<hr/>
<h1><a aria-label="MIPT HEP"
href="https://mipt.ru/science/labs/high_energy_physics_lab.php"><FormattedMessage
id="partners.mipt.title_energy"/></a></h1>
<p><FormattedMessage id="partners.mipt.description_energy"/></p>
</div>
<div className="media-right media-middle">
<a href="https://mipt.ru/education/chair/physics/"><img className="media-object" src={mipt_logo}
alt="mipt logo" width="400px"/></a>
</div>
</div>
<div className="media" style={{marginTop: `30px`}}>
<div className="media-body">
<h1><a aria-label="MIPT general physics" href="https://mipt.ru/education/chair/physics/"><FormattedMessage id="partners.mipt.title_fund"/></a></h1>
<p><FormattedMessage id="partners.mipt.description_fund"/></p>
<hr/> <hr/>
<h1><a aria-label="MIPT HEP" href="https://mipt.ru/science/labs/high_energy_physics_lab.php"><FormattedMessage id="partners.mipt.title_energy"/></a></h1>
<p><FormattedMessage id="partners.mipt.description_energy"/></p>
</div>
<div className="media-right media-middle">
<a href="https://mipt.ru/education/chair/physics/"><img className="media-object" src={mipt_logo} alt="mipt logo" width="400px"/></a>
</div>
</div>
<hr/> <div className="media">
<div className="media-body">
<h1><a id="partner" href="https://www.jetbrains.com/">JetBrains</a></h1>
<p><FormattedMessage id="partners.jb.description"/></p>
</div>
<div className="media-right media-middle">
<a href="https://www.jetbrains.com/"><img className="media-object" src={jetbrains_logo}
alt="inr logo" width="150px"
style={{marginLeft: `10px`}}/></a>
</div>
</div>
<div className="media"> <hr/>
<div className="media-body">
<h1><a id="partner" href="https://www.jetbrains.com/">JetBrains</a></h1>
<p><FormattedMessage id="partners.jb.description"/></p>
</div>
<div className="media-right media-middle">
<a href="https://www.jetbrains.com/"><img className="media-object" src={jetbrains_logo} alt="inr logo" width="150px" style={{marginLeft:`10px`}}/></a>
</div>
</div>
<hr/> <div className="media">
<div className="media-body">
<h1><a id="partner" href="https://research.jetbrains.org/ru/groups/npm">JetBrains Research</a></h1>
<p><FormattedMessage id="partners.jbr.description"/></p>
</div>
<div className="media-right media-middle">
<a href="https://research.jetbrains.org/ru/groups/npm"><img className="media-object" src={jbr}
alt="inr logo" width="250px"
style={{marginLeft: `10px`}}/></a>
</div>
</div>
<div className="media"> <hr/>
<div className="media-body">
<h1><a id="partner" href="https://research.jetbrains.org/ru/groups/npm">JetBrains Research</a></h1>
<p><FormattedMessage id="partners.jbr.description"/></p>
</div>
<div className="media-right media-middle">
<a href="https://research.jetbrains.org/ru/groups/npm"><img className="media-object" src={jbr} alt="inr logo" width="250px" style={{marginLeft:`10px`}}/></a>
</div>
</div>
<hr/> <div className="media">
<div className="media-body">
<h2 className="media-heading"><FormattedMessage id="partners.ras.title_exp"/></h2>
<p><FormattedMessage id="partners.ras.description_exp"/></p>
</div>
</div>
<div className="media"> <hr/>
<div className="media-body">
<h2 className="media-heading"><FormattedMessage id="partners.ras.title_exp"/></h2>
<p><FormattedMessage id="partners.ras.description_exp"/></p>
</div>
</div>
<hr/> <div className="media">
<div className="media-left media-middle">
<a href="http://www.inr.ru"><img className="media-object" src={inr_linac} alt="inr logo"
width="100px"/></a>
</div>
<div className="media-body" style={{marginLeft: `25px`}}>
<h1><a aria-label="INR" href="http://www.inr.ru/"><FormattedMessage
id="partners.ras.title_beam"/></a></h1>
<p><FormattedMessage id="partners.ras.description_beam"/></p>
</div>
</div>
<div className="media" > <hr/>
<div className="media-left media-middle">
<a href="http://www.inr.ru"><img className="media-object" src={inr_linac} alt="inr logo" width="100px"/></a>
</div>
<div className="media-body" style={{marginLeft: `25px`}}>
<h1><a aria-label="INR" href="http://www.inr.ru/"><FormattedMessage id="partners.ras.title_beam"/></a></h1>
<p><FormattedMessage id="partners.ras.description_beam"/></p>
</div>
</div>
<hr/> <div className="media">
<div className="media-body">
<h1><a aria-label="INR education" href="http://www.inr.ru/"><FormattedMessage
id="partners.ras.title_education"/></a></h1>
<p><FormattedMessage id="partners.ras.description_education"/></p>
</div>
<div className="media-right media-middle">
<a href="http://www.inr.ru"><img className="media-object" src={inr_logo} alt="inr logo"
width="100px" style={{marginLeft: `10px`}}/></a>
</div>
</div>
<div className="media"> <hr/>
<div className="media-body">
<h1><a aria-label="INR education" href="http://www.inr.ru/"><FormattedMessage id="partners.ras.title_education"/></a></h1>
<p><FormattedMessage id="partners.ras.description_education"/></p>
</div>
<div className="media-right media-middle">
<a href="http://www.inr.ru"><img className="media-object" src={inr_logo} alt="inr logo" width="100px" style={{marginLeft:`10px`}}/></a>
</div>
</div>
<hr/> {/* <div className="media" style={{fontSize: `20px`}}>
{/* <div className="media" style={{fontSize: `20px`}}>
<div className="media-left media-middle"> <div className="media-left media-middle">
<a href="#"><img className="media-object" src={mtl_logo} width="100px"/></a> <a href="#"><img className="media-object" src={mtl_logo} width="100px"/></a>
</div> </div>
@ -99,17 +112,21 @@ const PartnersPage = () => {
</div> </div>
</div> */} </div> */}
<div className="media" style={{marginBottom: `30px`}}> <div className="media" style={{marginBottom: `30px`}}>
<div className="media-body"> <div className="media-body">
<h1><a aria-label="SRI RAS" href="http://www.iki.rssi.ru/"><FormattedMessage id="partners.ras.title_iki"/></a></h1> <h1><a aria-label="SRI RAS" href="http://www.iki.rssi.ru/"><FormattedMessage
<p><FormattedMessage id="partners.ras.description_iki"/></p> id="partners.ras.title_iki"/></a></h1>
</div> <p><FormattedMessage id="partners.ras.description_iki"/></p>
<div className="media-right media-middle"> </div>
<a href="http://www.iki.rssi.ru"><img className="media-object" src="http://www.iki.rssi.ru/img/iki.png" alt="iki logo" width="100px"/></a> <div className="media-right media-middle">
</div> <a href="http://www.iki.rssi.ru"><img className="media-object"
</div> src="http://www.iki.rssi.ru/img/iki.png" alt="iki logo"
width="100px"/></a>
</div>
</div>
</Layout> </Layout>
)} )
}
export default injectIntl(PartnersPage) export default injectIntl(PartnersPage)

View File

@ -6,55 +6,66 @@ import Parser from "html-react-parser"
import Layout from "../../components/layout" import Layout from "../../components/layout"
import SEO from "../../components/seo" import SEO from "../../components/seo"
const SoftwarePage = ({ data }) => { const SoftwarePage = ({data}) => {
const intl = useIntl() const intl = useIntl()
const lang = intl.locale const lang = intl.locale
var posts = "" var posts = ""
if ( lang==="ru" ) { posts = data.ru_projects.edges; } if (lang === "ru") {
else if ( lang==="en" ) { posts = data.en_projects.edges; } posts = data.ru_projects.edges;
return( } else if (lang === "en") {
posts = data.en_projects.edges;
}
return (
<Layout> <Layout>
<SEO lang={lang} title={intl.formatMessage({ id: "title" })} /> <SEO lang={lang} title={intl.formatMessage({id: "title"})}/>
<ul className="nav nav-tabs"> <ul className="nav nav-tabs">
<li className="nav-item"><Link id="project" className="nav-link " to="/projects/physics"><FormattedMessage id="physics.bc_title"/></Link></li> <li className="nav-item"><Link id="project" className="nav-link "
<li className="nav-item"><Link id="project" className="nav-link active" to="/projects/education"><FormattedMessage id="education.bc_title"/></Link></li> to="/projects/physics"><FormattedMessage id="physics.bc_title"/></Link>
<li className="nav-item"><Link id="project" className="nav-link " to="/projects/math"><FormattedMessage id="math.bc_title"/></Link></li> </li>
<li className="nav-item"><Link id="project" className="nav-link " to="/projects/software"><FormattedMessage id="software.bc_title"/></Link></li> <li className="nav-item"><Link id="project" className="nav-link active"
to="/projects/education"><FormattedMessage
id="education.bc_title"/></Link></li>
<li className="nav-item"><Link id="project" className="nav-link " to="/projects/math"><FormattedMessage
id="math.bc_title"/></Link></li>
<li className="nav-item"><Link id="project" className="nav-link "
to="/projects/software"><FormattedMessage id="software.bc_title"/></Link>
</li>
</ul> </ul>
<h1 style = {{marginTop: `20px`}}><FormattedMessage id="education.title"/></h1> <h1 style={{marginTop: `20px`}}><FormattedMessage id="education.title"/></h1>
<p style={{marginBottom: `5px`}}><FormattedMessage id="education.description"/></p> <p style={{marginBottom: `5px`}}><FormattedMessage id="education.description"/></p>
<ul> <ul>
{posts.map(({node}) => { {posts.map(({node}) => {
const link = node.frontmatter.shortTitle; const link = node.frontmatter.shortTitle;
const id = node.frontmatter.id; const id = node.frontmatter.id;
return( return (
<li><Link to={`/projects/education#${id}`}>{link}</Link></li> <li><Link to={`/projects/education#${id}`}>{link}</Link></li>
) )
})} })}
</ul> </ul>
{posts.map(({node}) => { {posts.map(({node}) => {
const title = node.frontmatter.title; const title = node.frontmatter.title;
const id = node.frontmatter.id; const id = node.frontmatter.id;
const courseName = node.frontmatter.courseName; const courseName = node.frontmatter.courseName;
return( return (
<div className="row" id={id}> <div className="row" id={id}>
<div className="col-lg-12"> <div className="col-lg-12">
<hr/> <hr/>
<h2 name={id}>{title}</h2> <h2 name={id}>{title}</h2>
<div>{Parser(node.html)}</div> <div>{Parser(node.html)}</div>
<div className="card" style={{backgroundColor: `#F5F5F5`}}> <div className="card" style={{backgroundColor: `#F5F5F5`}}>
<div className="card-body" style={{padding: `10px`}}> <div className="card-body" style={{padding: `10px`}}>
<p style={{textAlign: `center`, margin: `5px`}}> <p style={{textAlign: `center`, margin: `5px`}}>
<FormattedMessage id="education.course1"/><Link to={`/pages/${courseName}`}><FormattedMessage id="education.course2"/></Link> <FormattedMessage id="education.course1"/><Link
</p> to={`/pages/${courseName}`}><FormattedMessage id="education.course2"/></Link>
</p>
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
) )
})} })}
</Layout> </Layout>
@ -66,31 +77,31 @@ export default injectIntl(SoftwarePage)
export const query = graphql` export const query = graphql`
query{ query{
ru_projects: allMarkdownRemark(filter: {frontmatter: {content_type: {eq: "project_education"}, published: {eq: true}, language: {eq: "ru"}}}, ru_projects: allMarkdownRemark(filter: {frontmatter: {content_type: {eq: "project_education"}, published: {eq: true}, language: {eq: "ru"}}},
sort: {fields: [frontmatter___order], order: ASC}){ sort: {fields: [frontmatter___order], order: ASC}){
edges{ edges{
node{ node{
html html
frontmatter{ frontmatter{
shortTitle shortTitle
title title
id id
courseName courseName
}
} }
} }}
}}
en_projects: allMarkdownRemark(filter: {frontmatter: {content_type: {eq: "project_education"}, published: {eq: true}, language: {eq: "en"}}}, en_projects: allMarkdownRemark(filter: {frontmatter: {content_type: {eq: "project_education"}, published: {eq: true}, language: {eq: "en"}}},
sort: {fields: [frontmatter___order], order: ASC}){ sort: {fields: [frontmatter___order], order: ASC}){
edges{ edges{
node{ node{
html html
frontmatter{ frontmatter{
shortTitle shortTitle
title title
id id
courseName courseName
}
} }
} }}
}}
} }
` `

View File

@ -6,45 +6,55 @@ import Parser from "html-react-parser"
import Layout from "../../components/layout" import Layout from "../../components/layout"
import SEO from "../../components/seo" import SEO from "../../components/seo"
const PhysicsPage = ({ data }) => { const PhysicsPage = ({data}) => {
const intl = useIntl() const intl = useIntl()
const lang = intl.locale const lang = intl.locale
var posts = "" var posts = ""
if ( lang==="ru" ) { posts = data.ru_projects.edges; } if (lang === "ru") {
else if ( lang==="en" ) { posts = data.en_projects.edges; } posts = data.ru_projects.edges;
return( } else if (lang === "en") {
posts = data.en_projects.edges;
}
return (
<Layout> <Layout>
<SEO lang={lang} title={intl.formatMessage({ id: "title" })} /> <SEO lang={lang} title={intl.formatMessage({id: "title"})}/>
<ul className="nav nav-tabs"> <ul className="nav nav-tabs">
<li className="nav-item"><Link id="project" className="nav-link active" to="/projects/physics"><FormattedMessage id="physics.bc_title"/></Link></li> <li className="nav-item"><Link id="project" className="nav-link active"
<li className="nav-item"><Link id="project" className="nav-link " to="/projects/education"><FormattedMessage id="education.bc_title"/></Link></li> to="/projects/physics"><FormattedMessage id="physics.bc_title"/></Link>
<li className="nav-item"><Link id="project" className="nav-link " to="/projects/math"><FormattedMessage id="math.bc_title"/></Link></li> </li>
<li className="nav-item"><Link id="project" className="nav-link " to="/projects/software"><FormattedMessage id="software.bc_title"/></Link></li> <li className="nav-item"><Link id="project" className="nav-link "
to="/projects/education"><FormattedMessage
id="education.bc_title"/></Link></li>
<li className="nav-item"><Link id="project" className="nav-link " to="/projects/math"><FormattedMessage
id="math.bc_title"/></Link></li>
<li className="nav-item"><Link id="project" className="nav-link "
to="/projects/software"><FormattedMessage id="software.bc_title"/></Link>
</li>
</ul> </ul>
<h1 style = {{marginTop: `20px`}}><FormattedMessage id="physics.title"/></h1> <h1 style={{marginTop: `20px`}}><FormattedMessage id="physics.title"/></h1>
<p style={{marginBottom: `5px`}}><FormattedMessage id="physics.description"/></p> <p style={{marginBottom: `5px`}}><FormattedMessage id="physics.description"/></p>
<ul> <ul>
{posts.map(({node}) => { {posts.map(({node}) => {
const link = node.frontmatter.shortTitle; const link = node.frontmatter.shortTitle;
const id = node.frontmatter.id; const id = node.frontmatter.id;
return( return (
<li><Link to={`/projects/physics#${id}`}>{link}</Link></li> <li><Link to={`/projects/physics#${id}`}>{link}</Link></li>
) )
})} })}
</ul> </ul>
{posts.map(({node}) => { {posts.map(({node}) => {
const title = node.frontmatter.title; const title = node.frontmatter.title;
const id = node.frontmatter.id; const id = node.frontmatter.id;
return( return (
<div className="row" id={id}> <div className="row" id={id}>
<div className="col-lg-12"> <div className="col-lg-12">
<hr/> <hr/>
<h2 name={id}>{title}</h2> <h2 name={id}>{title}</h2>
<div>{Parser(node.html)}</div> <div>{Parser(node.html)}</div>
</div> </div>
</div> </div>
) )
})} })}
@ -57,29 +67,29 @@ export default injectIntl(PhysicsPage)
export const query = graphql` export const query = graphql`
query{ query{
ru_projects: allMarkdownRemark(filter: {frontmatter: {content_type: {eq: "project_physics"}, published: {eq: true}, language: {eq: "ru"}}}, ru_projects: allMarkdownRemark(filter: {frontmatter: {content_type: {eq: "project_physics"}, published: {eq: true}, language: {eq: "ru"}}},
sort: {fields: [frontmatter___order], order: ASC}){ sort: {fields: [frontmatter___order], order: ASC}){
edges{ edges{
node{ node{
html html
frontmatter{ frontmatter{
shortTitle shortTitle
title title
id id
}
} }
} }}
}}
en_projects: allMarkdownRemark(filter: {frontmatter: {content_type: {eq: "project_physics"}, published: {eq: true}, language: {eq: "en"}}}, en_projects: allMarkdownRemark(filter: {frontmatter: {content_type: {eq: "project_physics"}, published: {eq: true}, language: {eq: "en"}}},
sort: {fields: [frontmatter___order], order: ASC}){ sort: {fields: [frontmatter___order], order: ASC}){
edges{ edges{
node{ node{
html html
frontmatter{ frontmatter{
shortTitle shortTitle
title title
id id
}
} }
} }}
}}
} }
` `

View File

@ -6,32 +6,36 @@ import Parser from "html-react-parser"
import Layout from "../components/layout" import Layout from "../components/layout"
import SEO from "../components/seo" import SEO from "../components/seo"
const QuarksPage = ({ data }) => { const QuarksPage = ({data}) => {
const intl = useIntl() const intl = useIntl()
const lang = intl.locale const lang = intl.locale
var pubs = "" var pubs = ""
if ( lang==="ru" ) { pubs = data.ru_publications.edges; } if (lang === "ru") {
else if ( lang==="en" ) { pubs = data.en_publications.edges; } pubs = data.ru_publications.edges;
return( } else if (lang === "en") {
<Layout> pubs = data.en_publications.edges;
<SEO lang={lang} title={intl.formatMessage({ id: "title" })} /> }
return (
<Layout>
<SEO lang={lang} title={intl.formatMessage({id: "title"})}/>
<nav aria-label="breadcrumb"> <nav aria-label="breadcrumb">
<ol className="breadcrumb" style={{margin: 0}}> <ol className="breadcrumb" style={{margin: 0}}>
<li className="breadcrumb-item"> <li className="breadcrumb-item">
<Link to={`/projects/physics`}><FormattedMessage id="quarks"/></Link> <Link to={`/projects/physics`}><FormattedMessage id="quarks"/></Link>
</li> </li>
<li className="breadcrumb-item active">QUARKS-2020</li> <li className="breadcrumb-item active">QUARKS-2020</li>
</ol> </ol>
</nav> </nav>
{pubs.map(({node}) =>{ {pubs.map(({node}) => {
return( return (
<div>{Parser(node.html)}</div> <div>{Parser(node.html)}</div>
) )
})} })}
</Layout> </Layout>
)} )
}
export default injectIntl(QuarksPage) export default injectIntl(QuarksPage)
@ -39,22 +43,22 @@ export const query = graphql`
query{ query{
ru_publications: allMarkdownRemark(filter: {frontmatter: {content_type: {eq: "quarks"}, published: {eq: true}, language: {eq: "ru"}}}){ ru_publications: allMarkdownRemark(filter: {frontmatter: {content_type: {eq: "quarks"}, published: {eq: true}, language: {eq: "ru"}}}){
edges{ edges{
node{ node{
html html
frontmatter{ frontmatter{
title title
}
} }
} }}
}}
en_publications: allMarkdownRemark(filter: {frontmatter: {content_type: {eq: "quarks"}, published: {eq: true}, language: {eq: "en"}}}){ en_publications: allMarkdownRemark(filter: {frontmatter: {content_type: {eq: "quarks"}, published: {eq: true}, language: {eq: "en"}}}){
edges{ edges{
node{ node{
html html
frontmatter{ frontmatter{
title title
}
} }
} }}
}}
} }
` `

View File

@ -1,5 +1,5 @@
footer { footer {
background-color: rgb(245,245,245); background-color: rgb(245, 245, 245);
left: 0; left: 0;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
@ -8,9 +8,23 @@ footer {
color: rgb(108, 117, 125); color: rgb(108, 117, 125);
font-family: Segoe UI; font-family: Segoe UI;
font-size: 20px; 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; } footer .container p {
footer p a { color: rgb(0, 86, 179); text-decoration: none; } margin-bottom: 15px;
footer p a:hover { color: rgb(12, 65, 124); text-decoration: underline; } }
footer a:visited { color: rgb(0, 86, 179); }
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);
}

View File

@ -1,72 +1,102 @@
html { html {
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
-ms-text-size-adjust: 100%; -ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;
height: 100%; height: 100%;
font-size: 1.08rem; font-size: 1.08rem;
} }
body { body {
height: 100%; height: 100%;
margin: 0; margin: 0;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.container { .container {
max-width: 1160px; max-width: 1160px;
width: 100%; width: 100%;
margin: 0 auto; margin: 0 auto;
padding: 0px 15px 0 15px; padding: 0px 15px 0 15px;
padding-top: 0; padding-top: 0;
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
font-weight: 400; font-weight: 400;
} }
@media (max-width: 769px) { @media (max-width: 769px) {
main { margin-top: 6%; } main {
nav.navbar.navbar-expand-lg.navbar-light { width: 100%; padding: 0; } } margin-top: 6%;
}
img { max-width: 100%; margin-bottom: 1.45rem; } nav.navbar.navbar-expand-lg.navbar-light {
width: 100%;
padding: 0;
}
}
h1 { font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; } img {
h2 { font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; } max-width: 100%;
h3 { font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; } margin-bottom: 1.45rem;
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; } 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;
}
figure { figure {
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;
margin-top: 0; margin-top: 0;
padding-bottom: 0; padding-bottom: 0;
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
padding-top: 0; padding-top: 0;
margin-bottom: 1.45rem; margin-bottom: 1.45rem;
} }
table { table {
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;
margin-top: 0; margin-top: 0;
padding-bottom: 0; padding-bottom: 0;
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
padding-top: 0; padding-top: 0;
margin-bottom: 1.45rem; margin-bottom: 1.45rem;
font-size: 1rem; font-size: 1rem;
line-height: 1.45rem; line-height: 1.45rem;
border-collapse: collapse; border-collapse: collapse;
width: 100%; width: 100%;
} }
b, strong, dt, th { font-weight: bold; } b, strong, dt, th {
font-weight: bold;
}
@media only screen and (max-width: 480px) { @media only screen and (max-width: 480px) {
html { html {
font-size: 100%; font-size: 100%;
} }
} }

View File

@ -1,153 +1,310 @@
main { margin-top: 75px; } main {
a#partner{ font-size: 1.8rem; } margin-top: 75px;
}
a#partner {
font-size: 1.8rem;
}
/* ---- projects navbar ---------------------- */ /* ---- projects navbar ---------------------- */
a { font-size: 0.98rem; font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; } a {
font-size: 0.98rem;
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
}
a.nav-link#project:hover { a.nav-link#project:hover {
padding-bottom: 7px; padding-bottom: 7px;
color: rgb(0, 0, 0); color: rgb(0, 0, 0);
text-decoration: none; text-decoration: none;
background-color: rgb(228, 228, 228); } background-color: rgb(228, 228, 228);
ul.nav-tabs a.nav-link.active { color: black; background-color: rgb(190, 190, 190); } }
ul.nav-tabs a.nav-link.active {
color: black;
background-color: rgb(190, 190, 190);
}
ul.nav-tabs a.nav-link, ul.nav-tabs a.nav-link.active { ul.nav-tabs a.nav-link, ul.nav-tabs a.nav-link.active {
border-radius: 0; border-radius: 0;
padding: 7px 22px 7px 22px; padding: 7px 22px 7px 22px;
margin-top: 5px; } margin-top: 5px;
}
/* ------------------------------------------- */ /* ------------------------------------------- */
/* ------- news & main content ----------------------------- */ /* ------- news & main content ----------------------------- */
h1 { font-size: 2.3rem; } h1 {
h2 { font-size: 1.75rem; } font-size: 2.3rem;
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) } h2 {
li a:hover { color: rgb(1,66,136) } font-size: 1.75rem;
li a:visited { color: rgb(0,86,179) } }
h2 a { color: rgb(0,86,179) } h3 {
h2 a:hover { color: rgb(1,66,136) } font-size: 1.5rem;
h2 a:visited { color: rgb(0,86,179) } }
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 { .jumbotron {
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
padding: 60px 40px 10px 40px; padding: 60px 40px 10px 40px;
margin-bottom: 0px; margin-bottom: 0px;
background-color: rgb(247,247,247); 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-bottom: 0;
border-radius: 5px 5px 0px 0px; } border-radius: 5px 5px 0px 0px;
}
.aboutButton { .aboutButton {
background-color: rgb(233,236,239); background-color: rgb(233, 236, 239);
padding-top: 5px; padding-top: 5px;
padding-bottom: 25px; padding-bottom: 25px;
margin-bottom: 0px; margin-bottom: 0px;
margin-bottom: 10px; margin-bottom: 10px;
border-bottom: 1.5px solid rgb(219, 219, 219); border-bottom: 1.5px solid rgb(219, 219, 219);
border-left: 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); } 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:hover { background-color: rgb(9, 110, 88); }
button#jt a { color: white; }
button#jt a:hover { text-decoration: none; }
button#jt { button#jt {
margin-left: 50px; margin-left: 50px;
font-size: 25px; font-size: 25px;
background-color: rgb(14, 156, 125); background-color: rgb(14, 156, 125);
border: rgb(0,99,99); } border: rgb(0, 99, 99);
}
button#more a {
font-size: 20px;
color: white;
}
button#more a:hover {
text-decoration: none;
}
button#more:hover {
background-color: rgb(34, 76, 104);
}
button#more a { font-size: 20px; color: white; }
button#more a:hover { text-decoration: none; }
button#more:hover { background-color: rgb(34, 76, 104); }
button#more { button#more {
margin-bottom: 15px; margin-bottom: 15px;
color: white; color: white;
background-color: rgb(51, 113, 155); background-color: rgb(51, 113, 155);
border: rgb(36,88,122); } border: rgb(36, 88, 122);
}
h2.title { h2.title {
background-color: rgb(247, 247, 247); background-color: rgb(247, 247, 247);
padding: 15px; padding: 15px;
border: 2px solid #E8E4E4; } border: 2px solid #E8E4E4;
}
span#date { span#date {
color: white; color: white;
font-size: 20px; font-size: 20px;
opacity: 0,7; opacity: 0, 7;
background-color: rgb(209, 121, 121); background-color: rgb(209, 121, 121);
padding: 5px; padding: 5px;
border: 1px solid #8f4f4f; border: 1px solid #8f4f4f;
position: absolute; position: absolute;
top: 0px; top: 0px;
right: 0px; } right: 0px;
}
p { p {
font-size: 0.95rem; font-size: 0.95rem;
margin-top: 15px; margin-top: 15px;
margin-bottom: 20px; margin-bottom: 20px;
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; } Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
}
hr { hr {
border-top: 1px solid rgb(220, 222, 224); border-top: 1px solid rgb(220, 222, 224);
margin: 10px 0px 20px 0px; } margin: 10px 0px 20px 0px;
}
img.center-block { margin-bottom: 0; } img.center-block {
ol li { font-size: 0.9rem; } margin-bottom: 0;
li { margin-bottom: 0; font-size: 0.9rem; font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, }
Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; }
ul { margin: 0 0 20px 0; padding-left: 40px; } ol li {
p#button { margin-bottom: 0px; } font-size: 0.9rem;
p#lead { margin-bottom: 20px; font-size: 1.15rem; font-weight: 300;} }
.card-body{ padding: 25px; }
.card-header { padding: 15px 25px 15px 25px; } li {
.card-title { margin-bottom: 15px; } margin-bottom: 0;
font-size: 0.9rem;
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
}
ul {
margin: 0 0 20px 0;
padding-left: 40px;
}
p#button {
margin-bottom: 0px;
}
p#lead {
margin-bottom: 20px;
font-size: 1.15rem;
font-weight: 300;
}
.card-body {
padding: 25px;
}
.card-header {
padding: 15px 25px 15px 25px;
}
.card-title {
margin-bottom: 15px;
}
span.badge.badge-info { span.badge.badge-info {
margin-right: 15px; margin-right: 15px;
background-color: rgb(20,142,161); } background-color: rgb(20, 142, 161);
}
span.katex-html{color: rgb(0, 0, 0); font-weight: 500;} span.katex-html {
color: rgb(0, 0, 0);
font-weight: 500;
}
/* timeline */ /* timeline */
div.timeline { max-width: 1400px; } div.timeline {
div.timeline--wrapper { margin-top: 60px; } max-width: 1400px;
div.entry div.title{ width: 20% } }
div.entry div.body { width: 80% }
div.timeline::before { left: calc(20% - 6px) }
div.body div.body-container.bounce-in p p a{ color: rgb(0, 86, 179) } div.timeline--wrapper {
div.body div.body-container.bounce-in p h2 a{ color: rgb(0, 86, 179) } margin-top: 60px;
div.body div.body-container.bounce-in p ul li a{ color: rgb(0, 86, 179) } }
nav div a:hover { text-decoration: none; } div.entry div.title {
width: 20%
}
div.entry div.body {
width: 80%
}
div.timeline::before {
left: calc(20% - 6px)
}
div.body div.body-container.bounce-in p p a {
color: rgb(0, 86, 179)
}
div.body div.body-container.bounce-in p h2 a {
color: rgb(0, 86, 179)
}
div.body div.body-container.bounce-in p ul li a {
color: rgb(0, 86, 179)
}
nav div a:hover {
text-decoration: none;
}
/* -------------------------------------------------------- */ /* -------------------------------------------------------- */
figcaption { figcaption {
font-size: 0.8rem; font-size: 0.8rem;
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
color: rgb(82, 82, 82) } color: rgb(82, 82, 82)
}
/* --- media --------------------------------------------- */ /* --- media --------------------------------------------- */
@media (max-width: 769px) { @media (max-width: 769px) {
span#date { span#date {
top: 0; top: 0;
right: 0; } right: 0;
button#togglerButton.navbar-toggler.collapsed { }
margin-top: 10px;
margin-left: 10px; } button#togglerButton.navbar-toggler.collapsed {
a.nav-link#project { margin-top: 10px;
margin-bottom: 10px; margin-left: 10px;
margin-right: 0; }
border: 1px solid rgb(202, 202, 202); }
a.nav-link#project.active { color: black; } a.nav-link#project {
div.entry div.title{ width: 40% } margin-bottom: 10px;
div.entry div.body { width: 80% } margin-right: 0;
div.timeline::before { left: calc(12% - 6px) } border: 1px solid rgb(202, 202, 202);
} }
a.nav-link#project.active {
color: black;
}
div.entry div.title {
width: 40%
}
div.entry div.body {
width: 80%
}
div.timeline::before {
left: calc(12% - 6px)
}
}
/* ------------------------------------------------------- */ /* ------------------------------------------------------- */

View File

@ -1,64 +1,143 @@
nav#site-navbar.navbar.navbar-expand-lg.navbar-light.bg-dark.fixed-top { height: 75px; } nav#site-navbar.navbar.navbar-expand-lg.navbar-light.bg-dark.fixed-top {
height: 75px;
}
div.mr-auto.navbar-nav a { font-size: 1rem; } div.mr-auto.navbar-nav a {
img#logo { margin-bottom: 0; } font-size: 1rem;
a[href="/"] { padding-top: 1.5%; opacity: 0.75} }
a[href="/"]:hover { opacity: 1; }
a[href="/"].activeBrand { opacity: 1; padding-top: 0} img#logo {
a.link-no-style[href="/"] { padding: 0; margin-top: 0 } 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="news"].nav-link,
a.link-no-style span[data-rb-event-key="about"].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="projects"].nav-link,
a.link-no-style span[data-rb-event-key="partners"].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; } color: rgb(209, 209, 209);
margin-left: 15px;
margin-right: 10px;
}
a.link-no-style { margin-top: 10px; } a.link-no-style {
a.active { margin-top: 10px; } 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="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="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="projects"].nav-link:hover,
a.link-no-style span[data-rb-event-key="partners"].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; } 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;} a.active {
.navbar-light .navbar-nav a.active>.nav-link { color: white; } background-color: rgb(20, 142, 161);
margin-left: 15px;
margin-right: 10px;
margin-bottom: 8px;
}
a.language.nav-link { margin-left: 50px; } .navbar-light .navbar-nav a.active > .nav-link {
a[data-rb-event-key="language"] div { margin-bottom: 8px; } color: white;
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; } 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)
}
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 ------------------------------ */ /* ------ navbar ------------------------------ */
/* ----- collapse show ---------------------- */ /* ----- collapse show ---------------------- */
@media(max-width: 769px) { @media (max-width: 769px) {
a.activeBrand { margin: 0 0px 0 20px; padding-top: 0 } a.activeBrand {
margin: 0 0px 0 20px;
padding-top: 0
}
a.nav-link a#active { a.nav-link a#active {
color: white; color: white;
background-color: rgb(20, 142, 161); background-color: rgb(20, 142, 161);
padding-top: 11px; padding-top: 11px;
padding-bottom: 12px; } padding-bottom: 12px;
}
} }
/* button.navbar-toggler.collapsed { margin-top: 0px; margin-left: 15px; } */ /* button.navbar-toggler.collapsed { margin-top: 0px; margin-left: 15px; } */
button.navbar-toggler { margin-top: 0px; margin-right: 17px; } button.navbar-toggler {
margin-top: 0px;
margin-right: 17px;
}
div#basic-navbar-nav.navbar-collapse.collapse.show { div#basic-navbar-nav.navbar-collapse.collapse.show {
width: 100px; width: 100px;
padding-bottom: 0px; padding-bottom: 0px;
text-align: center; text-align: center;
background-color: rgb(52,58,64); background-color: rgb(52, 58, 64);
margin-top: -0px; } margin-top: -0px;
button.navbar-toggler { background-color: rgb(20, 142, 161); } }
div#navbarSupportedContent.navbar-collapse.collapse.show img#logo{ margin: auto; }
button.navbar-toggler {
background-color: rgb(20, 142, 161);
}
div#navbarSupportedContent.navbar-collapse.collapse.show img#logo {
margin: auto;
}
/* ------------------------------------------- */ /* ------------------------------------------- */
/* #navbarSupportedContent { /* #navbarSupportedContent {

View File

@ -1,6 +1,6 @@
backend: backend:
name: github name: github
repo: mipt-npm/site repo: mipt-npm/site
media_folder: src/images media_folder: src/images
public_folder: images public_folder: images
@ -11,13 +11,13 @@ collections:
folder: src/content/news folder: src/content/news
create: true create: true
editor: editor:
preview: true preview: true
fields: fields:
- { label: Content Type, name: content_type, widget: string} - { label: Content Type, name: content_type, widget: string }
- { label: Title, name: title, widget: string} - { label: Title, name: title, widget: string }
- { label: Date, name: date, widget: date } - { label: Date, name: date, widget: date }
- { label: Published, name: published, widget: boolean} - { label: Published, name: published, widget: boolean }
- { label: Body, name: body, widget: markdown} - { label: Body, name: body, widget: markdown }
############################################################ ############################################################
- label: Members - label: Members
name: members name: members
@ -26,13 +26,13 @@ collections:
editor: editor:
preview: true preview: true
fields: fields:
- { label: Content Type, name: content_type, widget: string} - { label: Content Type, name: content_type, widget: string }
- { label: Display Name, name: title, widget: string} - { label: Display Name, name: title, widget: string }
- { label: ID, name: id, widget: string} - { label: ID, name: id, widget: string }
- { label: Order, name: order, widget: number} - { label: Order, name: order, widget: number }
- { label: Photo, name: image, widget: image, required: false} - { label: Photo, name: image, widget: image, required: false }
- { label: Published, name: published, widget: boolean} - { label: Published, name: published, widget: boolean }
- { label: Body, name: body, widget: markdown} - { label: Body, name: body, widget: markdown }
############################################################# #############################################################
- label: Physics - label: Physics
name: physics name: physics
@ -41,13 +41,13 @@ collections:
editor: editor:
preview: true preview: true
fields: fields:
- { label: Content Type, name: content_type, widget: string} - { label: Content Type, name: content_type, widget: string }
- { label: Display Title, name: title, widget: string} - { label: Display Title, name: title, widget: string }
- { label: Short Title, name: title, widget: string} - { label: Short Title, name: title, widget: string }
- { label: ID, name: id, widget: string} - { label: ID, name: id, widget: string }
- { label: Order, name: order, widget: number} - { label: Order, name: order, widget: number }
- { label: Published, name: published, widget: boolean} - { label: Published, name: published, widget: boolean }
- { label: Body, name: body, widget: markdown} - { label: Body, name: body, widget: markdown }
############################################################## ##############################################################
- label: Education - label: Education
name: education name: education
@ -56,13 +56,13 @@ collections:
editor: editor:
preview: true preview: true
fields: fields:
- { label: Content Type, name: content_type, widget: string} - { label: Content Type, name: content_type, widget: string }
- { label: Display Title, name: title, widget: string} - { label: Display Title, name: title, widget: string }
- { label: Short Title, name: title, widget: string} - { label: Short Title, name: title, widget: string }
- { label: ID, name: id, widget: string} - { label: ID, name: id, widget: string }
- { label: Order, name: order, widget: number} - { label: Order, name: order, widget: number }
- { label: Published, name: published, widget: boolean} - { label: Published, name: published, widget: boolean }
- { label: Body, name: body, widget: markdown} - { label: Body, name: body, widget: markdown }
############################################################## ##############################################################
- label: Math - label: Math
name: math name: math
@ -71,13 +71,13 @@ collections:
editor: editor:
preview: true preview: true
fields: fields:
- { label: Content Type, name: content_type, widget: string} - { label: Content Type, name: content_type, widget: string }
- { label: Display Title, name: title, widget: string} - { label: Display Title, name: title, widget: string }
- { label: Short Title, name: title, widget: string} - { label: Short Title, name: title, widget: string }
- { label: ID, name: id, widget: string} - { label: ID, name: id, widget: string }
- { label: Order, name: order, widget: number} - { label: Order, name: order, widget: number }
- { label: Published, name: published, widget: boolean} - { label: Published, name: published, widget: boolean }
- { label: Body, name: body, widget: markdown} - { label: Body, name: body, widget: markdown }
############################################################## ##############################################################
- label: Software - label: Software
name: software name: software
@ -86,23 +86,23 @@ collections:
editor: editor:
preview: true preview: true
fields: fields:
- { label: Content Type, name: content_type, widget: string} - { label: Content Type, name: content_type, widget: string }
- { label: Display Title, name: title, widget: string} - { label: Display Title, name: title, widget: string }
- { label: Short Title, name: title, widget: string} - { label: Short Title, name: title, widget: string }
- { label: ID, name: id, widget: string} - { label: ID, name: id, widget: string }
- { label: Order, name: order, widget: number} - { label: Order, name: order, widget: number }
- { label: Published, name: published, widget: boolean} - { label: Published, name: published, widget: boolean }
- { label: Body, name: body, widget: markdown} - { label: Body, name: body, widget: markdown }
############################################################## ##############################################################
- label: Dataforge News - label: Dataforge News
name: df-news name: df-news
folder: src/pages/dataforge/content/news folder: src/pages/dataforge/content/news
create: true create: true
editor: editor:
preview: true preview: true
fields: fields:
- { label: Content Type, name: content_type, widget: string} - { label: Content Type, name: content_type, widget: string }
- { label: Title, name: title, widget: string} - { label: Title, name: title, widget: string }
- { label: Date, name: date, widget: date } - { label: Date, name: date, widget: date }
- { label: Published, name: published, widget: boolean} - { label: Published, name: published, widget: boolean }
- { label: Body, name: body, widget: markdown} - { label: Body, name: body, widget: markdown }