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.

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

Replace a few front styles to reduce bandwidth usage #42

Merged
merged 2 commits into from
Apr 25, 2017
Merged
Changes from all commits
Commits
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 removed app/assets/images/desk.jpg
Binary file not shown.
Binary file added app/assets/images/laptop.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/laptop.png
Binary file not shown.
Binary file added app/assets/images/laptop@2x.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 4 additions & 5 deletions app/assets/stylesheets/front.scss
Original file line number Diff line number Diff line change
@@ -5,13 +5,10 @@
}

.navbar-transparent .navbar-makigas {
background: transparent !important;
background: rgba(black, 0.25) !important;
}

.makigas-tron {
background: image-url('desk.jpg');
background-size: cover;
background-position: bottom;
color: white;

font-family: 'Montserrat';
@@ -25,7 +22,9 @@
padding-bottom: 40px;
padding-left: 20px;
padding-right: 20px;
background: rgba(desaturate(#003399, 50%), 0.7);
background: desaturate(#003399, 50%);
background-image: linear-gradient(to bottom right, adjust-hue(desaturate(lighten(#003399, 30%), 25%), -25%), #003399);
box-shadow: 0 -4px 4px -2px rgba(black, 0.5) inset;

@media screen and (min-width: 767px) and (max-width: 1199px) {
padding-top: 130px;
2 changes: 1 addition & 1 deletion app/views/front/_about.html.haml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
%h1.title= t('.title')
.row
.col-md-6.hidden-xs.hidden-sm
= image_tag 'laptop.png', class: 'laptop-image', alt: t('.laptop')
= image_tag 'laptop.jpg', srcset: "#{path_to_image('laptop@2x.jpg')} 2x", class: 'laptop-image', alt: t('.laptop')
.col-md-6
%p= t('.about.line0')
%p= t('.about.line1')