UX: fix container layout
This commit is contained in:
parent
b5977bb364
commit
d6069e8c90
|
@ -434,7 +434,7 @@ class ApplicationController < ActionController::Base
|
||||||
|
|
||||||
def build_not_found_page(status=404, layout=false)
|
def build_not_found_page(status=404, layout=false)
|
||||||
category_topic_ids = Category.pluck(:topic_id).compact
|
category_topic_ids = Category.pluck(:topic_id).compact
|
||||||
@container_class = "container not-found-container"
|
@container_class = "wrap not-found-container"
|
||||||
@top_viewed = Topic.where.not(id: category_topic_ids).top_viewed(10)
|
@top_viewed = Topic.where.not(id: category_topic_ids).top_viewed(10)
|
||||||
@recent = Topic.where.not(id: category_topic_ids).recent(10)
|
@recent = Topic.where.not(id: category_topic_ids).recent(10)
|
||||||
@slug = params[:slug].class == String ? params[:slug] : ''
|
@slug = params[:slug].class == String ? params[:slug] : ''
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<header class="d-header">
|
<header class="d-header">
|
||||||
<div class="container">
|
<div class="wrap">
|
||||||
<div class="contents">
|
<div class="contents">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="title span13">
|
<div class="title span13">
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
<body>
|
<body>
|
||||||
<noscript data-path="<%= request.env['PATH_INFO'] %>">
|
<noscript data-path="<%= request.env['PATH_INFO'] %>">
|
||||||
<%= render partial: 'header' %>
|
<%= render partial: 'header' %>
|
||||||
<div id="main-outlet" class="container">
|
<div id="main-outlet" class="wrap">
|
||||||
<!-- preload-content: -->
|
<!-- preload-content: -->
|
||||||
<%= yield %>
|
<%= yield %>
|
||||||
<!-- :preload-content -->
|
<!-- :preload-content -->
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
<header>
|
<header>
|
||||||
<a href="<%= path "/" %>"><img src="<%=SiteSetting.logo_url%>" alt="<%=SiteSetting.title%>" id="site-logo"></a>
|
<a href="<%= path "/" %>"><img src="<%=SiteSetting.logo_url%>" alt="<%=SiteSetting.title%>" id="site-logo"></a>
|
||||||
</header>
|
</header>
|
||||||
<div id="main-outlet" class="container">
|
<div id="main-outlet" class="wrap">
|
||||||
<%= yield %>
|
<%= yield %>
|
||||||
</div>
|
</div>
|
||||||
<footer class="container">
|
<footer class="container">
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
<%- end %>
|
<%- end %>
|
||||||
<section id='main'>
|
<section id='main'>
|
||||||
<%= render partial: 'header' %>
|
<%= render partial: 'header' %>
|
||||||
<div id="main-outlet" class="<%= @container_class ? @container_class : 'container' %>">
|
<div id="main-outlet" class="<%= @container_class ? @container_class : 'wrap' %>">
|
||||||
<%= yield %>
|
<%= yield %>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
Loading…
Reference in New Issue