Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

New styles/images and html upgrades

  • Loading branch information...
commit c7e0b077e53eb55af8b1975114995bfe22e0dfe1 1 parent 648f3ca
@wolflisj wolflisj authored
View
22 Gemfile.lock
@@ -46,30 +46,30 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.1.3)
+ coffee-script-source (1.2.0)
diesel (0.1.5)
railties
erubis (2.7.0)
- execjs (1.2.12)
+ execjs (1.2.13)
multi_json (~> 1.0)
faker (1.0.1)
i18n (~> 0.4)
gravatar_image_tag (1.0.0.pre2)
- highline (1.6.8)
+ highline (1.6.9)
hike (1.2.1)
hpricot (0.8.5)
i18n (0.6.0)
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
- json (1.6.3)
+ json (1.6.4)
+ libv8 (3.3.10.4)
mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.17.2)
multi_json (1.0.4)
- mysql2 (0.3.11)
mysql2 (0.3.11-x86-mingw32)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
@@ -79,7 +79,7 @@ GEM
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
polyglot (0.3.3)
- rack (1.3.5)
+ rack (1.3.6)
rack-cache (1.1)
rack (>= 0.4)
rack-mount (0.8.3)
@@ -104,9 +104,9 @@ GEM
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
- rdoc (3.11)
+ rdoc (3.12)
json (~> 1.4)
- sass (3.1.11)
+ sass (3.1.12)
sass-rails (3.1.5)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
@@ -119,19 +119,20 @@ GEM
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
+ therubyracer (0.9.9)
+ libv8 (~> 3.3.10)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.31)
- uglifier (1.1.0)
+ uglifier (1.2.1)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
will_paginate (3.0.pre2)
PLATFORMS
- ruby
x86-mingw32
DEPENDENCIES
@@ -145,5 +146,6 @@ DEPENDENCIES
rails (= 3.1.2)
sass-rails (~> 3.1.4)
scrobbler
+ therubyracer
uglifier (>= 1.0.3)
will_paginate (= 3.0.pre2)
View
BIN  app/assets/images/MyFM-long.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  app/assets/images/logo16.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  app/assets/images/rails.png
Deleted file not rendered
View
BIN  app/assets/images/toolbar_bg.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
25 app/assets/stylesheets/custom.css
@@ -1,7 +1,14 @@
html, body
{
- background: #C3D9FF;
+ background: #dddddd;
height:100%;
+ margin:0;
+ font-family: "lucida grande",tahoma,verdana,arial,sans-serif;
+}
+
+.round
+{
+ margin:4px;
}
table.profile tbody tr td.sidebar
@@ -11,9 +18,11 @@ table.profile tbody tr td.sidebar
#copyrights
{
+ font-weight:bold;
margin: auto;
width:305px;
- color: #C3D9FF;
+ color: #aaaaaa;
+ font-size:0.6em;
}
.sidebar
{
@@ -48,19 +57,25 @@ table.posts
background-color:white;
padding: 16px;
min-height: 100%;
- padding-top:45px;
-
+ padding-top:35px;
+ color:#00ccff;
}
#header
{
- background-color: #222222;
+ background-image:url('toolbar_bg.jpg');
+ background-repeat:repeat-x;
color: #FFFFFF;
margin-bottom: 0;
position: fixed;
width: 100%;
}
+#header a
+{
+ color: #FFFFFF;
+}
+
img
{
vertical-align: middle;
View
2  app/views/layouts/application.html.erb
@@ -8,7 +8,7 @@
<body>
<div id="header">
<div class="container">
- <%= link_to image_tag("logo16.png", :alt => "MyFM", :class => "round"), root_path %>MyFM |
+ <%= link_to image_tag("logo16.png", :alt => "MyFM", :class => "round"), root_path %>|
<% if signed_in? %>
<%= current_user.firstname %>&nbsp;<%= current_user.name %>
<% else %>
View
1  app/views/pages/home.html.erb
@@ -1,4 +1,5 @@
<h1>MyFM</h1>
+<%= image_tag("MyFM-long.jpg", :alt => "MyFM", :class => "long_logo") %>
<h2>Social network designed for music bands and their fans!</h2>
<%= form_tag("/pages/search", :method => "get") do %>
<%= label_tag(:q, "Search for:") %>
View
BIN  public/favicon.ico
Binary file not shown

0 comments on commit c7e0b07

Please sign in to comment.
Something went wrong with that request. Please try again.