Merge branch 'master' conflicts into responsive_header

css/style.css

@@ -422,7 +422,11 @@ ul#nav li a:hover .ul#nav li ul {
    height: 80px;
    width: 250px;
    position: absolute;
+<<<<<<< HEAD
    top: 20px;
+=======
+   top: -20px;
+>>>>>>> master
 }
 .service-logo img {
    height: 80px;
@@ -434,9 +438,15 @@ ul#nav li a:hover .ul#nav li ul {
    display: inline-block;
    text-align: center;
    vertical-align: top;
+<<<<<<< HEAD
    height: 240px;
    width: 250px;
    margin: 70px 25px;
+=======
+   height: 300px;
+   width: 250px;
+   margin: 30px 25px;
+>>>>>>> master
    padding-top: 30px;
    clear: none;
    border-radius: 0px;
@@ -447,6 +457,7 @@ ul#nav li a:hover .ul#nav li ul {
 .framed p {
    width: 80%;
    text-align: left;
+<<<<<<< HEAD
    color: #555;
    margin: 5px auto;
    height: 58%;
@@ -455,6 +466,9 @@ ul#nav li a:hover .ul#nav li ul {
 .framed h2 {
    width: 70%;
    text-align: center;
+=======
+   width: 60%;
+>>>>>>> master
    margin: 5px auto;
    font-size: 1.5em;
 }
@@ -526,6 +540,73 @@ ul#nav li a:hover .ul#nav li ul {
   border-color: #50162D;
 }
 
+/* New services
+------------------------------------*/
+
+/*.service-parent {
+  display: flex;
+  justify-content: center;
+  flex-wrap: wrap;
+  margin-top: 40px;
+}
+
+.service-parent p {
+ text-align: justify;
+ padding-left: 10%;
+ padding-right: 10%;
+ line-height: 15px;
+ height: 27%;
+}
+
+.service-parent h1 {
+ margin-top: -10%;
+ color: #50162D;
+ padding: 2%;
+ font-size: 1.5em;
+}
+
+.service-item {
+  display: inline-block;
+  width: 220px;
+  height: 250px;
+  text-align: center;
+  border: none;
+  box-shadow: 10px 10px 38px 0px rgba(0, 0, 0, 0.25);
+  margin-right: 5%;
+  margin-top: 5%;
+  margin-bottom: 50px;
+  background-color: white;
+}
+
+.service-item img {
+  position: relative;
+  width: 30%;
+  max-width: 80px;
+  transform: translate(0%, -50%);
+}
+
+.service-btn {
+  position: relative;
+  margin: 0 auto;
+  bottom: -21px;
+  width: 30%;
+  background-color: #50162D;
+  text-align: center;
+  font-size: 1.2em;
+  color: white;
+  border-radius: 5px;
+  text-decoration: none;
+  padding: 2% 5%;
+  transition: all 0.3s ease-in-out;
+  border: 1px solid transparent;
+}
+
+.service-btn:hover {
+  background-color: #72384F;
+  color: #50162D;
+  border-color: #50162D;
+}*/
+
 /* clients
 ------------------------------------*/
 
@@ -605,6 +686,33 @@ ul#nav li a:hover .ul#nav li ul {
   opacity: 1;
 }
 
+
+/* Contact
+--------------------------------------*/
+.contact {
+  width:60px;
+  vertical-align:middle;
+  display:inline;
+  margin-right: 30px;
+}
+
+.contact:hover {
+filter: grayscale(100%);
+}
+
+.contact img {
+  max-height: 55px;
+  height: auto;
+  padding:5px;
+  float: left;
+  margin-right: 10px;
+}
+
+.contact p {
+  overflow: auto;
+  line-height: 1.5;
+}
+
 /* Donations
 ------------------------------------*/
 

templates/modular/services.html.twig

@@ -7,7 +7,11 @@
              {% for item in page.header.services %}
                <div class="four columns">
                    <div class="framed">
+<<<<<<< HEAD
                    <div class="service-logo"> <img src="../user/themes/disroot/images/logo_{{ item.icon }}"></div>
+=======
+                   <div class="service-logo"> <img src="user/themes/disroot/images/logo_{{ item.icon }}"></div>
+>>>>>>> master
                            <a href="{{ item.link }}">
                            <h2>{{ item.title }}</h2>
                            <p class="service">