rubyon
/
farmitry_hvac
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: rubyon:29841e2d15962b2f7d3f27deef7e97f7231d588b
Branches Tags
rubyon:main
rubyon:develop_mh_new
rubyon:develop_mh
...
compare: rubyon:2f237acaecde53d344441b680af825164da37014
Branches Tags
rubyon:develop_mh_new
rubyon:develop_mh
rubyon:main

2 Commits
29841e2d15 ... 2f237acaec

Author SHA1 Message Date
ming 2f237acaec Modal 스타일 수정 2025-04-25 14:00:52 +09:00
ming 55715a20eb scroll y area height fix 해제 2025-04-25 13:53:20 +09:00
3 changed files with 11 additions and 11 deletions
Show Stats Expand all files Collapse all files

8
app/views/layouts/application.html.erb
View File

@ -23,20 +23,20 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css">
</head> </head>
<body class="h-screen overflow-hidden bg-base-background text-base-text min-w-[400px] overflow-x-auto"> <body class="min-h-screen bg-base-background text-base-text min-w-[400px] overflow-x-auto h-full">
<%= turbo_frame_tag :modals %> <%= turbo_frame_tag :modals %>
<main class="flex flex-col h-full"> <main class="flex flex-col h-full">
<%= render "partials/header" %> <%= render "partials/header" %>
<div class="flex flex-row flex-1 w-full overflow-hidden"> <div class="flex flex-row flex-1 w-full">
<%= render "partials/sidebar" %> <%= render "partials/sidebar" %>
<div class="flex-1 h-full pb-4 pr-4"> <div class="flex-1 h-full pb-4 pr-4">
<div class="flex-1 h-full content"> <div class="flex-1 h-full content">
<% if flash[:notice] %> <% if flash[:notice] %>
<div class="m-4 rounded px-4 py-2 bg-accept text-white"> <div class="rounded px-4 py-2 bg-accept text-white">
<%= raw flash[:notice] %> <%= raw flash[:notice] %>
</div> </div>
<% elsif flash[:alert] %> <% elsif flash[:alert] %>
<div class="m-4 rounded px-4 py-2 bg-danger text-white"> <div class="rounded px-4 py-2 bg-danger text-white">
<%= raw flash[:alert] %> <%= raw flash[:alert] %>
</div> </div>
<% end %> <% end %>

6
app/views/partials/_modals_open.html.erb
View File

@ -10,9 +10,9 @@
From: "opacity-100" From: "opacity-100"
To: "opacity-0" To: "opacity-0"
--> -->
<div id="modals-backdrop" class="fixed inset-0 bg-default-slate-dark transition-opacity opacity-0 ease-out duration-500" aria-hidden="true"></div> <div id="modals-backdrop" class="fixed inset-0 bg-base-background transition-opacity opacity-0 ease-out duration-500" aria-hidden="true"></div>
<div class="fixed inset-0 z-40 w-screen overflow-y-auto py-8"> <div class="fixed inset-0 z-40 w-screen overflow-y-auto py-4">
<div class="flex min-h-full items-center justify-center text-center sm:items-center"> <div class="flex min-h-full items-center justify-center text-center sm:items-center">
<!-- <!--
Modal panel, show/hide based on modal state. Modal panel, show/hide based on modal state.
@ -24,7 +24,7 @@
From: "opacity-100 translate-y-0 sm:scale-100" From: "opacity-100 translate-y-0 sm:scale-100"
To: "opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95" To: "opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
--> -->
<div id="modals-panel" class="p-4 space-y-4 z-40 relative transform overflow-hidden rounded-md bg-white text-left shadow-xl transition-all w-full max-w-full mx-2 sm:mx-10 opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95 ease-out duration-500" data-controller="modals" data-action="modals:click:outside->modals#close"> <div id="modals-panel" class="p-4 space-y-4 z-40 relative transform overflow-hidden rounded-md bg-base-secondary text-left shadow-xl transition-all w-full max-w-full mx-2 sm:mx-10 opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95 ease-out duration-500" data-controller="modals" data-action="modals:click:outside->modals#close">
<div> <div>
<%= render "partials/modals/#{type}" %> <%= render "partials/modals/#{type}" %>
</div> </div>

8
app/views/partials/modals/_add_schedule.html.erb
View File

@ -1,7 +1,7 @@
<%= form_with model: @schedule, method: :post, data: { turbo: false }, class: 'flex flex-col h-full divide-y divide-border-table-border' do |form| %> <%= 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] %> <%= form.hidden_field :controller_id, value: params[:id] %>
<div class="flex-1 p-4"> <div class="flex-1 text-white space-y-4">
<span class="text-2xl font-bold"><%= Controller.find(params[:id]).name %> 컨트롤러</span> <div class="text-2xl font-bold"><%= Controller.find(params[:id]).name %> 컨트롤러</div>
<table class="base-table"> <table class="base-table">
<thead> <thead>
<tr> <tr>
@ -35,7 +35,7 @@
</table> </table>
</div> </div>
<div class="flex p-4"> <div class="flex">
<%= submit_tag "추가", class: "btn bg-primary" %> <%= submit_tag "추가", class: "btn bg-primary" %>
</div> </div>
<% end %> <% end %>