Skip to content

J
jianchayuan
Commit 406c6590 authored by zhangyudan's avatar zhangyudan
Browse files
Options

1

parents d14f8d3e a58bbc28
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
static/css/common.css
View file @ 406c6590
...@@ -21,6 +21,7 @@ div { ...@@ -21,6 +21,7 @@ div {
} }
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
ul, ul,
ol { ol {
list-style: none; list-style: none;
...@@ -60,6 +61,8 @@ a:focus { ...@@ -60,6 +61,8 @@ a:focus {
position: absolute; position: absolute;
} }
======= =======
=======
>>>>>>> a58bbc28b511c367a82c847858c8470172463762
body,ul,ol,li,p,h1,h2,h3,h4,h5,h6,form,fieldset,table,td,img,div{margin:0;padding:0;border:0;font-size: 16px;color: #fff;} body,ul,ol,li,p,h1,h2,h3,h4,h5,h6,form,fieldset,table,td,img,div{margin:0;padding:0;border:0;font-size: 16px;color: #fff;}
ul,ol{list-style:none;} ul,ol{list-style:none;}
select,input,img,select{vertical-align:middle;} select,input,img,select{vertical-align:middle;}
...@@ -116,5 +119,9 @@ a:hover,a:active,a:focus{color:#c00;text-decoration:underline;} ...@@ -116,5 +119,9 @@ a:hover,a:active,a:focus{color:#c00;text-decoration:underline;}
padding:3px 20px; padding:3px 20px;
border-radius: 13px; border-radius: 13px;
margin-left: 10px margin-left: 10px
<<<<<<< HEAD
} }
>>>>>>> origin/master >>>>>>> origin/master
=======
}
>>>>>>> a58bbc28b511c367a82c847858c8470172463762
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment