c_meyer/thingspeak
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Upgrade to Rails 3.2 and move some of the assets to the asset pipeline directories

Browse Source
This commit is contained in:
Alan Bradburne
2012-02-09 23:26:47 +00:00
parent 61c7d2147c
commit bfd5b29a9a
15 changed files with 169 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/application.js Normal file
View File

@ -0,0 +1,9 @@
// This is a manifest file that'll be compiled into including all the files listed below.
// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
// be included in the compiled file accessible from http://example.com/assets/application.js
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
// the compiled file.
//
//= require jquery
//= require jquery_ujs
//= require_tree .

7
app/assets/stylesheets/application.css Normal file
View File

@ -0,0 +1,7 @@
/*
* This is a manifest file that'll automatically include all the stylesheets available in this directory
* and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
* the top of the compiled file, but it's generally better to create a new file per style scope.
*= require_self
*= require_tree .
*/

85
app/assets/stylesheets/custom.css Normal file
View File

@ -0,0 +1,85 @@
html, body { height: 100%; margin: 0; padding: 0; font-family: Helvetica, Arial, sans-serif; color: #333333; }
img { border: 0; }
h2 { margin-top: 5px; }
h3 { margin-top: 0; }
a { color: #2565a5; text-decoration: none; }
a:hover, a:hover div,
a:hover .info { color: #0066ff; text-decoration: underline; }
ul { margin: 0; padding: 0 0 0 20px; }
ul li { margin-left: 15px; }
table { border-collapse: collapse; }
#logo { margin: 6px 0 0 20px; font-size: 45px; font-weight: bold; font-family: Tahoma, Geneva, Kalimati, sans-serif; }
#logo a { color: #d62020; }
#logo a span, .paygray { color: #666666; }
#logo a:hover { text-decoration: none; }
#logo.small { font-size: 30px; color: #666666; }
#options { float: right; text-align: right; }
#options span { padding-right: 10px; }
#login { padding: 6px; border: 1px solid #bbbbbb; border-collapse: separate; border-spacing: 3px; background-color: #eeeeee; background: -webkit-gradient(linear, left top, right top, from(#dddddd), to(#f5f5f5)); background: -moz-linear-gradient(left, #dddddd, #f5f5f5); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dddddd', endColorstr='#f5f5f5', GradientType=1)); }
#menu { height: 40px; margin: 0 auto; border: 1px solid #dddddd; background-color: #d6d6d6; background: -webkit-gradient(linear, left top, left bottom, from(#eeeeee), to(#bbbbbb)); background: -moz-linear-gradient(top, #eeeeee, #bbbbbb); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#bbbbbb')); }
#menu div { float: left; }
#menu div a { color: #777777; padding: 10px 30px; display: block; font-weight: bold; }
#menu div:hover { background-color: #cccccc; }
#menu div:hover a { color: #000000; text-decoration: none; }
#menu .selected,
#menu .selected:hover { background-color: #e5e5e5; }
#menu .selected a { color: #000000; }
.userlogin { display:none; }
.login_info { font-weight: bold; text-align: right; font-size: 12px; }
.round { -moz-border-radius: 7px; -webkit-border-radius: 7px; }
.text_center { text-align: center; }
.big { font-size: 18px; }
.large { font-size: 20px; }
.xlarge { font-size: 30px; }
.small { font-size: 12px; }
.action { margin-right: 30px; position: relative; top: 25px; font-weight: bold; }
.nicetable { font-size: 14px; border: 1px solid #bbbbbb; }
.nicetable .header { font-weight: bold; background-color: #e5e5e5; }
.nicetable .header td { padding-top: 3px; }
.nicetable td { padding: 2px 10px; border-bottom: 1px solid #bbbbbb; }
.nicetable .stripe { background-color: #f9f9f9; }
.table_no_header { font-size: 14px; border: 1px solid #bbbbbb; }
.table_no_header td { padding: 2px 10px; border-bottom: 1px solid #bbbbbb; }
.table_no_header .left { font-weight: bold; }
.pagination { font-size: 14px; }
.centerme { display: table; margin: 0 auto; }
.fixedwidth { width: 990px; display: table; margin: 0 auto; }
/* error messages */
.errorExplanation { background-color: #ffffe0; display: table; margin-bottom: 20px; padding: 10px; border: 1px solid #aaaaaa; }
.field_with_errors { display: inline; }
/* main layout */
#wrapper { min-height: 100%; position: relative; }
#header { height: 75px; }
#menuwrap { padding: 0 20px; }
#content { padding: 23px 20px 58px 23px; }
/* shortcuts */
.FL { float: left; }
.FR { float: right; }
.FN { float: none; }
.DT { display: table; }
.CL { clear: left; }
.UL { text-decoration: underline; }
.TAR { text-align: right; }
.TAC { text-align: center; }
.VAT { vertical-align: top; }
.PB10 { padding-bottom: 10px; }
.PR20 { padding-right: 20px; }
.PL20 { padding-left: 20px; }
.PL30 { padding-left: 30px; }
.MR20 { margin-right: 20px; }
.MR60 { margin-right: 60px; }
.ML20 { margin-left: 20px; }
.W100 { width: 100%; }
.left20 { position: relative; left: -20px; }
.up2 { position: relative; top: -2px; }
.up20 { position: relative; top: -20px; }
/* form styling */
input[type='text'],
input[type='password'] { border: 1px inset #999999; width: 165px; }
input[type='text']:focus,
input[type='password']:focus { background-color: #ffffdd; }
input[type='submit'] { font-size: 14px; padding: 3px 6px; color: #333333; }

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

@ -2,10 +2,9 @@
<html>
<head>
<title><%= @title.nil? ? (@menu.nil? ? t(:application_name) : @menu.capitalize + ' - ' + t(:application_name)) : @title + ' - ' + t(:application_name) %></title>
<%= stylesheet_link_tag :all %>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
<%= csrf_meta_tag %>
<%= stylesheet_link_tag "application" %>
<%= javascript_include_tag "application" %>
<%= csrf_meta_tag %>
</head>
<body>
<div id="wrapper">