Skip to content

fix header #91

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

Open
PetroHrynyk wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix header #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfd6471
fix header
PetroHrynyk Sep 15, 2022
90b34df
one -more-fix
PetroHrynyk Sep 17, 2022
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
67 changes: 35 additions & 32 deletions src/partials/header-mylibrary.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,44 @@
<header class="header-mylibrary">
<div class="container">
<div class="header-mylibrary__wrapper">
<div class="header__container">
<label class="form-switch">
<input type="checkbox" id="theme-switch-toggle">
<i></i>

<a href="./index.html">
<svg class="theme-switch__icon" aria-label="moon">
<use href="./images/symbol-defs.svg#moon"></use>
</svg>
</label>
<div class="header-mylibrary__wrapper">

<div class="header__logo">
<img class="header__logo--icon" src="/src/images/logo.png" alt="" width="24" height="24" />
</div>
<span class="logo-mylibrary__text">Filmoteka</span>
</a>
<a href="./index.html">

<nav class="nav-mylibrary">
<ul class="nav-mylibrary__list">
<li class="nav-mylibrary__item">
<a class="nav-mylibrary__link" href="index.html"> home </a>
</li>
<li class="nav-mylibrary__item active">
<a class="nav-mylibrary__link" href="./library.html">
my library
</a>
</li>
</ul>
</nav>
</div>
<div class="button-mylibrary__wrap">
<button class="button" type="button" data-action="watched">
Watched
</button>
<button class="button" type="button" data-action="queue">queue</button>
<div class="header__logo">
<img class="header__logo--icon" src="/src/images/logo.png" alt="" width="24" height="24" />
</div>
<span class="logo-mylibrary__text">Filmoteka</span>
</a>

<nav class="nav-mylibrary">
<ul class="nav-mylibrary__list">
<li class="nav-mylibrary__item">
<a class="nav-mylibrary__link" href="index.html"> home </a>
</li>
<li class="nav-mylibrary__item active">
<a class="nav-mylibrary__link" href="./library.html">
my library
</a>
</li>
</ul>
</nav>
</div>
<div class="button-mylibrary__wrap">
<button class="button" type="button" data-action="watched">
Watched
</button>
<button class="button" type="button" data-action="queue">queue</button>
</div>
</div>
</div>
<label class="form-switch">
<input type="checkbox" id="theme-switch-toggle">
<i></i>

<svg class="theme-switch__icon" aria-label="moon">
<use href="./images/symbol-defs.svg#moon"></use>
</svg>
</label>
</header>
118 changes: 54 additions & 64 deletions src/partials/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,67 +1,57 @@
<header class="header" id="home">
<div class="header__container container">
<div class="header__wrapper">
<a class="logo" href="./index.html">
<div class="header__logo">
<img
class="header__logo--icon"
src="/src/images/logo.png"
alt=""
width="24"
height="24"
/>
</div>
<span class="logo__text">Filmoteka</span>
</a>
<nav class="nav">
<ul class="nav__list">
<li class="nav__item active">
<a class="nav__link" href="index.html"> home </a>
</li>
<li class="nav__item hidden-item" id="library">
<a class="nav__link" href="library.html"> my library </a>
</li>
<li>
<button type="button" class="open-auth">
<svg class="auth-icon" width="20" height="20">
<use href="/src/images/symbol-defs.svg#icon-closed"></use>
</svg>
</button>
</li>
<li>
<button type="button" class="exit hidden-item">
<svg class="auth-icon" width="20" height="20">
<use href="/src/images/symbol-defs.svg#icon-open"></use>
</svg>
</button>
</li>
</ul>
</nav>
</div>
<div class="input">
<form class="input__wraper form" id="search-form">
<input
class="header__input"
name="searchQuery"
type="text"
placeholder="Movie search"
autocomplete="off"
/>
<button class="input__search-btn" type="submit">
<svg class="input__search-icon" width="12px" height="12px">
<use href="./images/symbol-defs.svg#icon-search-2"></use>
</svg>
</button>
</form>
</div>
<div class="container">
<div class="header__container">
<div class="header__wrapper">
<a class="logo" href="./index.html">
<div class="header__logo">
<img class="header__logo--icon" src="/src/images/logo.png" alt="" width="24" height="24" />
</div>
<span class="logo__text">Filmoteka</span>
</a>
<nav class="nav">
<ul class="nav__list">
<li class="nav__item active">
<a class="nav__link" href="index.html"> home </a>
</li>
<li class="nav__item" id="library">
<a class="nav__link" href="library.html"> my library </a>
</li>
<li>
<button type="button" class="open-auth">
<svg class="auth-icon" width="20" height="20">
<use href="/src/images/symbol-defs.svg#icon-closed"></use>
</svg>
</button>
</li>
<li>
<button type="button" class="exit hidden-item">
<svg class="auth-icon" width="20" height="20">
<use href="/src/images/symbol-defs.svg#icon-open"></use>
</svg>
</button>
</li>
</ul>
</nav>
</div>
<div class="input">
<form class="input__wraper form" id="search-form">
<input class="header__input" name="searchQuery" type="text" placeholder="Movie search" autocomplete="off" />
<button class="input__search-btn" type="submit">
<svg class="input__search-icon" width="12px" height="12px">
<use href="./images/symbol-defs.svg#icon-search-2"></use>
</svg>
</button>
</form>
</div>

