diff --git a/app/assets/stylesheets/application.tailwind.css b/app/assets/stylesheets/application.tailwind.css index 69d2670..35c2472 100644 --- a/app/assets/stylesheets/application.tailwind.css +++ b/app/assets/stylesheets/application.tailwind.css @@ -78,7 +78,7 @@ } .select-style { - @apply block w-full px-3 py-1.5 border border-default-slate/50 rounded-xs text-base-background + @apply block w-full px-2 py-1.5 border border-default-slate/50 rounded-xs text-base-background } .select-style option { @@ -86,7 +86,7 @@ } .input-style { - @apply block w-full px-3 py-1.5 border border-default-slate/50 rounded-xs + @apply block w-full px-2 py-1.5 border border-default-slate/50 rounded-xs } .textarea-style { @@ -109,11 +109,11 @@ } .side-bar { - @apply w-[16rem] px-4 text-lg font-bold divide-y divide-base-border; + @apply w-[16rem] pl-4 text-lg font-bold divide-y divide-base-border; } .content { - @apply rounded-lg bg-base-secondary; + @apply lg:rounded-lg bg-base-secondary; } .page-title { @@ -234,3 +234,13 @@ ::-webkit-scrollbar-thumb:hover { background-color: rgba(100, 100, 100, 0.6); } + +.input-style::-webkit-outer-spin-button, +.input-style::-webkit-inner-spin-button { + -webkit-appearance: none; + margin: 0; +} + +.input-style[type="number"] { + -moz-appearance: textfield; +} \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index a26c021..4e1bf29 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -23,20 +23,20 @@ - + <%= turbo_frame_tag :modals %>
<%= render "partials/header" %>
<%= render "partials/sidebar" %> -
+
<% if flash[:notice] %> -
+
<%= raw flash[:notice] %>
<% elsif flash[:alert] %> -
+
<%= raw flash[:alert] %>
<% end %> diff --git a/app/views/partials/_header.html.erb b/app/views/partials/_header.html.erb index 443bad4..5f0c789 100644 --- a/app/views/partials/_header.html.erb +++ b/app/views/partials/_header.html.erb @@ -1,4 +1,4 @@ -
+
<%= image_tag "svg/svg_logo.svg", class: "w-auto h-8 mr-4" %> <%= link_to root_path do %> diff --git a/app/views/partials/modals/_add_schedule.html.erb b/app/views/partials/modals/_add_schedule.html.erb index dca4c46..7995c96 100644 --- a/app/views/partials/modals/_add_schedule.html.erb +++ b/app/views/partials/modals/_add_schedule.html.erb @@ -1,7 +1,7 @@ <%= form_with model: @schedule, method: :post, data: { turbo: false }, class: 'flex flex-col h-full space-y-4' do |form| %> <%= form.hidden_field :controller_id, value: params[:id] %>
-
<%= Controller.find(params[:id]).name %> 컨트롤러
+
<%= Controller.find(params[:id]).name %> 컨트롤러
diff --git a/app/views/schedules/schedule_edit.html.erb b/app/views/schedules/schedule_edit.html.erb index fa98b72..1c1bd62 100644 --- a/app/views/schedules/schedule_edit.html.erb +++ b/app/views/schedules/schedule_edit.html.erb @@ -4,7 +4,7 @@ <%= hidden_field_tag :controller_id, params[:id] %>
-
<%= @controller.name %> 컨트롤러
+
<%= @controller.name %> 컨트롤러
<%= submit_tag "업데이트", class: "btn bg-primary" %>
    @@ -13,25 +13,24 @@
  • -
    +
    시간
    <%= select_tag "schedule[#{s.id}][hour]", options_for_select((0..23).map { |h| [h.to_s.rjust(2, '0'), h] }, s.hour), - class: "select-style text-white min-w-[68px] h-full" %> + class: "select-style text-white min-w-[60px] h-full" %>
    :
    <%= number_field_tag "schedule[#{s.id}][minute]", s.minute, min: 0, max: 59, step: 1, inputmode: "decimal", - class: "input-style min-w-[68px] h-full" %> + class: "input-style min-w-[60px] h-full" %>
    -
    -
    온도
    -
    - <%= number_field_tag "schedule[#{s.id}][temperature]", s.temperature, step: "0.1", inputmode: "decimal", class: "input-style min-w-[78px] h-full" %> -
    °C
    +
    +
    온도 (°C)
    +
    + <%= number_field_tag "schedule[#{s.id}][temperature]", s.temperature, min: -99, max: 99, step: "0.1", inputmode: "decimal", class: "input-style min-w-[68px] h-full" %>
    diff --git a/app/views/schedules/view.html.erb b/app/views/schedules/view.html.erb index 27290a0..6c41570 100644 --- a/app/views/schedules/view.html.erb +++ b/app/views/schedules/view.html.erb @@ -2,7 +2,7 @@
    -
    <%= @controller.name %> 컨트롤러
    +
    <%= @controller.name %> 컨트롤러
    <%= link_to "수정", schedule_edit_schedule_path(@controller.id), class: "btn bg-default-slate" %>
      @@ -25,15 +25,15 @@
      온도
      <%= s.temperature %>
      -
      °C
      +
      °C
    -
    +
    ON/OFF
    -
    +
    <%#= s.is_active %> <% if s.is_active %>