aboutsummaryrefslogtreecommitdiff
path: root/assets/css/creative.css
diff options
context:
space:
mode:
authorHumairAK <humair88@hotmail.com>2016-07-13 09:05:08 +0000
committerHumairAK <humair88@hotmail.com>2016-07-13 09:05:08 +0000
commit4797d1ff9ef4ef35306750dd2bb8c259519d222d (patch)
tree09746eadefdd4bd2f412e644e1aee8b85c127b47 /assets/css/creative.css
parentccc8d9bdbc53fd0e1467e8b3d3ce1d64d8f2e2c1 (diff)
parent47093c298d4cf60375311200d3ae85a57d787262 (diff)
Merge branch 'master' of https://github.com/HumairAK/solutions_repo
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%;