Merge remote-tracking branch 'upstream/main'

lib/features/feed/models/diets_pagination_model.g.dart

@@ -85,7 +85,10 @@ _$AuthorImpl _$$AuthorImplFromJson(Map<String, dynamic> json) => _$AuthorImpl(
       authorProfileIcon: json['author_profile_icon'] as String,
       authorIsMe: json['author_is_me'] as bool,
       isEntitySubscribedByMe: json['is_entity_subscribed_by_me'] as bool?,
+<<<<<<< HEAD
       authorPlaceInRating: (json['author_place_in_rating'] as num?)?.toInt(),
+=======
+>>>>>>> upstream/main
     );
 
 Map<String, dynamic> _$$AuthorImplToJson(_$AuthorImpl instance) =>

lib/features/feed/presentation/widgets/blog_post_widget.dart

@@ -75,6 +75,7 @@ class _BlogPostWidgetState extends State<BlogPostWidget> {
                                 height: 1,
                                 color: Colors.black87,
                                 fontWeight: FontWeight.w500,
+                                fontSize: 16,
                               ),
                             ),
                             const SizedBox(height: 4),
@@ -83,6 +84,7 @@ class _BlogPostWidgetState extends State<BlogPostWidget> {
                               style: TextStyle(
                                 height: 1,
                                 color: Colors.black45,
+                                fontSize: 14,
                               ),
                             ),
                           ],
@@ -102,6 +104,7 @@ class _BlogPostWidgetState extends State<BlogPostWidget> {
                     child: Text(
                       state.feedBlogPostList[widget.index].title,
                       style: TextStyle(
+                        fontSize: 18,
                         fontWeight: FontWeight.w600,
                         color: Colors.black87,
                       ),
@@ -117,6 +120,7 @@ class _BlogPostWidgetState extends State<BlogPostWidget> {
                             : state.feedBlogPostList[widget.index].description,
                         style: {
                           "*": Style(
+                            fontSize: FontSize(16),
                             color: Colors.black87,
                           ),
                         },

lib/features/feed/presentation/widgets/comments_widget.dart

@@ -78,7 +78,7 @@ class _CommentsWidgetState extends State<CommentsWidget> {
                 ),
                 SizedBox(height: 4),
                 SizedBox(
-                  width: MediaQuery.of(context).size.width * 0.8,
+                  width: isChild ? MediaQuery.of(context).size.width * 0.72 : MediaQuery.of(context).size.width * 0.8,
                   child: Text(
                     comment.body,
                     style: TextStyle(