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.

Sign up for GitHub

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

Jump to bottom

fix question area in question shadow page #5860

Merged
merged 5 commits into from
Nov 26, 2019
Merged

fix question area in question shadow page #5860

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6ab3df7
fix question area in question shadow page
gautamig54 Jun 8, 2019
e46219f
add modal for login and signup
gautamig54 Jun 14, 2019
961841f
Merge branch 'master' into fix_question_area
gautamig54 Jul 20, 2019
62f5411
Merge branch 'master' into fix_question_area
jywarren Nov 26, 2019
1ad8304
Update index_shadow.html.erb
jywarren Nov 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions app/views/questions/index_shadow.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
<div class= "question-header">
<h5>What's your question?</h5>
<% if !current_user %>
<p>To ask a question, please <a href="/login?return_to=/questions">log in</a> or <a href="/signup?return_to=/questions">sign up</a> first.</p>
<p>To ask a question, please <a class="loginToggle" href="#"><%= t('layout._header.login.login_title') %></a> or
<a class="signupToggle" href="#"><%= t('layout._header.join') %></a> first.</p>
<% end %>
</div>
<div class= "question-form">
Expand All @@ -28,18 +29,18 @@
<input type="hidden" name="template" value="question">
<input type="hidden" name="redirect" value="question">
</div>
<div class="input-group-append">
<div class="input-group-append" style="padding-bottom:15px;">
<button id="question_search" type="submit" rel="tooltip" title="Ask a question with the entered title" class="btn btn-primary">Continue</button>
</div>
</form>
</div>
</div>
<%= render partial: "layouts/signupLoginModal" %>
<style>
.question-area{
margin:auto;
width:70%;
background-color: #F5F5F5;
height: 300px;
border-radius: 10px;
}

Expand Down