diff options
Diffstat (limited to 'assets/css')
| -rw-r--r-- | assets/css/creative.css | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/assets/css/creative.css b/assets/css/creative.css index f36128c..3d00fb7 100644 --- a/assets/css/creative.css +++ b/assets/css/creative.css @@ -127,14 +127,11 @@ footer .navbar-default .affix .nav>li>a:focus { color: #222; } -<<<<<<< HEAD + @media(min-width:768px) { } - -======= ->>>>>>> 952f7cefcd35550bb0930418e56c524f09eca92d header { position: relative; width: 100%; |