atomaka
/
creddit
1
0
Fork 0
Code Releases Activity

Merge branch 'atomaka/feature/layout' into 'master' 

Layout updates

We basically are reddit now

See merge request !3
This commit is contained in:
Andrew Tomaka 2015-07-09 23:50:22 -04:00
parent 80af796096 790cb26f2a
commit 29600b12a3
5 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/stylesheets/custom.scss
View File

@ -1,2 +1,7 @@
$navbar-default-brand-color: black;
$navbar-default-bg: #cee3f8;
$navbar-default-link-color: #369;
$navbar-default-link-hover-color: #369;
@import "bootstrap-sprockets";
@import "bootstrap";

13
app/views/application/_navbar.html.slim Normal file
View File

@ -0,0 +1,13 @@
.navbar.navbar-default.navbar-static-top
.container-fluid
.navbar-header
button.navbar-toggle.collapsed type='button' data-toggle='collapse' data-target='.navbar-collapse'
span.sr-only Toggle navigation
span.icon-bar
span.icon-bar
span.icon-bar
= link_to 'Creddit', root_path, class: 'navbar-brand'
.collapse.navbar-collapse
ul.nav.navbar-nav.navbar-right
li= link_to 'Create Account', new_user_path

14
app/views/layouts/application.html.erb
View File

@ -1,14 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title>Creddit</title>
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
<%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
<%= csrf_meta_tags %>
</head>
<body>
<%= yield %>
</body>
</html>

13
app/views/layouts/application.html.slim Normal file
View File

@ -0,0 +1,13 @@
doctype html
html
head
title Creddit
= stylesheet_link_tag 'application', media: 'all'
= javascript_include_tag 'application'
= csrf_meta_tags
body
== render 'navbar'
.container-fluid
= yield

2
config/routes.rb
View File

@ -1,3 +1,5 @@
Rails.application.routes.draw do
resources :users, only: [:new, :create]
root to: 'users#new'
end