github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-31 16:00:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Sync Ember and non-Ember layouts (#9028)

Browse Source
This commit is contained in:
Dan Ungureanu 2020-02-25 15:31:04 +02:00 committed by GitHub
parent 41ee7cad0e
commit 5905930c32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/common/base/header.scss
View File

@ -79,14 +79,14 @@
} }
.login-button, .login-button,
button.sign-up-button { .sign-up-button {
padding: 6px 10px; padding: 6px 10px;
.fa { .fa {
margin-right: 3px; margin-right: 3px;
} }
} }
button.login-button { .login-button {
margin-left: 7px; margin-left: 7px;
} }
} }

28
app/views/application/_header.html.erb
View File

@ -1,24 +1,24 @@
<%= replace_plugin_html('server:simple-header') do %> <%= replace_plugin_html('server:simple-header') do %>
<header class="d-header"> <header class="d-header">
<div class="wrap"> <div class="wrap">
<div class="contents"> <div class="contents clearfix">
<div class="header-row"> <div class="title">
<div class="logo-wrapper"> <a href="<%= path "/" %>">
<a href="<%= path "/" %>"> <%- if application_logo_url.present? %>
<%- if application_logo_url.present? %> <img src="<%= application_logo_url %>" alt="<%= SiteSetting.title %>" id="site-logo">
<img src="<%= application_logo_url %>" alt="<%= SiteSetting.title %>" id="site-logo"> <%- else %>
<%- else %> <h2 id='site-text-logo'><%= SiteSetting.title %></h2>
<h2 id='site-text-logo'><%= SiteSetting.title %></h2> <%- end %>
<%- end %> </a>
</a> </div>
</div> <div class="panel clearfix">
<%- unless current_user || local_assigns[:hide_auth_buttons] %> <%- unless current_user || local_assigns[:hide_auth_buttons] %>
<div class='auth-buttons'> <span class='header-buttons'>
<%- if can_sign_up? %> <%- if can_sign_up? %>
<a href="<%= path "/signup"%>" class='btn btn-primary btn-small signup-button'><%= I18n.t('sign_up') %></a> <a href="<%= path "/signup"%>" class='btn btn-primary btn-small sign-up-button'><%= I18n.t('sign_up') %></a>
<%- end %> <%- end %>
<a href="<%= path "/login"%>" class='btn btn-primary btn-small login-button btn-icon-text'><%= SvgSprite.raw_svg('fa-user') %><%= I18n.t('log_in') %></a> <a href="<%= path "/login"%>" class='btn btn-primary btn-small login-button btn-icon-text'><%= SvgSprite.raw_svg('fa-user') %><%= I18n.t('log_in') %></a>
</div> </span>
<%- end %> <%- end %>
</div> </div>
</div> </div>