From 0993317b2cf7b4b6fe14a065897f4024101827cb Mon Sep 17 00:00:00 2001 From: Will McNeilly Date: Fri, 16 Sep 2011 14:56:57 +0100 Subject: [PATCH] Style short url and fix js logic t:40m --- .../stylesheets/partials/_layout.css.scss | 32 +++++++++++++++++++ app/views/links/_short_url.html.erb | 12 +++---- app/views/links/create.js.erb | 3 +- 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/partials/_layout.css.scss b/app/assets/stylesheets/partials/_layout.css.scss index 1e38aac..e8b3ba0 100644 --- a/app/assets/stylesheets/partials/_layout.css.scss +++ b/app/assets/stylesheets/partials/_layout.css.scss @@ -244,6 +244,38 @@ hr { border: solid #ddd; border-width: 1px 0 0; clear: both; margin: 10px 0 30px } } +.short-link-container { + margin: 30px 130px 0px; + overflow:hidden; + + label { + display:block; + width: 160px; + height: 60px; + line-height: 60px; + font-family: league-gothic, helvetica, sans-serif; + text-align: center; + font-size: 36px; + font-weight: 400; + text-transform: uppercase; + letter-spacing: 1.3px; + position: relative; + @include border-radius (3px 0px 0px 3px); + background: $sqsh-blue; + color: $sqsh-white; + float:left; + } + input[type="text"] { + margin:0; + float:left; + border-right: 1px solid $sqsh-mid-grey; + border-left: none; + @include border-radius (0px 3px 3px 0px); + font-weight: 600; + color: $sqsh-blue; + } + +} diff --git a/app/views/links/_short_url.html.erb b/app/views/links/_short_url.html.erb index f7091ef..b2dd6d5 100644 --- a/app/views/links/_short_url.html.erb +++ b/app/views/links/_short_url.html.erb @@ -1,8 +1,6 @@ -
-
-

Short Link

- <%= link_to short_url(@link), short_url(@link) %> -

Long Link

- <%= link_to @link.url, @link.url %> -
+ + + diff --git a/app/views/links/create.js.erb b/app/views/links/create.js.erb index b9ffda5..7e072bb 100644 --- a/app/views/links/create.js.erb +++ b/app/views/links/create.js.erb @@ -1,2 +1,3 @@ +$('.short-link-container').remove(); $('#new_link').after("<%= escape_javascript(render(:partial => "short_url")) %>"); -$('.link-table').prepend("<%= escape_javascript(render(:partial => "link", :locals => { :link => @link })) %>") \ No newline at end of file +$('.link-table').prepend("<%= escape_javascript(render(:partial => "link", :locals => { :link => @link })) %>"); \ No newline at end of file