Re-format
This commit is contained in:
parent
d5d98f1057
commit
82db874c9c
@ -49,6 +49,7 @@ module.exports = {
|
||||
icon: `src/images/icon.png`, // This path is relative to the root of the site.
|
||||
},
|
||||
},
|
||||
`gatsby-plugin-netlify-cms`,
|
||||
{
|
||||
resolve: `gatsby-plugin-react-intl`,
|
||||
options: {
|
||||
|
||||
@ -3,18 +3,18 @@ import "../styles/footer.css"
|
||||
|
||||
const Footer = () => (
|
||||
<footer>
|
||||
<div className = "container" style = {{textAlign: `left`,}}>
|
||||
<div className="container" style={{textAlign: `left`,}}>
|
||||
<p>
|
||||
© 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
|
||||
{` `}
|
||||
<a href = "https://getbootstrap.com/">Bootstrap styles</a>
|
||||
<a href="https://getbootstrap.com/">Bootstrap styles</a>
|
||||
</p>
|
||||
</div>
|
||||
</footer>
|
||||
)
|
||||
)
|
||||
|
||||
export default Footer
|
||||
@ -10,7 +10,7 @@ const Language = () => {
|
||||
return (
|
||||
<div>
|
||||
<IntlContextConsumer>
|
||||
{({ languages, language: currentLocale }) =>
|
||||
{({languages, language: currentLocale}) =>
|
||||
languages.map(language => (
|
||||
<a
|
||||
href={language}
|
||||
@ -18,7 +18,7 @@ const Language = () => {
|
||||
onClick={() => changeLocale(language)}
|
||||
style={{
|
||||
color: currentLocale === language ? `white` : `rgb(170,172,173)`,
|
||||
backgroundColor: currentLocale === language ? `#db4446`: ``,
|
||||
backgroundColor: currentLocale === language ? `#db4446` : ``,
|
||||
marginLeft: -11,
|
||||
margin: 10,
|
||||
cursor: `pointer`,
|
||||
|
||||
@ -10,19 +10,20 @@ import "../styles/layout.css"
|
||||
import "../styles/main.css"
|
||||
import "katex/dist/katex.min.css"
|
||||
|
||||
const Layout = ({ children }) => {
|
||||
const Layout = ({children}) => {
|
||||
const intl = useIntl();
|
||||
const lang = intl.locale;
|
||||
return (
|
||||
<>
|
||||
<Navbar />
|
||||
<SEO lang={lang} title={intl.formatMessage({ id: "title" })} />
|
||||
<div className = "container">
|
||||
<Navbar/>
|
||||
<SEO lang={lang} title={intl.formatMessage({id: "title"})}/>
|
||||
<div className="container">
|
||||
<main>{children}</main>
|
||||
</div>
|
||||
<Footer/>
|
||||
</>
|
||||
)}
|
||||
)
|
||||
}
|
||||
|
||||
Layout.propTypes = {
|
||||
children: PropTypes.node.isRequired,
|
||||
|
||||
@ -11,26 +11,26 @@ import "../styles/navbar.css"
|
||||
import logo from "../images/index/logo_white.png"
|
||||
|
||||
const CustomNavbar = () => {
|
||||
const { location } = history;
|
||||
const {location} = history;
|
||||
|
||||
var active = ["", "", "", ""]
|
||||
active[0] = location.pathname.includes('/news/') ? '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[3] = location.pathname.includes('/partners/') ? 'active': "link-no-style";
|
||||
var activeBrand = location.pathname === "/ru/" || location.pathname === "/en/" ? 'activeBrand': "link-no-style";
|
||||
let active = ["", "", "", ""]
|
||||
active[0] = location.pathname.includes('/news/') ? '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[3] = location.pathname.includes('/partners/') ? 'active' : "link-no-style";
|
||||
let activeBrand = location.pathname === "/ru/" || location.pathname === "/en/" ? 'activeBrand' : "link-no-style";
|
||||
|
||||
const intl = useIntl();
|
||||
const lang = intl.locale;
|
||||
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">
|
||||
<Container>
|
||||
<Link to="/" className={activeBrand}>
|
||||
<Navbar.Brand as="span"><img src={logo} height="50px" alt="npm logo" id="logo"/></Navbar.Brand>
|
||||
</Link>
|
||||
<Navbar.Toggle aria-controls="basic-navbar-nav" />
|
||||
<Navbar.Toggle aria-controls="basic-navbar-nav"/>
|
||||
<Navbar.Collapse id="basic-navbar-nav">
|
||||
<Nav className="mr-auto" activeKey={location.pathname}>
|
||||
<Link to="/news" className={active[0]}> {/* news */}
|
||||
@ -40,10 +40,12 @@ const CustomNavbar = () => {
|
||||
<Nav.Link as="span" eventKey="about"><FormattedMessage id="header.group"/></Nav.Link>
|
||||
</Link>
|
||||
<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
|
||||
id="header.projects"/></Nav.Link>
|
||||
</Link>
|
||||
<Link to="/partners" className={active[3]}> {/* partners */}
|
||||
<Nav.Link as="span" eventKey="partners"><FormattedMessage id="header.partners"/></Nav.Link>
|
||||
<Nav.Link as="span" eventKey="partners"><FormattedMessage
|
||||
id="header.partners"/></Nav.Link>
|
||||
</Link>
|
||||
<Link>
|
||||
<Nav.Link eventKey="language" className="language"><Language/></Nav.Link>
|
||||
|
||||
@ -2,8 +2,8 @@ import React from "react"
|
||||
import {injectIntl} from "gatsby-plugin-react-intl"
|
||||
import SEO from "./seo"
|
||||
|
||||
const Redirect = ({ intl }) => {
|
||||
return <SEO title={`${intl.formatMessage({ id: "title" })}`} />
|
||||
const Redirect = ({intl}) => {
|
||||
return <SEO title={`${intl.formatMessage({id: "title"})}`}/>
|
||||
}
|
||||
|
||||
export default injectIntl(Redirect)
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
import React from "react"
|
||||
import PropTypes from "prop-types"
|
||||
import Helmet from "react-helmet"
|
||||
import { useStaticQuery, graphql } from "gatsby"
|
||||
import {graphql, useStaticQuery} from "gatsby"
|
||||
|
||||
const SEO = ({ description, lang, meta, title }) => {
|
||||
const { site } = useStaticQuery(
|
||||
const SEO = ({description, lang, meta, title}) => {
|
||||
const {site} = useStaticQuery(
|
||||
graphql`
|
||||
query {
|
||||
site {
|
||||
|
||||
@ -8,38 +8,41 @@ import {Timeline, TimelineItem} from 'vertical-timeline-component-for-react'
|
||||
import Navbar from "../navBar"
|
||||
import Footer from "../footer"
|
||||
|
||||
const NewsTemplate = ( props ) => {
|
||||
const NewsTemplate = (props) => {
|
||||
const intl = useIntl()
|
||||
const lang = intl.locale
|
||||
|
||||
var news = ""
|
||||
if ( lang==="ru" ) { news = props.data.ru_news.edges}
|
||||
else if ( lang==="en" ) { news = props.data.en_news.edges; }
|
||||
if (lang === "ru") {
|
||||
news = props.data.ru_news.edges
|
||||
} else if (lang === "en") {
|
||||
news = props.data.en_news.edges;
|
||||
}
|
||||
|
||||
const next = props.pageContext.next
|
||||
const prev = props.pageContext.prev
|
||||
|
||||
return (
|
||||
<>
|
||||
<Navbar />
|
||||
<Navbar/>
|
||||
<Timeline lineColor={'#ddd'} animate={false}>
|
||||
{news.map(({node}) => (
|
||||
<TimelineItem
|
||||
key={node.frontmatter.date}
|
||||
dateText={node.frontmatter.date}
|
||||
style={{ color: '#e86971' }} >
|
||||
style={{color: '#e86971'}}>
|
||||
<h2>{node.frontmatter.title}</h2>
|
||||
<div>{Parser(node.html)}</div>
|
||||
</TimelineItem>
|
||||
))}
|
||||
</Timeline>
|
||||
<nav style={{ display: 'flex', justifyContent: 'space-between', marginLeft: `15%` }}>
|
||||
<nav style={{display: 'flex', justifyContent: 'space-between', marginLeft: `15%`}}>
|
||||
<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 style={{ justifySelf: 'flex-end', marginRight: `10%`}}>
|
||||
{next && <Link to={`/${next}`} ><h1 style={{padding: 10, color: `red`}}>---></h1></Link>}
|
||||
<div style={{justifySelf: 'flex-end', marginRight: `10%`}}>
|
||||
{next && <Link to={`/${next}`}><h1 style={{padding: 10, color: `red`}}>---></h1></Link>}
|
||||
</div>
|
||||
</nav>
|
||||
<Footer/>
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -20,13 +20,15 @@
|
||||
height="113.09572"><metadata
|
||||
id="metadata70"><rdf:RDF><cc:Work
|
||||
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>
|
||||
<defs
|
||||
id="defs68">
|
||||
|
||||
|
||||
|
||||
|
||||
</defs><sodipodi:namedview
|
||||
</defs>
|
||||
<sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
@ -49,14 +51,14 @@
|
||||
fit-margin-top="10"
|
||||
fit-margin-left="12"
|
||||
fit-margin-right="8"
|
||||
fit-margin-bottom="10" />
|
||||
<style
|
||||
fit-margin-bottom="10"/>
|
||||
<style
|
||||
type="text/css"
|
||||
id="style2">
|
||||
.st0{fill:#003DA6;}
|
||||
.st1{enable-background:new ;}
|
||||
</style>
|
||||
<g
|
||||
<g
|
||||
id="svg8"
|
||||
inkscape:version="0.92.3 (2405546, 2018-03-11)"
|
||||
sodipodi:docname="npm-logo.svg"
|
||||
@ -90,9 +92,9 @@
|
||||
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"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#003da6" />
|
||||
style="fill:#003da6"/>
|
||||
</g>
|
||||
<g
|
||||
<g
|
||||
style="enable-background:new"
|
||||
id="g14"
|
||||
class="st1"
|
||||
@ -102,18 +104,18 @@
|
||||
inkscape:connector-curvature="0"
|
||||
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"
|
||||
class="st0" />
|
||||
class="st0"/>
|
||||
<path
|
||||
style="fill:#003da6"
|
||||
inkscape:connector-curvature="0"
|
||||
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"
|
||||
class="st0" />
|
||||
class="st0"/>
|
||||
<path
|
||||
style="fill:#003da6"
|
||||
inkscape:connector-curvature="0"
|
||||
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"
|
||||
class="st0" />
|
||||
class="st0"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 5.1 KiB |
@ -5,7 +5,6 @@
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
@ -17,7 +16,7 @@
|
||||
inkscape:version="0.91 r13725"
|
||||
sodipodi:docname="logo3.svg">
|
||||
<defs
|
||||
id="defs4" />
|
||||
id="defs4"/>
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
@ -39,7 +38,7 @@
|
||||
inkscape:window-height="791"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="1"
|
||||
inkscape:window-maximized="1" />
|
||||
inkscape:window-maximized="1"/>
|
||||
<metadata
|
||||
id="metadata7">
|
||||
<rdf:RDF>
|
||||
@ -47,7 +46,7 @@
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
@ -69,49 +68,49 @@
|
||||
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" />
|
||||
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" />
|
||||
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" />
|
||||
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" />
|
||||
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" />
|
||||
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" />
|
||||
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" />
|
||||
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" />
|
||||
style="fill:#7f8185"/>
|
||||
</g>
|
||||
</g>
|
||||
<g
|
||||
@ -128,18 +127,18 @@
|
||||
<stop
|
||||
id="stop3491"
|
||||
style="stop-color:#29ABE2"
|
||||
offset="0" />
|
||||
offset="0"/>
|
||||
<stop
|
||||
id="stop3493"
|
||||
style="stop-color:#9F77A6"
|
||||
offset="1" />
|
||||
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_)" />
|
||||
style="fill:url(#SVGID_1_)"/>
|
||||
<linearGradient
|
||||
y2="41.634102"
|
||||
x2="314.04889"
|
||||
@ -150,18 +149,18 @@
|
||||
<stop
|
||||
id="stop3498"
|
||||
style="stop-color:#EA0E7D"
|
||||
offset="0" />
|
||||
offset="0"/>
|
||||
<stop
|
||||
id="stop3500"
|
||||
style="stop-color:#9F77A6"
|
||||
offset="1" />
|
||||
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_)" />
|
||||
style="fill:url(#SVGID_2_)"/>
|
||||
<linearGradient
|
||||
y2="125.0705"
|
||||
x2="230.92149"
|
||||
@ -172,18 +171,18 @@
|
||||
<stop
|
||||
id="stop3505"
|
||||
style="stop-color:#EA0E7D"
|
||||
offset="0" />
|
||||
offset="0"/>
|
||||
<stop
|
||||
id="stop3507"
|
||||
style="stop-color:#5D2E8E"
|
||||
offset="1" />
|
||||
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_)" />
|
||||
style="fill:url(#SVGID_3_)"/>
|
||||
<linearGradient
|
||||
y2="125.9293"
|
||||
x2="232.12759"
|
||||
@ -194,18 +193,18 @@
|
||||
<stop
|
||||
id="stop3512"
|
||||
style="stop-color:#4AC7F4"
|
||||
offset="0" />
|
||||
offset="0"/>
|
||||
<stop
|
||||
id="stop3514"
|
||||
style="stop-color:#5D2E8E"
|
||||
offset="1" />
|
||||
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_)" />
|
||||
style="fill:url(#SVGID_4_)"/>
|
||||
</g>
|
||||
<g
|
||||
id="g3518">
|
||||
@ -214,7 +213,7 @@
|
||||
height="51.299999"
|
||||
width="51.299999"
|
||||
y="71.699997"
|
||||
x="187.89999" />
|
||||
x="187.89999"/>
|
||||
<g
|
||||
id="g3522">
|
||||
<rect
|
||||
@ -224,7 +223,7 @@
|
||||
class="st5"
|
||||
y="113.3"
|
||||
x="192.3"
|
||||
style="fill:#ffffff" />
|
||||
style="fill:#ffffff"/>
|
||||
<g
|
||||
id="g3526">
|
||||
<path
|
||||
@ -232,55 +231,55 @@
|
||||
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" />
|
||||
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" />
|
||||
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" />
|
||||
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" />
|
||||
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" />
|
||||
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" />
|
||||
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" />
|
||||
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" />
|
||||
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" />
|
||||
style="fill:#ffffff"/>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
@ -296,5 +295,5 @@
|
||||
.st3{fill:url(#SVGID_3_);}
|
||||
.st4{fill:url(#SVGID_4_);}
|
||||
.st5{fill:#FFFFFF;}
|
||||
</style>
|
||||
</style>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 16 KiB |
@ -1,8 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- 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"
|
||||
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"
|
||||
>
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0px"
|
||||
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>
|
||||
<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"/>
|
||||
@ -44,7 +46,8 @@
|
||||
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
|
||||
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;"
|
||||
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
|
||||
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"/>
|
||||
@ -54,7 +57,8 @@
|
||||
<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"/>
|
||||
<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
|
||||
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
|
||||
|
||||
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.9 KiB |
@ -1,9 +1,10 @@
|
||||
<?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">
|
||||
<!-- 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"
|
||||
viewBox="0 0 1832 665"
|
||||
>
|
||||
<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"
|
||||
viewBox="0 0 1832 665"
|
||||
>
|
||||
<defs>
|
||||
<style type="text/css">
|
||||
<![CDATA[
|
||||
@ -45,32 +46,55 @@ viewBox="0 0 1832 665"
|
||||
</g>
|
||||
<g>
|
||||
<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="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"/>
|
||||
<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="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="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"/>
|
||||
<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 "/>
|
||||
<g>
|
||||
<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" 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 "/>
|
||||
<polygon class="fil3" points="1239,578 1232,615 1221,615 1229,578 1216,578 1218,568 1254,568 1252,578 "/>
|
||||
<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"
|
||||
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 "/>
|
||||
<polygon class="fil3"
|
||||
points="1239,578 1232,615 1221,615 1229,578 1216,578 1218,568 1254,568 1252,578 "/>
|
||||
<polygon class="fil3" points="1091,568 1082,615 1071,615 1080,568 "/>
|
||||
<polygon class="fil3" points="1117,568 1097,591 1109,615 1096,615 1085,593 1086,589 1104,568 "/>
|
||||
<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" 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 "/>
|
||||
<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"/>
|
||||
<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"/>
|
||||
<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="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"/>
|
||||
<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"
|
||||
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 "/>
|
||||
<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"/>
|
||||
<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"/>
|
||||
<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="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>
|
||||
|
||||
|
Before Width: | Height: | Size: 7.0 KiB After Width: | Height: | Size: 8.0 KiB |
@ -1,58 +1,62 @@
|
||||
{
|
||||
"title": "NPM Group",
|
||||
"language": "ru",
|
||||
"description": "Лаборатория методов ядерной физики",
|
||||
"description": "Лаборатория методов ядерно-физических экспериментов",
|
||||
"header": {
|
||||
"news": "Новости",
|
||||
"group": "Лаборатория",
|
||||
"projects": "Проекты",
|
||||
"partners": "Партнёры" },
|
||||
"partners": "Партнёры"
|
||||
},
|
||||
"notfound": {
|
||||
"header": "404: СТРАНИЦА НЕ НАЙДЕНА",
|
||||
"description": "Вы перешли по несуществующему пути" },
|
||||
|
||||
"description": "Вы перешли по несуществующему пути"
|
||||
},
|
||||
"jumbotron": {
|
||||
"labintro": "Лаборатория методов ядерно-физических экспериментов",
|
||||
"lead": "Особенности нашего подхода к решению научных задач сегодняшнего времени: ",
|
||||
"list": "<ul><li>Лаборатория была создана на базе МФТИ, что позволяет привлекать большое количество заинтересованных лиц из числа студентов.<\/li><li>Благодаря совмещению научной работы с образовательным процессом мы обеспечиваем преемственность научного опыта.<\/li><li>Структура нашей лаборатории позволяет принимать участие в экспериментах мирового уровня даже студентам младших курсов.<\/li><li>Мы применяем самые современные методы в работе на физических экспериментах.<\/li><\/ul><p \/>",
|
||||
"about": "О нашей лаборатории" },
|
||||
|
||||
"about": "О нашей лаборатории"
|
||||
},
|
||||
"more": {
|
||||
"nuclear_title": "Ядерная физика",
|
||||
"nuclear_body": "Лаборатория принимает участие в нескольких международных экспериментах в области физики частиц, таких как эксперимент по безнейтринному двойному бета-распаду GERDA, эксперимент по поиску массы нейтрино Троицк ню-масс и так далее.",
|
||||
"nuclear_more": "Подробнее »",
|
||||
|
||||
"education_title": "Образование",
|
||||
"education_body": "В задачи лаборатории входит разработка новых образовательных программ по физике и методике проведения физического эксперимента, а также совершенствование существующей методической и информационной базы в МФТИ и академических институтах.",
|
||||
"education_more": "Подробнее »",
|
||||
|
||||
"software_title": "Компьютерные методы",
|
||||
"software_body": "Одним из основных направлений деятельности является разработка вычислительных методов и открытого программного обеспечения для использования в образовании и научной деятельности.",
|
||||
"software_more": "Подробнее »",
|
||||
|
||||
"news": "Последние новости" },
|
||||
|
||||
"news": "Последние новости"
|
||||
},
|
||||
"about": {
|
||||
"title": "Лаборатория методики ядерно-физического эксперимента",
|
||||
"descr": "Группа была создана в 2015 году на базе кафедры общей физики МФТИ, нескольких лабораторий ИЯИ РАН и при поддержке лаборатории физики высоких энергий МФТИ. Цель создания - разработка методов для проведения и анализа данных экспериментов в области физики частиц и ядерной физики. Помимо этого участники группы занимаются внедрением современных информационных технологий в экспериментальную физику и образование.",
|
||||
"pubs": {
|
||||
"title": "Публикации",
|
||||
"available1": "Публикации группы доступны на ",
|
||||
"available2": "отдельной странице" },
|
||||
"available2": "отдельной странице"
|
||||
},
|
||||
"contacts": {
|
||||
"title": "Контактная информация",
|
||||
"mail": "Электронный адрес: ",
|
||||
"telegram": "Телеграм канал: " }
|
||||
"telegram": "Телеграм канал: "
|
||||
}
|
||||
},
|
||||
|
||||
"partners": {
|
||||
"mipt": {
|
||||
"title_fund": "Кафедра общей физики МФТИ",
|
||||
"description_fund": "Кафедра общей физики является основной точкой соприкосновения для ученых и преподавателей с одной стороны и студентов с другой стороны. Тесное сотрудничество с кафдерой является залогом постоянного притока молодых сотрудников, а также постоянного самосовершенствования членов группы, работающих со студентами.",
|
||||
"title_energy": "Лаборатория физики высоких энергий МФТИ",
|
||||
"description_energy": "Тесное сотрудничество с лабораторией физики высоких энергий позволяет осуществлять прямой контакт между образованием и научным сообществом, не выходя за рамки МФТИ." },
|
||||
"jb": { "description": "Лаборатория активно сотрудничает с компанией JetBrains во внедрении языка Kotlin в научном программировании, преподавании Kotlin и разработке библиотек на Kotlin." },
|
||||
"jbr": { "description": "Группа разработки программного обеспечения входит в международное научное объединение JetBrains Research." },
|
||||
"description_energy": "Тесное сотрудничество с лабораторией физики высоких энергий позволяет осуществлять прямой контакт между образованием и научным сообществом, не выходя за рамки МФТИ."
|
||||
},
|
||||
"jb": {
|
||||
"description": "Лаборатория активно сотрудничает с компанией JetBrains во внедрении языка Kotlin в научном программировании, преподавании Kotlin и разработке библиотек на Kotlin."
|
||||
},
|
||||
"jbr": {
|
||||
"description": "Группа разработки программного обеспечения входит в международное научное объединение JetBrains Research."
|
||||
},
|
||||
"ras": {
|
||||
"title_exp": "Отдел экспериментальной физики ИЯИ РАН",
|
||||
"description_exp": "Ведется очень плотное сотруднничество с ОЭФ ИЯИ РАН в рамках коллабораций Troitsk nu-mass и KATRIN, а также в плане подготовки квалифицированных кадров для работы на эксперименте NICA и в других ускорительных экспериментах. В рамках сотрудничества реализуются как научные так и образовательные задачи.",
|
||||
@ -61,27 +65,30 @@
|
||||
"title_education": "Научно-образовательный центр ИЯИ РАН",
|
||||
"description_education": "Часть студентов, участвующих в группе обучается в научно-образовательном центре ИЯИ РАН.",
|
||||
"title_iki": "ИКИ РАН",
|
||||
"description_iki": "Группа участвует в математическом моделировании электрических разрядов в атмосфере." }
|
||||
"description_iki": "Группа участвует в математическом моделировании электрических разрядов в атмосфере."
|
||||
}
|
||||
},
|
||||
|
||||
"physics": {
|
||||
"bc_title": "Физика",
|
||||
"title": "Ядерная физика",
|
||||
"description": "Традиционно к ядерной физике относят не только исследования, связанные со структурой атомного ядра и ядерными реакциями, но и всю физику элементарных частиц, а также отчасти некоторые разделы астрофизики и космологии. В настоящее время усилия нашей группы сосредоточены в области так называемых неускорительных экспериментов в физике элементарных частиц." },
|
||||
"description": "Традиционно к ядерной физике относят не только исследования, связанные со структурой атомного ядра и ядерными реакциями, но и всю физику элементарных частиц, а также отчасти некоторые разделы астрофизики и космологии. В настоящее время усилия нашей группы сосредоточены в области так называемых неускорительных экспериментов в физике элементарных частиц."
|
||||
},
|
||||
"education": {
|
||||
"bc_title": "Образование",
|
||||
"title": "Образование",
|
||||
"description": "Образовательные проекты в побласти ядерной физики и методов проведения и анализа результатов физического эксперимента являются одним из ключевых направлений деятельности группы.",
|
||||
"course1": "Подробная информация доступна на ",
|
||||
"course2": "странице курса" },
|
||||
"course2": "странице курса"
|
||||
},
|
||||
"math": {
|
||||
"bc_title": "Математика",
|
||||
"title": "Математические методы",
|
||||
"description": "Математическое моделирование физических процессов и математические методы анализа данных являются неотъемлимой частью современной экспериментальной физики. Постоянно возникает потребность как в совершенствовании существующих методов, так и в разработке принципиально новых подходов." },
|
||||
"description": "Математическое моделирование физических процессов и математические методы анализа данных являются неотъемлимой частью современной экспериментальной физики. Постоянно возникает потребность как в совершенствовании существующих методов, так и в разработке принципиально новых подходов."
|
||||
},
|
||||
"software": {
|
||||
"bc_title": "Программное обеспечение",
|
||||
"title": "Научное программное обеспечение",
|
||||
"description": "Современные эксперименты в физике частиц немыслимы без специального программного обеспечения, которое требуется как на этапе проведения эксперимента и сбора данных, так и при обработке результатов. Разработка научного программного обеспечения является дополнительным, но существенным направлением работы группы." },
|
||||
|
||||
"description": "Современные эксперименты в физике частиц немыслимы без специального программного обеспечения, которое требуется как на этапе проведения эксперимента и сбора данных, так и при обработке результатов. Разработка научного программного обеспечения является дополнительным, но существенным направлением работы группы."
|
||||
},
|
||||
"quarks": "Физика"
|
||||
}
|
||||
|
||||
@ -6,14 +6,15 @@ import SEO from "../components/seo"
|
||||
const NotFoundPage = () => {
|
||||
const intl = useIntl()
|
||||
const lang = intl.locale
|
||||
return(
|
||||
return (
|
||||
<Layout>
|
||||
<SEO lang={lang} title={intl.formatMessage({ id: "title" })} />
|
||||
<SEO lang={lang} title={intl.formatMessage({id: "title"})}/>
|
||||
<div style={{minHeight: `95vh`}}>
|
||||
<h1 style={{textAlign: `center`, paddingTop: `300px`}}><FormattedMessage id="notfound.header"/></h1>
|
||||
<p style={{textAlign: `center`}}><FormattedMessage id="notfound.description"/></p>
|
||||
</div>
|
||||
</Layout>
|
||||
)}
|
||||
)
|
||||
}
|
||||
|
||||
export default injectIntl(NotFoundPage)
|
||||
|
||||
@ -7,38 +7,44 @@ import Layout from "../components/layout"
|
||||
import SEO from "../components/seo"
|
||||
import "../styles/main.css"
|
||||
|
||||
const AboutPage = ({ data }) => {
|
||||
const AboutPage = ({data}) => {
|
||||
const intl = useIntl()
|
||||
const lang = intl.locale
|
||||
var members = ""
|
||||
if ( lang==="ru" ) { members = data.ru_members.edges; }
|
||||
else if ( lang==="en" ) { members = data.en_members.edges; }
|
||||
return(
|
||||
if (lang === "ru") {
|
||||
members = data.ru_members.edges;
|
||||
} else if (lang === "en") {
|
||||
members = data.en_members.edges;
|
||||
}
|
||||
return (
|
||||
<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>
|
||||
<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>
|
||||
<p style = {{marginTop: `0px`, marginBottom: `0px`}}><FormattedMessage id="about.pubs.available1"/><Link to="/publications"><FormattedMessage id="about.pubs.available2"/></Link></p>
|
||||
<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>
|
||||
|
||||
<h2 id="contacts"><FormattedMessage id="about.contacts.title" /></h2>
|
||||
<p style = {{marginTop: `0px`, marginBottom: `0px`}}><FormattedMessage id="about.contacts.mail" /><a href='mailto:npm@m%69%70t.ru'>npm@mipt.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>
|
||||
<h2 id="contacts"><FormattedMessage id="about.contacts.title"/></h2>
|
||||
<p style={{marginTop: `0px`, marginBottom: `0px`}}><FormattedMessage id="about.contacts.mail"/><a
|
||||
href='mailto:npm@m%69%70t.ru'>npm@mipt.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 photo = node.frontmatter.photo;
|
||||
const path = "../../images/members/"
|
||||
if (photo === null)
|
||||
return(
|
||||
return (
|
||||
<div>
|
||||
<hr/>
|
||||
<div className = "row">
|
||||
<div className = "col-lg-2"></div>
|
||||
<div className = "col-lg-10">
|
||||
<div className="row">
|
||||
<div className="col-lg-2"></div>
|
||||
<div className="col-lg-10">
|
||||
<h2>{name}</h2>
|
||||
<div>{Parser(node.html)}</div>
|
||||
</div>
|
||||
@ -49,11 +55,11 @@ const AboutPage = ({ data }) => {
|
||||
return (
|
||||
<div>
|
||||
<hr/>
|
||||
<div className = "row">
|
||||
<div className = "col-lg-2">
|
||||
<img src={path+photo} alt=" "/>
|
||||
<div className="row">
|
||||
<div className="col-lg-2">
|
||||
<img src={path + photo} alt=" "/>
|
||||
</div>
|
||||
<div className = "col-lg-10">
|
||||
<div className="col-lg-10">
|
||||
<h2>{name}</h2>
|
||||
<div>{Parser(node.html)}</div>
|
||||
</div>
|
||||
@ -68,7 +74,7 @@ const AboutPage = ({ data }) => {
|
||||
export default injectIntl(AboutPage)
|
||||
|
||||
export const query = graphql`
|
||||
query {
|
||||
query {
|
||||
ru_members: allMarkdownRemark(filter: {frontmatter: {content_type: {eq: "member"}, published: {eq: true}, language: {eq: "ru"}}},
|
||||
sort: {fields: frontmatter___order, order: ASC}) {
|
||||
edges{
|
||||
@ -96,4 +102,4 @@ query {
|
||||
}
|
||||
}
|
||||
}
|
||||
}`
|
||||
}`
|
||||
@ -13,20 +13,25 @@ import SEO from "../components/seo"
|
||||
const PartnersPage = () => {
|
||||
const intl = useIntl()
|
||||
const lang = intl.locale
|
||||
return(
|
||||
return (
|
||||
<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>
|
||||
<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>
|
||||
<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>
|
||||
<a href="https://mipt.ru/education/chair/physics/"><img className="media-object" src={mipt_logo}
|
||||
alt="mipt logo" width="400px"/></a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -38,7 +43,9 @@ const PartnersPage = () => {
|
||||
<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>
|
||||
<a href="https://www.jetbrains.com/"><img className="media-object" src={jetbrains_logo}
|
||||
alt="inr logo" width="150px"
|
||||
style={{marginLeft: `10px`}}/></a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -50,7 +57,9 @@ const PartnersPage = () => {
|
||||
<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>
|
||||
<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>
|
||||
|
||||
@ -65,12 +74,14 @@ const PartnersPage = () => {
|
||||
|
||||
<hr/>
|
||||
|
||||
<div className="media" >
|
||||
<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>
|
||||
<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>
|
||||
<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>
|
||||
@ -79,11 +90,13 @@ const PartnersPage = () => {
|
||||
|
||||
<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>
|
||||
<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>
|
||||
<a href="http://www.inr.ru"><img className="media-object" src={inr_logo} alt="inr logo"
|
||||
width="100px" style={{marginLeft: `10px`}}/></a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -101,15 +114,19 @@ const PartnersPage = () => {
|
||||
|
||||
<div className="media" style={{marginBottom: `30px`}}>
|
||||
<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
|
||||
id="partners.ras.title_iki"/></a></h1>
|
||||
<p><FormattedMessage id="partners.ras.description_iki"/></p>
|
||||
</div>
|
||||
<div className="media-right media-middle">
|
||||
<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>
|
||||
<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>
|
||||
</div>
|
||||
|
||||
</Layout>
|
||||
)}
|
||||
)
|
||||
}
|
||||
|
||||
export default injectIntl(PartnersPage)
|
||||
@ -6,31 +6,41 @@ import Parser from "html-react-parser"
|
||||
import Layout from "../../components/layout"
|
||||
import SEO from "../../components/seo"
|
||||
|
||||
const SoftwarePage = ({ data }) => {
|
||||
const SoftwarePage = ({data}) => {
|
||||
const intl = useIntl()
|
||||
const lang = intl.locale
|
||||
var posts = ""
|
||||
if ( lang==="ru" ) { posts = data.ru_projects.edges; }
|
||||
else if ( lang==="en" ) { posts = data.en_projects.edges; }
|
||||
return(
|
||||
if (lang === "ru") {
|
||||
posts = data.ru_projects.edges;
|
||||
} else if (lang === "en") {
|
||||
posts = data.en_projects.edges;
|
||||
}
|
||||
return (
|
||||
<Layout>
|
||||
<SEO lang={lang} title={intl.formatMessage({ id: "title" })} />
|
||||
<SEO lang={lang} title={intl.formatMessage({id: "title"})}/>
|
||||
|
||||
<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 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>
|
||||
<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 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>
|
||||
|
||||
<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>
|
||||
|
||||
<ul>
|
||||
{posts.map(({node}) => {
|
||||
const link = node.frontmatter.shortTitle;
|
||||
const id = node.frontmatter.id;
|
||||
return(
|
||||
return (
|
||||
<li><Link to={`/projects/education#${id}`}>{link}</Link></li>
|
||||
)
|
||||
})}
|
||||
@ -40,7 +50,7 @@ const SoftwarePage = ({ data }) => {
|
||||
const title = node.frontmatter.title;
|
||||
const id = node.frontmatter.id;
|
||||
const courseName = node.frontmatter.courseName;
|
||||
return(
|
||||
return (
|
||||
<div className="row" id={id}>
|
||||
<div className="col-lg-12">
|
||||
<hr/>
|
||||
@ -49,7 +59,8 @@ const SoftwarePage = ({ data }) => {
|
||||
<div className="card" style={{backgroundColor: `#F5F5F5`}}>
|
||||
<div className="card-body" style={{padding: `10px`}}>
|
||||
<p style={{textAlign: `center`, margin: `5px`}}>
|
||||
<FormattedMessage id="education.course1"/><Link to={`/pages/${courseName}`}><FormattedMessage id="education.course2"/></Link>
|
||||
<FormattedMessage id="education.course1"/><Link
|
||||
to={`/pages/${courseName}`}><FormattedMessage id="education.course2"/></Link>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -6,30 +6,40 @@ import Parser from "html-react-parser"
|
||||
import Layout from "../../components/layout"
|
||||
import SEO from "../../components/seo"
|
||||
|
||||
const PhysicsPage = ({ data }) => {
|
||||
const PhysicsPage = ({data}) => {
|
||||
const intl = useIntl()
|
||||
const lang = intl.locale
|
||||
var posts = ""
|
||||
if ( lang==="ru" ) { posts = data.ru_projects.edges; }
|
||||
else if ( lang==="en" ) { posts = data.en_projects.edges; }
|
||||
return(
|
||||
if (lang === "ru") {
|
||||
posts = data.ru_projects.edges;
|
||||
} else if (lang === "en") {
|
||||
posts = data.en_projects.edges;
|
||||
}
|
||||
return (
|
||||
<Layout>
|
||||
<SEO lang={lang} title={intl.formatMessage({ id: "title" })} />
|
||||
<SEO lang={lang} title={intl.formatMessage({id: "title"})}/>
|
||||
<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 " 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>
|
||||
<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 "
|
||||
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>
|
||||
|
||||
<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>
|
||||
|
||||
<ul>
|
||||
{posts.map(({node}) => {
|
||||
const link = node.frontmatter.shortTitle;
|
||||
const id = node.frontmatter.id;
|
||||
return(
|
||||
return (
|
||||
<li><Link to={`/projects/physics#${id}`}>{link}</Link></li>
|
||||
)
|
||||
})}
|
||||
@ -38,7 +48,7 @@ const PhysicsPage = ({ data }) => {
|
||||
{posts.map(({node}) => {
|
||||
const title = node.frontmatter.title;
|
||||
const id = node.frontmatter.id;
|
||||
return(
|
||||
return (
|
||||
<div className="row" id={id}>
|
||||
<div className="col-lg-12">
|
||||
<hr/>
|
||||
|
||||
@ -6,15 +6,18 @@ import Parser from "html-react-parser"
|
||||
import Layout from "../components/layout"
|
||||
import SEO from "../components/seo"
|
||||
|
||||
const QuarksPage = ({ data }) => {
|
||||
const QuarksPage = ({data}) => {
|
||||
const intl = useIntl()
|
||||
const lang = intl.locale
|
||||
var pubs = ""
|
||||
if ( lang==="ru" ) { pubs = data.ru_publications.edges; }
|
||||
else if ( lang==="en" ) { pubs = data.en_publications.edges; }
|
||||
return(
|
||||
if (lang === "ru") {
|
||||
pubs = data.ru_publications.edges;
|
||||
} else if (lang === "en") {
|
||||
pubs = data.en_publications.edges;
|
||||
}
|
||||
return (
|
||||
<Layout>
|
||||
<SEO lang={lang} title={intl.formatMessage({ id: "title" })} />
|
||||
<SEO lang={lang} title={intl.formatMessage({id: "title"})}/>
|
||||
|
||||
<nav aria-label="breadcrumb">
|
||||
<ol className="breadcrumb" style={{margin: 0}}>
|
||||
@ -25,13 +28,14 @@ const QuarksPage = ({ data }) => {
|
||||
</ol>
|
||||
</nav>
|
||||
|
||||
{pubs.map(({node}) =>{
|
||||
return(
|
||||
{pubs.map(({node}) => {
|
||||
return (
|
||||
<div>{Parser(node.html)}</div>
|
||||
)
|
||||
})}
|
||||
</Layout>
|
||||
)}
|
||||
)
|
||||
}
|
||||
|
||||
export default injectIntl(QuarksPage)
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
footer {
|
||||
background-color: rgb(245,245,245);
|
||||
background-color: rgb(245, 245, 245);
|
||||
left: 0;
|
||||
bottom: 0;
|
||||
width: 100%;
|
||||
@ -8,9 +8,23 @@ footer {
|
||||
color: rgb(108, 117, 125);
|
||||
font-family: Segoe UI;
|
||||
font-size: 20px;
|
||||
text-decoration: none solid rgb(108, 117, 125); }
|
||||
text-decoration: none solid rgb(108, 117, 125);
|
||||
}
|
||||
|
||||
footer .container p { margin-bottom: 15px; }
|
||||
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); }
|
||||
footer .container p {
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
footer p a {
|
||||
color: rgb(0, 86, 179);
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
footer p a:hover {
|
||||
color: rgb(12, 65, 124);
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
footer a:visited {
|
||||
color: rgb(0, 86, 179);
|
||||
}
|
||||
@ -6,6 +6,7 @@ html {
|
||||
height: 100%;
|
||||
font-size: 1.08rem;
|
||||
}
|
||||
|
||||
body {
|
||||
height: 100%;
|
||||
margin: 0;
|
||||
@ -25,17 +26,44 @@ body {
|
||||
|
||||
|
||||
@media (max-width: 769px) {
|
||||
main { margin-top: 6%; }
|
||||
nav.navbar.navbar-expand-lg.navbar-light { width: 100%; padding: 0; } }
|
||||
main {
|
||||
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; }
|
||||
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; }
|
||||
img {
|
||||
max-width: 100%;
|
||||
margin-bottom: 1.45rem;
|
||||
}
|
||||
|
||||
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 {
|
||||
margin-left: 0;
|
||||
@ -63,7 +91,9 @@ table {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
b, strong, dt, th { font-weight: bold; }
|
||||
b, strong, dt, th {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 480px) {
|
||||
html {
|
||||
|
||||
@ -1,153 +1,310 @@
|
||||
main { margin-top: 75px; }
|
||||
a#partner{ font-size: 1.8rem; }
|
||||
main {
|
||||
margin-top: 75px;
|
||||
}
|
||||
|
||||
a#partner {
|
||||
font-size: 1.8rem;
|
||||
}
|
||||
|
||||
/* ---- 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 {
|
||||
padding-bottom: 7px;
|
||||
color: rgb(0, 0, 0);
|
||||
text-decoration: none;
|
||||
background-color: rgb(228, 228, 228); }
|
||||
ul.nav-tabs a.nav-link.active { color: black; background-color: rgb(190, 190, 190); }
|
||||
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, ul.nav-tabs a.nav-link.active {
|
||||
border-radius: 0;
|
||||
padding: 7px 22px 7px 22px;
|
||||
margin-top: 5px; }
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
/* ------------------------------------------- */
|
||||
|
||||
/* ------- news & main content ----------------------------- */
|
||||
h1 { font-size: 2.3rem; }
|
||||
h2 { font-size: 1.75rem; }
|
||||
h3 { font-size: 1.5rem; }
|
||||
div.container main a { color: rgb(0, 86, 179); }
|
||||
div.container main a:hover { color: rgb(1, 66, 136); text-decoration: underline; }
|
||||
div.container main p a:visited {color: rgb(0, 86, 179); text-decoration: none; }
|
||||
h1 {
|
||||
font-size: 2.3rem;
|
||||
}
|
||||
|
||||
li a { color: rgb(0,86,179) }
|
||||
li a:hover { color: rgb(1,66,136) }
|
||||
li a:visited { color: rgb(0,86,179) }
|
||||
h2 {
|
||||
font-size: 1.75rem;
|
||||
}
|
||||
|
||||
h2 a { color: rgb(0,86,179) }
|
||||
h2 a:hover { color: rgb(1,66,136) }
|
||||
h2 a:visited { color: rgb(0,86,179) }
|
||||
h3 {
|
||||
font-size: 1.5rem;
|
||||
}
|
||||
|
||||
div.container main a {
|
||||
color: rgb(0, 86, 179);
|
||||
}
|
||||
|
||||
div.container main a:hover {
|
||||
color: rgb(1, 66, 136);
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
div.container main p a:visited {
|
||||
color: rgb(0, 86, 179);
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
li a {
|
||||
color: rgb(0, 86, 179)
|
||||
}
|
||||
|
||||
li a:hover {
|
||||
color: rgb(1, 66, 136)
|
||||
}
|
||||
|
||||
li a:visited {
|
||||
color: rgb(0, 86, 179)
|
||||
}
|
||||
|
||||
h2 a {
|
||||
color: rgb(0, 86, 179)
|
||||
}
|
||||
|
||||
h2 a:hover {
|
||||
color: rgb(1, 66, 136)
|
||||
}
|
||||
|
||||
h2 a:visited {
|
||||
color: rgb(0, 86, 179)
|
||||
}
|
||||
|
||||
.jumbotron {
|
||||
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
|
||||
Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
|
||||
padding: 60px 40px 10px 40px;
|
||||
margin-bottom: 0px;
|
||||
background-color: rgb(247,247,247);
|
||||
background-color: rgb(247, 247, 247);
|
||||
border: 1.5px solid rgb(219, 219, 219);
|
||||
border-bottom: 0;
|
||||
border-radius: 5px 5px 0px 0px; }
|
||||
border-radius: 5px 5px 0px 0px;
|
||||
}
|
||||
|
||||
.aboutButton {
|
||||
background-color: rgb(233,236,239);
|
||||
background-color: rgb(233, 236, 239);
|
||||
padding-top: 5px;
|
||||
padding-bottom: 25px;
|
||||
margin-bottom: 0px;
|
||||
margin-bottom: 10px;
|
||||
border-bottom: 1.5px solid rgb(219, 219, 219);
|
||||
border-left: 1.5px solid rgb(219, 219, 219);
|
||||
border-right: 1.5px solid rgb(219, 219, 219); }
|
||||
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 {
|
||||
margin-left: 50px;
|
||||
font-size: 25px;
|
||||
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 {
|
||||
margin-bottom: 15px;
|
||||
color: white;
|
||||
background-color: rgb(51, 113, 155);
|
||||
border: rgb(36,88,122); }
|
||||
border: rgb(36, 88, 122);
|
||||
}
|
||||
|
||||
h2.title {
|
||||
background-color: rgb(247, 247, 247);
|
||||
padding: 15px;
|
||||
border: 2px solid #E8E4E4; }
|
||||
border: 2px solid #E8E4E4;
|
||||
}
|
||||
|
||||
span#date {
|
||||
color: white;
|
||||
font-size: 20px;
|
||||
opacity: 0,7;
|
||||
opacity: 0, 7;
|
||||
background-color: rgb(209, 121, 121);
|
||||
padding: 5px;
|
||||
border: 1px solid #8f4f4f;
|
||||
position: absolute;
|
||||
top: 0px;
|
||||
right: 0px; }
|
||||
right: 0px;
|
||||
}
|
||||
|
||||
p {
|
||||
font-size: 0.95rem;
|
||||
margin-top: 15px;
|
||||
margin-bottom: 20px;
|
||||
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 {
|
||||
border-top: 1px solid rgb(220, 222, 224);
|
||||
margin: 10px 0px 20px 0px; }
|
||||
margin: 10px 0px 20px 0px;
|
||||
}
|
||||
|
||||
img.center-block { margin-bottom: 0; }
|
||||
ol li { font-size: 0.9rem; }
|
||||
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; }
|
||||
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; }
|
||||
img.center-block {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
ol li {
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
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 {
|
||||
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 */
|
||||
div.timeline { max-width: 1400px; }
|
||||
div.timeline--wrapper { margin-top: 60px; }
|
||||
div.entry div.title{ width: 20% }
|
||||
div.entry div.body { width: 80% }
|
||||
div.timeline::before { left: calc(20% - 6px) }
|
||||
div.timeline {
|
||||
max-width: 1400px;
|
||||
}
|
||||
|
||||
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) }
|
||||
div.timeline--wrapper {
|
||||
margin-top: 60px;
|
||||
}
|
||||
|
||||
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 {
|
||||
font-size: 0.8rem;
|
||||
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
|
||||
color: rgb(82, 82, 82) }
|
||||
color: rgb(82, 82, 82)
|
||||
}
|
||||
|
||||
/* --- media --------------------------------------------- */
|
||||
@media (max-width: 769px) {
|
||||
span#date {
|
||||
top: 0;
|
||||
right: 0; }
|
||||
right: 0;
|
||||
}
|
||||
|
||||
button#togglerButton.navbar-toggler.collapsed {
|
||||
margin-top: 10px;
|
||||
margin-left: 10px; }
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
a.nav-link#project {
|
||||
margin-bottom: 10px;
|
||||
margin-right: 0;
|
||||
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) }
|
||||
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)
|
||||
}
|
||||
}
|
||||
|
||||
/* ------------------------------------------------------- */
|
||||
@ -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; }
|
||||
img#logo { margin-bottom: 0; }
|
||||
a[href="/"] { padding-top: 1.5%; opacity: 0.75}
|
||||
a[href="/"]:hover { opacity: 1; }
|
||||
a[href="/"].activeBrand { opacity: 1; padding-top: 0}
|
||||
a.link-no-style[href="/"] { padding: 0; margin-top: 0 }
|
||||
div.mr-auto.navbar-nav a {
|
||||
font-size: 1rem;
|
||||
}
|
||||
|
||||
img#logo {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
a[href="/"] {
|
||||
padding-top: 1.5%;
|
||||
opacity: 0.75
|
||||
}
|
||||
|
||||
a[href="/"]:hover {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
a[href="/"].activeBrand {
|
||||
opacity: 1;
|
||||
padding-top: 0
|
||||
}
|
||||
|
||||
a.link-no-style[href="/"] {
|
||||
padding: 0;
|
||||
margin-top: 0
|
||||
}
|
||||
|
||||
a.link-no-style span[data-rb-event-key="news"].nav-link,
|
||||
a.link-no-style span[data-rb-event-key="about"].nav-link,
|
||||
a.link-no-style span[data-rb-event-key="projects"].nav-link,
|
||||
a.link-no-style span[data-rb-event-key="partners"].nav-link
|
||||
{ color: rgb(209, 209, 209); margin-left: 15px; margin-right: 10px; }
|
||||
a.link-no-style span[data-rb-event-key="partners"].nav-link {
|
||||
color: rgb(209, 209, 209);
|
||||
margin-left: 15px;
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
a.link-no-style { margin-top: 10px; }
|
||||
a.active { margin-top: 10px; }
|
||||
a.link-no-style {
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
a.active {
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
a.link-no-style span[data-rb-event-key="news"].nav-link:hover,
|
||||
a.link-no-style span[data-rb-event-key="about"].nav-link:hover,
|
||||
a.link-no-style span[data-rb-event-key="projects"].nav-link:hover,
|
||||
a.link-no-style span[data-rb-event-key="partners"].nav-link:hover
|
||||
{ color: white; background-color: rgb(20, 142, 161); padding-bottom: 15px; }
|
||||
a.link-no-style span[data-rb-event-key="partners"].nav-link:hover {
|
||||
color: white;
|
||||
background-color: rgb(20, 142, 161);
|
||||
padding-bottom: 15px;
|
||||
}
|
||||
|
||||
a.active { background-color: rgb(20, 142, 161); margin-left: 15px; margin-right: 10px; margin-bottom: 8px;}
|
||||
.navbar-light .navbar-nav a.active>.nav-link { color: white; }
|
||||
a.active {
|
||||
background-color: rgb(20, 142, 161);
|
||||
margin-left: 15px;
|
||||
margin-right: 10px;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
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;}
|
||||
.navbar-light .navbar-nav a.active > .nav-link {
|
||||
color: white;
|
||||
}
|
||||
|
||||
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 ------------------------------ */
|
||||
|
||||
|
||||
/* ----- collapse show ---------------------- */
|
||||
@media(max-width: 769px) {
|
||||
a.activeBrand { margin: 0 0px 0 20px; padding-top: 0 }
|
||||
@media (max-width: 769px) {
|
||||
a.activeBrand {
|
||||
margin: 0 0px 0 20px;
|
||||
padding-top: 0
|
||||
}
|
||||
|
||||
a.nav-link a#active {
|
||||
color: white;
|
||||
background-color: rgb(20, 142, 161);
|
||||
padding-top: 11px;
|
||||
padding-bottom: 12px; }
|
||||
padding-bottom: 12px;
|
||||
}
|
||||
}
|
||||
|
||||
/* 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 {
|
||||
width: 100px;
|
||||
padding-bottom: 0px;
|
||||
text-align: center;
|
||||
background-color: rgb(52,58,64);
|
||||
margin-top: -0px; }
|
||||
button.navbar-toggler { background-color: rgb(20, 142, 161); }
|
||||
div#navbarSupportedContent.navbar-collapse.collapse.show img#logo{ margin: auto; }
|
||||
background-color: rgb(52, 58, 64);
|
||||
margin-top: -0px;
|
||||
}
|
||||
|
||||
button.navbar-toggler {
|
||||
background-color: rgb(20, 142, 161);
|
||||
}
|
||||
|
||||
div#navbarSupportedContent.navbar-collapse.collapse.show img#logo {
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
/* ------------------------------------------- */
|
||||
|
||||
/* #navbarSupportedContent {
|
||||
|
||||
@ -13,11 +13,11 @@ collections:
|
||||
editor:
|
||||
preview: true
|
||||
fields:
|
||||
- { label: Content Type, name: content_type, widget: string}
|
||||
- { label: Title, name: title, widget: string}
|
||||
- { label: Content Type, name: content_type, widget: string }
|
||||
- { label: Title, name: title, widget: string }
|
||||
- { label: Date, name: date, widget: date }
|
||||
- { label: Published, name: published, widget: boolean}
|
||||
- { label: Body, name: body, widget: markdown}
|
||||
- { label: Published, name: published, widget: boolean }
|
||||
- { label: Body, name: body, widget: markdown }
|
||||
############################################################
|
||||
- label: Members
|
||||
name: members
|
||||
@ -26,13 +26,13 @@ collections:
|
||||
editor:
|
||||
preview: true
|
||||
fields:
|
||||
- { label: Content Type, name: content_type, widget: string}
|
||||
- { label: Display Name, name: title, widget: string}
|
||||
- { label: ID, name: id, widget: string}
|
||||
- { label: Order, name: order, widget: number}
|
||||
- { label: Photo, name: image, widget: image, required: false}
|
||||
- { label: Published, name: published, widget: boolean}
|
||||
- { label: Body, name: body, widget: markdown}
|
||||
- { label: Content Type, name: content_type, widget: string }
|
||||
- { label: Display Name, name: title, widget: string }
|
||||
- { label: ID, name: id, widget: string }
|
||||
- { label: Order, name: order, widget: number }
|
||||
- { label: Photo, name: image, widget: image, required: false }
|
||||
- { label: Published, name: published, widget: boolean }
|
||||
- { label: Body, name: body, widget: markdown }
|
||||
#############################################################
|
||||
- label: Physics
|
||||
name: physics
|
||||
@ -41,13 +41,13 @@ collections:
|
||||
editor:
|
||||
preview: true
|
||||
fields:
|
||||
- { label: Content Type, name: content_type, widget: string}
|
||||
- { label: Display Title, name: title, widget: string}
|
||||
- { label: Short Title, name: title, widget: string}
|
||||
- { label: ID, name: id, widget: string}
|
||||
- { label: Order, name: order, widget: number}
|
||||
- { label: Published, name: published, widget: boolean}
|
||||
- { label: Body, name: body, widget: markdown}
|
||||
- { label: Content Type, name: content_type, widget: string }
|
||||
- { label: Display Title, name: title, widget: string }
|
||||
- { label: Short Title, name: title, widget: string }
|
||||
- { label: ID, name: id, widget: string }
|
||||
- { label: Order, name: order, widget: number }
|
||||
- { label: Published, name: published, widget: boolean }
|
||||
- { label: Body, name: body, widget: markdown }
|
||||
##############################################################
|
||||
- label: Education
|
||||
name: education
|
||||
@ -56,13 +56,13 @@ collections:
|
||||
editor:
|
||||
preview: true
|
||||
fields:
|
||||
- { label: Content Type, name: content_type, widget: string}
|
||||
- { label: Display Title, name: title, widget: string}
|
||||
- { label: Short Title, name: title, widget: string}
|
||||
- { label: ID, name: id, widget: string}
|
||||
- { label: Order, name: order, widget: number}
|
||||
- { label: Published, name: published, widget: boolean}
|
||||
- { label: Body, name: body, widget: markdown}
|
||||
- { label: Content Type, name: content_type, widget: string }
|
||||
- { label: Display Title, name: title, widget: string }
|
||||
- { label: Short Title, name: title, widget: string }
|
||||
- { label: ID, name: id, widget: string }
|
||||
- { label: Order, name: order, widget: number }
|
||||
- { label: Published, name: published, widget: boolean }
|
||||
- { label: Body, name: body, widget: markdown }
|
||||
##############################################################
|
||||
- label: Math
|
||||
name: math
|
||||
@ -71,13 +71,13 @@ collections:
|
||||
editor:
|
||||
preview: true
|
||||
fields:
|
||||
- { label: Content Type, name: content_type, widget: string}
|
||||
- { label: Display Title, name: title, widget: string}
|
||||
- { label: Short Title, name: title, widget: string}
|
||||
- { label: ID, name: id, widget: string}
|
||||
- { label: Order, name: order, widget: number}
|
||||
- { label: Published, name: published, widget: boolean}
|
||||
- { label: Body, name: body, widget: markdown}
|
||||
- { label: Content Type, name: content_type, widget: string }
|
||||
- { label: Display Title, name: title, widget: string }
|
||||
- { label: Short Title, name: title, widget: string }
|
||||
- { label: ID, name: id, widget: string }
|
||||
- { label: Order, name: order, widget: number }
|
||||
- { label: Published, name: published, widget: boolean }
|
||||
- { label: Body, name: body, widget: markdown }
|
||||
##############################################################
|
||||
- label: Software
|
||||
name: software
|
||||
@ -86,13 +86,13 @@ collections:
|
||||
editor:
|
||||
preview: true
|
||||
fields:
|
||||
- { label: Content Type, name: content_type, widget: string}
|
||||
- { label: Display Title, name: title, widget: string}
|
||||
- { label: Short Title, name: title, widget: string}
|
||||
- { label: ID, name: id, widget: string}
|
||||
- { label: Order, name: order, widget: number}
|
||||
- { label: Published, name: published, widget: boolean}
|
||||
- { label: Body, name: body, widget: markdown}
|
||||
- { label: Content Type, name: content_type, widget: string }
|
||||
- { label: Display Title, name: title, widget: string }
|
||||
- { label: Short Title, name: title, widget: string }
|
||||
- { label: ID, name: id, widget: string }
|
||||
- { label: Order, name: order, widget: number }
|
||||
- { label: Published, name: published, widget: boolean }
|
||||
- { label: Body, name: body, widget: markdown }
|
||||
##############################################################
|
||||
- label: Dataforge News
|
||||
name: df-news
|
||||
@ -101,8 +101,8 @@ collections:
|
||||
editor:
|
||||
preview: true
|
||||
fields:
|
||||
- { label: Content Type, name: content_type, widget: string}
|
||||
- { label: Title, name: title, widget: string}
|
||||
- { label: Content Type, name: content_type, widget: string }
|
||||
- { label: Title, name: title, widget: string }
|
||||
- { label: Date, name: date, widget: date }
|
||||
- { label: Published, name: published, widget: boolean}
|
||||
- { label: Body, name: body, widget: markdown}
|
||||
- { label: Published, name: published, widget: boolean }
|
||||
- { label: Body, name: body, widget: markdown }
|
||||
Loading…
Reference in New Issue
Block a user