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

Feature: Category description banner. #54

Closed
wants to merge 30 commits into from
Closed
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
ba866f3
Add section structure and contents
jaimelr Feb 21, 2018
c13496b
Add background image for banner 2
jaimelr Feb 21, 2018
4060cb4
Finish the structure of the two top banners
jaimelr Feb 21, 2018
3d2414b
Footer Implementation
albertm805 Feb 21, 2018
fea8e63
Add font families link tag
jaimelr Feb 21, 2018
9d7ae9b
Delete middleman default css stylesheet
jaimelr Feb 21, 2018
052f8ec
Add styles to top two banners from homepage
jaimelr Feb 21, 2018
4a4acfd
Minor design improvement
jaimelr Feb 22, 2018
5a6d772
Add structure to two new banners
jaimelr Feb 22, 2018
0c3c754
Add styles to new banners
jaimelr Feb 22, 2018
96c146b
Adding footer DESKTOP and MOBILE
Feb 22, 2018
755cb7f
Fix typo in mid banner class name
jaimelr Feb 22, 2018
096f2d5
Add support for tablet
jaimelr Feb 22, 2018
c143a59
Add desktop view
jaimelr Feb 22, 2018
7f42fc9
Add footer
jaimelr Feb 22, 2018
8e0d7df
Add footer stylesheet link
jaimelr Feb 22, 2018
e071130
Stylesheet footer
Feb 22, 2018
591585a
Add correct footer stylesheet
jaimelr Feb 22, 2018
a127bb6
Remove fixed position in footer
jaimelr Feb 22, 2018
c8a1cf4
Move content from index file to partial
jaimelr Feb 22, 2018
cfe14d2
[] Implement Header and Main Menu
sr-meh Feb 25, 2018
978504a
Merge branch 'featuredkits' into featured_head
sr-meh Feb 26, 2018
2023069
Fixes_Magmahound
sr-meh Feb 26, 2018
fe607a1
Fixes_Magmahound
sr-meh Feb 26, 2018
a87d985
Banner category description
sr-meh Feb 26, 2018
3491f74
Add font family on the banner
sr-meh Feb 26, 2018
866ba49
Fixes Magmahound
sr-meh Feb 27, 2018
28b7142
Fixes style rgba
sr-meh Feb 28, 2018
cff06ae
Fixes style rgba
sr-meh Feb 28, 2018
2c82364
deletes style duplicate
sr-meh Mar 1, 2018
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 added theme6/source/images/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added theme6/source/images/Logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions theme6/source/images/Logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added theme6/source/images/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added theme6/source/images/Search icon@2x(1).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added theme6/source/images/banner1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added theme6/source/images/banner1_mobile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added theme6/source/images/banner2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added theme6/source/images/carving-w-butcher-gouge.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions theme6/source/images/fb.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions theme6/source/images/g+.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added theme6/source/images/logo2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added theme6/source/images/mid_banner1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added theme6/source/images/mid_banner2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions theme6/source/images/twt.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 1 addition & 21 deletions theme6/source/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,23 +1,3 @@
---
title: Welcome to Middleman
title: Featured kit
---

<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 340" class="middleman-logo" aria-labelledby="middleman-logo__title" role="img">
<title id="middleman-logo__title">Middleman</title>
<path class="middleman-logo__top-left-bar" fill-opacity=".45" d="M0 40L200 0v30L0 60z"/>
<path class="middleman-logo__top-right-bar" fill="#fff" d="M200 0l200 40v20L200 30z"/>
<path class="middleman-logo__left-m" fill-opacity=".45" d="M0 78v184l45 5V152l45 83 47-83v129l53 7V52l-57 8-43 83-43-70z"/>
<path class="middleman-logo__right-m" fill="#fff" d="M400 78v184l-45 5V152l-45 83-47-83v129l-53 7V52l57 8 43 83 43-70z"/>
<path class="middleman-logo__bottom-left-bar" fill-opacity=".45" d="M0 300l200 40v-30L0 280z"/>
<path class="middleman-logo__bottom-right-bar" fill="#fff" d="M200 340l200-40v-20l-200 30z"/>
</svg>

<h1>
Middleman is Running
</h1>

<%= link_to(
"Read Documentation",
"https://middlemanapp.com/basics/templating_language/",
target: "_blank"
) %>
8 changes: 8 additions & 0 deletions theme6/source/javascripts/site.js
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
// This is where it all goes :)

function openNav() {

Choose a reason for hiding this comment

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

'openNav' is defined but never used.

document.getElementById("mySidenav").style.width = "90%";
}

function closeNav() {

Choose a reason for hiding this comment

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

'closeNav' is defined but never used.

document.getElementById("mySidenav").style.width = "0";
}
9 changes: 9 additions & 0 deletions theme6/source/layouts/layout.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,19 @@
content="width=device-width, initial-scale=1, shrink-to-fit=no">
<!-- Use the title from a page's frontmatter if it has one -->
<title><%= current_page.data.title || "Middleman" %></title>
<%= stylesheet_link_tag "header" %>
<%= stylesheet_link_tag "main" %>
<%= stylesheet_link_tag "https://fonts.googleapis.com/css?family=Lato|Oswald:300" %>
<%= stylesheet_link_tag "site" %>
<%= stylesheet_link_tag "category-description-banner" %>
<%= javascript_include_tag "site" %>


</head>
<body>
<%= partial 'partials/header' %>
<%= partial 'partials/offers' %>
<%= yield %>
<%= partial 'partials/footer' %>
</body>
</html>
8 changes: 8 additions & 0 deletions theme6/source/partials/_category-description-banner.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<div class="banner_handcrafted">
<div class="banner_content">
<div class="banner_description">
<h3>HAND CRAFTED</h3>
<p>We attempt tp bring back the good old days when children would play fusce vehicula dolor arcu, sit amet blandit dolor mollis nec. Donec viverra eleifend lacus, vitae ullamcorper metus. Sed sollicitudin ipsum quis nunc sollicitudin ultrices. Donec euismod scelerisque ligula </p>
</div>
</div>
</div>
40 changes: 40 additions & 0 deletions theme6/source/partials/_footer.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<div class="contenedor">
<footer>
<div class="contenedorsocial">
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's make class names more readable by using - to separate words; contenedorsocial => contenedor-social

<div class="box-social">
<p class="socialmedia" i>FOLLOW US</p>
<div class="boxsocialmedia">
<button type="button" class="sm" id="fb"></button>
<button type="button" class="sm" id="twt"></button>
<button type="button" class="sm" id="g"></button>
</div>
</div>
<div class="logo">
<img src="../images/Logo.svg" alt="Lil Peep">
</div>
</div>


<div class="contenedornews">
<div class="newsletter">
<p>JOIN OUR NEWSLETTER!</p>
<input type="email" placeholder="EMAIL" maxlength="25">
</div>
</div>

<div class="information">
<ul>
<li><a href="#">CONTACT US</a></li>
<li><a href="#">ABOUT US</a></li>
<li><a href="#">RETURN POLICY</a></li>
<li><a href="#">PRIVACY POLICY<a></li>
</ul>
</div>

</br>

<div class="author">
<p>Created by Crowd Interactive 2015</p>
</div>
</footer>
</div>
Loading