aboutsummaryrefslogtreecommitdiff
path: root/assets/css/creative.css
diff options
context:
space:
mode:
Diffstat (limited to 'assets/css/creative.css')
-rw-r--r--assets/css/creative.css8
1 files changed, 8 insertions, 0 deletions
diff --git a/assets/css/creative.css b/assets/css/creative.css
index e8c7ca5..f36128c 100644
--- a/assets/css/creative.css
+++ b/assets/css/creative.css
@@ -127,6 +127,14 @@ footer .navbar-default .affix .nav>li>a:focus {
color: #222;
}
+<<<<<<< HEAD
+@media(min-width:768px) {
+
+}
+
+
+=======
+>>>>>>> 952f7cefcd35550bb0930418e56c524f09eca92d
header {
position: relative;
width: 100%;