diff --git a/app/assets/stylesheets/article-show.scss b/app/assets/stylesheets/article-show.scss index 4aef63151..14cb5327b 100644 --- a/app/assets/stylesheets/article-show.scss +++ b/app/assets/stylesheets/article-show.scss @@ -647,7 +647,7 @@ header{ .article-actions{ text-align:center; padding:9px 0px 16px; - position: fixed; + position: sticky; bottom:0; z-index:22; background: white; diff --git a/app/assets/stylesheets/articles.scss b/app/assets/stylesheets/articles.scss index 3605ce4b8..c8dfd35c8 100644 --- a/app/assets/stylesheets/articles.scss +++ b/app/assets/stylesheets/articles.scss @@ -5,7 +5,6 @@ .home{ position:relative; - overflow:hidden; min-height:440px; margin:auto; max-width:1250px; @@ -560,7 +559,7 @@ } .bm-success{ display:none; - } + } &.selected{ color: darken($purple, 33%); background: transparent; diff --git a/app/assets/stylesheets/scaffolds.scss b/app/assets/stylesheets/scaffolds.scss index b2d41cd74..9262a80d2 100644 --- a/app/assets/stylesheets/scaffolds.scss +++ b/app/assets/stylesheets/scaffolds.scss @@ -28,7 +28,6 @@ body { .universal-page-content-wrapper{ - overflow:hidden; min-height:88vh; visibility: visible; &.stories-index,&.notifications-index,&.stories-search,&.podcast_episodes-index,&.reading_list_items-index,.tags-index{ @@ -94,4 +93,4 @@ button{ input[type="submit"]{ cursor:pointer; -}; \ No newline at end of file +}; diff --git a/app/views/articles/show.html.erb b/app/views/articles/show.html.erb index 4f19ce35b..771cbc582 100644 --- a/app/views/articles/show.html.erb +++ b/app/views/articles/show.html.erb @@ -165,7 +165,6 @@ <%= @article.processed_html.html_safe %> <%= render "articles/collection", position: "bottom" %> - <%= render 'articles/actions' %> <% if @article.body_markdown && @article.body_markdown.size > 900 %> <% cache("article-about-author-#{@user.id}-#{@user.updated_at}", :expires_in => 100.hours) do %> @@ -200,6 +199,7 @@ <% end %> + <%= render 'articles/actions' %> <% cache("article-bottom-content-#{@article.cached_tag_list_array.sort}", :expires_in => 6.hours) do %> <% @classic_article = Suggester::Articles::Classic.new(@article).get %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 640be0afd..705867813 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -21,7 +21,6 @@