Skip to content

G
getme
Commit a60d1375 by muhsin
Options

conflixx

parent f1e0cd78
Showing with 0 additions and 17 deletions
src/app/home/home.page.scss
...@@ -276,21 +276,6 @@ ...@@ -276,21 +276,6 @@
padding: 0px; padding: 0px;
font-weight: 800; font-weight: 800;
} }
<<<<<<< HEAD
ul {
margin: 0px;
padding: 0px;
padding-top: 30px;
li {
list-style: none;
margin-bottom: 15px;
p {
margin: 0px;
padding: 0px;
color: rgba(176, 174, 199, 1);
padding-top: 5px;
padding-bottom: 5px;
=======
.add_address_wrapper { .add_address_wrapper {
position: fixed; position: fixed;
bottom: 0px; bottom: 0px;
...@@ -308,7 +293,6 @@ ...@@ -308,7 +293,6 @@
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
font-weight: 800; font-weight: 800;
>>>>>>> a9bd8295df980b5b3661ca885b051970c7f081fc
} }
.styled-checkbox { .styled-checkbox {
position: absolute; // take it out of document flow position: absolute; // take it out of document flow
...@@ -360,5 +344,4 @@ ...@@ -360,5 +344,4 @@
} }
} }
} }
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment