Upd gulpfile and upd header

9d1a27fe · Sergey · bb7dc385 · 9d1a27fe · 9d1a27fe · 9d1a27fe
Commit 9d1a27fe authored Nov 27, 2018 by Sergey
6 changed files
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -51,6 +51,13 @@ gulp.task('sass', function () {
            cascade: false
        }))
        .pipe(sass().on('error', sass.logError))
+        .pipe(concat('style.css'))
+        .pipe(minify({
+            ext:{
+                src:'',
+                min:'.min.css'
+            },
+            noSource: false}))
        .pipe(sourcemaps.write())
        .pipe(gulp.dest('./build/css'));
 });

--- a/src/scss/common/header/header-main.scss
+++ b/src/scss/common/header/header-main.scss
+@import "../../settings/color";
+
+.header{
+  background: $red-color;
+}
+
--- a/src/scss/common/header/header-nav.scss
+++ b/src/scss/common/header/header-nav.scss
+@import "../../settings/color";
+
+.nav__list{
+  display: flex;
+  padding-left: 0;
+  margin: 0;
+  list-style-type: none;
+}
+
+.nav__link{
+  text-decoration: none;
+  color: $white-text;
+}
\ No newline at end of file
--- a/src/scss/settings/color.scss
+++ b/src/scss/settings/color.scss
+$red-color: #e33000;
+$white-text: #fefefe;
\ No newline at end of file
--- a/src/scss/settings/common-style.scss
+++ b/src/scss/settings/common-style.scss
+*, *:after, *:before{
+  box-sizing: border-box;
+}
+
+body{
+  margin: 0;
+  padding: 0;
+}
+
+.wrapper{
+  width: 1170px;
+  margin: 0 auto;
+}
\ No newline at end of file
--- a/src/template/common/header.html
+++ b/src/template/common/header.html
@@ -3,8 +3,26 @@
 <head lang="ru">
    <meta charset="UTF-8">
    <title>Bobcat SU</title>
-    <link rel="stylesheet" href="css/utils.css">
+    <link rel="stylesheet" href="css/style.css">
 </head>
 <body>
-<p>ddaddas</p>
-<p>test headder</p>
\ No newline at end of file
+<header class="header">
+    <div class="wrapper header__wrapper">
+        <div class="header__bl header__bl-nav">
+            <nav class="header__nav">
+                <ul class="header__nav-list nav__list">
+                    <li class="nav__item"><a class="nav__link" href="#">Каталог</a></li>
+                    <li class="nav__item"><a class="nav__link" href="#">Сервис</a></li>
+                    <li class="nav__item"><a class="nav__link" href="#">Запчасти</a></li>
+                    <li class="nav__item"><a class="nav__link" href="#">Аренда</a></li>
+                    <li class="nav__item"><a class="nav__link" href="#">Техника Б/У</a></li>
+                    <li class="nav__item"><a class="nav__link" href="#">Акции</a></li>
+                    <li class="nav__item"><a class="nav__link" href="#">Контакты</a></li>
+                </ul>
+            </nav>
+        </div>
+        <div class="header__bl">
+
+        </div>
+    </div>
+</header>
\ No newline at end of file