<p class="input__error" id="js-input-error"></p>
<label class="form-switch">
<input type="checkbox" id="theme-switch-toggle" />
<i></i>
<svg class="theme-switch__icon" aria-label="moon">
<use href="./images/symbol-defs.svg#moon"></use>
</svg>
</label>
<p class="input__error" id="js-input-error"></p>
<label class="form-switch">
<input type="checkbox" id="theme-switch-toggle" />
<i></i>
<svg class="theme-switch__icon" aria-label="moon">
<use href="./images/symbol-defs.svg#moon"></use>
</svg>
</label>
</div>
</div>
</header>
</header>
10 changes: 6 additions & 4 deletions src/sass/components/_switch-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
color: $main-bgcolor;
-webkit-tap-highlight-color: transparent;
position: absolute;
bottom: 10px;
right: 15px;
// margin-left: auto;
// margin-right: 5px;
top: 180px;
right: 20px;

@media screen and (max-width: 767px) {
top: 195px;
}
}
.form-switch i {
position: relative;
Expand Down
2 changes: 1 addition & 1 deletion src/sass/layout/_header-mylibrary.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
display: flex;
justify-content: space-between;
align-items: center;
padding-top: 40px;
// padding-top: 40px;
}

.logo-mylibrary {
Expand Down
24 changes: 3 additions & 21 deletions src/sass/layout/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
}

@include desktop {
// max-width: 1600px;
height: 216px;

background-image: linear-gradient(
Expand Down Expand Up @@ -72,8 +71,6 @@
}

.logo {
margin-top: 40px;
margin-left: 20px;
display: flex;
align-items: center;
justify-content: center;
Expand Down Expand Up @@ -101,7 +98,6 @@
}
.nav {
display: flex;
margin-top: 40px;
}
.nav__list {
display: flex;
Expand Down Expand Up @@ -135,23 +131,6 @@
}

.nav__link {
// opacity: 1;
// font-weight: 500;
// text-transform: uppercase;
// color: $secondary-text-color;

// font-weight: 500;
// line-height: 1.17;

// display: flex;
// align-items: center;
// text-align: center;
// text-transform: uppercase;
// &:hover,
// &:focus {
// color: $trird-text-color;
// transition: $transition;
// }
text-transform: uppercase;
@include font(12, 500, 1.16);
color: $secondary-text-color;
Expand Down Expand Up @@ -196,6 +175,9 @@
.header__container {
height: 216px;
position: relative;
max-width: 1280px;
margin: 0 auto;
padding-top: 40px;
}
.input__search-btn {
position: absolute;
Expand Down