bug(interface):

- Fix the delete comment pop up style - Fix broken user table - Fix search functionality [Finishes #171434652]
andela · Feb 28, 2020 · f7e4337 · f7e4337
1 parent 339a4cc
commit f7e4337
Show file tree

Hide file tree

Showing 9 changed files with 102 additions and 97 deletions.
diff --git a/src/assets/css/createProfile.css → src/assets/css/createProfile.scss b/src/assets/css/createProfile.css → src/assets/css/createProfile.scss
@@ -1,10 +1,13 @@
+.profile-row{
+        background-color: white;
+    margin-left: 0px;
+    height: 100%;
 * {
     box-sizing: border-box;
-}
-
+} 
 .profile-column-form {
     float: left;
-    width: 75%;
+    width: 64%;
     padding: 10px;
     background-color: white;
 }
@@ -16,29 +19,21 @@
 .edit-profile-column-picture {
     float: left;
     width: 35%;
-    height: 461px;
+    height: 450px;
     background-color: white;
     padding: 5px 20px 15px 20px;
     border: 1px solid lightgrey;
     border-radius: 3px;
     margin-top: 99px;
 }
 
-.profile-row:after {
-    content: "";
-    display: table;
-    clear: both;
-}
 
-.profile-row {
-    background-color: white;
-    margin-left: 0px;
-}
 
 .edit-profile-title {
-    margin: 35px;
+    padding-top: 35px;
     margin-left: 20px;
     text-align: center;
+
 }
 
 .edit-profile-title-details {
@@ -66,11 +61,11 @@
 }
 
 .profile-details-row {
-    display: -ms-flexbox; /* IE10 */
+       display: -ms-flexbox; /* IE10 */
     display: flex;
     -ms-flex-wrap: wrap; /* IE10 */
     flex-wrap: wrap;
-    margin: 0 -16px;
+    padding: 20px;
 }
 
 .col-25 {
@@ -92,7 +87,7 @@
 .col-25,
 .col-50,
 .col-75 {
-    padding: 0 16px;
+    padding: 0 16px 0 0;
 }
 
 .profile-container {
@@ -123,15 +118,15 @@ select {
 label {
     margin-bottom: 10px;
     display: block;
-}
+} 
 
 .icon-container {
     margin-bottom: 20px;
     padding: 7px 0;
     font-size: 24px;
 }
 
-.btn {
+ .btn {
     background-color: #00B9F2;
     color: white;
     padding: 12px;
@@ -142,16 +137,13 @@ label {
     border-radius: 3px;
     cursor: pointer;
     font-size: 17px;
-}
+} 
 
 .edit-btn {
     background-color: #00B9F2;
     color: white;
-    padding: 12px;
-    margin: 10px;
-    margin-left: 17px;
     border: none;
-    width: 100px;
+    width: 250px;
     height: 50px;
     border-radius: 3px;
     cursor: pointer;
@@ -220,14 +212,26 @@ hr {
     margin-left: 30px;
 }
 
+}
+.profile-row:after {
+    content: "";
+    display: table;
+    clear: both;
+}
+
 /* Responsive layout - when the screen is less than 800px wide, make the two columns stack on top of each other instead of next to each other (also change the direction - make the "cart" column go on top) */
   @media (max-width: 800px) {
     .profile-row {
       display: flex;
       flex-direction: column-reverse;
 
-    }
-    .profile-row  div{
+   .profile-column-form {
+    width: 100%;
+}
+.edit-profile-column-picture {
+    width: 100%;
+}
+    div{
         width: 100%;
     }
     .col-25 {
@@ -241,5 +245,5 @@ hr {
         width: 400px;
         height: 70px;
     }
-
+    } 
 }
diff --git a/src/assets/css/profile.css → src/assets/css/profile.scss b/src/assets/css/profile.css → src/assets/css/profile.scss
@@ -1,7 +1,10 @@
-* {
-    box-sizing: border-box;
-}
 
+.main-profile-row{
+    background-color: white;
+    height: 94%;
+    * {
+    box-sizing: border-box;
+} 
 .profile-column-form {
     float: left;
     width: 64%;
@@ -20,20 +23,9 @@
     padding: 5px 20px 15px 20px;
     border: 1px solid lightgrey;
     border-radius: 3px;
-    margin-top: 79px;
+    margin-top: 70px;
 }
 
-.main-profile-row:after {
-    content: "";
-    display: table;
-    clear: both;
-}
-
-.main-profile-row {
-    background-color: white;
-    margin-bottom: 100px;
-    margin-top: 40px;
-}
 
 .profile-title {
     margin: 10px;
@@ -95,13 +87,12 @@
 .col-75 {
     padding: 0 16px;
 }
-
 .container {
-    background-color: white;
     border: 1px solid lightgrey;
     border-radius: 3px;
 }
 
+
 input[type=text] {
     width: 100%;
     margin-bottom: 20px;
@@ -122,7 +113,7 @@ select {
 label {
     margin-bottom: 10px;
     display: block;
-}
+} 
 
 .icon-container {
     margin-bottom: 20px;
@@ -140,7 +131,7 @@ label {
     border-radius: 3px;
     cursor: pointer;
     font-size: 17px;
-}
+} 
 
 .edit-btn {
     background-color: #00B9F2;
@@ -217,6 +208,13 @@ hr {
     margin-left: 30px;
 }
 
+
+}
+.main-profile-row:after {
+    content: "";
+    display: table;
+    clear: both;
+}
 /* Responsive layout - when the screen is less than 800px wide, make the two columns stack on top of each other instead of next to each other (also change the direction - make the "cart" column go on top) */
 @media (max-width: 800px) {
     .main-profile-row {
@@ -239,4 +237,4 @@ hr {
         height: 70px;
     }
 
-}
+}
diff --git a/src/assets/css/selectOption.scss b/src/assets/css/selectOption.scss
@@ -3,6 +3,7 @@
 
 .selectOption {
   height: 30px !important;
+  margin-right: 15px;
   width: 100%;
   border: 1px solid $logo-color;
   outline: none;

diff --git a/src/assets/css/statsTrip.scss b/src/assets/css/statsTrip.scss
@@ -38,6 +38,7 @@
         border-radius: 5px;
         outline: none;
         border: 1px solid #34c6f3;
+        padding: 10px;
       }
       label {
         font-family: Muli;

diff --git a/src/assets/css/table.scss b/src/assets/css/table.scss
@@ -125,6 +125,7 @@ $attributes: tripId tripType tripOrigin tripDestination createdAt status action
       margin-left: 10px;
       height: 40px;
     }
+    margin-right: 20px;
     outline: none;
     width: 235px;
     height: 40px;
@@ -754,50 +755,6 @@ $attributes: tripId tripType tripOrigin tripDestination createdAt status action
       }
     }
   }
-
-  .popupContainer {
-    border-radius: 5px;
-    box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.25);
-    flex-direction: column;
-    width: 300px !important;
-    height: 150px !important;
-    margin: auto;
-    background-color: white;
-    .popupMessage {
-      padding: 5px;
-    }
-    .popupButtons {
-      width: 40%;
-      display: flex;
-      margin-right: 50px;
-    }
-    div {
-      margin-top: 13px;
-      height: 40px;
-      width: 90%;
-      margin: auto;
-      display: flex;
-      justify-content: space-evenly;
-      div {
-        width: 80px;
-        padding: 10px;
-        button {
-          width: 80px;
-          margin: 3px;
-          border: 0px;
-          color: white;
-          box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.25);
-          border-radius: 5px;
-        }
-        #delete {
-          background-color: red;
-        }
-        #cancel {
-          background-color: #00b9f2;
-        }
-      }
-    }
-  }
 }
 }
 .pagination-buttons {
@@ -895,3 +852,49 @@ height: 50px;
   }
 }
 }
