Browse Source

Invited members dropdown

Unknown 7 years ago
parent
commit
9618aff5ad
6 changed files with 239 additions and 30 deletions
  1. 122 20
      canvas/css/canvas.css
  2. 23 7
      canvas/index.php
  3. 2 1
      canvas/js/canvas.js
  4. 42 0
      icon/members kopia.svg
  5. 42 0
      icon/members.svg
  6. 8 2
      index.html

+ 122 - 20
canvas/css/canvas.css

@@ -24,7 +24,8 @@ a.logo {
 }
 a.logo img {
     display: block;
-    width: 60%;
+    /* width: 60%; */
+    height: 50px;
     margin: auto;
 }
 
@@ -119,39 +120,71 @@ a.logo img {
 /* User area button and dropdown menu in the header: only shown when logged in */
 
 .form-header .user-profile {
+    margin-top: 9px;
+}
+.form-header .dropdown {
     font-size: 1em;
-    margin-top: 1.8em;
-    margin-right: 0.3em;
-    color: #444;
-    min-width: 80%;
+    /*
+    position: absolute;
+    top: 0;
+    right: 10%;
+    z-index: 2;
+    background-color: red;
+    */
+    /*
+    margin-top: 1.5em;
+    margin-right: 0em;
     margin-left: 3.5em;
+     */
+    text-align: left;
+    color: #444;
 }
-.form-header .user-profile li:hover {
-    background-color: #ffffff;
+.form-header .dropdown ul {
+    min-width: 215px;
+    margin-left: 0;
+}
+/*
+.form-header .dropdown li {
+    width: auto;
+}
+ */
+.form-header .dropdown li:not(.divider) {
+    padding-top: 5px;
+    padding-bottom: 5px;
+}
+.form-header .dropdown li.divider {
+    margin-top: 0;
+    margin-bottom: 0;
 }
-.form-header .user-profile img {
+.form-header .dropdown li:hover {
+    /*
+    background-color: #f5f5f5;
+    color: #444;
+     */
+}
+.form-header .dropdown img {
     width: 2.6em;
     margin-right: 0.5em;
+    height: 29px;
+    width: 29px;
 }
-.form-header .user-profile button {
+.form-header .dropdown button {
     padding: 0.2em 1em;
-    width: 90%;
+    outline: none !important;
+    min-width: 215px;
     border: none;
     border-radius: 2px;
     outline: 0;
+    text-align: left;
     background-color: transparent;
-    transition: all 0.5s;
+    /* transition: all 0.5s; */
 }
-.form-header .user-profile button:hover {
-    padding: 0.2em;
-}
-
-/* Bootstrap dropdown classes */
-
 ul.dropdown-menu {
     border: none;
     border-radius: 2px;
-    width: 90%;
+    width: 215px;
+    padding-top: 0;
+    padding-bottom: 0;
     margin: 0 5%;
     box-shadow: none;
     background-color: #48585f;
@@ -1131,6 +1164,10 @@ div.dialog-content {
     .field_10 {
         min-height: 250px;
     }
+    /* Logo */
+    a.logo img {
+        height: 60px;
+    }
     /* Adjusting textarea heights */
     .added_item .expandable {
         height: 8em;
@@ -1267,20 +1304,32 @@ div.dialog-content {
     }
     /* User area button and dropdown menu in the header: only shown when logged in */
     .form-header .user-profile {
+        margin-top: 20px;
+    }
+    .form-header .invited-members {
+        margin-bottom: -15px;
+    }
+    /*
+    .form-header .dropdown {
         margin-left: 0;
         width: 95%;
     }
+     */
     /* The button When the drop down menu is open */
+    /*
     .dropdown button#dropdownMenu1 {
         width: 100%;
         margin: auto;
     }
+     */
     /* Bootstrap dropdown classes */
+    /*
     ul.dropdown-menu {
         margin-left: 0;
         width: 100%;
         margin: auto;
     }
+     */
 }
 
 /* ----------------- 2 COL ----------------- */
@@ -1310,6 +1359,10 @@ div.dialog-content {
     .field_10 {
         min-height: 460px;
     }
+    /* Logo */
+    a.logo img {
+        height: 75px;
+    }
     /* Adjusting textarea heights */
     .added_item .expandable {
         height: 8em;
@@ -1341,7 +1394,7 @@ div.dialog-content {
     }
     a.logo img {
         display: block;
-        width: 40%;
+        /* width: 40%; */
         margin: auto;
     }
     /* Saved tags */
@@ -1367,22 +1420,34 @@ div.dialog-content {
         width: 100%;
     }
     /* User area button and dropdown menu in the header: only shown when logged in */
+    .form-header .user-profile {
+        margin-top: 20px;
+    }
+    .form-header .invited-members {
+        margin-bottom: -15px;
+    }
+    /*
     .form-header .user-profile {
         margin-left: 0;
         width: 50%;
         margin: 2em auto;
     }
+     */
     /* The button When the drop down menu is open */
+    /*
     .dropdown button#dropdownMenu1 {
         width: 60%;
         margin: 0 20%;
     }
+     */
     /* Bootstrap dropdown classes */
+    /*
     ul.dropdown-menu {
         margin-left: 0;
         width: 60%;
         margin: 0 20%;
     }
+     */
 }
 
 /* ----------------- 4 COL Smaller ----------------- */
@@ -1412,6 +1477,10 @@ div.dialog-content {
     .field_10 {
         min-height: 500px;
     }
+    /* Logo */
+    a.logo img {
+        height: 100px;
+    }
     /* Dialog */
     div.dialog {
         width: 30%;
@@ -1439,26 +1508,48 @@ div.dialog-content {
     }
     /* User area button and dropdown menu in the header: only shown when logged in */
     .form-header .user-profile {
+        margin-top: 20px;
+    }
+    .form-header .invited-members {
+        margin-bottom: -15px;
+    }
+    /*
+    .form-header .dropdown {
+        text-align: center;
+        /*
         margin-left: 0;
         width: 60%;
         margin: 2em auto;
-        transition: all 0.4s;
+         */
     }
+    /*
+    .form-header .dropdown {
+        width: 50%;
+    }
+    .form-header .dropdown ul {
+        width: 260px;
+        margin-left: 100px;
+    }
+     */
     /* Tag window */
     div#tag-window {
         width: 75%;
     }
     /* The button When the drop down menu is open */
+    /*
     .dropdown button#dropdownMenu1 {
         width: 62%;
         margin: 0 18%;
     }
+     */
     /* Bootstrap dropdown classes */
+    /*
     ul.dropdown-menu {
         margin-left: 0;
         width: 62%;
         margin: 0 18%;
     }
+     */
 }
 @media (min-width: 935px) and (max-width: 1153px) {
     /* Adjusting textarea heights */
@@ -1495,6 +1586,10 @@ div.dialog-content {
     .field_10 {
         min-height: 480px;
     }
+    /* Logo */
+    a.logo img {
+        margin-top: 37px;
+    }
     /* Dialog */
     div.dialog {
         width: 30%;
@@ -1520,6 +1615,13 @@ div.dialog-content {
     .form-header p {
         margin-top: 2em;
     }
+    /* User area button and dropdown menu in the header: only shown when logged in */
+    .form-header .user-profile {
+        /* margin-left: 0; */
+        /* width: 60%; */
+        margin-top: 19px;
+        /* transition: all 0.4s; */
+    }
     /* Tag window */
     div#tag-window {
         width: 75%;

+ 23 - 7
canvas/index.php

@@ -52,7 +52,7 @@
                         <!-- Logo -->
                         <h1 class="page_title">
                             <a class="logo" href="../index.html">
-                                <img src="icons/logo-black-text.svg" alt="Online Ethics Canvas"/>
+                                <img src="icons/logo-black-text.svg" alt="Online Ethics Canvas" />
                             </a>
                         </h1>
                     </div>
@@ -64,10 +64,9 @@
                         <label class="project_date">Date</label>
                         <input class="proj_date" name="field_00[]" type="date"/>
                     </div>
-                    <!-- Login coming soon -->
+                    <!-- Log in -->
                     <div class="col-md-3 ">
                         <?php if (!empty($name)) { ?>
-
                         <!-- Bootstrap dropdown component -->
                         <div class="dropdown user-profile">
                             <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
@@ -83,7 +82,24 @@
                         </div>
                         <?php } ?>
                     </div>
-                    
+                    <!-- Invited Members -->
+                    <div class="col-md-3">
+                        <?php if (!empty($name)) { ?>
+                        <!-- Bootstrap dropdown component -->
+                        <div class="dropdown invited-members">
+                            <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                                <img src="../icon/members.svg" alt="members" /><span>Invited Members</span>
+                                <span class="caret"></span>
+                            </button>
+                            <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+                                <li><a id="toDashboard" href="php/dashboard.php">Add/Remove Members</a></li>
+                                <!-- <li><a href="#">Something else here</a></li> -->
+                                <li role="separator" class="divider"></li>
+                                <li><a id="logout" href="#">View Online Members (0)</a></li>
+                            </ul>
+                        </div>
+                        <?php } ?>
+                    </div>
                 </div>
                 
                 <!-- Jump to -->
@@ -96,7 +112,7 @@
                             <hr />
                             <ul>
                                 <li>
-                                    <a href="#row_saved_tags">Saved tags</a>
+                                    <a href="#row_saved_tags">Saved Tags for This Canvas</a>
                                 </li>
                                 <li>
                                     <a href="#panel_01">1.&nbsp;&nbsp;Individuals Affected</a>
@@ -133,10 +149,10 @@
                     </div>
                 </div>
                 
-                <!-- Saved tags -->
+                <!-- Saved Tags for This Canvas -->
                 <div class="saved-tags row" id="row_saved_tags">
                     <div class="col-s-12">
-                        <label>Saved Tags</label>
+                        <label>Saved Tags for This Canvas</label>
                         <p>You haven't added any tags yet.</p>
                     </div>
                 </div>

+ 2 - 1
canvas/js/canvas.js

@@ -155,7 +155,7 @@ $(document).ready(function() {
                 showFixedJumpedTo();
                 
                 // Update scroll position
-                $(window).scrollTop($("div.saved-tags").offset().top - 360);
+                $(window).scrollTop($("div.saved-tags").offset().top - 300);
                 hasScrolledDown = true;
             }
             
@@ -1176,6 +1176,7 @@ $(document).ready(function() {
         $.post(url, function(data, status) {
             if (data == 200) {
                 $('.user-profile').hide();
+                $('.invited-members').hide();
                 window.location.href="https://www.ethicscanvas.org";
             }
         });

+ 42 - 0
icon/members kopia.svg

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   viewBox="0 0 85.333336 85.333336"
+   height="85.333336"
+   width="85.333336"
+   xml:space="preserve"
+   id="svg2"
+   version="1.1"><metadata
+     id="metadata8"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs6" /><g
+     transform="matrix(1.3333333,0,0,-1.3333333,0,85.333333)"
+     id="g10"><g
+       transform="scale(0.1)"
+       id="g12"><path
+         id="path14"
+         style="fill:#46556e;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="M 320,640 C 496.73,640 640,496.73 640,320 640,143.27 496.73,0 320,0 143.27,0 0,143.27 0,320 0,496.73 143.27,640 320,640" /><path
+         id="path16"
+         style="fill:#3c495b;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 426.145,222.453 c -12.559,4.524 -33.161,5.527 -42.707,9.047 -6.532,2.512 -16.583,5.023 -19.594,9.043 -3.52,4.02 -3.52,31.652 -3.52,31.652 0,0 8.039,7.539 11.055,15.578 3.016,8.04 5.527,30.649 5.527,30.649 0,0 0.5,0 1.504,0 2.516,0 6.535,1.508 8.543,12.058 2.512,12.563 7.035,19.594 6.031,29.141 -1.007,6.531 -3.519,7.539 -5.023,7.539 -1.008,0 -1.512,0 -1.512,0 0,0 6.535,9.543 6.535,41.703 0,33.16 -25.625,66.321 -73.359,66.321 -47.23,0 -72.852,-33.161 -72.852,-66.321 0,-32.16 6.532,-41.703 6.532,-41.703 0,0 -0.504,0 -1.508,0 -1.508,0 -4.524,-1.008 -5.024,-7.539 -1.507,-9.547 3.516,-16.078 6.028,-29.141 2.012,-10.55 6.531,-12.058 8.543,-12.058 1.004,0 1.508,0 1.508,0 0,0 2.007,-22.609 5.527,-30.649 3.516,-8.543 11.051,-15.578 11.051,-15.578 0,0 0,-28.136 -3.516,-31.652 -3.519,-4.02 -13.062,-6.531 -19.598,-9.043 -9.043,-3.52 -29.64,-5.027 -42.707,-9.047 -12.558,-4.519 -51.75,-23.109 -51.75,-73.859 h 315.536 c 0.503,50.75 -38.688,69.34 -51.25,73.859 v 0" /><path
+         id="path18"
+         style="fill:#3c495b;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 193.387,236.523 c 10.051,5.024 20.097,5.024 28.136,6.028 0,0 4.524,7.035 -10.046,9.547 0,0 -19.094,5.023 -21.606,7.539 -2.012,2.511 -1.008,17.586 -1.008,17.586 0,0 27.133,1.004 37.684,10.55 -17.582,26.125 -8.039,57.278 -12.059,85.415 -3.515,28.64 -20.597,46.73 -53.258,46.73 0,0 0,0 -1.003,0 v 0 c -31.657,0 -48.235,-18.09 -51.754,-46.73 -3.516,-28.637 7.035,-62.805 -11.055,-85.918 10.051,-9.043 35.172,-9.547 37.684,-9.547 v 0 0 c 0,0 1.007,-16.078 -1.004,-19.09 -2.008,-3.016 -9.043,-5.028 -13.567,-6.031 -10.047,-2.012 -20.5974,-5.528 -29.1404,-8.543 -8.5429,-3.012 -25.625,-20.598 -25.625,-42.204 h 90.9414 c 3.016,10.047 20.098,26.629 36.68,34.668 v 0" /><path
+         id="path20"
+         style="fill:#3c495b;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 483.297,202.859 h 90.945 c 0,21.606 -16.582,39.192 -25.625,42.207 -8.543,3.012 -19.094,6.532 -29.144,8.539 -4.52,1.004 -11.051,3.516 -13.567,6.032 -2.008,2.511 -1.004,19.09 -1.004,19.09 v 0 0 c 3.016,0 28.137,0.503 38.188,9.546 -18.09,23.114 -7.539,57.282 -11.559,85.918 -3.515,28.641 -20.097,46.227 -51.75,46.227 v 0 h -1.004 c -32.66,0 -50.246,-18.09 -53.761,-46.727 -3.52,-28.64 5.527,-59.289 -12.059,-85.418 10.551,-9.546 37.684,-10.55 37.684,-10.55 0,0 1.504,-15.075 -1.008,-17.586 -2.008,-2.512 -21.606,-7.535 -21.606,-7.535 -14.066,-2.512 -10.047,-9.547 -10.047,-9.547 7.536,-1.004 17.586,-1.004 28.137,-6.032 17.586,-8.539 34.668,-25.121 37.18,-34.164 v 0" /><path
+         id="path22"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 426.145,238.668 c -12.559,4.523 -33.161,5.527 -42.707,9.043 -6.532,2.512 -16.583,5.023 -19.594,9.047 -3.52,4.019 -3.52,31.652 -3.52,31.652 0,0 8.039,7.535 11.055,15.574 3.016,8.039 5.527,30.653 5.527,30.653 0,0 0.5,0 1.504,0 2.516,0 6.535,1.508 8.543,12.058 2.512,12.559 7.035,19.594 6.031,29.141 -1.007,6.531 -3.519,7.535 -5.023,7.535 -1.008,0 -1.512,0 -1.512,0 0,0 6.535,9.547 6.535,41.703 0,33.164 -25.625,66.324 -73.359,66.324 -47.23,0 -72.852,-33.16 -72.852,-66.324 0,-32.156 6.532,-41.703 6.532,-41.703 0,0 -0.504,0 -1.508,0 -1.508,0 -4.524,-1.004 -5.024,-7.535 -1.507,-9.547 3.516,-16.078 6.028,-29.141 2.012,-10.554 6.531,-12.058 8.543,-12.058 1.004,0 1.508,0 1.508,0 0,0 2.007,-22.614 5.527,-30.653 3.516,-8.539 11.051,-15.574 11.051,-15.574 0,0 0,-28.137 -3.516,-31.652 -3.519,-4.024 -13.062,-6.535 -19.598,-9.047 -9.043,-3.516 -29.64,-5.023 -42.707,-9.043 -12.558,-4.523 -51.75,-23.113 -51.75,-73.859 h 315.536 c 0.503,50.746 -38.688,69.336 -51.25,73.859 v 0" /><path
+         id="path24"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 193.387,252.734 c 10.051,5.028 20.097,5.028 28.136,6.032 0,0 4.524,7.035 -10.046,9.547 0,0 -19.094,5.023 -21.606,7.535 -2.012,2.511 -1.008,17.586 -1.008,17.586 0,0 27.133,1.004 37.684,10.55 -17.582,26.129 -8.039,57.282 -12.059,85.418 -3.515,28.641 -20.597,46.727 -53.258,46.727 0,0 0,0 -1.003,0 v 0 c -31.657,0 -48.235,-18.086 -51.754,-46.727 -3.516,-28.64 7.035,-62.804 -11.055,-85.918 10.051,-9.046 35.172,-9.546 37.684,-9.546 v 0 0 c 0,0 1.007,-16.079 -1.004,-19.094 -2.008,-3.016 -9.043,-5.024 -13.567,-6.028 -10.047,-2.011 -20.5974,-5.527 -29.1404,-8.543 -8.5429,-3.015 -25.625,-20.601 -25.625,-42.207 h 90.9414 c 3.016,10.051 20.098,26.629 36.68,34.668 v 0" /><path
+         id="path26"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 483.297,219.074 h 90.945 c 0,21.606 -16.582,39.188 -25.625,42.203 -8.543,3.016 -19.094,6.532 -29.144,8.543 -4.52,1.004 -11.051,3.516 -13.567,6.028 -2.008,2.511 -1.004,19.093 -1.004,19.093 v 0 0 c 3.016,0 28.137,0.504 38.188,9.547 -18.09,23.114 -7.539,57.278 -11.559,85.918 -3.515,28.641 -20.097,46.227 -51.75,46.227 v 0 h -1.004 c -32.66,0 -50.246,-18.09 -53.761,-46.731 -3.52,-28.636 5.527,-59.289 -12.059,-85.414 10.551,-9.547 37.684,-10.55 37.684,-10.55 0,0 1.504,-15.075 -1.008,-17.586 -2.008,-2.512 -21.606,-7.536 -21.606,-7.536 -14.066,-2.515 -10.047,-9.546 -10.047,-9.546 7.536,-1.008 17.586,-1.008 28.137,-6.032 17.586,-8.543 34.668,-25.121 37.18,-34.164 v 0" /></g></g></svg>

+ 42 - 0
icon/members.svg

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   viewBox="0 0 85.333336 85.333336"
+   height="85.333336"
+   width="85.333336"
+   xml:space="preserve"
+   id="svg2"
+   version="1.1"><metadata
+     id="metadata8"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs6" /><g
+     transform="matrix(1.3333333,0,0,-1.3333333,0,85.333333)"
+     id="g10"><g
+       transform="scale(0.1)"
+       id="g12"><path
+         id="path14"
+         style="fill:#4f5d73;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="M 320,640 C 496.73,640 640,496.73 640,320 640,143.27 496.73,0 320,0 143.27,0 0,143.27 0,320 0,496.73 143.27,640 320,640" /><path
+         id="path16"
+         style="fill:#3c495b;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 426.145,222.453 c -12.559,4.524 -33.161,5.527 -42.707,9.047 -6.532,2.512 -16.583,5.023 -19.594,9.043 -3.52,4.02 -3.52,31.652 -3.52,31.652 0,0 8.039,7.539 11.055,15.578 3.016,8.04 5.527,30.649 5.527,30.649 0,0 0.5,0 1.504,0 2.516,0 6.535,1.508 8.543,12.058 2.512,12.563 7.035,19.594 6.031,29.141 -1.007,6.531 -3.519,7.539 -5.023,7.539 -1.008,0 -1.512,0 -1.512,0 0,0 6.535,9.543 6.535,41.703 0,33.16 -25.625,66.321 -73.359,66.321 -47.23,0 -72.852,-33.161 -72.852,-66.321 0,-32.16 6.532,-41.703 6.532,-41.703 0,0 -0.504,0 -1.508,0 -1.508,0 -4.524,-1.008 -5.024,-7.539 -1.507,-9.547 3.516,-16.078 6.028,-29.141 2.012,-10.55 6.531,-12.058 8.543,-12.058 1.004,0 1.508,0 1.508,0 0,0 2.007,-22.609 5.527,-30.649 3.516,-8.543 11.051,-15.578 11.051,-15.578 0,0 0,-28.136 -3.516,-31.652 -3.519,-4.02 -13.062,-6.531 -19.598,-9.043 -9.043,-3.52 -29.64,-5.027 -42.707,-9.047 -12.558,-4.519 -51.75,-23.109 -51.75,-73.859 h 315.536 c 0.503,50.75 -38.688,69.34 -51.25,73.859 v 0" /><path
+         id="path18"
+         style="fill:#3c495b;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 193.387,236.523 c 10.051,5.024 20.097,5.024 28.136,6.028 0,0 4.524,7.035 -10.046,9.547 0,0 -19.094,5.023 -21.606,7.539 -2.012,2.511 -1.008,17.586 -1.008,17.586 0,0 27.133,1.004 37.684,10.55 -17.582,26.125 -8.039,57.278 -12.059,85.415 -3.515,28.64 -20.597,46.73 -53.258,46.73 0,0 0,0 -1.003,0 v 0 c -31.657,0 -48.235,-18.09 -51.754,-46.73 -3.516,-28.637 7.035,-62.805 -11.055,-85.918 10.051,-9.043 35.172,-9.547 37.684,-9.547 v 0 0 c 0,0 1.007,-16.078 -1.004,-19.09 -2.008,-3.016 -9.043,-5.028 -13.567,-6.031 -10.047,-2.012 -20.5974,-5.528 -29.1404,-8.543 -8.5429,-3.012 -25.625,-20.598 -25.625,-42.204 h 90.9414 c 3.016,10.047 20.098,26.629 36.68,34.668 v 0" /><path
+         id="path20"
+         style="fill:#3c495b;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 483.297,202.859 h 90.945 c 0,21.606 -16.582,39.192 -25.625,42.207 -8.543,3.012 -19.094,6.532 -29.144,8.539 -4.52,1.004 -11.051,3.516 -13.567,6.032 -2.008,2.511 -1.004,19.09 -1.004,19.09 v 0 0 c 3.016,0 28.137,0.503 38.188,9.546 -18.09,23.114 -7.539,57.282 -11.559,85.918 -3.515,28.641 -20.097,46.227 -51.75,46.227 v 0 h -1.004 c -32.66,0 -50.246,-18.09 -53.761,-46.727 -3.52,-28.64 5.527,-59.289 -12.059,-85.418 10.551,-9.546 37.684,-10.55 37.684,-10.55 0,0 1.504,-15.075 -1.008,-17.586 -2.008,-2.512 -21.606,-7.535 -21.606,-7.535 -14.066,-2.512 -10.047,-9.547 -10.047,-9.547 7.536,-1.004 17.586,-1.004 28.137,-6.032 17.586,-8.539 34.668,-25.121 37.18,-34.164 v 0" /><path
+         id="path22"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 426.145,238.668 c -12.559,4.523 -33.161,5.527 -42.707,9.043 -6.532,2.512 -16.583,5.023 -19.594,9.047 -3.52,4.019 -3.52,31.652 -3.52,31.652 0,0 8.039,7.535 11.055,15.574 3.016,8.039 5.527,30.653 5.527,30.653 0,0 0.5,0 1.504,0 2.516,0 6.535,1.508 8.543,12.058 2.512,12.559 7.035,19.594 6.031,29.141 -1.007,6.531 -3.519,7.535 -5.023,7.535 -1.008,0 -1.512,0 -1.512,0 0,0 6.535,9.547 6.535,41.703 0,33.164 -25.625,66.324 -73.359,66.324 -47.23,0 -72.852,-33.16 -72.852,-66.324 0,-32.156 6.532,-41.703 6.532,-41.703 0,0 -0.504,0 -1.508,0 -1.508,0 -4.524,-1.004 -5.024,-7.535 -1.507,-9.547 3.516,-16.078 6.028,-29.141 2.012,-10.554 6.531,-12.058 8.543,-12.058 1.004,0 1.508,0 1.508,0 0,0 2.007,-22.614 5.527,-30.653 3.516,-8.539 11.051,-15.574 11.051,-15.574 0,0 0,-28.137 -3.516,-31.652 -3.519,-4.024 -13.062,-6.535 -19.598,-9.047 -9.043,-3.516 -29.64,-5.023 -42.707,-9.043 -12.558,-4.523 -51.75,-23.113 -51.75,-73.859 h 315.536 c 0.503,50.746 -38.688,69.336 -51.25,73.859 v 0" /><path
+         id="path24"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 193.387,252.734 c 10.051,5.028 20.097,5.028 28.136,6.032 0,0 4.524,7.035 -10.046,9.547 0,0 -19.094,5.023 -21.606,7.535 -2.012,2.511 -1.008,17.586 -1.008,17.586 0,0 27.133,1.004 37.684,10.55 -17.582,26.129 -8.039,57.282 -12.059,85.418 -3.515,28.641 -20.597,46.727 -53.258,46.727 0,0 0,0 -1.003,0 v 0 c -31.657,0 -48.235,-18.086 -51.754,-46.727 -3.516,-28.64 7.035,-62.804 -11.055,-85.918 10.051,-9.046 35.172,-9.546 37.684,-9.546 v 0 0 c 0,0 1.007,-16.079 -1.004,-19.094 -2.008,-3.016 -9.043,-5.024 -13.567,-6.028 -10.047,-2.011 -20.5974,-5.527 -29.1404,-8.543 -8.5429,-3.015 -25.625,-20.601 -25.625,-42.207 h 90.9414 c 3.016,10.051 20.098,26.629 36.68,34.668 v 0" /><path
+         id="path26"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 483.297,219.074 h 90.945 c 0,21.606 -16.582,39.188 -25.625,42.203 -8.543,3.016 -19.094,6.532 -29.144,8.543 -4.52,1.004 -11.051,3.516 -13.567,6.028 -2.008,2.511 -1.004,19.093 -1.004,19.093 v 0 0 c 3.016,0 28.137,0.504 38.188,9.547 -18.09,23.114 -7.539,57.278 -11.559,85.918 -3.515,28.641 -20.097,46.227 -51.75,46.227 v 0 h -1.004 c -32.66,0 -50.246,-18.09 -53.761,-46.731 -3.52,-28.636 5.527,-59.289 -12.059,-85.414 10.551,-9.547 37.684,-10.55 37.684,-10.55 0,0 1.504,-15.075 -1.008,-17.586 -2.008,-2.512 -21.606,-7.536 -21.606,-7.536 -14.066,-2.515 -10.047,-9.546 -10.047,-9.546 7.536,-1.008 17.586,-1.008 28.137,-6.032 17.586,-8.543 34.668,-25.121 37.18,-34.164 v 0" /></g></g></svg>

+ 8 - 2
index.html

@@ -415,7 +415,6 @@ MEAT THE TEAM
                 <p>
                     Arturo is a software professional with experience in the industry and in academia. As a Software Architect at <a href="http://www.adaptcentre.ie" target="_new">ADAPT Centre</a>, he coordinates the overall technology of a set of research projects ranging from Machine Learning to Ethics.</p><p> Passionate about
                 entrepreneurship and technology, he is very active in the Dublin startup ecosystem. Arturo founded three companies in the past, and he is CTO of a new one: <a href="https://www.sedicii.com" target="_new">Sedicii</a>. He is the main organiser of the <a href="http://www.meetup.com/Machine-Learning-Dublin/" target="_new">Machine Learning Dublin</a> meetup group.
-
                 </p>
             </div>
             <div class=" team-member andreas col-md-4   col-sm-6 ">
@@ -428,6 +427,13 @@ MEAT THE TEAM
                 <img src="img/farnoosh.jpg" alt="Andreas Burburan, front-end developer and interaction designer in the Online Ethics Canvas project"/>
                 <p>
                     Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quae si potest singula consolando levare, universa quo modo sustinebit? Teneo, inquit, finem illi videri nihil dolere. Ut proverbia non nulla veriora sint quam vestra dogmata.</p><p>Isto modo, ne si avia quidem eius nata non esset. Quod quidem iam fit etiam in Academia. Duo Reges: constructio interrete. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Dempta enim aeternitate nihilo beatior Iuppiter quam Epicurus.</p>
+                <!--
+                    Andreas is a front-end developer and interaction designer. I study web development at Karlstad University in Karlstad, Sweden. Few things delight me more than elegantly solving logical problems, while building beautiful and effective interactive products that deliver value to the client. With a tireless devotion, I also thrive under pressure, and most of all where I grow as a professional and human being. This desire for learning has motivated me to apply for an internship in the Ethics Canvas project, where I hope to fully utilise my skills in HTML, CSS, JavaScript and more—while contributing to the great work that I can already tell is being done. I am convinced that I will be a valuable asset for the Ethics Project, given my unusually wide range of skills.
+                    
+                    He has also long cultivated a keen interest in interaction and graphic design, with many years of experience in several areas related to advertising production including graphic design, image editing, 3D modelling and markup using HTML and CSS.
+                    
+                    I look forward to hearing from you soon!
+                -->
             </div>
             <div class=" team-member farnoosh col-md-4   col-sm-6 ">
                 <h3>Farnoosh Mohri
@@ -438,7 +444,7 @@ MEAT THE TEAM
                 </p>
                 <img src="img/farnoosh.jpg" alt="Farnoosh Mohri, Concept developer and business development in the Online Ethics Canvas project"/>
                 <p>
-                    Farnoosh is an interaction designer and front-end developer. She has a great passion for technology and how it can empower us as humans. She has studied web and multimedia development and she has been involed in different design and development projects with start-ups at Innovation Park in Sweden.</p><p>Farnoosh believes that our global digital connection and engagement is a crucial part of the human experience. She has joined the Online Ethics Canvas team at ADAPT Centre, as a wish to create new possibilities through innovative digital content, and contribute to a better world.</p>
+                    Farnoosh is a front-end developer and interaction designer. She has a great passion for technology and how it can empower us as humans. She has studied web and multimedia development and she has been involed in different design and development projects with start-ups at Innovation Park in Sweden.</p><p>Farnoosh believes that our global digital connection and engagement is a crucial part of the human experience. She has joined the Online Ethics Canvas team at ADAPT Centre, as a wish to create new possibilities through innovative digital content, and contribute to a better world.</p>
             </div>
         </div>
         <!--  end of second .row .meet-the-team -->