diff --git a/app/views/activity_mailer/assigned_as_checker.html.slim b/app/views/activity_mailer/assigned_as_checker.html.slim index aff42f5a412..8955ca4e85a 100644 --- a/app/views/activity_mailer/assigned_as_checker.html.slim +++ b/app/views/activity_mailer/assigned_as_checker.html.slim @@ -1,2 +1,4 @@ -= render '/notification_mailer/notification_mailer_template', title: "#{@product.user.login_name}さんの提出物#{@product.title}の担当になりました。", link_url: @link_url, link_text: 'この提出物へ' do += render '/notification_mailer/notification_mailer_template', + title: "#{@product.user.login_name}さんの提出物#{@product.title}の担当になりました。", + link_url: @link_url, link_text: 'この提出物へ' do = md2html @product.description diff --git a/app/views/activity_mailer/came_answer.html.slim b/app/views/activity_mailer/came_answer.html.slim index 0f56de31f77..46e3659f52f 100644 --- a/app/views/activity_mailer/came_answer.html.slim +++ b/app/views/activity_mailer/came_answer.html.slim @@ -1,2 +1,4 @@ -= render '/notification_mailer/notification_mailer_template', title: "質問「#{@answer.question.title}」に#{@answer.user.login_name}さんが回答しました。", link_url: @link_url, link_text: '回答へ' do += render '/notification_mailer/notification_mailer_template', + title: "質問「#{@answer.question.title}」に#{@answer.user.login_name}さんが回答しました。", + link_url: @link_url, link_text: '回答へ' do = md2html(@answer.description) diff --git a/app/views/activity_mailer/consecutive_sad_report.html.slim b/app/views/activity_mailer/consecutive_sad_report.html.slim index a9b38ef8b23..d1041ad14b0 100644 --- a/app/views/activity_mailer/consecutive_sad_report.html.slim +++ b/app/views/activity_mailer/consecutive_sad_report.html.slim @@ -1,4 +1,6 @@ -= render '/notification_mailer/notification_mailer_template', title: "#{@report.user.login_name}さんが#{User::DEPRESSED_SIZE}回連続でsadアイコンの日報を提出しました。", link_url: @link_url, link_text: 'この日報へ' do += render '/notification_mailer/notification_mailer_template', + title: "#{@report.user.login_name}さんが#{User::DEPRESSED_SIZE}回連続でsadアイコンの日報を提出しました。", + link_url: @link_url, link_text: 'この日報へ' do p #{@report.user.login_name}さんが#{User::DEPRESSED_SIZE}回連続でsadアイコンの日報を提出しました。メンターのみなさんはフォローいただけると幸いです。 div(style='border-top: solid 1px #ccc; height: 0;') = md2html(@report.description) diff --git a/app/views/activity_mailer/create_page.html.slim b/app/views/activity_mailer/create_page.html.slim index 4360dd5af2e..ed96da5fd4f 100644 --- a/app/views/activity_mailer/create_page.html.slim +++ b/app/views/activity_mailer/create_page.html.slim @@ -1,2 +1,4 @@ -= render '/notification_mailer/notification_mailer_template', title: "#{@page.user.login_name}さんがDocsに#{@page.title}を投稿しました。", link_url: @link_url, link_text: 'このDocsへ' do += render '/notification_mailer/notification_mailer_template', + title: "#{@page.user.login_name}さんがDocsに#{@page.title}を投稿しました。", + link_url: @link_url, link_text: 'このDocsへ' do = md2html(@page.body) diff --git a/app/views/activity_mailer/hibernated.html.slim b/app/views/activity_mailer/hibernated.html.slim index f10f30c2465..ff607cf258c 100644 --- a/app/views/activity_mailer/hibernated.html.slim +++ b/app/views/activity_mailer/hibernated.html.slim @@ -1 +1,3 @@ -= render '/notification_mailer/notification_mailer_template', title: "#{@sender.login_name}さんが休会しました。", link_url: @link_url, link_text: "#{@sender.login_name}さんのページへ" do += render '/notification_mailer/notification_mailer_template', + title: "#{@sender.login_name}さんが休会しました。", + link_url: @link_url, link_text: "#{@sender.login_name}さんのページへ" do diff --git a/app/views/activity_mailer/mentioned.html.slim b/app/views/activity_mailer/mentioned.html.slim index 384532ac594..2e2f02b9ad6 100644 --- a/app/views/activity_mailer/mentioned.html.slim +++ b/app/views/activity_mailer/mentioned.html.slim @@ -1,2 +1,4 @@ -= render '/notification_mailer/notification_mailer_template', title: "#{@mentionable.user.login_name}さんからメンションがありました", link_url: @link_url, link_text: 'このメンションへ' do += render '/notification_mailer/notification_mailer_template', + title: "#{@mentionable.user.login_name}さんからメンションがありました", + link_url: @link_url, link_text: 'このメンションへ' do = md2html @mentionable.body diff --git a/app/views/activity_mailer/no_correct_answer.html.slim b/app/views/activity_mailer/no_correct_answer.html.slim index d9f68aa4e55..5c64aa3152c 100644 --- a/app/views/activity_mailer/no_correct_answer.html.slim +++ b/app/views/activity_mailer/no_correct_answer.html.slim @@ -1 +1,3 @@ -= render '/notification_mailer/notification_mailer_template', title: "#{@user.login_name}さんの質問【 #{@question.title} 】のベストアンサーがまだ選ばれていません。", link_url: @link_url, link_text: "#{@user.login_name}さんの質問へ" += render '/notification_mailer/notification_mailer_template', + title: "#{@user.login_name}さんの質問【 #{@question.title} 】のベストアンサーがまだ選ばれていません。", + link_url: @link_url, link_text: "#{@user.login_name}さんの質問へ" diff --git a/app/views/activity_mailer/product_update.html.slim b/app/views/activity_mailer/product_update.html.slim index a3262b37311..1ae41b302d6 100644 --- a/app/views/activity_mailer/product_update.html.slim +++ b/app/views/activity_mailer/product_update.html.slim @@ -1,2 +1,4 @@ -= render '/notification_mailer/notification_mailer_template', title: "#{@product.user.login_name}さんが#{@product.title}を更新しました。", link_url: @link_url, link_text: '提出物へ' do += render '/notification_mailer/notification_mailer_template', + title: "#{@product.user.login_name}さんが#{@product.title}を更新しました。", + link_url: @link_url, link_text: '提出物へ' do = md2html(@product.body) diff --git a/app/views/activity_mailer/submitted.html.slim b/app/views/activity_mailer/submitted.html.slim index 75cc8bbe0fe..ff8eb0d4230 100644 --- a/app/views/activity_mailer/submitted.html.slim +++ b/app/views/activity_mailer/submitted.html.slim @@ -1,2 +1,4 @@ -= render '/notification_mailer/notification_mailer_template', title: "#{@product.user.login_name}さんが#{@product.title}を提出しました。", link_url: @link_url, link_text: '提出物へ' do += render '/notification_mailer/notification_mailer_template', + title: "#{@product.user.login_name}さんが#{@product.title}を提出しました。", + link_url: @link_url, link_text: '提出物へ' do = md2html(@product.body) diff --git a/app/views/application/_required_field.html.slim b/app/views/application/_required_field.html.slim index 253fff300ed..aa93d8805c0 100644 --- a/app/views/application/_required_field.html.slim +++ b/app/views/application/_required_field.html.slim @@ -21,4 +21,5 @@ .card-list-item__row .card-list-item-title h3.card-list-item-title__title.is-sm - = link_to error.message, edit_current_user_path(anchor: anchor_to_required_field(error.attribute)), class: "card-list-item-title__link a-text-link is-#{error.attribute}" + = link_to error.message, edit_current_user_path(anchor: anchor_to_required_field(error.attribute)), + class: "card-list-item-title__link a-text-link is-#{error.attribute}" diff --git a/app/views/application/_tags_input.slim b/app/views/application/_tags_input.slim index 444ff8d3d62..f760236e04a 100644 --- a/app/views/application/_tags_input.slim +++ b/app/views/application/_tags_input.slim @@ -1 +1,3 @@ -= react_component('Tags/TagsInput', { tagsInitialValue: taggable.tag_list.join(',').to_s, tagsParamName: "#{taggable.class.to_s.tableize.singularize}[tag_list]", taggableType: taggable.class.to_s.capitalize.to_s }) += react_component('Tags/TagsInput', { tagsInitialValue: taggable.tag_list.join(',').to_s, + tagsParamName: "#{taggable.class.to_s.tableize.singularize}[tag_list]", + taggableType: taggable.class.to_s.capitalize.to_s }) diff --git a/app/views/articles/_recent_articles.html.slim b/app/views/articles/_recent_articles.html.slim index 39d8cdbe9c3..43249315827 100644 --- a/app/views/articles/_recent_articles.html.slim +++ b/app/views/articles/_recent_articles.html.slim @@ -11,7 +11,9 @@ .card-list-item__thumbnail .card-list-item__thumbnail-inner - if recent_article.thumbnail.attached? - = image_tag recent_article.thumbnail.variant(resize_to_limit: [200, 105]).processed.url, class: 'card-list-item__thumbnail-image', alt: "ブログ記事「#{recent_article.title}」のアイキャッチ画像" + = image_tag recent_article.thumbnail.variant(resize_to_limit: [200, 105]).processed.url, \ + class: 'card-list-item__thumbnail-image', \ + alt: "ブログ記事「#{recent_article.title}」のアイキャッチ画像" - else = image_tag 'work-blank.svg', class: 'card-list-item__thumbnail-image', alt: 'ブログ記事のブランクアイキャッチ画像' .card-list-item__rows diff --git a/app/views/events/_participation.html.slim b/app/views/events/_participation.html.slim index 6213f75d510..7a49a90dc9a 100644 --- a/app/views/events/_participation.html.slim +++ b/app/views/events/_participation.html.slim @@ -14,7 +14,8 @@ | 参加登録しています。 ul.event-main-actions__items li.event-main-actions__item - = link_to event_participation_path(event_id: event), method: :delete, data: { confirm: '特別イベントの参加をキャンセルします。よろしいですか?' }, class: 'event-main-actions__item-cancel' do + = link_to event_participation_path(event_id: event), method: :delete, + data: { confirm: '特別イベントの参加をキャンセルします。よろしいですか?' }, class: 'event-main-actions__item-cancel' do | 参加を取り消す - elsif event.opening? .event-main-actions.is-unparticipationed(class="#{event.capacity > event.participants.count ? 'is-available' : 'is-capacity-over'}") @@ -30,8 +31,10 @@ li.event-main-actions__item - if event.capacity > event.participants.count // TODO helprtにしてわかりやすくしたい↑ - = link_to event_participations_path(event_id: event), method: :post, data: { confirm: '特別イベント参加申込をします。よろしいですか?' }, class: 'a-button is-primary is-md is-block' do + = link_to event_participations_path(event_id: event), method: :post, + data: { confirm: '特別イベント参加申込をします。よろしいですか?' }, class: 'a-button is-primary is-md is-block' do | 参加申込 - else - = link_to event_participations_path(event_id: event), method: :post, data: { confirm: '補欠として特別イベント参加申込をします。よろしいですか?' }, class: 'a-button is-warning is-md is-block' do + = link_to event_participations_path(event_id: event), method: :post, + data: { confirm: '補欠として特別イベント参加申込をします。よろしいですか?' }, class: 'a-button is-warning is-md is-block' do | 補欠登録 diff --git a/app/views/notification_mailer/trainee_report.html.slim b/app/views/notification_mailer/trainee_report.html.slim index 641bb783aed..2c441b650c3 100644 --- a/app/views/notification_mailer/trainee_report.html.slim +++ b/app/views/notification_mailer/trainee_report.html.slim @@ -1,2 +1,4 @@ -= render 'notification_mailer_template', title: "#{@report.user.login_name}さんが日報【 #{@report.title} 】を書きました！", link_url: notification_url(@notification), link_text: 'この日報へ！！！' do += render 'notification_mailer_template', + title: "#{@report.user.login_name}さんが日報【 #{@report.title} 】を書きました！", + link_url: notification_url(@notification), link_text: 'この日報へ！！！' do = md2html(@report.description) diff --git a/app/views/pages/_doc_header.html.slim b/app/views/pages/_doc_header.html.slim index bf18c5f7ce4..43bd51c883e 100644 --- a/app/views/pages/_doc_header.html.slim +++ b/app/views/pages/_doc_header.html.slim @@ -76,4 +76,8 @@ header.page-content-header .page-content-header__row .page-content-header__tags - = react_component('Tags/Tags', { tagsInitialValue: page.tag_list.join(',').to_s, tagsParamName: 'page[tag_list]', tagsInputId: 'page_tag_list', tagsType: 'Page', tagsTypeId: page.id.to_s }) + = react_component('Tags/Tags', { tagsInitialValue: page.tag_list.join(',').to_s, + tagsParamName: 'page[tag_list]', + tagsInputId: 'page_tag_list', + tagsType: 'Page', + tagsTypeId: page.id.to_s }) diff --git a/app/views/practices/questions/index.html.slim b/app/views/practices/questions/index.html.slim index 1bf4a0739ab..10dd0dfece0 100644 --- a/app/views/practices/questions/index.html.slim +++ b/app/views/practices/questions/index.html.slim @@ -9,11 +9,14 @@ nav.tab-nav .container ul.tab-nav__items li.tab-nav__item - = link_to '全ての質問', practice_questions_path(@practice), class: "tab-nav__item-link #{params[:target] == 'not_solved' || params[:target] == 'solved' ? '' : 'is-active'}" + = link_to '全ての質問', practice_questions_path(@practice), + class: "tab-nav__item-link #{params[:target] == 'not_solved' || params[:target] == 'solved' ? '' : 'is-active'}" li.tab-nav__item - = link_to '解決済み', practice_questions_path(@practice, target: 'solved'), class: "tab-nav__item-link #{params[:target] == 'solved' ? 'is-active' : ''}" + = link_to '解決済み', practice_questions_path(@practice, target: 'solved'), + class: "tab-nav__item-link #{params[:target] == 'solved' ? 'is-active' : ''}" li.tab-nav__item - = link_to '未解決', practice_questions_path(@practice, target: 'not_solved'), class: "tab-nav__item-link #{params[:target] == 'not_solved' ? 'is-active' : ''}" + = link_to '未解決', practice_questions_path(@practice, target: 'not_solved'), + class: "tab-nav__item-link #{params[:target] == 'not_solved' ? 'is-active' : ''}" .page-body .container.is-md diff --git a/app/views/products/unchecked/index.html.slim b/app/views/products/unchecked/index.html.slim index 60ba5153c3b..e47403c8e7b 100644 --- a/app/views/products/unchecked/index.html.slim +++ b/app/views/products/unchecked/index.html.slim @@ -15,7 +15,8 @@ header.page-header .form__items .form-item.is-inline-md-up = label_tag :checker_id, '担当メンター', class: 'a-form-label' - = select_tag :checker_id, options_from_collection_for_select(User.mentor.order(:login_name), :id, :login_name, selected: params[:checker_id]), include_blank: '全ての提出物を表示', onchange: 'this.form.submit()', id: 'js-choices-single-select' + = select_tag :checker_id, options_from_collection_for_select(User.mentor.order(:login_name), :id, :login_name, selected: params[:checker_id]), + include_blank: '全ての提出物を表示', onchange: 'this.form.submit()', id: 'js-choices-single-select' hr.a-border .page-body .container.is-md diff --git a/app/views/questions/_question_body.html.slim b/app/views/questions/_question_body.html.slim index 5db7f8de359..cdc1dccdfa6 100644 --- a/app/views/questions/_question_body.html.slim +++ b/app/views/questions/_question_body.html.slim @@ -14,7 +14,9 @@ i#new.fa-solid.fa-pen | 内容修正 li.card-main-actions__item.is-sub.is-only-mentor class=(current_user.mentor ? '' : 'is-hidden') - =link_to '削除する', question_path(question), data: { confirm: '本当に削除しますか？質問はなるべく消さず、もし質問者が自己解決した場合も、質問者自身で解決した手段や手順を回答に記入し、それをベストアンサーにしてこの質問を解決することを即すようにしてください。' }, method: :delete, class: 'card-main-actions__muted-action' + =link_to '削除する', question_path(question), + data: { confirm: '本当に削除しますか？質問はなるべく消さず、もし質問者が自己解決した場合も、質問者自身で解決した手段や手順を回答に記入し、それをベストアンサーにしてこの質問を解決することを即すようにしてください。' }, method: :delete, + class: 'card-main-actions__muted-action' li.card-main-actions__item.is-sub class=(current_user.mentor ? 'is-hidden' : '') label.card-main-actions__muted-action for='modal-delete-request' | 削除申請 diff --git a/app/views/questions/_question_header.html.slim b/app/views/questions/_question_header.html.slim index b7307ec84df..d4c4c6a742b 100644 --- a/app/views/questions/_question_header.html.slim +++ b/app/views/questions/_question_header.html.slim @@ -65,4 +65,8 @@ header.page-content-header .page-content-header__row .page-content-header__tags - = react_component('Tags/Tags', { tagsInitialValue: question.tag_list.join(','), tagsParamName: 'question[tag_list]', tagsInputId: 'question_tag_list', tagsType: 'Question', tagsTypeId: question.id.to_s }) + = react_component('Tags/Tags', { tagsInitialValue: question.tag_list.join(','), + tagsParamName: 'question[tag_list]', + tagsInputId: 'question_tag_list', + tagsType: 'Question', + tagsTypeId: question.id.to_s }) diff --git a/app/views/questions/_tabs.html.slim b/app/views/questions/_tabs.html.slim index b7d7b0ebe97..0a9ac4e492d 100644 --- a/app/views/questions/_tabs.html.slim +++ b/app/views/questions/_tabs.html.slim @@ -2,13 +2,16 @@ .container ul.page-tabs__items li.page-tabs__item - = link_to questions_path(target: 'not_solved', practice_id: params[:practice_id]), class: "page-tabs__item-link #{params[:target] == 'not_solved' ? 'is-active' : ''}" do + = link_to questions_path(target: 'not_solved', practice_id: params[:practice_id]), + class: "page-tabs__item-link #{params[:target] == 'not_solved' ? 'is-active' : ''}" do | 未解決 - if Question.not_solved.not_wip.size.positive? && current_user.admin_or_mentor? .page-tabs__item-count.a-notification-count #not-solved-count = params[:practice_id].present? ? Question.not_solved.not_wip.where(practice_id: params[:practice_id]).size : Question.not_solved.not_wip.size li.page-tabs__item - = link_to '解決済み', questions_path(target: 'solved', practice_id: params[:practice_id]), class: "page-tabs__item-link #{params[:target] == 'solved' ? 'is-active' : ''}" + = link_to '解決済み', questions_path(target: 'solved', practice_id: params[:practice_id]), + class: "page-tabs__item-link #{params[:target] == 'solved' ? 'is-active' : ''}" li.page-tabs__item - = link_to '全て', questions_path(practice_id: params[:practice_id], title: params[:title]), class: "page-tabs__item-link #{params[:target] == 'not_solved' || params[:target] == 'solved' ? '' : 'is-active'}" + = link_to '全て', questions_path(practice_id: params[:practice_id], title: params[:title]), + class: "page-tabs__item-link #{params[:target] == 'not_solved' || params[:target] == 'solved' ? '' : 'is-active'}" diff --git a/app/views/regular_events/_participation.html.slim b/app/views/regular_events/_participation.html.slim index b3a8024d670..05b61691df7 100644 --- a/app/views/regular_events/_participation.html.slim +++ b/app/views/regular_events/_participation.html.slim @@ -5,11 +5,13 @@ | 参加登録しています。 ul.event-main-actions__items li.event-main-actions__item - = link_to regular_event_participation_path(regular_event_id: regular_event), method: :delete, data: { confirm: 'イベントの参加をキャンセルします。よろしいですか?' }, class: 'event-main-actions__item-cancel' do + = link_to regular_event_participation_path(regular_event_id: regular_event), method: :delete, + data: { confirm: 'イベントの参加をキャンセルします。よろしいですか?' }, class: 'event-main-actions__item-cancel' do | 参加を取り消す - else .event-main-actions.is-unparticipationed.is-available ul.event-main-actions__items li.event-main-actions__item - = link_to regular_event_participations_path(regular_event_id: regular_event), method: :post, data: { confirm: 'イベント参加申込をします。よろしいですか?' }, class: 'a-button is-primary is-md is-block' do + = link_to regular_event_participations_path(regular_event_id: regular_event), method: :post, + data: { confirm: 'イベント参加申込をします。よろしいですか?' }, class: 'a-button is-primary is-md is-block' do | 参加申込 diff --git a/app/views/reports/_learning_time_fields.html.slim b/app/views/reports/_learning_time_fields.html.slim index 54fc3e72c83..7d6cd053633 100644 --- a/app/views/reports/_learning_time_fields.html.slim +++ b/app/views/reports/_learning_time_fields.html.slim @@ -1,6 +1,7 @@ .form-times .nested-fields.form-times__inner - - tag = '
' + - tag = '
'\ + '
' .form-times__items.learning-time .form-times__time = f.label :started_at, class: 'form-times__time-label' diff --git a/app/views/survey_questions/edit.html.slim b/app/views/survey_questions/edit.html.slim index 6337158ad29..cfdead49762 100644 --- a/app/views/survey_questions/edit.html.slim +++ b/app/views/survey_questions/edit.html.slim @@ -24,4 +24,5 @@ header.page-header hr.a-border .page-body .container.is-md - = render 'form', survey_question: @survey_question, linear_scale: @linear_scale, radio_button: @radio_button, check_box: @check_box, radio_button_choices: @radio_button_choices, check_box_choices: @check_box_choices + = render 'form', survey_question: @survey_question, linear_scale: @linear_scale, radio_button: @radio_button, + check_box: @check_box, radio_button_choices: @radio_button_choices, check_box_choices: @check_box_choices diff --git a/app/views/survey_questions/new.html.slim b/app/views/survey_questions/new.html.slim index fd7291af804..69d4912e3f3 100644 --- a/app/views/survey_questions/new.html.slim +++ b/app/views/survey_questions/new.html.slim @@ -24,4 +24,5 @@ header.page-header hr.a-border .page-body .container.is-md - = render 'form', survey_question: @survey_question, linear_scale: @linear_scale, radio_button: @radio_button, check_box: @check_box, radio_button_choices: @radio_button_choices, check_box_choices: @check_box_choices + = render 'form', survey_question: @survey_question, linear_scale: @linear_scale, radio_button: @radio_button, + check_box: @check_box, radio_button_choices: @radio_button_choices, check_box_choices: @check_box_choices diff --git a/app/views/surveys/show.html.slim b/app/views/surveys/show.html.slim index 6664743c298..d24ec803144 100644 --- a/app/views/surveys/show.html.slim +++ b/app/views/surveys/show.html.slim @@ -99,13 +99,15 @@ header.page-header - 10.times do |i| - if survey_question.linear_scale.reason_for_choice_required li.linear-scale__points-item - = f.radio_button survey_question.id, i + 1, id: "linear-scale-#{survey_question.id}-#{i}", class: 'a-toggle-checkbox js-questionnaire_choice js-answer_required_choice' + = f.radio_button survey_question.id, i + 1, id: "linear-scale-#{survey_question.id}-#{i}", + class: 'a-toggle-checkbox js-questionnaire_choice js-answer_required_choice' label.linear-scale__point for="linear-scale-#{survey_question.id}-#{i}" .linear-scale__point-number = i + 1 - else li.linear-scale__points-item - = f.radio_button survey_question.id, i + 1, id: "linear-scale-#{survey_question.id}-#{i}", class: 'a-toggle-checkbox js-questionnaire_choice' + = f.radio_button survey_question.id, i + 1, id: "linear-scale-#{survey_question.id}-#{i}", + class: 'a-toggle-checkbox js-questionnaire_choice' label.linear-scale__point for="linear-scale-#{survey_question.id}-#{i}" .linear-scale__point-number = i + 1 diff --git a/app/views/users/show.html.slim b/app/views/users/show.html.slim index fe3be86a6c5..09544fe265c 100644 --- a/app/views/users/show.html.slim +++ b/app/views/users/show.html.slim @@ -46,7 +46,12 @@ - if @user.tag_list.present? || current_user == @user .user-data__row .user-data__tags - - tags_props = { tagsInitialValue: @user.tag_list.join(',').to_s, tagsParamName: 'user[tag_list]', tagsInputId: 'user_tag_list', tagsType: 'User', tagsTypeId: @user.id.to_s, tagsEditable: @user.id == current_user.id } + - tags_props = { tagsInitialValue: @user.tag_list.join(',').to_s, + tagsParamName: 'user[tag_list]', + tagsInputId: 'user_tag_list', + tagsType: 'User', + tagsTypeId: @user.id.to_s, + tagsEditable: @user.id == current_user.id } = react_component('Tags/Tags', tags_props) - if admin_or_mentor_login? && @user.hibernated? .user-data__row @@ -94,4 +99,5 @@ class: 'a-button is-sm is-danger is-block' - if @user != current_user .user-statuses__delete - = link_to 'このユーザーを削除する', admin_user_path(@user), method: :delete, id: "delete-#{@user.id}", class: 'a-muted-text-link', data: { confirm: '本当によろしいですか？この操作はデータを削除するため元に戻すことができません。' } + = link_to 'このユーザーを削除する', admin_user_path(@user), method: :delete, id: "delete-#{@user.id}", class: 'a-muted-text-link', + data: { confirm: '本当によろしいですか？この操作はデータを削除するため元に戻すことができません。' } diff --git a/app/views/welcome/_mentors.html.slim b/app/views/welcome/_mentors.html.slim index f45d92183ba..e5cc2583ecb 100644 --- a/app/views/welcome/_mentors.html.slim +++ b/app/views/welcome/_mentors.html.slim @@ -4,6 +4,10 @@ section.welcome-child-section .welcome-members .row.is-gutter-width-32 - mentors.each do |mentor| - - if mentor.profile_image.present? && mentor.profile_name.present? && mentor.profile_job.present? && mentor.profile_text.present? && mentor.login_name != 'achamixx' + - if mentor.profile_image.present? && \ + mentor.profile_name.present? && \ + mentor.profile_job.present? && \ + mentor.profile_text.present? && \ + mentor.login_name != 'achamixx' .col-xs-12.col-md-6.col-lg-4 = render 'welcome/mentor', mentor:, page: 'welcome-index' diff --git a/config/slim_lint.yml b/config/slim_lint.yml index 6ec54d94d72..5d9c06034ff 100644 --- a/config/slim_lint.yml +++ b/config/slim_lint.yml @@ -16,7 +16,6 @@ linters: - Layout/HashAlignment - Layout/IndentationWidth - Layout/InitialIndentation - - Layout/LineLength - Layout/MultilineArrayBraceLayout - Layout/MultilineAssignmentLayout - Layout/MultilineHashBraceLayout