From ca33070b9e9f8c222bed20636084219a93abc7a8 Mon Sep 17 00:00:00 2001 From: Dennis Collinson Date: Sat, 21 Apr 2012 15:21:52 -0700 Subject: [PATCH] loader is background image of span fix tests --- app/assets/stylesheets/application.css.sass | 15 +-------------- app/assets/stylesheets/loader.css.scss | 1 - app/assets/stylesheets/new-templates.css.scss | 3 ++- app/assets/stylesheets/new_styles/_spinner.scss | 15 +++++++++++++++ app/assets/templates/profile.jst.hbs | 17 ++++++++--------- app/views/aspects/_aspect_stream.haml | 2 +- app/views/people/show.html.haml | 2 +- .../app/views/small_frame_view_spec.js | 12 ++++++------ 8 files changed, 34 insertions(+), 33 deletions(-) create mode 100644 app/assets/stylesheets/new_styles/_spinner.scss diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass index 47158db90..586d6b95d 100644 --- a/app/assets/stylesheets/application.css.sass +++ b/app/assets/stylesheets/application.css.sass @@ -1,5 +1,6 @@ @import 'ui.css.sass' @import '_mixins.css.scss' +@import 'new_styles/_spinner' /* ====== media ====== */ .media @@ -596,20 +597,6 @@ form.new_comment h4 :font-weight bold -#paginate, #infscr-loading - :display block - - :margin - :top 10px - - :padding 8px 0 - :text-align center - :width 100% - img - :border none - - :min-height 20px - #photo_container :text :align center diff --git a/app/assets/stylesheets/loader.css.scss b/app/assets/stylesheets/loader.css.scss index 085d286e4..fc8ca7abe 100644 --- a/app/assets/stylesheets/loader.css.scss +++ b/app/assets/stylesheets/loader.css.scss @@ -29,6 +29,5 @@ fade-in 0.2s ease-in; -moz-animation: spin 1s infinite ease-in-out, fade-in 0.2s ease-in; - } diff --git a/app/assets/stylesheets/new-templates.css.scss b/app/assets/stylesheets/new-templates.css.scss index 90a46501f..6baf8f48e 100644 --- a/app/assets/stylesheets/new-templates.css.scss +++ b/app/assets/stylesheets/new-templates.css.scss @@ -7,4 +7,5 @@ @import 'new_styles/viewer_nav'; /* profile */ -@import 'new_styles/canvas'; \ No newline at end of file +@import 'new_styles/canvas'; +@import 'new_styles/spinner'; \ No newline at end of file diff --git a/app/assets/stylesheets/new_styles/_spinner.scss b/app/assets/stylesheets/new_styles/_spinner.scss new file mode 100644 index 000000000..22b098d97 --- /dev/null +++ b/app/assets/stylesheets/new_styles/_spinner.scss @@ -0,0 +1,15 @@ +#paginate, #infscr-loading { + margin-top: 10px; + padding: 8px 0; + text-align: center; + width: 100%; + display: block; + + .loader { + display: inline-block; + width : 14px; + height: 14px; + background-image : url(asset_path("static-loader.png", "image")) + } +} + diff --git a/app/assets/templates/profile.jst.hbs b/app/assets/templates/profile.jst.hbs index dbab2cbc9..6a0bb109f 100644 --- a/app/assets/templates/profile.jst.hbs +++ b/app/assets/templates/profile.jst.hbs @@ -1,14 +1,11 @@

{{full_name}}

-
- Gender: {{gender}} -
-
- Bio: {{bio}} -
-
- Birthday: {{birthday}} -
+
+
Location:
{{location}}
+
Bio:
{{bio}}
+
Birthday:
{{birthday}}
+
Gender:
{{gender}}
+
COMPOSE @@ -16,3 +13,5 @@
+ +
diff --git a/app/views/aspects/_aspect_stream.haml b/app/views/aspects/_aspect_stream.haml index 91cbbbe81..13786de1d 100644 --- a/app/views/aspects/_aspect_stream.haml +++ b/app/views/aspects/_aspect_stream.haml @@ -13,7 +13,7 @@ #main_stream.stream #paginate - = image_tag "static-loader.png", :height => 14, :width => 14, :class => "loader hidden" + %span.loader.hidden - if current_user.contacts.size < 2 = render 'aspects/no_contacts_message' \ No newline at end of file diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml index 4448b1d22..206cfad3c 100644 --- a/app/views/people/show.html.haml +++ b/app/views/people/show.html.haml @@ -34,4 +34,4 @@ = t('.ignoring', :name => @person.first_name) #paginate - = image_tag "static-loader.png", :height => 14, :width => 14, :class => "loader hidden" + %span.loader.hidden diff --git a/spec/javascripts/app/views/small_frame_view_spec.js b/spec/javascripts/app/views/small_frame_view_spec.js index 75879d074..e4b07598c 100644 --- a/spec/javascripts/app/views/small_frame_view_spec.js +++ b/spec/javascripts/app/views/small_frame_view_spec.js @@ -20,18 +20,18 @@ describe("app.views.SmallFrame", function(){ }) describe("textClass", function(){ - it("returns and empty string with a post with text longer than 140 characters", function(){ - expect(this.view.textClass()).toBe("") + it("returns and 'text extra-small' with a post with text longer than 140 characters", function(){ + expect(this.view.textClass()).toBe("text extra-small") }); - it("returns 'x2 height' if if it is less than 500 characters", function(){ + it("returns 'text medium' if if it is less than 500 characters", function(){ this.view.model.set({text: "ldfkdfdkfkdfjdkjfdkfjdkjfkdfjdkjfkdjfkdjfdkjdfkjdkfjkdjfkdjfkdfkdjf" + "dfkjdkfjkdjfkdjfkdjfdkfjdkfjkd;fklas;dfkjsad;kljf ;laskjf;lkajsdf;kljasd;flkjasd;flkjasdf;l" + "jasd;fkjasd;lfkja;sdlkjf;alsdkf;lasdjf;alskdfj;alsdkjf;alsdkfja;sdlkj "}) - expect(this.view.textClass()).toBe("x2 height") + expect(this.view.textClass()).toBe("text medium") }); - it("returns 'x2 width' if if it is more than 500 characters", function(){ + it("returns 'text large' if if it is more than 500 characters", function(){ this.view.model.set({text: "ldfkdfdkfkdfjdkjfdkfjdkjfkdfjdkjfkdjfkdjfdkjdfkjdkfjkdjfkdjfkdfkdjf" + "dfkjdkfjkdjfkdjfkdjfdkfjdkfjkd;fklas;dfkjsad;kljf ;laskjf;lkajsdf;kljasd;flkjasd;flkjasdf;l" + "jasd;fkjasd;lfkja;sdlkjf;alsdkf;lasdjf;alskdfj;alsdkjf;alsdkfja;sdlkj f;lkajs;dflkjasd;lfkja;sldkjf;alskdjfs" + @@ -41,7 +41,7 @@ describe("app.views.SmallFrame", function(){ "as;dlfk;alsdkjf;lkasdf;lkjasd;flkjasd;lfkjasdkl;" + "asl;dkfj;asldkfj;alsdkfj;alsdfjk" + "askdjf;laksdf;lkdflkjhasldfhoiawufjkhasugfoiwaufaw "}) - expect(this.view.textClass()).toBe("x2 width") + expect(this.view.textClass()).toBe("text large") }) }) }) \ No newline at end of file