diff --git a/app/assets/javascripts/pagination.coffee b/app/assets/javascripts/pagination.coffee index 7292baac..17ad5e14 100644 --- a/app/assets/javascripts/pagination.coffee +++ b/app/assets/javascripts/pagination.coffee @@ -12,5 +12,5 @@ jQuery -> $.getScript more_posts_url, -> $this.text('Load more').removeClass('disabled') if $this loading_posts = false - $('[data-toggle="tooltip"]').tooltip() + $('[data-toggle="tooltip"]').tooltip() return diff --git a/app/views/inbox/show.html.haml b/app/views/inbox/show.html.haml index 2838789d..31c95187 100644 --- a/app/views/inbox/show.html.haml +++ b/app/views/inbox/show.html.haml @@ -6,7 +6,16 @@ %h3.panel-title Out of questions? .panel-body %button.btn.btn-block.btn-info{type: :button, id: 'ib-generate-question'} Get new question - %a.btn.btn-block.btn-primary{target: '_blank', href: "https://twitter.com/intent/tweet?text=Ask%20me%20anything%21&url=#{show_user_profile_url(current_user.screen_name)}"} Share on Twitter + .panel.panel-default.inbox--panel + .panel-heading + %h3.panel-title Share + .panel-body + %a.btn.btn-block.btn-primary{target: '_blank', href: "https://twitter.com/intent/tweet?text=Ask%20me%20anything%21&url=#{show_user_profile_url(current_user.screen_name)}"} + %i.fa.fa-twitter + Share on Twitter + %a.btn.btn-block.btn-primary{target: '_blank', href: "http://www.tumblr.com/share/link?url=#{show_user_profile_url(current_user.screen_name)}&name=Ask%20me%20anything%21"} + %i.fa.fa-tumblr + Share on Tumblr .panel.panel-default.warning--panel .panel-heading %h3.panel-title Actions diff --git a/app/views/notifications/index.html.haml b/app/views/notifications/index.html.haml index 348a6c98..f394a2bd 100644 --- a/app/views/notifications/index.html.haml +++ b/app/views/notifications/index.html.haml @@ -1,9 +1,10 @@ .container.j2-page = render 'notification_tabs' .col-md-9.col-xs-12.col-sm-9 - %ul#notifications.list-group - - @notifications.each do |notification| - = render 'notifications/notification', notification: notification + .panel.panel-default + %ul#notifications.list-group + - @notifications.each do |notification| + = render 'notifications/notification', notification: notification #pagination= will_paginate @notifications, renderer: BootstrapPagination::Rails, page_links: false diff --git a/app/views/static/about.html.haml b/app/views/static/about.html.haml index b2ad025e..944250d3 100644 --- a/app/views/static/about.html.haml +++ b/app/views/static/about.html.haml @@ -1,14 +1,9 @@ +.jumbotron.j2-jumbo.text-center + %h1= APP_CONFIG['site_name'] + %p About our service, features and other information .container - %h1.centre - About - = APP_CONFIG['site_name'] - = render 'layouts/messages' - - / - TODO: fill this out. - also TODO: find a way to make each panel's height equal - + .row .col-sm-4 .panel.panel-default diff --git a/app/views/static/faq.html.haml b/app/views/static/faq.html.haml index c403d4b9..5704b81a 100644 --- a/app/views/static/faq.html.haml +++ b/app/views/static/faq.html.haml @@ -78,17 +78,39 @@ 7. Can I format my questions/answers? .panel-collapse.collapse{id: "collapseEight", role: "tabpanel", aria: {labelledby: "faqEight"}} .panel-body - You sure can! We use a customized version of markdown for this. Wrap your text in following ways to format it! - %code *italic* - or - %code _italic_ - , - %code **bold** - or - %code __bold__ - and - %code - \~~strikethrough~~ + %p + You sure can! We use a customized version of markdown for this. Wrap your text in following ways to format it! + %code *italic* + or + %code _italic_ + , + %code **bold** + or + %code __bold__ + and + %code + \~~strikethrough~~ + + %p + You can also create lists with this method: + %pre + \* item 1 + \* item 2 + + %p + Quotes? Here you go!: + %pre + > This is a quote from a famous person + + %p + Don't like the formatting? You can escape it with prepending a + %code \ + before the + %code * + , + %code _ + or + %code > .panel.panel-default .panel-heading{id: "faqNine", role: "tab"}