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.

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

Scroll #12

Merged
merged 15 commits into from
Jul 20, 2020
Merged

Scroll #12

merged 15 commits into from
Jul 20, 2020

Conversation

funtom48
Copy link
Collaborator

#4 Инфинити скролл новостей и сюжетов. аффикс сюжетов части (sticky)

funtom48 added 6 commits July 16, 2020 01:02
# Conflicts:
#	public/css/app.css
#	public/js/app.js
#	public/mix-manifest.json
#	resources/js/controllers/main_controller.js
#	resources/sass/app.scss
#	resources/views/components/story.blade.php
@@ -0,0 +1,25 @@
<div class="card border-0 mb-3">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Такого файла нет

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Вроде помечено как решен, но я не вижу, где бы этот файл использовался.

@@ -0,0 +1,14 @@
<div class="col mb-3">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Такого файла нет

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Аналогично

funtom48 added 8 commits July 20, 2020 23:21
# Conflicts:
#	public/css/app.css
#	public/js/app.js
#	public/mix-manifest.json
#	resources/js/controllers/main_controller.js
#	resources/sass/app.scss
#	resources/views/app.blade.php
#	resources/views/index.blade.php
#	resources/views/particles/load-news.blade.php
public/feeds.main.xml Outdated Show resolved Hide resolved
@funtom48 funtom48 force-pushed the scroll branch 2 times, most recently from 70c4042 to bf8dcbb Compare July 20, 2020 21:22
@funtom48 funtom48 merged commit e1d932a into source Jul 20, 2020
@tabuna tabuna deleted the scroll branch July 26, 2022 16:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants