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

Dance page - style Amazon logo section #25950

Merged
merged 7 commits into from
Nov 9, 2018
Merged

Dance page - style Amazon logo section #25950

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bf654f2
changed size of amazon logo image
nkiruka Nov 9, 2018
17d3eb5
Resized logo and updated styles
nkiruka Nov 9, 2018
6ee38a4
make log section responsive
nkiruka Nov 9, 2018
773ba6a
Add new line
nkiruka Nov 9, 2018
02abe4c
Merge branch 'staging' into amazon-logo-responsive
nkiruka Nov 9, 2018
2297226
extracted inline styles to css file, removed redundnat div and remove…
nkiruka Nov 9, 2018
f571f44
Moved styles from dance sponsor logo css into the dance css file
nkiruka Nov 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions pegasus/sites.v3/code.org/public/css/dance-landing/dance-sponsor-logo.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,13 @@
margin-left: 18%;
margin-right: 18%;
}

@media screen and (min-width: 0px) and (max-width: 512px) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think you need to have a separate css file just for the logo classes. I'd put this inside the dance.css file which should have all the styles needed for /dance.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done!

.sponsor-logo-with-text {
flex-direction: column;
}

.sponsor-logo-with-text .sponsor-logo-image {
margin-top: 10px;
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Missing new line at the end of the file

4 changes: 2 additions & 2 deletions pegasus/sites.v3/code.org/views/dance_sponsor_logo.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
%div.sponsor-logo-with-text{style: "font-size: 24px; text-align: center; margin-top: 60px"}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: I like to keep my HAML as clean as possible. If there is an id or class, you can remove the %div part.

Also, these in-line styles can be moved to your css file.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same for line 6 and throughout the file.

= I18n.t(:hoc2018_dance_amazon_sponsor_section_with_logo_title)
 
%div
%div.sponsor-logo-image
%img{src:"/images/fit-250/afe-dark-orange-logo.png"}

%div.sponsor-subtext-description
= I18n.t(:hoc2018_dance_amazon_sponsor_section_with_logo_description_with_link, amazon_future_engineer_link: 'https://www.amazonfutureengineer.com' )
= I18n.t(:hoc2018_dance_amazon_sponsor_section_with_logo_description_with_link, amazon_future_engineer_link: 'https://www.amazonfutureengineer.com')