Skip to content

Commit

Permalink
Merge pull request #42 from makigas/front-reduce-size
Browse files Browse the repository at this point in the history
Replace a few front styles to reduce bandwidth usage
  • Loading branch information
danirod authored Apr 25, 2017
2 parents 38526ea + e649712 commit 4742702
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 6 deletions.
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
Expand Up @@ -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';
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion app/views/front/_about.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -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')

0 comments on commit 4742702

Please sign in to comment.