fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by uedxwg
Commit 1be8b0a636c3f94282237da0a64e1fe0a2666128 1 parent 81716154

update

Inline Side-by-side
Showing 1 changed file with 0 additions and 10 deletions
@@ -11,13 +11,8 @@ @@ -11,13 +11,8 @@
11 .search-icon { 11 .search-icon {
12 position: absolute; 12 position: absolute;
13 font-size: 12px; 13 font-size: 12px;
14 -<<<<<<< HEAD  
15 - top: 14px;  
16 - left: 24px;  
17 -=======  
18 top: 9px; 14 top: 9px;
19 left: 10px; 15 left: 10px;
20 ->>>>>>> 07ccf4f30b0880e107d15539abc34f479ceb0f95  
21 } 16 }
22 17
23 input { 18 input {
@@ -36,14 +31,9 @@ @@ -36,14 +31,9 @@
36 } 31 }
37 32
38 .search { 33 .search {
39 -<<<<<<< HEAD  
40 position: absolute; 34 position: absolute;
41 top: 7px; 35 top: 7px;
42 right:0; 36 right:0;
43 -=======  
44 - float: right;  
45 - margin-top: 6px;  
46 ->>>>>>> 07ccf4f30b0880e107d15539abc34f479ceb0f95  
47 border: none; 37 border: none;
48 background: transparent; 38 background: transparent;
49 font-size: 16px; 39 font-size: 16px;