Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add all #74

Merged
merged 3 commits into from
May 2, 2024
Merged

add all #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21a33cb
add all
ger619 May 2, 2024
cb5909c
add all
ger619 May 2, 2024
7bc9ac6
add all
ger619 May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .idea/mseals.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,5 @@ gem 'hotwire-rails', '~> 0.1.3'

gem 'image_processing'
gem 'mini_magick'

gem 'chartkick', '~> 5.0'
29 changes: 3 additions & 26 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
chartkick (5.0.6)
cloudinary (1.29.0)
aws_cf_signer
rest-client (>= 2.0.0)
Expand Down Expand Up @@ -182,18 +183,8 @@ GEM
net-protocol
netrc (0.11.0)
nio4r (2.7.0)
nokogiri (1.16.3-aarch64-linux)
racc (~> 1.4)
nokogiri (1.16.3-arm-linux)
racc (~> 1.4)
nokogiri (1.16.3-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.3-x86-linux)
racc (~> 1.4)
nokogiri (1.16.3-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.3-x86_64-linux)
racc (~> 1.4)
orm_adapter (0.5.0)
pagy (6.5.0)
parallel (1.24.0)
Expand Down Expand Up @@ -290,18 +281,8 @@ GEM
stimulus-rails (1.3.3)
railties (>= 6.0.0)
stringio (3.1.0)
tailwindcss-rails (2.3.0)
railties (>= 6.0.0)
tailwindcss-rails (2.3.0-aarch64-linux)
railties (>= 6.0.0)
tailwindcss-rails (2.3.0-arm-linux)
railties (>= 6.0.0)
tailwindcss-rails (2.3.0-arm64-darwin)
railties (>= 6.0.0)
tailwindcss-rails (2.3.0-x86_64-darwin)
railties (>= 6.0.0)
tailwindcss-rails (2.3.0-x86_64-linux)
railties (>= 6.0.0)
thor (1.3.1)
timeout (0.4.1)
tinymce-rails (6.8.3)
Expand Down Expand Up @@ -333,18 +314,14 @@ GEM
zeitwerk (2.6.13)

PLATFORMS
aarch64-linux
arm-linux
arm64-darwin
x86-linux
x86_64-darwin
x86_64-linux
x86_64-darwin-22

DEPENDENCIES
annotate (~> 3.2)
bootsnap
cancancan
capybara
chartkick (~> 5.0)
cloudinary (~> 1.29.0)
debug
devise (~> 4.9, >= 4.9.2)
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

<body class="bg-[#e6e6e6]">
<%= render "layouts/navbar" %>
<main class="lg:max-w-full md:mx-auto mt-0 md:mt-[28px] w-full">
<main class="lg:max-w-full md:mx-auto mt-0 w-full">
<%= yield %>
</main>
<%= render "layouts/footer" %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/news/_news_render.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<p class="text-sm text-gray-600 flex items-center uppercase">
<%= news.type_of_news %>
</p>
<div class="text-gray-900 font-bold text-xl mb-2 md:mt-3 sm:text-sm md:text-xl truncate ">
<div class="text-gray-900 font-bold text-xl mb-2 md:mt-3 sm:text-sm md:text-xl max-w-[400px] truncate ">
<%= news.header_news %>
</div>
<div class="hidden md:flex xl:flex lg:flex-row md:flex-row sm:flex-row gap-2 md:w-[60%] sm:w-[20%] sm:hidden">
Expand Down
Loading