conflict resolution

source/gitlab-com/index.html

@@ -75,9 +75,10 @@ extra_js:
       <div class="row support">
         <div class="col-xs-6 col-md-1"></div>
-        <div class="col-xs-6 col-md-5">
+        <div class="col-xs-6 col-md-4 txt-middle">
           <i class="fa fa-briefcase hidden-xs hidden-sm"></i>
         </div>
+        <div class="col-md-1 hidden-sm hidden-xs"></div>
         <div class="col-xs-12 col-md-6">
           <h2>Support Package</h2>
             <ul>

source/handbook/index.html

@@ -290,7 +290,7 @@ extra_css:
                         <li>If you are assigned to merge a Merge Request and there is a merge conflict, consider trying to resolve it <b>yourself</b> instead of asking the MR creator to resolve the conflict. If it is easy to resolve you avoid a round trip between you and the creator, and the MR gets merged sooner. This is a suggestion, not an obligation.</li>
                         <li>When you create a merge request, please <b>mention</b> the issue that it solves in the description but avoid auto closing it by saying Fixes #1 or Solves #1. Since we frequently have to report back to customers or the rest of the community, issues are not done when the code is merged.</li>
                         <li>If you ask a question to a specific person, always start the comment by mentioning them; this will ensure they see it if their notification level is mentioned and other people will understand they don't have to respond.</li>
-                        <li>Do not close an issue until it has been <b>reported</b> back to all parties and issue trackers updated.</li>
+                        <li>Do not close an issue until code has been merged, it has been <b>reported</b> back to all parties, all issue trackers are updated and any documentation is written and merged.</li>
                       </ol>
                     <h3 id="starting-with-git">Getting Started with Git and GitLab (to be populated)</h3>

source/jobs/index.html

@@ -24,6 +24,7 @@ extra_css:
       Anyone in the top 50 contributors of CE and top 10 of CI gets a guaranteed interview.
     </div>
+    <div class="all-jobs">
     <div class="vacancy" id="service-eng">
       <h2>Service Engineer
@@ -404,6 +405,15 @@ extra_css:
           resumes. Please do not contact us.
         </small>
       </p>
+=======
+
+        <script src='https://www.workable.com/assets/embed.js' type='text/javascript'></script>
+        <script type='text/javascript' charset='utf-8'>
+        whr(document).ready(function(){
+        whr_embed(34611, {detail: 'descriptions', base: 'jobs', zoom: 'country', grouping: 'none'});
+        });
+        </script>
+        <div id="whr_embed_hook"></div>
     </div>
     <div class="title">

source/stylesheets/jobs.css

@@ -3,6 +3,10 @@ body {
   font-family: "Roboto Condensed", sans-serif;
 }
+.alert {
+  font-size: 17px;
+}
+
 .wrapper {
   min-height: 55%;
 }
@@ -39,18 +43,28 @@ body {
   font-size: 35px;
 }
-.vacancy h2 {
-  font-weight: 600;
+.whr-items h2 {
+  font-weight: 600 !important;
   margin-top: 0;
-  font-size: 36px;
+  font-size: 36px !important;
+}
+
+.whr-items {
+  list-style-type: none;
 }
-.vacancy h1 small {
+.whr-title a{
+  font-weight: 700 !important;
+  font-size: 36px !important;
+}
+
+
+.whr-items h1 small {
   text-transform: none;
   font-weight: 300;
 }
-.vacancy {
+.whr-item {
   color: #555;
   font-size: 1.7rem;
   margin-top: 20px;
@@ -58,9 +72,11 @@ body {
   background: white;
   padding: 25px;
   box-shadow: 0px 3px 3px #F0F0F0;
+  margin-left: -38px;
+  padding-top: 10px !important;
 }
-.vacancy:nth-last-child(2) {
+.whr-item:nth-last-child(2) {
   margin-bottom: 50px;
 }