Merge pull request #575 from ipavlenko/fix/MINT-1158-ui-fixes

Fix/mint 1158 ui fixes
Chrono-Tech · Feb 20, 2018 · 1f53eb1 · 1f53eb1
2 parents a54cc1a + 886b472
commit 1f53eb1
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 11 deletions.
diff --git a/src/i18n/ru.js b/src/i18n/ru.js
@@ -666,6 +666,14 @@ export default {
     ASSETS_OWNER_ONLY: 'Ассеты: только владелец',
     ASSETS_CANNOT_ADD_TO_REGISTRY: 'Ассеты: не могу добавить в реестр',
   },
+  fileSelect: {
+    errors: {
+      // TODO @dkchv: add errors
+    },
+    addAttachments: 'Добавить вложения',
+    selectFile: 'Выбрать файл',
+    filesLimit: '%{files} из %{limit}',
+  },
   materialUi: {
     DatePicker: {
       cancelLabel: 'Отмена',

diff --git a/src/layouts/Splash/Splash.js b/src/layouts/Splash/Splash.js
@@ -18,7 +18,7 @@ class Splash extends Component {
         </div>
         { !window.isMobile && (
           <div styleName='footer'>
-            <div styleName='copyright'>Copyright ©2017 Edway Group Pty. Ltd. All Rights Reserved.</div>
+            <div styleName='copyright'>Copyright © 2018 LaborX Pty Ltd. All Rights Reserved.</div>
             <div styleName='links'>
               <a styleName='link' href='https://chronobank.io'>Chronobank.io</a>
               <a styleName='link' href='https://chronobank.io/faq'>Q&A</a>

diff --git a/src/layouts/partials/DrawerPartial/DrawerPartial.jsx b/src/layouts/partials/DrawerPartial/DrawerPartial.jsx
@@ -80,6 +80,7 @@ export default class DrawerPartial extends PureComponent {
             styleName='item'
             activeClassName='drawer-item-active'
             to={{ pathname: item.path }}
+            stopPropagation
           />
           : <div />
         }

diff --git a/src/layouts/partials/FooterPartial/FooterPartial.jsx b/src/layouts/partials/FooterPartial/FooterPartial.jsx
@@ -18,7 +18,8 @@ export default class FooterPartial extends PureComponent {
               <ul styleName='papersList'>
                 <li styleName='papersListItem'><a href='https://chronobank.io/files/business_outline.pdf' target='_blank' rel='noopener noreferrer'><Translate value='layouts.partials.FooterPartial.download' /></a> Business outline</li>
                 <li styleName='papersListItem'><a href='https://chronobank.io/files/dev_plan.pdf' target='_blank' rel='noopener noreferrer'><Translate value='layouts.partials.FooterPartial.download' /></a> Development plan</li>
-                <li styleName='papersListItem'><a href='https://chronobank.io/files/whitepaper.pdf' target='_blank' rel='noopener noreferrer'><Translate value='layouts.partials.FooterPartial.download' /></a> White paper</li>
+                <li styleName='papersListItem'><a href='https://files.chronobank.io/files/Chronobank_WP.pdf' target='_blank' rel='noopener noreferrer'><Translate value='layouts.partials.FooterPartial.download' /></a> White paper</li>
+                <li styleName='papersListItem'><a href='https://files.chronobank.io/files/Opinion_TIME_1.5.18.pdf' target='_blank' rel='noopener noreferrer'><Translate value='layouts.partials.FooterPartial.download' /></a> Legal Opinion</li>
               </ul>
             </div>
           </div>
@@ -94,12 +95,11 @@ export default class FooterPartial extends PureComponent {
         <div styleName='row'>
           <div styleName='columnLeft'>
             <div styleName='copyright'>
-              <p>Copyright © 2016-2017 Edway Group Pty. Ltd. All Rights Reserved.</p>
+              <p>Copyright © 2018 LaborX Pty Ltd. All Rights Reserved.</p>
             </div>
           </div>
         </div>
       </div>
     )
   }
 }
-
diff --git a/src/layouts/partials/FooterPartial/FooterPartial.scss b/src/layouts/partials/FooterPartial/FooterPartial.scss
@@ -56,7 +56,7 @@
   font-size: 16px;
   font-weight: 600;
   color: $color-white;
-  line-height: 2.8125em; // 45/16
+  line-height: 2.5em;
 
   @include md-only {
     line-height: 1.5em;

diff --git a/src/layouts/partials/LocaleDropDown/styles.js b/src/layouts/partials/LocaleDropDown/styles.js
@@ -3,7 +3,7 @@ import variables from 'styles/themes/variables'
 export default {
   labelStyle: {
     verticalAlign: 'middle',
-    margin: '-5px 0px 0px 0px',
+    margin: '-2px 0px 0px 0px',
     color: variables.colorWhite,
     fontSize: '16px',
     paddingLeft: '20px',

diff --git a/src/menu.js b/src/menu.js
@@ -1,9 +1,9 @@
 export default {
   global: [
-    { key: 'about', title: 'global.about', path: 'https://chronobank.io/#about' },
-    { key: 'labourHours', title: 'global.labourHours', path: 'https://chronobank.io/#labor-hours' },
-    { key: 'laborx', title: 'global.laborx', path: 'https://chronobank.io/#laborx' },
-    { key: 'team', title: 'global.team', path: 'https://chronobank.io/#team' },
+    { key: 'about', title: 'global.about', path: 'https://chronobank.io/' },
+    // { key: 'labourHours', title: 'global.labourHours', path: 'https://chronobank.io/#labor-hours' },
+    { key: 'laborx', title: 'global.laborx', path: 'https://chronobank.io/products/laborx' },
+    { key: 'team', title: 'global.team', path: 'https://chronobank.io/team' },
     { key: 'faq', title: 'global.faq', path: 'https://chronobank.io/faq' },
     { key: 'blog', title: 'global.blog', path: 'https://blog.chronobank.io/' },
   ],

diff --git a/yarn.lock b/yarn.lock
@@ -420,7 +420,7 @@ async-eventemitter@^0.2.2:
   dependencies:
     async "^2.4.0"
 
-"async-eventemitter@github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c":
+async-eventemitter@ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c:
   version "0.2.3"
   resolved "https://codeload.github.com/ahultgren/async-eventemitter/tar.gz/fa06e39e56786ba541c180061dbf2c0a5bbf951c"
   dependencies: