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

merge #2

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

merge #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a998d45
assigment completed
beewhoo May 21, 2018
2501846
improved responsiveness at 722 and 922
Aug 13, 2018
9e6ca89
added logo and fixed the bug for side scroll
Aug 14, 2018
c5b07d9
made some changes on 768px
Aug 14, 2018
b6417a3
logo changed
Aug 14, 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
100 changes: 98 additions & 2 deletions css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,20 @@ figure {
height: 80px;
margin: 0;
z-index: 100;

}

.site-logo-image{
border-radius: 50%;
}

.site-nav {
position: fixed;
bottom: 0;
left: 0;

right: 0;
width: 100%;
z-index: 100;
z-index: 1;
background-color: #ffffff;
}

Expand Down Expand Up @@ -103,6 +108,7 @@ figure {
/* MOVIE styles */
.movie {
position: relative;

}

.movie-poster,
Expand Down Expand Up @@ -195,3 +201,93 @@ figure {
.about > p {
margin: 0;
}

@media only screen and (min-width:768px) {


.site-nav-list{
display: grid;
position: absolute;
top:81px;
}
.site-nav {
width: 5%;
height:100%;
left: 20px;

}

.site-nav-item {
float: none;
width: inherit;
margin-top: 2em;
margin-bottom: 2em;

}

.movie {
left:111px;

}
.movie-overview {
display: inline-block;
width: 90%
}

.site-logo {
z-index : 104;
width:53px;
top: 20px;
left: 30px;
position: fixed;
}

.site-nav {
z-index: 0;
}

.about {
position: relative;
}
}

@media screen and ( min-width: 992px ) {
.movie-overview, .movie-backdrop {
display: none;
}

body {
padding: 0;
}

main{
display: grid;
grid-template-columns: 1fr 1fr 1fr;
max-width: 90%;

}

.movie-poster {
display:inline-block;

}

.movie:first-child .movie-overview {
display: block;}

article:first-child {
display: block;
grid-column: 1/4;
}

article:first-child .movie-poster {
display: none; }

article:first-child .movie-backdrop {
display: block;
width: 130%;

}


}
Binary file added images/bibek.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.
7 changes: 3 additions & 4 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<title>Now Playing Responsive</title>

<!-- This is where your <meta> viewport tag should go -->
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- We need this to indicate to devices that our design is responsive -->

<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat|Source+Sans+Pro">
Expand All @@ -13,7 +13,7 @@

<body>
<header class="site-header">
<h1 class="site-logo"><img src="images/logo.svg" alt="Bitmaker Responsive Movie DB" class="site-logo-image"></h1>
<h1 class="site-logo"><img src="images/bibek.png" alt="Bitmaker Responsive Movie DB" class="site-logo-image"></h1>
<nav class="site-nav">
<ul class="site-nav-list">
<li class="site-nav-item">
Expand Down Expand Up @@ -304,8 +304,7 @@ <h1 class="movie-title">The Hunger Games: Mockingjay - Part 1</h1>
</nav>

<section class="about">
<p>Site created by <strong>YOUR NAME!</strong></p>
<p><small>A Bitmaker assignment &copy; 2016</small></p>
<p>Site created by <strong>BIBEK</strong></p>
</section>
</footer>
</body>
Expand Down