Merge branch 'daniel-server' of https://github.com/OSU-CS290-Sp18/final-project-group-4 into daniel-server

public/css/main.css

@@ -88,6 +88,7 @@ div.top-bar {
 .board-cell {
   display: inline-block;
   position: relative;
+<<<<<<< HEAD
   padding: 5.5555555556%;
 }
 .board-cell .overlay {
@@ -109,6 +110,24 @@ div.top-bar {
 .board-cell.large {
   padding: 2.6315789474%;
 }
+=======
+  padding: 5.5555555556%; }
+  .board-cell .overlay {
+    position: absolute;
+    box-sizing: border-box;
+    top: 10%;
+    left: 10%;
+    width: 80%;
+    height: 80%;
+    border-radius: 50%;
+    transition: background-color .25s; }
+  .board-cell.small {
+    padding: 5.5555555556%; }
+  .board-cell.medium {
+    padding: 3.8461538462%; }
+  .board-cell.large {
+    padding: 2.6315789474%; }
+>>>>>>> 733c32748eb734f126d45e84e3609b04d4f1f023
 
 .black-cell .overlay {
   background-color: black;

public/css/style.css

@@ -0,0 +1,94 @@
+body {
+    font-family: Roboto;
+    background-image: url(/images/clouds.jpg);
+    background-color: #F5F7FA;
+    color: #2d2d2d;
+}
+
+a {
+    text-decoration:none;
+}
+
+.card {
+    background-color:white;
+    box-shadow: 2px 2px 3px rgba(0,0,0,.13) ,1px 2px 2px rgba(0,0,0,.1) , -1px -2px 2px rgba(0,0,0,.05);
+    margin: auto;
+    margin-top: 20px;
+    max-width: 750px;
+    padding: 20px;
+}
+
+.member-container{
+    display:flex;
+    flex-direction: column;
+}
+.person-photo img{
+    padding-top:10px;
+    height:30%;
+    width:30%;
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+    border-radius:50%;
+}
+
+.member {
+    padding: 20px;
+
+    box-sizing: border-box;
+    flex-grow:1;
+    flex-basis:50%;
+
+    background-color:white;
+}
+
+.toplevel{
+    position:relative;
+    display: flex;
+    flex-wrap: wrap;
+}
+
+h2 {
+    font-size:30px;
+    color:#546076;
+    font-weight:100;
+    text-align:center;
+    width: 100%;
+}
+
+.Mission{
+    font-size:40px;
+    font-weight:100;
+    padding-top:16px;
+    margin-left: auto;
+    margin-right: auto;
+    text-align:center;
+}
+
+.Person-Name{
+    font-size:20px;
+    font-weight:600;
+    padding-top:16px;
+    margin-left: auto;
+    margin-right: auto;
+    text-align:center;
+}
+.member-text {
+    position:center;
+    display: block;
+    margin: auto;
+    font:Roboto;
+    font-weight:400;
+}
+
+.mission-text {
+    position:center;
+    display: block;
+    margin: auto;
+    width:50%;
+    width:800px;
+    font:Roboto;
+    font-weight:400;
+    text-align:center;
+    padding-top:1%;
+}

public/scss/css/main.css

@@ -0,0 +1,158 @@
+h1, h2, h3, h4, h5, h6 {
+  font-family: "Comfortaa", serif;
+  text-align: center;
+}
+
+h1 {
+  font-size: 5em;
+  margin: 0px;
+}
+
+body {
+  font-family: "Comfortaa", sans-serif;
+  margin: 0px;
+  background-color: #f4f4f4;
+}
+
+.content-wrapper {
+  max-width: 750px;
+  margin: auto;
+}
+
+li {
+  list-style: none;
+}
+
+ul.game-instructions {
+  display: flex;
+}
+
+div.top-bar {
+  background-image: url(../../src/Go/views/grid.jpg);
+  line-height: 135px;
+}
+
+.board {
+  background-color: tomato;
+  padding: 20px;
+  max-width: 500px;
+  margin: auto;
+  border-radius: 10px;
+}
+
+.black-player .board-cell:hover .overlay {
+  background-color: black;
+}
+
+.white-player .board-cell:hover .overlay {
+  background-color: white;
+}
+
+.board-cell {
+  display: inline-block;
+  position: relative;
+  padding: 5.5555555556%;
+}
+.board-cell .overlay {
+  position: absolute;
+  box-sizing: border-box;
+  top: 10%;
+  left: 10%;
+  width: 80%;
+  height: 80%;
+  border-radius: 50%;
+  transition: background-color 0.25s;
+}
+.board-cell.small {
+  padding: 5.5555555556%;
+}
+.board-cell.medium {
+  padding: 3.8461538462%;
+}
+.board-cell.large {
+  padding: 2.6315789474%;
+}
+
+.black-cell .overlay {
+  background-color: black;
+}
+
+.white-cell .overlay {
+  background-color: white;
+}
+
+.split-wrapper {
+  display: flex;
+  width: 100%;
+}
+@media screen and (max-width: 640px) {
+  .split-wrapper {
+    flex-direction: column;
+  }
+}
+
+.split-item {
+  flex-grow: 1;
+  box-sizing: border-box;
+}
+
+.split-wrapper form {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 10px;
+}
+.split-wrapper form input {
+  margin-top: 20px;
+  padding: 5px;
+  padding-left: 10px;
+  padding-right: 10px;
+  border: none;
+  outline: none;
+  width: 100%;
+  max-width: 300px;
+}
+.split-wrapper form input[type=radio] {
+  opacity: 0;
+  width: 0px;
+  height: 0px;
+}
+.split-wrapper form input[type=radio]:checked ~ label {
+  color: tomato;
+  transition: color 0.25s;
+}
+.split-wrapper form input[type=submit] {
+  padding: 10px;
+  background-color: tomato;
+  color: white;
+}
+.split-wrapper form input[type=submit]:focus, .split-wrapper form input[type=submit]:hover {
+  background-color: inherit;
+  color: tomato;
+  transition: background-color 0.25s, color 0.25s;
+}
+.split-wrapper form input[type=text] {
+  background-color: inherit;
+  border-bottom: solid tomato;
+  border-width: 2px;
+  height: 3em;
+  box-sizing: border-box;
+  display: block;
+}
+.split-wrapper form input[type=text]:focus {
+  border-width: 3px;
+  transition: background-color 0.25s, border-width 0.25s;
+}
+.split-wrapper form .radio-parent {
+  display: flex;
+  margin-top: 20px;
+  width: 100%;
+  max-width: 300px;
+}
+.split-wrapper form .radio-wrapper {
+  flex-grow: 1;
+  display: inline-block;
+  text-align: center;
+}
+
+/*# sourceMappingURL=css/main.css.map */