Permalink
Browse files

Changed some styles

  • Loading branch information...
1 parent f420789 commit 57d5ea9381655f2d4743d5dc2bedb51d5113790e @phillipkregg committed Mar 28, 2013
View
@@ -56,6 +56,7 @@ GEM
mime-types (1.21)
multi_json (1.7.2)
pg (0.14.1)
+ pg (0.14.1-x86-mingw32)
polyglot (0.3.3)
rack (1.4.5)
rack-cache (1.2)
@@ -93,6 +94,7 @@ GEM
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.7)
+ sqlite3 (1.3.7-x86-mingw32)
thor (0.18.0)
tilt (1.3.6)
treetop (1.4.12)
@@ -105,6 +107,7 @@ GEM
PLATFORMS
ruby
+ x86-mingw32
DEPENDENCIES
bootstrap-sass (~> 2.3.1.0)
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -7,7 +7,7 @@
.header-inner .container {
a.brand {
- margin-top: -5px;
+ //margin-top: -5px;
margin-right: 40px;
}
@@ -38,20 +38,20 @@
<div class="span8">
<!--branding/logo-->
<a class="brand" href="index.htm" title="Home">
- <h1><span>App</span>Strap<span>.</span></h1>
+ <img src="assets/curse_logo.png" />
</a>
<div class="features">
<ul class="thumbnails">
- <li class="span2"> <a href="features.htm"><img src="" alt="Feature 1" /></a>
+ <li class="span1"> <a href="features.htm"><img src="" alt="Feature 1" /></a>
</li>
- <li class="span2"> <a href="features.htm"><img src="" alt="Feature 2" /></a>
+ <li class="span1"> <a href="features.htm"><img src="" alt="Feature 2" /></a>
</li>
- <li class="span2"> <a href="features.htm"><img src="" alt="Feature 3" /></a>
+ <li class="span1"> <a href="features.htm"><img src="" alt="Feature 3" /></a>
</li>
- <li class="span2"> <a href="features.htm"><img src="" alt="Feature 4" /></a>
+ <li class="span1"> <a href="features.htm"><img src="" alt="Feature 4" /></a>
</li>
</ul>
</div>
@@ -96,49 +96,30 @@
<!--main navigation-->
<ul class="nav" id="main-menu">
- <li class="home-link"><a href="index.htm"><i class="icon-home hidden-phone"></i><span class="visible-phone">Home</span></a></li>
- <li class="dropdown"><a href="#" class="dropdown-toggle menu-item" id="features-drop" data-toggle="dropdown">Features +</a>
+ <li class="home-link"><a href="#"><i class="icon-home hidden-phone"></i><span class="visible-phone">Home</span></a></li>
+ <li><a href="#" class="menu-item">News</a></li>
+ <li class="dropdown"><a href="#" class="dropdown-toggle menu-item" id="features-drop" data-toggle="dropdown">Tier List +</a>
<!-- Dropdown Menu -->
- <ul class="dropdown-menu mega-menu" role="menu" aria-labelledby="features-drop">
- <li class="mega-menu-wrapper" role="menuitem"> <span class="menu-title">Mega Menu with links & text items</span>
- <ul class="row-fluid" role="menu">
- <li class="span4" role="menuitem"> <a href="features.htm"><img src="assets/features/feature-1.png" alt="Feature 1" /></a> <a href="features.htm" tabindex="-1" class="menu-item">Mobile Friendly</a> <span>Rhoncus adipiscing, magna integer cursus augue eros lacus porttitor magna. Dictumst, odio!</span> </li>
- <li class="span4" role="menuitem"> <a href="features.htm"><img src="assets/features/feature-2.png" alt="Feature 2" /></a> <a href="features.htm" tabindex="-1" class="menu-item">24/7 Support</a> <span>Rhoncus adipiscing, magna integer cursus augue eros lacus porttitor magna. Dictumst, odio!</span> </li>
- <li class="span4" role="menuitem"> <a href="features.htm"><img src="assets/features/feature-4.png" alt="Feature 4" /></a> <a href="features.htm" tabindex="-1" class="menu-item">99% Uptime</a> <span>Rhoncus adipiscing, magna integer cursus augue eros lacus porttitor magna. Dictumst, odio!</span> </li>
- </ul>
- </li>
+ <ul class="dropdown-menu" role="menu" aria-labelledby="about-drop">
+ <li role="menuitem"><a href="about.htm" tabindex="-1" class="menu-item">Solo Tier List</a></li>
+ <li role="menuitem"><a href="team.htm" tabindex="-1" class="menu-item">Jungle Tier List</a></li>
+ <li role="menuitem"><a href="contact.htm" tabindex="-1" class="menu-item">Competitive Tier List</a></li>
</ul>
</li>
- <li><a href="pricing.htm" class="menu-item">Pricing</a></li>
- <li><a href="customers.htm" class="menu-item">Customers</a></li>
- <li class="dropdown"> <a href="about.htm" class="dropdown-toggle" id="about-drop" data-toggle="dropdown">About +</a>
+ <li><a href="#" class="menu-item">Red Tracker</a></li>
+ <li><a href="#" class="menu-item">Videos</a></li>
+ <li><a href="#" class="menu-item">Streams</a></li>
+ <li class="dropdown"> <a href="about.htm" class="dropdown-toggle" id="about-drop" data-toggle="dropdown">Forums +</a>
<!-- Dropdown Menu -->
<ul class="dropdown-menu" role="menu" aria-labelledby="about-drop">
<li role="menuitem"><a href="about.htm" tabindex="-1" class="menu-item">About Us</a></li>
<li role="menuitem"><a href="team.htm" tabindex="-1" class="menu-item">Our Team</a></li>
<li role="menuitem"><a href="contact.htm" tabindex="-1" class="menu-item">Contact</a></li>
</ul>
</li>
- <li class="dropdown"> <a href="blog.htm" class="dropdown-toggle" id="blog-drop" data-toggle="dropdown">Blog +</a>
- <!-- Dropdown Menu -->
- <ul class="dropdown-menu pull-left" role="menu" aria-labelledby="blog-drop">
- <li role="menuitem"><a href="blog.htm" tabindex="-1" class="menu-item">Right Sidebar</a></li>
- <li role="menuitem"><a href="blog-leftbar.htm" tabindex="-1" class="menu-item">Left Sidebar</a></li>
- <li role="menuitem"><a href="blog-post.htm" tabindex="-1" class="menu-item">Blog Post</a></li>
- </ul>
- </li>
- <li class="dropdown"><a href="pages.htm" class="dropdown-toggle" id="pages-drop" data-toggle="dropdown">More +</a>
- <!-- Dropdown Menu -->
- <ul class="dropdown-menu pull-left" role="menu" aria-labelledby="pages-drop">
- <li role="menuitem"><a href="login.htm" tabindex="-1" class="menu-item">Login</a></li>
- <li role="menuitem"><a href="signup.htm" tabindex="-1" class="menu-item">Sign Up</a></li>
- <li role="menuitem"><a href="starter.htm" tabindex="-1" class="menu-item">Starter Snippets</a></li>
- <li role="menuitem"><a href="index-static.htm" tabindex="-1" class="menu-item">Homepage Static Banner</a></li>
- <li role="menuitem"><a href="fixed-header.htm" tabindex="-1" class="menu-item">Fixed Header</a></li>
- <li role="menuitem"><a href="colours.htm" tabindex="-1" class="menu-item">Theme Colours</a></li>
- <li role="menuitem"><a href="elements.htm" tabindex="-1" class="menu-item">Theme Elements</a></li>
- </ul>
- </li>
+ <li><a href="#" class="menu-item">Store</a></li>
+
+
</ul>
</div>
<!--/.nav-collapse -->
@@ -189,7 +170,6 @@
</div>
<div class="span11">
<div class="media-body">
- <div class="tags"><a href="#" class="tag">coding</a> / <a href="#" class="type">event</a></div>
<h4 class="title media-heading"><a href="blog-post.htm">a nec in sed hac ultrices cursus</a></h4>
<!-- Meta details mobile -->
@@ -198,8 +178,7 @@
<li><i class="icon-user"></i> <a href="#">Alex</a></li>
</ul>
<a href="blog-post.htm" class="media-object"> <img src="assets/blog/ape.jpg" alt="Picture of frog by Ben Fredericson" /> </a>
- <p>Nam risus magna, fringilla sit amet blandit viverra, dignissim eget est. Ut <strong>commodo ullamcorper risus nec</strong> mattis. Morbi tincidunt posuere turpis eu laoreet. Nulla facilisi. Aenean at massa leo. Vestibulum in varius arcu.</p>
- <p>Nam risus magna, fringilla sit amet blandit viverra, dignissim eget est. Ut <strong>commodo ullamcorper risus nec</strong> mattis</p>
+ <p>anyone know?</p>
<ul class="inline links">
<li><a href="blog-post.htm" class="btn btn-mini"><i class="icon-circle-arrow-right"></i> Read more</a></li>
<li><a href="blog-post.htm#comments" class="btn btn-mini"><i class="icon-comment"></i> 50 Comments</a></li>

0 comments on commit 57d5ea9

Please sign in to comment.