diff --git a/.gitignore b/.gitignore index 2087fd9..eb69288 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ settings-development.json private/GeoLite2-City.mmdb* npm-debug.log **/.sass-cache +.deploy/ diff --git a/designs/icons-tcef.svg b/designs/icons-tcef.svg index 8f82ffd..be90e76 100644 --- a/designs/icons-tcef.svg +++ b/designs/icons-tcef.svg @@ -247,12 +247,12 @@ inkscape:pageshadow="2" inkscape:zoom="0.25" inkscape:cx="-324.9908" - inkscape:cy="1157.3585" + inkscape:cy="997.3585" inkscape:document-units="mm" - inkscape:current-layer="layer1" + inkscape:current-layer="g22554-45" showgrid="false" inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-height="983" inkscape:window-x="0" inkscape:window-y="867" inkscape:window-maximized="1" /> @@ -484,18 +484,82 @@ + style="font-size:192px;fill:#ff0000" /> + + + + + + + + + + + + + + + + diff --git a/imports/startup/client/i18n.js b/imports/startup/client/i18n.js index a56557e..57186b2 100644 --- a/imports/startup/client/i18n.js +++ b/imports/startup/client/i18n.js @@ -50,7 +50,7 @@ i18nOpts.react = { nsMode: 'default' */ }; -const sendMissing = false; +const sendMissing = true; if (sendMissing && !Meteor.isProduction) { i18nOpts.sendMissing = true; i18nOpts.sendMissingTo = 'fallback'; diff --git a/imports/ui/components/DistanceSlider/DistanceSlider.scss b/imports/ui/components/DistanceSlider/DistanceSlider.scss index 4b77467..629b81f 100644 --- a/imports/ui/components/DistanceSlider/DistanceSlider.scss +++ b/imports/ui/components/DistanceSlider/DistanceSlider.scss @@ -1,11 +1,17 @@ +@import '../../stylesheets/mixins'; + .dist-slider { width: 400px; margin: 30px; } -@media only screen and (max-width: 400px) { - .dist-slider { - width: 200px; - margin: 10px; - } +@include breakpoint(mobile) { + .dist-slider { + width: 100%; + margin: 10px; + } + + .rc-slider { + margin: 0 0 0 -10px; + } } \ No newline at end of file diff --git a/imports/ui/components/Footer/Footer.js b/imports/ui/components/Footer/Footer.js index e27f8ae..cf20267 100644 --- a/imports/ui/components/Footer/Footer.js +++ b/imports/ui/components/Footer/Footer.js @@ -31,4 +31,4 @@ const Footer = (props) => { Footer.propTypes = {}; -export default translate([], { wait: true })(Footer) +export default translate([], { wait: true })(Footer); diff --git a/imports/ui/components/Footer/Footer.scss b/imports/ui/components/Footer/Footer.scss index 18cd297..2b2f234 100644 --- a/imports/ui/components/Footer/Footer.scss +++ b/imports/ui/components/Footer/Footer.scss @@ -72,3 +72,9 @@ body { -webkit-transform: rotate(-180deg); transform: rotate(-180deg); } + +@include breakpoint(mobile) { + .Footer, .Footer p { + font-size: 14px; + } +} \ No newline at end of file diff --git a/imports/ui/components/NavItem/NavItem.js b/imports/ui/components/NavItem/NavItem.js index 8d51871..84fceea 100644 --- a/imports/ui/components/NavItem/NavItem.js +++ b/imports/ui/components/NavItem/NavItem.js @@ -12,12 +12,12 @@ const propTypes = { href: PropTypes.string, onClick: PropTypes.func, onSelect: PropTypes.func, - eventKey: PropTypes.any, + eventKey: PropTypes.any }; const defaultProps = { active: false, - disabled: false, + disabled: false }; class NavItem extends React.Component { @@ -38,7 +38,9 @@ class NavItem extends React.Component { } render() { - const { active, disabled, onClick, className, anchorClassName, style, ...props } = + const { + active, disabled, onClick, className, anchorClassName, style, ...props + } = this.props; delete props.onSelect; @@ -58,13 +60,15 @@ class NavItem extends React.Component { return (
  • diff --git a/imports/ui/components/Navigation/Navigation.js b/imports/ui/components/Navigation/Navigation.js index d22ef88..86718aa 100644 --- a/imports/ui/components/Navigation/Navigation.js +++ b/imports/ui/components/Navigation/Navigation.js @@ -17,7 +17,9 @@ const Navigation = props => ( {/* https://github.com/react-bootstrap/react-bootstrap/blob/master/src/Navbar.js */} - {props.t('AppNameFull')} + + {props.t('AppNameFull')} + {/* */}