Permalink
Browse files

Began reworking nav and header

  • Loading branch information...
phillipkregg committed Mar 27, 2013
1 parent dff797e commit 64aadcff351497ee9d6da8d8321f8c997930141f
View
@@ -11,6 +11,7 @@ group :assets do
gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'
gem 'bootstrap-sass', '~> 2.3.1.0'
+ gem "font-awesome-rails"
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer', :platforms => :ruby
View
@@ -42,6 +42,8 @@ GEM
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
+ font-awesome-rails (3.0.2.0)
+ railties (>= 3.1)
hike (1.2.1)
i18n (0.6.4)
journey (1.0.4)
@@ -109,6 +111,7 @@ PLATFORMS
DEPENDENCIES
bootstrap-sass (~> 2.3.1.0)
coffee-rails (~> 3.2.1)
+ font-awesome-rails
jquery-rails
pg
rails (= 3.2.9)
Binary file not shown.
@@ -12,4 +12,4 @@
//
//= require jquery
//= require jquery_ujs
-//= require_tree .
+//= require bootstrap
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
@@ -9,5 +9,14 @@
* compiled file, but it's generally better to create a new file per style scope.
*
*= require_self
- *= require_tree .
*/
+
+@import "bootstrap";
+@import "bootstrap-responsive";
+@import "font-awesome";
+
+
+// Import Sass
+@import "sass/globals/globals";
+@import "sass/layout/layout";
+@import "sass/components/components";
@@ -1,3 +0,0 @@
-// Place all the styles related to the home controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
@@ -0,0 +1,13 @@
+
+
+.navbar {
+ border-radius: 0;
+ .navbar-inner {
+ border-radius: 0;
+ }
+ .navbar-search {
+ input[type="text"] {
+ border-radius: 0;
+ }
+ }
+}
@@ -0,0 +1,2 @@
+
+@import "_navbar";
@@ -0,0 +1,2 @@
+
+$black: #000000;
@@ -0,0 +1,2 @@
+
+@import "variables";
@@ -0,0 +1,7 @@
+
+header {
+ background: $black;
+ img {
+ margin: 20px 0;
+ }
+}
@@ -1 +1,62 @@
-<h2>test</h2>
+
+
+
+
+<div class="navbar">
+ <div class="navbar-inner">
+ <div class="container">
+ <a class="btn btn-navbar" data-toggle="collapse" data-target=".navbar-responsive-collapse">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </a>
+ <div class="nav-collapse collapse navbar-responsive-collapse">
+ <ul class="nav">
+ <li class="active"><a href="#">Home</a></li>
+ <li><a href="#">News</a></li>
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tier List <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="#">Solo Tier List</a></li>
+ <li><a href="#">Jungle Tier List</a></li>
+ <li><a href="#">Competitive Tier List</a></li>
+ <li><a href="#">Three's Tier List</a></li>
+ <li><a href="#">Dominion Tier List</a></li>
+ <li><a href="#">Item Tier List</a></li>
+ </ul>
+ </li>
+ <li><a href="#">Red Tracker</a></li>
+ <li><a href="#">Videos</a></li>
+ <li><a href="#">Streams</a></li>
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Forums <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="#">Forum Home</a></li>
+ <li><a href="#">Latest Threads</a></li>
+ <li><a href="#">Member List</a></li>
+ </ul>
+ </li>
+ </ul>
+ <form class="navbar-search pull-left" action="">
+ <input type="text" class="search-query span2" placeholder="Search">
+ </form>
+
+ <ul class="nav pull-right">
+ <li class="divider-vertical"></li>
+ <li>
+ <a href="#">
+ <i class="icon-facebook icon-large"></i>
+ </a>
+ </li>
+ <li>
+ <a href="#">
+ <i class="icon-twitter icon-large"></i>
+ </a>
+ </li>
+
+
+ </ul>
+ </div><!-- /.nav-collapse -->
+ </div>
+ </div><!-- /navbar-inner -->
+</div>
@@ -8,7 +8,16 @@
</head>
<body>
-<%= yield %>
+<div class="container">
+ <header>
+ <img src="assets/curse_logo.png" />
+ </header>
+
+ <%= yield %>
+
+</div>
+
+
</body>
</html>

0 comments on commit 64aadcf

Please sign in to comment.