Commit 654cc5ad authored by Mark Otto's avatar Mark Otto

resolving deltas between that epic css selector specifity pull request and latest changes here

parent 65025122
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<!-- Topbar <!-- Topbar
================================================== --> ================================================== -->
<div class="topbar"> <div class="topbar">
<div class="wrapper"> <div class="fill">
<div class="container"> <div class="container">
<h3><a href="#">Bootstrap</a></h3> <h3><a href="#">Bootstrap</a></h3>
<ul class="nav"> <ul class="nav">
...@@ -906,7 +906,7 @@ ...@@ -906,7 +906,7 @@
<h2>Fixed topbar</h2> <h2>Fixed topbar</h2>
<div class="topbar-wrapper" style="z-index: 5;"> <div class="topbar-wrapper" style="z-index: 5;">
<div class="topbar"> <div class="topbar">
<div class="wrapper"> <div class="fill">
<div class="container"> <div class="container">
<h3><a href="#">Project Name</a></h3> <h3><a href="#">Project Name</a></h3>
<ul class="nav"> <ul class="nav">
......
This diff is collapsed.
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