knowledge
/
front-end-frameworks
mirror of https://github.com/Llewellynvdm/front-end-frameworks.git
1
0
Fork 0
Code Issues Releases Activity

Fix the "Seelva" bad merge.

This commit is contained in:
Hosein Emrani 2013-07-10 23:30:08 +04:30
parent 2f8a26cf9d
commit e132591296
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
compare.html
View File

@ -1254,42 +1254,42 @@
</div>
</div>
<div class="parent">
+ <ul>
+ <li><h1>Seelva</h1></li>
+ <li>
+ <div class="details">
+ <div class="browsers">
+ <span class="ie" data-version="7"></span>
+ <span class="cr" data-version="13"></span>
+ <span class="sa" data-version="+"></span>
+ <span class="ff" data-version="3.6"></span>
+ <span class="op" data-version="+"></span>
+ </div>
+ <div class="ui">
+ <span class="less">LESS</span>
+ <span class="sass" data-active="yes">SASS</span>
+ </div>
+ <span class="responsive">
+ <span class="desktop" data-responsive="yes"></span>
+ <span class="mobile"></span>
+ <span class="tablet"></span>
+ </span>
+ </div>
+ </li>
+ <li><h3>Apache 2.0</h3></li>
+ </ul>
+ <div class="info">
+ <article>
+ <p>
+ Seelva is a CSS and HTML Framework built with SASS and Compass. It features a fixed 960px 24 columns grid that can be modified through SASS.
+ </p>
+ </article>
+ <aside>
+ <a target="_blank" href="http://seelva.com/">Site</a>
+ <a target="_blank" href="http://github.com/seelva/seelva">Github</a>
+ </aside>
+ </div>
+ </div>
<ul>
<li><h1>Seelva</h1></li>
<li>
<div class="details">
<div class="browsers">
<span class="ie" data-version="7"></span>
<span class="cr" data-version="13"></span>
<span class="sa" data-version="+"></span>
<span class="ff" data-version="3.6"></span>
<span class="op" data-version="+"></span>
</div>
<div class="ui">
<span class="less">LESS</span>
<span class="sass" data-active="yes">SASS</span>
</div>
<span class="responsive">
<span class="desktop" data-responsive="yes"></span>
<span class="mobile"></span>
<span class="tablet"></span>
</span>
</div>
</li>
<li><h3>Apache 2.0</h3></li>
</ul>
<div class="info">
<article>
<p>
Seelva is a CSS and HTML Framework built with SASS and Compass. It features a fixed 960px 24 columns grid that can be modified through SASS.
</p>
</article>
<aside>
<a target="_blank" href="http://seelva.com/">Site</a>
<a target="_blank" href="http://github.com/seelva/seelva">Github</a>
</aside>
</div>
</div>
</nav>
</section>