+
+.popupContainer {
+  border-radius: 5px;
+  box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.25);
+  flex-direction: column !important;
+  width: 300px !important;
+  height: 150px !important;
+  margin: auto;
+  background-color: white;
+  .popupMessage {
+    padding: 5px;
+  }
+  .popupButtons {
+    width: 40%;
+    display: flex;
+    margin-right: 50px;
+  }
+  div {
+    margin-top: 13px;
+    height: 20px;
+    width: 80% !important;
+    margin: auto;
+    display: flex;
+    justify-content: space-evenly;
+    div {
+      width: 60px;
+      padding: 1px;
+      height: 40px;
+      button {
+        height: 40px;
+        width: 80px;
+        margin: 1px;
+        border: 0px;
+        color: white;
+        box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.25);
+        border-radius: 5px;
+      }
+      #delete {
+        background-color: red;
+      }
+      #cancel {
+        background-color: #00b9f2;
+      }
+    }
+  }
+}
diff --git a/src/components/CreateProfile.js b/src/components/CreateProfile.js
@@ -9,7 +9,7 @@ import getProfile, { updateSpinnerStatus } from '../redux/actions/profileActions
 import updateProfile, {
   uploadImage,
 } from '../redux/actions/updateProfileActions';
-import '../assets/css/createProfile.css';
+import '../assets/css/createProfile.scss';
 import Navbar from './Navbar';
 import profilePicture from '../assets/images/profile-picture2.png';
 import TextInput from './common/TextInput';
@@ -175,8 +175,8 @@ export class CreateProfile extends Component {
         } = this.state;
             return (
                 <>
-                <h2 className="edit-profile-title">EDIT PROFILE</h2>
                 <div className="profile-row">
+                <h2 className="edit-profile-title">EDIT PROFILE</h2>
                     <div className="profile-column-form">
                         <div className="profile-details-row">
                             <div className="col-75">

diff --git a/src/components/Profile.js b/src/components/Profile.js
@@ -9,7 +9,7 @@ import getProfile, { updateSpinnerStatus } from '../redux/actions/profileActions
 import updateProfile, {
     uploadImage,
 } from '../redux/actions/updateProfileActions';
-import '../assets/css/profile.css';
+import '../assets/css/profile.scss';
 import Navbar from './Navbar';
 import profilePicture from '../assets/images/profile-picture2.png';
 import TextInput from './common/TextInput';

diff --git a/src/components/common/TextInput.js b/src/components/common/TextInput.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import '../../assets/css/profile.css';
+import '../../assets/css/profile.scss';
 
 const TextInput = ({
   placeholder, name, value, disabled, onChange, pattern, title,