Skip to content
Snippets Groups Projects

Fixing conflicts.

Merged Zainab Almeshari requested to merge 25-adding-a-basic-locations-template-route into development
6 files
+ 219
70
Compare changes
  • Side-by-side
  • Inline
Files
6
@@ -125,9 +125,9 @@ header #pageHeader
main #pageMain
form #recordForm
label .smallLabel
input textarea .smallInput
button
label
input .formTextInput
button #addButton
*/
@@ -136,38 +136,13 @@ main #pageMain
flex: 1;
}
#recordForm label, #recordForm input, #recordForm textarea {
margin-left: 1.25px;
margin-top: 5px;
#recordForm {
margin-left: 5px;
}
#recordForm label {
display: inline-block;
min-width: 27.5%;
text-align: right;
font-weight: bold;
vertical-align: top;
}
#recordForm input {
width: 50%;
min-width: 550px;
}
#recordForm textarea {
#recordForm .formTextInput {
margin-top: 5px;
width: 50%;
min-width: 550px;
font-size: 14.25px;
}
#recordForm .smallLabel {
width: 10%;
min-width: 125px;
}
#recordForm .smallInput {
width: 19.2%;
min-width: 200px;
}
/* [#4] Page footer styling. Uses [#2].
@@ -183,3 +158,86 @@ footer #pageFooter
font-size: 15px;
padding: 5px 10px;
}
div.contain {
text-align: center;
}
ul.list {
display: inline-block;
list-style-type: none;
margin: 0;
}
.container {
display: flex;
position: relative;
padding: 5px 660px 5px 5px;
width: 40%;
height: 50%;
background-color: white;
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
margin-bottom: 25px;
border-radius: 10px;
margin-left: 20px;
}
.image {
opacity: 1;
display: block;
transition: .5s ease;
backface-visibility: hidden;
border-radius: 10px 10px 10px 10px;
float: left;
width: 300px;
height: 250px;
object-fit: cover;
}
h2 {
position: absolute;
margin-left: 320px;
margin-top: 30px;
}
p{
margin-top: 80px;
margin-left: 50px;
}
.checked{
color: orange;
}
.star{
position: absolute;
top: 50%;
left: 40%;
transform: translate(-50%, -50%);
margin-top: 80px;
}
.middle {
transition: .5s ease;
opacity: 0;
position: absolute;
top: 45%;
left: 10.5%;
transform: translate(-25%, -25%);
-ms-transform: translate(-25%, -25%)
}
.container:hover .image {
opacity: 0.3;
}
.container:hover .middle {
opacity: 1;
}
.text {
background-color: black;
color: white;
font-size: 16px;
padding: 16px 32px;
}
Loading