Merge branch 'main' into fix-profile-edit-dialog-size

kufu · May 10, 2024 · 445da18 · 445da18
2 parents 1f53fe1 + f9b804c
commit 445da18
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 12 deletions.
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
@@ -2,7 +2,9 @@
   <div class="flex items-center justify-end direction-row h-[50px] bg-[var(--mainColor)]">
     <div class="flex flex-col sm:flex-row flex-grow items-start sm:items-center mx-4 my-0 text-[var(--textColor)]">
       <% unless Rails.env.test? %>
-        <img class="h-6" src="<%= asset_path("#{@event.name}/rubykaigi_logo.svg") %>">
+        <a href="<%= event_path %>">
+          <img class="h-6" src="<%= asset_path("#{@event.name}/rubykaigi_logo.svg") %>">
+        </a>
       <% end %>
       <div class="flex items-center text-xs sm:text-sm">
         <div class="flex items-center gap-0.5 sm:ml-2">

diff --git a/app/views/plans/_description_dialog.html.erb b/app/views/plans/_description_dialog.html.erb
@@ -6,7 +6,7 @@
         <p class="text-xl"><%= I18n.t('description.form_titme') %></p>
       </div>
       <div class="max-h-[calc(100vh-212px)] overflow-auto">
-        <div class="w-full sm:w-[656px] p-6">
+        <div class="w-full p-6">
           <%= f.text_area :description, class: "border opacity-100 rounded-md border border-[rgb(214,211,208)] bg-white p-2 text-[rgb(35,34,30)] w-full", data: { "word-counter-target": "source", action: "input->word-counter#calc" } %>
           <div class="font-xs mt-2 text-[rgb(112,109,101)]">
             <span data-word-counter-target="counter"></span>/<%= plan_description_max_length %>
@@ -21,4 +21,4 @@
       </div>
     </div>
   <% end %>
-</dialog>
+</dialog>
diff --git a/app/views/plans/_password_dialog.html.erb b/app/views/plans/_password_dialog.html.erb
@@ -5,7 +5,7 @@
       <p class="my-0 text-xl"><%= I18n.t('settings.title') %></p>
     </div>
     <div class="max-h-[calc(100vh-212px)] overflow-auto">
-      <div class="w-full sm:w-[656px] p-6 border-b border-[rgb(214,211,208)]">
+      <div class="w-full p-6 border-b border-[rgb(214,211,208)]">
         <div class="py-2 w-full">
           <div><%= f.label :password, I18n.t('dialog.input_password'), class: "text-[rgb(112,109,101)] font-bold" %></div>
           <div class="mt-4">
@@ -21,4 +21,4 @@
       </div>
     </div>
   <% end %>
-</dialog>
+</dialog>
diff --git a/app/views/plans/_rename_dialog.html.erb b/app/views/plans/_rename_dialog.html.erb
@@ -6,7 +6,7 @@
         <p class="text-xl"><%= I18n.t('dialog.edit_title') %></p>
       </div>
       <div class="max-h-[calc(100vh-212px)] overflow-auto">
-        <div class="w-full sm:w-[656px] p-6">
+        <div class="w-full p-6">
           <%= f.text_area :title, class: "border opacity-100 rounded-md border border-[rgb(214,211,208)] bg-white p-2 text-[rgb(35,34,30)] w-full", data: { "word-counter-target": "source", action: "input->word-counter#calc" } %>
           <div class="font-xs mt-2 text-[rgb(112,109,101)]">
             <span data-word-counter-target="counter"></span>/<%= plan_title_max_length %>
@@ -21,4 +21,4 @@
       </div>
     </div>
   <% end %>
-</dialog>
+</dialog>
diff --git a/app/views/plans/_setting_dialog.html.erb b/app/views/plans/_setting_dialog.html.erb
@@ -4,7 +4,7 @@
       <p class="my-0 text-xl"><%= I18n.t('settings.title') %></p>
     </div>
     <div class="max-h-[calc(100vh-212px)] overflow-auto">
-      <div class="w-full sm:w-[656px] p-6 border-b border-[rgb(214,211,208)]">
+      <div class="w-full p-6 border-b border-[rgb(214,211,208)]">
         <div class="py-2 w-full">
           <div><%= f.label :password, I18n.t('settings.set_password'), class: "text-[rgb(112,109,101)] font-bold" %></div>
           <div class="mt-2"><%= I18n.t('settings.password_expression') %></div>
@@ -41,4 +41,4 @@
       </div>
     </div>
   <% end %>
-</dialog>
+</dialog>
diff --git a/app/views/schedules/_card.html.erb b/app/views/schedules/_card.html.erb
@@ -65,7 +65,7 @@
                     <p class="text-xl"><%= I18n.t('dialog.edit_memo', title: schedule.title) %></p>
                   </div>
                   <div class="max-h-[calc(100vh-212px)] overflow-auto">
-                    <div class="w-[656px] p-6">
+                    <div class="w-full p-6">
                       <%= f.hidden_field :edit_memo_schedule_id, value: schedule.id %>
                       <%= f.text_area :memo, value: @plan.plan_schedules.find { _1.schedule == schedule }&.memo, class: "border opacity-100 rounded-md border border-[rgb(214,211,208)] bg-white p-2 text-[rgb(35,34,30)] w-full", data: { "word-counter-target": "source", action: "input->word-counter#calc" } %>
                       <div class="font-xs mt-2 text-[rgb(112,109,101)]">

diff --git a/app/views/teams/_rename_dialog.html.erb b/app/views/teams/_rename_dialog.html.erb
@@ -15,7 +15,7 @@
               </ul>
             </div>
           <% end %>
-          <div class="w-full: sm:w-[656px] p-6">
+          <div class="w-full p-6">
             <%= f.text_area :name, class: "border opacity-100 rounded-md border border-[rgb(214,211,208)] bg-white p-2 text-[rgb(35,34,30)] w-full", data: { "word-counter-target": "source", action: "input->word-counter#calc" } %>
             <div class="font-xs mt-2 text-[rgb(112,109,101)]">
               <span data-word-counter-target="counter"></span>/<%= team_name_max_length %>
@@ -31,4 +31,4 @@
       </div>
     <% end %>
   <% end %>
-</dialog>
+</dialog>