Merge pull request #75 from 3daddict/dev

Dev

package.json

@@ -18,7 +18,8 @@
     "Sunil Kumar Jain <[email protected]@gmail.com> (https://github.com/sunilsj99)",
     "Cintia Tahirih <[email protected]> (https://github.com/cTahirih)",
     "Prashant Chaudhari <[email protected]> (https://github.com/pandaa880)",
-    "Alexis Pandaan <[email protected]> (https://github.com/Alexius08)"
+    "Alexis Pandaan <[email protected]> (https://github.com/Alexius08)",
+    "Ivan Sosnin <[email protected]> (https://github.com/vansosnin)"
   ],
   "license": "ISC",
   "repository": {

src/assets/css/app.css

@@ -122,16 +122,12 @@ button {
   cursor: pointer;
   color: #fff;
   background: #8bbc37;
-  -webkit-box-shadow: 0 3px 1px #64950d;
-  -moz-box-shadow: 0 3px 1px #64950d;
   box-shadow: 0 3px 1px #64950d;
 
   border: 0;
   padding: 10px;
   margin: 20px auto;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
+  border-radius: 5px; 
   display: block;
   text-decoration: none;
   text-align: center;
@@ -157,8 +153,6 @@ button:disabled {
 
 .card:hover {
   cursor: pointer;
-  -webkit-box-shadow: 0px 10px 5px 0px rgba(0, 0, 0, 0.75);
-  -moz-box-shadow: 0px 10px 5px 0px rgba(0, 0, 0, 0.75);
   box-shadow: 0px 10px 5px 0px rgba(0, 0, 0, 0.75);
   transition: all 0.3s ease-in;
 }

src/assets/css/card.css

@@ -1,35 +1,35 @@
-.front {
-  width: 100%;
-  height: 100%;
-}
-
-.front-icon {
-  position: absolute;
-  left: 20%;
-  top: 20%;
-}
-
-.back-icon {
-  background-color: lavender;
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  left: 0;
-  border-radius: 50%;
-  border: 1px black solid;
-  top: 0;
-}
-
-.front-icon-spa {
-  position: absolute;
-  left: 20%;
-  top: 20%;
-}
-
-@media (max-width: 650px) {
-  .front-icon,
-  .front-icon-spa {
-    left: 12%;
-    top: 15%;
-  }
-}
+.front {
+  width: 100%;
+  height: 100%;
+}
+
+.front-icon {
+  position: absolute;
+  left: 20%;
+  top: 20%;
+}
+
+.back-icon {
+  background-color: lavender;
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  left: 0;
+  border-radius: 50%;
+  border: 1px black solid;
+  top: 0;
+}
+
+.front-icon-spa {
+  position: absolute;
+  left: 20%;
+  top: 20%;
+}
+
+@media (max-width: 650px) {
+  .front-icon,
+  .front-icon-spa {
+    left: 12%;
+    top: 15%;
+  }
+}

src/components/app.js

@@ -258,4 +258,4 @@ class App extends Component {
   }
 }
 
-export default App;
+export default App;