Explorar el Código

240624-1321-Kim

hokky hace 5 meses
padre
commit
0e4e900684
Se han modificado 1 ficheros con 0 adiciones y 4 borrados
  1. 0 4
      pro/resources/css/style.css

+ 0 - 4
pro/resources/css/style.css

@@ -407,7 +407,6 @@ img {
 .quick_kbgolf button {background:none; color:inherit;}
 .quick_kbgolf p {margin-top:6px;}
 
-<<<<<<< HEAD
 @media only screen and (max-width:991px){
 	.dabory-quick-B {right: 0!important;  left: 0;  top: auto!important;  bottom: 0;  transform: translate(0, 0) !important;  border: none!important;  border-top: 1px solid #e1e1e1!important;  border-radius: 0!important;  padding: 0px 7px!important; box-shadow: 0px -1px 8px rgba(0, 0, 0, 0.1);}
 	.dabory-quick-B ul {display:flex;}
@@ -426,9 +425,6 @@ img {
 	.quick_kbgolf dd {display:flex; flex-direction:column; justify-content:center; padding:10px 20px; text-align:left;}
 }
 
-
-=======
->>>>>>> bf0bc9b88644bd39b6d0466216104cc643a002d3
 .sec-title{position: relative; display: block;}
 .sec-title.center{text-align: center;}
 .sec-title h2{position: relative;  display: block; margin-bottom: 0; padding-bottom: 0; font-size: 36px;  line-height: 48px;  color: #222222;  font-weight:700;  word-break:keep-all;}