Skip to content

New Icons, New Background color #247

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

Open
Kourchenko wants to merge 1 commit into
base: master
Choose a base branch
from
Open

New Icons, New Background color #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file modified app/assets/images/take_the_test.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/view_results.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 20 additions & 12 deletions app/assets/stylesheets/home.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
body {
background-color: rgb(232, 232, 232);
}

body.result-page {
background: #D3D3D3;
}
Expand Down Expand Up @@ -75,12 +79,26 @@ body.result-page {
}

.home-wrapper {
background-color: rgba(255, 255, 255, 0.8);
background-color: rgb(232, 232, 232);
display: table;
margin: 0 auto;
float: none !important;
padding: 10px;
box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
}

.test_icon {
color: rgb(232, 232, 232);

background-color: rgb(232, 232, 232);
border-radius: 100%;
box-shadow: 0 20px 20px #e8e8e8, 0 6px 6px rgba(0, 0, 0, 0.26);
}

.test_icon:hover {
color: rgb(232, 232, 232);
background-color: rgb(232, 232, 232);
border-radius: 100%;
box-shadow: 0 20px 20px rgba(226, 223, 223, 0.63), 0 6px 6px rgba(0, 0, 0, 0.26);
}

.bold {
Expand Down Expand Up @@ -265,10 +283,6 @@ body.in-stats .background-container,
}
li {
width: 40%;

img {
max-width: 100%
}
}
}

Expand Down Expand Up @@ -558,12 +572,6 @@ body.in-stats .background-container,
font-size: 20px;
}

.take-test-img {
-ms-transform: rotate(270deg);
-webkit-transform: rotate(270deg);
transform: rotate(270deg);
}

.results-sharing-box {
text-align: center;
color: white;
Expand Down
6 changes: 2 additions & 4 deletions app/views/home/_introduction.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,14 @@
<ul class='list-inline'>
<li>
<%= button_tag type: 'button', id: 'take_test' do %>
<%= image_tag 'take_the_test.png', class: 'take-test-img' %>
<%= image_tag 'take_the_test.png', class: 'test_icon' %>
<% end %>
<p>Take the Test!!</p>
</li>

<li>
<%= link_to result_page_path, data: {no_turbolink: true} do %>
<%= image_tag 'view_results.png', width: '65%' %>
<%= image_tag 'view_results.png', class: 'test_icon' %>
<% end %>
<p>View Results</p>
</li>
</ul>
</div>
Expand Down