Skip to content

M
mycard
Commit d29762ef authored by h3remi7's avatar h3remi7
Browse files
Options

fix merge str

parent 4ed8f8f2
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
app/mycard.component.css
View file @ d29762ef
<<<<<<< HEAD
body { body {
font-family: "Helvetica Neue", Helvetica, Arial, 'Source Sans Pro', "Microsoft YaHei", 'Microsoft JhengHei', "WenQuanYi Micro Hei", sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, 'Source Sans Pro', "Microsoft YaHei", 'Microsoft JhengHei', "WenQuanYi Micro Hei", sans-serif;
} }
...@@ -6,6 +5,7 @@ body { ...@@ -6,6 +5,7 @@ body {
nav { nav {
-webkit-app-region: drag; -webkit-app-region: drag;
} }
nav.darwin { nav.darwin {
padding-left: 80px; padding-left: 80px;
} }
...@@ -16,11 +16,14 @@ nav.darwin { ...@@ -16,11 +16,14 @@ nav.darwin {
.navbar-right > div, #user > .item { .navbar-right > div, #user > .item {
float: left; float: left;
margin: 0 0.5rem margin: 0 0.5rem;
}
#wrapper { #wrapper {
padding-top: 60px; padding-top: 60px;
/*margin-bottom: 60px;*/ /*margin-bottom: 60px;*/
} }
.nav-right { .nav-right {
float: 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