diff options
| author | nanalelfe <nargiza.nosirova@mail.utoronto.ca> | 2016-07-13 09:14:23 +0000 |
|---|---|---|
| committer | nanalelfe <nargiza.nosirova@mail.utoronto.ca> | 2016-07-13 09:14:23 +0000 |
| commit | 32a07ea09bed919cf1c30f46ef0a1cefd46dd3cf (patch) | |
| tree | 765b3e495c7b403f57c2d589385b010719a147e0 /assets/css/creative.css | |
| parent | 2f885555d4cb9ae4da6edae611f9d049ad603dc9 (diff) | |
| parent | 0e9c374c0b4d3e0f3c4f8c695087ca3bb0ac978f (diff) | |
Merged conflict
Diffstat (limited to 'assets/css/creative.css')
| -rw-r--r-- | assets/css/creative.css | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/assets/css/creative.css b/assets/css/creative.css index 1f9012c..714af8b 100644 --- a/assets/css/creative.css +++ b/assets/css/creative.css @@ -146,48 +146,6 @@ footer .navbar-default .affix .nav>li>a:focus { color: #222; } -/*@media(min-width:768px) { - footer .navbar-default { - border-color: rgba(255,255,255,.3); - background-color: #333333; - } - - footer .navbar-default .navbar-header .navbar-brand { - color: rgba(255,255,255,.7); - } - - footer .navbar-default .navbar-header .navbar-brand:hover , - footer .navbar-default .navbar-header .navbar-brand:focus { - color: #fff; - } - - footer .navbar-default .nav > li>a, - footer .navbar-default .nav>li>a:focus { - color: rgba(255,255,255,.7); - } - - footer .navbar-default .nav > li>a:hover, - footer .navbar-default .nav>li>a:focus:hover { - color: #fff; - } - - footer .navbar-default .affix { - border-color: rgba(34,34,34,.05); - background-color: #fff; - } - - footer .navbar-default .affix .navbar-header .navbar-brand { - font-size: 14px; - } - - - footer .navbar-default .affix .nav > li>a, - footer .navbar-default .affix .nav>li>a:focus { - color: #222; - } -}*/ - - header { position: relative; width: 100%; |