Fixe merge conflit

2026-04-19 21:06:06 +00:00 · 2021-01-19 08:52:43 +01:00
parent 285b9ea323 7e18af8233
commit 4a5395be94
185 changed files with 6115 additions and 379 deletions
@@ -0,0 +1,25 @@
+.main-container{
+  padding: 0px 20px;
+  .input-text {
+    margin-top: 20px;
+    width: 100%;
+    height: 45px;
+    border-radius: 5px;
+    border: 1px solid #ebebeb;
+  }
+  ul{
+    padding: 0px;
+    margin: 0px;
+    padding-top: 10px;
+    li{    
+      padding-top: 5px;
+      padding-bottom: 10px;
+      margin: 0px;
+      padding-bottom: 10px;
+      border-bottom: 1px solid #ebebeb;
+      list-style:  none;
+      font-family: Roboto;
+      font-size: 15px;
+    }
+  }
+}