cody/wrestlingdev.com
1
0
Fork 0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-03-25 01:14:43 +00:00
Code Issues Releases Wiki Activity

Changed layout page

Browse Source
This commit is contained in:
Jacob Cody Wimer
2015-04-22 08:41:25 -04:00
parent 7769006166
commit 97c40587d0
4 changed files with 51 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
app/assets/stylesheets/custom.css.scss
View File

@@ -1,138 +0,0 @@
@import "bootstrap";
/* mixins, variables, etc. */
$grayMediumLight: #eaeaea;
$lightGray: #999;
$grayLight: #999;
$grayDarker: #2F4F4F;
$grayLighter: #A8A8A8;
$blue: #0000FF;
@mixin box_sizing {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
/* universal */
html {
overflow-y: scroll;
}
body {
padding-top: 60px;
}
section {
overflow: auto;
}
textarea {
resize: vertical;
}
.center {
text-align: center;
h1 {
margin-bottom: 10px;
}
}
/* typography */
h1, h2, h3, h4, h5, h6 {
line-height: 1;
}
h1 {
font-size: 3em;
letter-spacing: -2px;
margin-bottom: 30px;
text-align: center;
}
h2 {
font-size: 1.2em;
letter-spacing: -1px;
margin-bottom: 30px;
text-align: center;
font-weight: normal;
color: $grayLight;
}
p {
font-size: 1.1em;
line-height: 1.7em;
}
/* header */
#logo {
float: left;
margin-right: 10px;
font-size: 1.7em;
color: white;
text-transform: uppercase;
letter-spacing: -1px;
padding-top: 9px;
font-weight: bold;
line-height: 1;
&:hover {
color: white;
text-decoration: none;
}
}
/* footer */
footer {
margin-top: 45px;
padding-top: 5px;
border-top: 1px solid $grayMediumLight;
color: $grayLight;
a {
color: $gray;
&:hover {
color: $grayDarker;
}
}
small {
float: left;
}
ul {
float: right;
list-style: none;
li {
float: left;
margin-left: 10px;
}
}
}
/* miscellaneous */
.debug_dump {
clear: both;
float: left;
width: 100%;
margin-top: 45px;
@include box_sizing;
}
#error_explanation {
color: #f00;
ul {
list-style: none;
margin: 0 0 18px 0;
}
}
.field_with_errors {
@extend .control-group;
@extend .error;
}

3
app/views/layouts/_cdn.html.erb
View File

@@ -2,7 +2,8 @@
<!-- Bootstrap CDN -->
<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
<!-- Optional theme -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css">
<link rel="stylesheet" href="https://cdn.datatables.net/1.10.6/css/jquery.dataTables.min.css">
<!-- Latest compiled and minified JavaScript -->
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>

40
app/views/layouts/_header.html.erb
View File

@@ -1,23 +1,21 @@
<header class="navbar navbar-fixed-top navbar-inverse">
<div class="navbar-inner">
<div class="container">
<%= link_to "Wrestling App", root_path, id: "logo" %>
<nav>
<ul class="nav pull-right">
<li><%= link_to "Home", root_path %></li>
<% if @tournament %>
<li><%= link_to "Brackets" , "/static_pages/weights?tournament=#{@tournament.id}" %></li>
<li><%= link_to "Upcoming Matches" , "/static_pages/up_matches?tournament=#{@tournament.id}" %></li>
<li><%= link_to "Results" , "/static_pages/results?tournament=#{@tournament.id}" %></li>
<li><%= link_to "Team Scores" , "/static_pages/team_scores?tournament=#{@tournament.id}" %></li>
<% end %>
<% if user_signed_in? %>
<li><%= link_to "Log Out", destroy_user_session_path, method: :delete %></li>
<% else %>
<li><%= link_to "Log In" , new_user_session_path %></li>
<% end %>
<nav class="navbar navbar-inverse navbar-fixed-top navbar-custom">
<div class="container">
<div class="navbar-header navbar-custom-header">
<a class="navbar-brand navbar-custom-brand" href="/">WrestlingApp</a>
</div>
<ul class="nav navbar-nav navbar-right navbar-custom-link">
<li><%= link_to "Home", root_path %></li>
<% if @tournament %>
<li><%= link_to "Brackets" , "/static_pages/weights?tournament=#{@tournament.id}" %></li>
<li><%= link_to "Upcoming Matches" , "/static_pages/up_matches?tournament=#{@tournament.id}" %></li>
<li><%= link_to "Results" , "/static_pages/results?tournament=#{@tournament.id}" %></li>
<li><%= link_to "Team Scores" , "/static_pages/team_scores?tournament=#{@tournament.id}" %></li>
<% end %>
<% if user_signed_in? %>
<li><%= link_to "Log Out", destroy_user_session_path, method: :delete %></li>
<% else %>
<li><%= link_to "Log In" , new_user_session_path %></li>
<% end %>
</ul>
</nav>
</div>
</div>
</header>
</nav>

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

@@ -1,31 +1,36 @@
<!DOCTYPE html>
<html>
<% if params[:print] %>
<head>
<title>Wrestling App</title>
</head>
<body>
<%= yield %>
</body>
<% else %>
<head>
<title>Wrestling App</title>
<%= render 'layouts/js' %>
<%= stylesheet_link_tag "application", media: "all",
"data-turbolinks-track" => true %>
<%= javascript_include_tag "application", "data-turbolinks-track" => true %>
<%= csrf_meta_tags %>
<%= render 'layouts/shim' %>
</head>
<body>
<%= render 'layouts/header' %>
<div class="container">
<head>
<title>Wrestling App</title>
</head>
<body>
<%= yield %>
<%= render 'layouts/footer' %>
<%= debug(params) if Rails.env.development? %>
</div>
</body>
<% end %>
</body>
<% else %>
<head>
<title>Wrestling App</title>
<%= render 'layouts/cdn' %>
<%= stylesheet_link_tag "application", media: "all",
"data-turbolinks-track" => true %>
<%= javascript_include_tag "application", "data-turbolinks-track" => true %>
<%= csrf_meta_tags %>
<%= render 'layouts/shim' %>
</head>
<body style="padding-top: 70px;">
<div class="container">
<div class="navbar-roof"></div>
<%= render 'layouts/header' %>
<div id="page-content">
<div class="row no-margin">
<div class="col-md-12">
<div id="view"><%= yield %></div>
</div>
</div>
</div>
</div>
</body>
<% end %>
</html>