From c34f250da3fadeb55280fcb636960dbfdab7dd84 Mon Sep 17 00:00:00 2001 From: Matchu Date: Sat, 2 Jul 2011 15:51:30 -0400 Subject: [PATCH] add thank you to userbar for donors --- app/stylesheets/_layout.sass | 9 ++ app/stylesheets/outfits/_edit.sass | 2 +- app/stylesheets/outfits/_star.sass | 2 +- .../{outfits => partials}/_icon.sass | 0 app/views/layouts/application.html.haml | 8 +- public/images/image_mode_icon.png | Bin 0 -> 516 bytes public/stylesheets/compiled/screen.css | 110 ++++++++++-------- 7 files changed, 80 insertions(+), 51 deletions(-) rename app/stylesheets/{outfits => partials}/_icon.sass (100%) create mode 100644 public/images/image_mode_icon.png diff --git a/app/stylesheets/_layout.sass b/app/stylesheets/_layout.sass index b7670ef9..a4b5722a 100644 --- a/app/stylesheets/_layout.sass +++ b/app/stylesheets/_layout.sass @@ -1,3 +1,5 @@ +@import "partials/icon" + /* Reset html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, @@ -135,6 +137,13 @@ ul.buttons display: inline margin: 0 .25em +#userbar-image-mode + font-weight: bold + margin-right: 1em + text-decoration: none + img + +icon + #userbar-log-in text-decoration: none img diff --git a/app/stylesheets/outfits/_edit.sass b/app/stylesheets/outfits/_edit.sass index eb579f2a..80b0ce6a 100644 --- a/app/stylesheets/outfits/_edit.sass +++ b/app/stylesheets/outfits/_edit.sass @@ -1,7 +1,7 @@ @import ../shared/jquery.jgrowl @import partials/wardrobe -@import icon +@import "partials/icon" @import star $object-padding: 6px diff --git a/app/stylesheets/outfits/_star.sass b/app/stylesheets/outfits/_star.sass index 7e56407b..ec6ce0b8 100644 --- a/app/stylesheets/outfits/_star.sass +++ b/app/stylesheets/outfits/_star.sass @@ -1,4 +1,4 @@ -@import icon +@import "partials/icon" =outfit-star .outfit-star diff --git a/app/stylesheets/outfits/_icon.sass b/app/stylesheets/partials/_icon.sass similarity index 100% rename from app/stylesheets/outfits/_icon.sass rename to app/stylesheets/partials/_icon.sass diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 9aff792f..6add87c3 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -35,8 +35,14 @@ #userbar - if user_signed_in? + - if can_use_image_mode? + = link_to donate_path, :id => 'userbar-image-mode' do + = image_tag 'image_mode_icon.png', :alt => 'Image Mode' + Thank you! %span - == Hey, #{link_to current_user.name, user_contributions_path(current_user)}! + Hey, + = succeed '!' do + = link_to current_user.name, user_contributions_path(current_user) == You have #{current_user.points} points. = link_to 'Outfits', current_user_outfits_path = link_to 'Settings', Openneo::Auth.remote_settings_url diff --git a/public/images/image_mode_icon.png b/public/images/image_mode_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..fc3c393caa3bc4371d12d0c67ffd6d333ecf1d8e GIT binary patch literal 516 zcmV+f0{i`mP)0oSgT$J*kO*Aq9I~CW*s{G*(t$KS{OS+#aO%?udUme<*TTEO`Fr@r_QT zk=#}u-n~>Vm!+9S1PE{@3<)G~CPb<$Za;W?3+O}|+q)?*Pn355=}S(XIZmEANjZci zf5 zj<%@MX^bD1^BwlS^+AD|$dm-1wial0hwPI;CDM?Y9SXW#@w-UF0SQ8OgplRTleOB2 zUjkDS|0U9pI|lSN*EvXUa~*UIclJdZ#)Npbwh9>YT?Z;=B8|l&^t~P~om?<5Lre$+ z;%`P>SL7`djY#8Y9$wv9dv|3p)>"; } -/* line 94, ../../../app/stylesheets/_layout.sass */ +/* line 96, ../../../app/stylesheets/_layout.sass */ ul.buttons { margin-bottom: 1em; } -/* line 96, ../../../app/stylesheets/_layout.sass */ +/* line 98, ../../../app/stylesheets/_layout.sass */ ul.buttons li { list-style: none; margin: 0 0.5em; } -/* line 99, ../../../app/stylesheets/_layout.sass */ +/* line 101, ../../../app/stylesheets/_layout.sass */ ul.buttons li, ul.buttons li form { display: inline; } -/* line 102, ../../../app/stylesheets/_layout.sass */ +/* line 104, ../../../app/stylesheets/_layout.sass */ #footer { clear: both; font-size: 75%; @@ -179,77 +179,91 @@ ul.buttons li, ul.buttons li form { padding-top: 2em; text-align: center; } -/* line 108, ../../../app/stylesheets/_layout.sass */ +/* line 110, ../../../app/stylesheets/_layout.sass */ #footer ul, #footer div { display: inline; margin: 0 1em; } -/* line 111, ../../../app/stylesheets/_layout.sass */ +/* line 113, ../../../app/stylesheets/_layout.sass */ #footer li, #footer div ul { display: inline; margin: 0 0.5em; } -/* line 115, ../../../app/stylesheets/_layout.sass */ +/* line 117, ../../../app/stylesheets/_layout.sass */ .success, .alert, .warning { margin-bottom: 1em; padding: 0.25em 0.5em; text-align: center; } -/* line 120, ../../../app/stylesheets/_layout.sass */ +/* line 122, ../../../app/stylesheets/_layout.sass */ .success { background: #e6efc2; border: 1px solid #c6d880; color: #264409; } -/* line 123, ../../../app/stylesheets/_layout.sass */ +/* line 125, ../../../app/stylesheets/_layout.sass */ .alert { background: #fbe3e4; border: 1px solid #fbc2c4; color: #8a1f11; } -/* line 126, ../../../app/stylesheets/_layout.sass */ +/* line 128, ../../../app/stylesheets/_layout.sass */ .warning { background: #fff6bf; border: 1px solid #ffd324; color: #514721; } -/* line 129, ../../../app/stylesheets/_layout.sass */ +/* line 131, ../../../app/stylesheets/_layout.sass */ #userbar { font-family: Delicious, Helvetica, Arial, Verdana, sans-serif; position: absolute; right: 0; top: 0; } -/* line 134, ../../../app/stylesheets/_layout.sass */ +/* line 136, ../../../app/stylesheets/_layout.sass */ #userbar > * { display: inline; margin: 0 0.25em; } -/* line 138, ../../../app/stylesheets/_layout.sass */ +/* line 140, ../../../app/stylesheets/_layout.sass */ +#userbar-image-mode { + font-weight: bold; + margin-right: 1em; + text-decoration: none; +} +/* line 144, ../../../app/stylesheets/_layout.sass */ +#userbar-image-mode img { + bottom: -2px; + height: 16px; + position: relative; + width: 16px; +} + +/* line 147, ../../../app/stylesheets/_layout.sass */ #userbar-log-in { text-decoration: none; } -/* line 140, ../../../app/stylesheets/_layout.sass */ +/* line 149, ../../../app/stylesheets/_layout.sass */ #userbar-log-in img { margin-bottom: -4px; margin-right: 0.25em; } -/* line 144, ../../../app/stylesheets/_layout.sass */ +/* line 153, ../../../app/stylesheets/_layout.sass */ #userbar-log-in span { text-decoration: underline; } -/* line 146, ../../../app/stylesheets/_layout.sass */ +/* line 155, ../../../app/stylesheets/_layout.sass */ #userbar-log-in:hover span { text-decoration: none; } -/* line 149, ../../../app/stylesheets/_layout.sass */ +/* line 158, ../../../app/stylesheets/_layout.sass */ .object { display: -moz-inline-box; -moz-box-orient: vertical; @@ -263,25 +277,25 @@ ul.buttons li, ul.buttons li form { vertical-align: top; width: 100px; } -/* line 156, ../../../app/stylesheets/_layout.sass */ +/* line 165, ../../../app/stylesheets/_layout.sass */ .object a { text-decoration: none; } -/* line 158, ../../../app/stylesheets/_layout.sass */ +/* line 167, ../../../app/stylesheets/_layout.sass */ .object a img { -moz-opacity: 0.75; -webkit-opacity: 0.75; -o-opacity: 0.75; -khtml-opacity: 0.75; } -/* line 160, ../../../app/stylesheets/_layout.sass */ +/* line 169, ../../../app/stylesheets/_layout.sass */ .object a:hover img { -moz-opacity: 1; -webkit-opacity: 1; -o-opacity: 1; -khtml-opacity: 1; } -/* line 162, ../../../app/stylesheets/_layout.sass */ +/* line 171, ../../../app/stylesheets/_layout.sass */ .object img { display: block; height: 80px; @@ -289,17 +303,17 @@ ul.buttons li, ul.buttons li form { width: 80px; } -/* line 168, ../../../app/stylesheets/_layout.sass */ +/* line 177, ../../../app/stylesheets/_layout.sass */ dt { font-weight: bold; } -/* line 171, ../../../app/stylesheets/_layout.sass */ +/* line 180, ../../../app/stylesheets/_layout.sass */ dd { margin: 0 0 1.5em 1em; } -/* line 174, ../../../app/stylesheets/_layout.sass */ +/* line 183, ../../../app/stylesheets/_layout.sass */ #home-link { font-family: Delicious, Helvetica, Arial, Verdana, sans-serif; font-size: 175%; @@ -310,26 +324,26 @@ dd { position: absolute; top: 0; } -/* line 184, ../../../app/stylesheets/_layout.sass */ +/* line 193, ../../../app/stylesheets/_layout.sass */ #home-link:hover { background: #eeffee; text-decoration: none; } -/* line 187, ../../../app/stylesheets/_layout.sass */ +/* line 196, ../../../app/stylesheets/_layout.sass */ #home-link span:before { content: "<< "; } -/* line 191, ../../../app/stylesheets/_layout.sass */ +/* line 200, ../../../app/stylesheets/_layout.sass */ .pagination a, .pagination span { margin: 0 0.5em; } -/* line 193, ../../../app/stylesheets/_layout.sass */ +/* line 202, ../../../app/stylesheets/_layout.sass */ .pagination .current { font-weight: bold; } -/* line 196, ../../../app/stylesheets/_layout.sass */ +/* line 205, ../../../app/stylesheets/_layout.sass */ .object .nc-icon { height: 16px; position: absolute; @@ -337,7 +351,7 @@ dd { top: 64px; width: 16px; } -/* line 202, ../../../app/stylesheets/_layout.sass */ +/* line 211, ../../../app/stylesheets/_layout.sass */ .object .nc-icon:hover { -moz-opacity: 0.5; -webkit-opacity: 0.5;