From b258de57fbde0582bedc93f8efe7e5004c596afa Mon Sep 17 00:00:00 2001 From: Senad Uka Date: Sat, 7 Sep 2024 09:10:51 +0200 Subject: [PATCH] Fix problem with scrolling --- .idea/dataSources.local.xml | 4 +- .idea/terminator.iml | 182 ++++++++-------- .idea/workspace.xml | 202 ++++++++++++++---- Gemfile.lock | 6 + .../stylesheets/application.tailwind.css | 13 +- app/assets/stylesheets/calendar.tailwind.css | 24 +++ app/views/layouts/calendar.html.erb | 4 +- 7 files changed, 282 insertions(+), 153 deletions(-) create mode 100644 app/assets/stylesheets/calendar.tailwind.css diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml index c07f0ea..50c87dc 100644 --- a/.idea/dataSources.local.xml +++ b/.idea/dataSources.local.xml @@ -1,8 +1,8 @@ - + - + no-auth diff --git a/.idea/terminator.iml b/.idea/terminator.iml index 88aba9c..2a7a89e 100644 --- a/.idea/terminator.iml +++ b/.idea/terminator.iml @@ -27,97 +27,97 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -147,6 +147,7 @@ + + { "associatedIndex": 7 } @@ -57,29 +48,32 @@ - { - "keyToString": { - "ASKED_ADD_EXTERNAL_FILES": "true", - "ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true", - "Rails.terminator.executor": "Run", - "RunOnceActivity.ShowReadmeOnStart": "true", - "git-widget-placeholder": "master", - "last_opened_file_path": "/home/hamo/projects/kbr4/terminator/app/views/layouts", - "list.type.of.created.stylesheet": "CSS", - "node.js.detected.package.eslint": "true", - "node.js.detected.package.tslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "node.js.selected.package.tslint": "(autodetect)", - "nodejs_package_manager_path": "npm", - "ruby.structure.view.model.defaults.configured": "true", - "settings.editor.selected.configurable": "org.jetbrains.plugins.ruby.settings.RubyActiveModuleSdkConfigurable", - "vue.rearranger.settings.migration": "true" + +}]]> - + @@ -88,6 +82,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -97,11 +162,7 @@ - - - - - + @@ -112,6 +173,24 @@ + + + + + + + + + + + + + + + + + + @@ -121,11 +200,7 @@ - - - - - + @@ -148,11 +223,7 @@ - - - - - + @@ -163,6 +234,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -193,6 +299,8 @@ + + diff --git a/Gemfile.lock b/Gemfile.lock index 4bfc577..2eece38 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -149,6 +149,8 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.3) + nokogiri (1.16.5-arm64-darwin) + racc (~> 1.4) nokogiri (1.16.5-x86_64-linux) racc (~> 1.4) psych (5.1.2) @@ -219,11 +221,14 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) + sqlite3 (1.7.3-arm64-darwin) sqlite3 (1.7.3-x86_64-linux) stimulus-rails (1.3.3) railties (>= 6.0.0) stringio (3.1.0) strscan (3.1.0) + tailwindcss-rails (2.6.0-arm64-darwin) + railties (>= 7.0.0) tailwindcss-rails (2.6.0-x86_64-linux) railties (>= 7.0.0) thor (1.3.1) @@ -249,6 +254,7 @@ GEM zeitwerk (2.6.14) PLATFORMS + arm64-darwin-23 x86_64-linux DEPENDENCIES diff --git a/app/assets/stylesheets/application.tailwind.css b/app/assets/stylesheets/application.tailwind.css index 16f48d0..08d74a7 100644 --- a/app/assets/stylesheets/application.tailwind.css +++ b/app/assets/stylesheets/application.tailwind.css @@ -10,15 +10,4 @@ } } -*/ -body { - height: 100vw; - overflow: hidden; -} - -toastui-calendar-time { - height: 100% !important; -} - -.toastui-calendar-timegrid { height: 100%; } -.toastui-calendar-panel.toastui-calendar-time { overflow-y: inherit; } \ No newline at end of file +*/ \ No newline at end of file diff --git a/app/assets/stylesheets/calendar.tailwind.css b/app/assets/stylesheets/calendar.tailwind.css new file mode 100644 index 0000000..575ee47 --- /dev/null +++ b/app/assets/stylesheets/calendar.tailwind.css @@ -0,0 +1,24 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; + +/* + +@layer components { + .btn-primary { + @apply py-2 px-4 bg-blue-200; + } +} + +*/ +body.calendar { + height: 99vw; + overflow: hidden; +} + +toastui-calendar-time { + height: 99% !important; +} + +.toastui-calendar-timegrid { height: 99%; } +.toastui-calendar-panel.toastui-calendar-time { overflow-y: inherit; } \ No newline at end of file diff --git a/app/views/layouts/calendar.html.erb b/app/views/layouts/calendar.html.erb index fc7f371..7ea68d4 100644 --- a/app/views/layouts/calendar.html.erb +++ b/app/views/layouts/calendar.html.erb @@ -8,12 +8,12 @@ <%= stylesheet_link_tag "tailwind", "inter-font", "data-turbo-track": "reload" %> - <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %> + <%= stylesheet_link_tag "calendar.tailwind", "data-turbo-track": "reload" %> <%= javascript_importmap_tags %> - +
<%= yield %>