Merge pull request #1203 from nataliauvarova/xal_proxy

part 2: fixes

Author: nataliauvarova

src/api/i18n.js

@@ -92,6 +92,7 @@ export const stringsToTranslate = [
   "antipassive",
   "Antonymous translation",
   "Any three consecutive characters",
+  "Apply",
   "Apply filter",
   "Archive",
   "Are you sure you want to delete dictionary",
@@ -937,6 +938,8 @@ export const stringsToTranslate = [
   "Support",
   "Support@Telegram",
   "Sync",
+  "Synchronize",
+  "Synchronize data loading error",
   "Table of contents",
   "Tag data loading error",
   "Tapekhin Andrey Nikolaevich",

src/components/SyncModal/index.js

@@ -265,7 +265,7 @@ const SyncModal = ({ columns, onClose, perspectiveId }) => {
           //onClick={applySync}
           //loading={loadingApply}
           //disabled={errorApply}
-          className="lingvo-button-greenest"
+          className="lingvo-button-greenest lingvo-button-greenest_sync"
         />
 
         <Button content={getTranslation("Close")} onClick={onClose} className="lingvo-button-basic-black" />

src/components/SyncModal/styles.scss

@@ -36,6 +36,10 @@
     & .ui.table tr td {
       &:last-child {
         border-radius: 0 8px 8px 0 !important;
+
+        @media only screen and (max-device-width: 767px), only screen and (max-width: 767px) {
+          border-radius: 0 0 8px 8px !important;
+        }
       }
 
       &.td-type {
@@ -50,6 +54,12 @@
           text-align: center;
           //color: #a66a12;
           color: #b55b27;
+
+          @media only screen and (max-device-width: 767px), only screen and (max-width: 767px) {
+            display: block;
+            padding: 6px 12px;
+            text-align: left;
+          }
         }
       }
 
@@ -63,7 +73,8 @@
       }
 
       &.td-date-sync {
-        background-color: #feffd7 !important;
+        //background-color: #feffd7 !important;
+        background-color: #fdff9c !important;
 
         &::before {
           content: "";
@@ -72,23 +83,76 @@
           top: 0;
           bottom: 0;
           width: 1px;
-          border-right: 2px solid #feffd7;
+          //border-right: 2px solid #feffd7;
+          border-right: 2px solid #fdff9c;
           font-size: 0;
         }
       }
     }
 
+    & .ui.table tr td.td-type + td.td-color {
+      &::before {
+        content: "";
+        position: absolute;
+        left: -2px;
+        top: 0;
+        bottom: 0;
+        width: 1px;
+        border-right: 2px solid #57b895ce;
+        font-size: 0;
+      }
+    }
+
+    & .ui.table tr td.td-date-sync + td.td-date {
+      &::before {
+        content: "";
+        position: absolute;
+        left: -2px;
+        top: 0;
+        bottom: 0;
+        width: 1px;
+        border-right: 2px solid #fff;
+        font-size: 0;
+      }
+
+      &.td-color {
+        &::before {
+          border-color: #57b895ce;
+        }
+      }
+    }
+
     & .ui.table tr:nth-child(2n) td {
       &.td-color {
         //background-color: #dee98a !important;
         background-color: #57b894 !important;
       }
 
       &.td-date-sync {
-        background-color: #f7f8c2 !important;
+        //background-color: #f7f8c2 !important;
+        background-color: #fcff79 !important;
+
+        &::before {
+          //border-color: #f7f8c2;
+          border-color: #fcff79;
+        }
+      }
+    }
 
+    & .ui.table tr:nth-child(2n) td.td-type + td.td-color {
+      &::before {
+        border-color: #57b894;
+      }
+    }
+
+    & .ui.table tr:nth-child(2n) td.td-date-sync + td.td-date {
+      &::before {
+        border-color: #fafafa;
+      }
+
+      &.td-color {
         &::before {
-          border-color: #f7f8c2;
+          border-color: #57b894;
         }
       }
     }
@@ -117,5 +181,18 @@
   }
 
   &__type {
+    font-weight: bold;
+    color: #b55b27;
+  }
+
+  @media only screen and (max-device-width: 767px), only screen and (max-width: 767px) {
+    top: -7px;
+  }
+}
+
+.actions .lingvo-button-greenest {
+  &_sync {
+    min-height: 40px !important;
+    border-radius: 12px !important;
   }
 }