diff --git a/style.css b/style.css
index 9dd1362..e4f4cd1 100644
--- a/style.css
+++ b/style.css
@@ -199,18 +199,14 @@
 .btn,
 a.btn,
 button.btn {
-<<<<<<< HEAD
-  font-size: 1rem;
-  font-weight: 700;
-=======
   font-size: 1.15rem;
   font-weight: 750;
->>>>>>> 2ff6f9df117d31f3c06c6395e8d2b787d89c1950
   line-height: 1.5;
   position :relative;
   display:inline-block;
-  padding:1rem 2rem;
+  padding:1rem;
   width: 13rem; /*ボタンの横幅*/
+  height: 7rem;
   margin: 0.2rem; /*余白*/
   cursor: pointer;
   -webkit-transition: all 0.3s;
@@ -230,7 +226,7 @@
 .btn-html, /*------------------html------------------*/
 a.btn-html {
   color: #fff;
-  background-color: #c1c806;}
+  background-color: #e7eb0f;}
 .btn-html:hover,
 a.btn-html:hover {
   color: #fff;
@@ -239,7 +235,7 @@
 .btn-css,/*-------------------css---------------------*/
 a.btn-css {
   color: #fff;
-  background-color: #dd538a;}
+  background-color: #e0418e;}
 .btn-css:hover,
 a.btn-css:hover {
   color: #fff;
@@ -248,7 +244,7 @@
 .btn-java,/*-------------------java---------------------*/
 a.btn-java {
   color: #fff;
-  background-color: #0b4fe3;}
+  background-color: #4689c8;}
 .btn-java:hover,
 a.btn-java:hover {
   color: #fff;
@@ -266,7 +262,7 @@
 .btn-unity,/*-------------------unity---------------------*/
 a.btn-unity {
   color: #fff;
-   background-color: #021841;}
+   background-color: #394862;}
 .btn-unity:hover,
 a.btn-unity:hover {
   color: #fff;
@@ -275,7 +271,7 @@
  .btn-date,/*-------------------date---------------------*/
  a.btn-date {
    color: #fff;
-   background-color: #0a708c;}
+   background-color: #1c596a;}
 .btn-date:hover,
 a.btn-date:hover {
    color: #fff;
@@ -284,16 +280,16 @@
 .btn-movie,/*-------------------movie---------------------*/
  a.btn-movie {
     color: #fff;
-    background-color: #08a12e;}
+    background-color: #2d8643;}
 .btn-movie:hover,
 a.btn-movie:hover {
    color: #fff;
-   background: #28f662;}
+   background: #1bbf49;}
 
 .btn-creat,/*-------------------creat---------------------*/
 a.btn-creat {
      color: #fff;
-    background-color: #e30b2f;}
+    background-color: #a3273c;}
 .btn-creat:hover,
 a.btn-creat:hover {
     color: #fff;
@@ -302,11 +298,11 @@
 .btn-edit,/*-------------------edit---------------------*/
 a.btn-edit {
       color: #fff;
-      background-color: #e30b94;}
+      background-color: #a918e3;}
 .btn-edit:hover,
 a.btn-edit:hover {
      color: #fff;
-     background: #eb4eb4;}
+     background: #db4eeb;}
 
 
 /*-------------------------------------------