From adc5a7fb49072826785c371e35467422f76968b8 Mon Sep 17 00:00:00 2001 From: Matchu Date: Thu, 1 Jul 2010 00:35:54 -0400 Subject: [PATCH] add negg faerie branding --- app/stylesheets/screen.scss | 21 +++++++++++++++++++++ app/views/layouts/items.html.haml | 5 ++++- public/stylesheets/compiled/screen.css | 23 +++++++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/app/stylesheets/screen.scss b/app/stylesheets/screen.scss index 55e8d68c..296894c7 100644 --- a/app/stylesheets/screen.scss +++ b/app/stylesheets/screen.scss @@ -10,5 +10,26 @@ input[type=text] { width: 15em; } +h1 { + margin-bottom: 1em; + img { + height: 80px; + margin-bottom: -.5em; + width: 80px; + } + + a { + text-decoration: none; + + span { + text-decoration: underline; + } + + &:hover span { + text-decoration: none; + } + } +} + @import "items/index"; @import "items/show"; diff --git a/app/views/layouts/items.html.haml b/app/views/layouts/items.html.haml index a58a9a68..943a44c5 100644 --- a/app/views/layouts/items.html.haml +++ b/app/views/layouts/items.html.haml @@ -6,7 +6,10 @@ = stylesheet_link_tag "compiled/screen" %body{:class => params[:action]} #container - %h1= link_to 'Infinite Closet', items_path + %h1 + = link_to items_path do + = image_tag 'http://images.neopets.com/items/mall_floatingneggfaerie.gif' + %span Infinite Closet = flashes = form_tag items_path, :method => :get do = text_field_tag :q, @query diff --git a/public/stylesheets/compiled/screen.css b/public/stylesheets/compiled/screen.css index 58165575..438100cc 100644 --- a/public/stylesheets/compiled/screen.css +++ b/public/stylesheets/compiled/screen.css @@ -9,6 +9,29 @@ input[type=text] { width: 15em; } +/* line 13, ../../../app/stylesheets/screen.scss */ +h1 { + margin-bottom: 1em; +} +/* line 15, ../../../app/stylesheets/screen.scss */ +h1 img { + height: 80px; + margin-bottom: -0.5em; + width: 80px; +} +/* line 21, ../../../app/stylesheets/screen.scss */ +h1 a { + text-decoration: none; +} +/* line 24, ../../../app/stylesheets/screen.scss */ +h1 a span { + text-decoration: underline; +} +/* line 28, ../../../app/stylesheets/screen.scss */ +h1 a:hover span { + text-decoration: none; +} + /* line 1, ../../../app/stylesheets/items/_index.scss */ form { margin-bottom: 2em;