Commit d29762ef authored by h3remi7's avatar h3remi7

fix merge str

parent 4ed8f8f2
<<<<<<< HEAD
body {
font-family: "Helvetica Neue", Helvetica, Arial, 'Source Sans Pro', "Microsoft YaHei", 'Microsoft JhengHei', "WenQuanYi Micro Hei", sans-serif;
}
......@@ -6,6 +5,7 @@ body {
nav {
-webkit-app-region: drag;
}
nav.darwin {
padding-left: 80px;
}
......@@ -16,11 +16,14 @@ nav.darwin {
.navbar-right > div, #user > .item {
float: left;
margin: 0 0.5rem
margin: 0 0.5rem;
}
#wrapper {
padding-top: 60px;
/*margin-bottom: 60px;*/
}
.nav-right {
float: right;
}
......
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