Skip to content

Commit

Permalink
Final styling
Browse files Browse the repository at this point in the history
  • Loading branch information
Dual-Ice committed May 4, 2020
1 parent a27eb6e commit 93442d2
Show file tree
Hide file tree
Showing 22 changed files with 97 additions and 64 deletions.
7 changes: 7 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
},
"keywords": [],
"author": "Maxim Stogniy <[email protected]>",
"contributors": [
{
"name": "Stelios Baglaridis",
"email": "[email protected]",
"url": "https://psd-to.site"
}
],
"license": "ISC",
"devDependencies": {
"@babel/core": "^7.2.2",
Expand Down
2 changes: 1 addition & 1 deletion src/components/about.pug
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
section.about
section.about(id="about")
.container.about__container
.about__content
.about__user
Expand Down
2 changes: 1 addition & 1 deletion src/components/contacts.pug
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
section.contacts
section.contacts(id="contacts")
.container
h2.section__title.contacts__title Связаться со мной
.contacts__form
Expand Down
4 changes: 2 additions & 2 deletions src/components/hero.pug
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
section.hero.fullscreen-section
section.hero.fullscreen-section(id="hero")
.container.hero__container
header.header
.header__logo
Expand All @@ -12,4 +12,4 @@ section.hero.fullscreen-section
h1.user-info__desc !{desc}
.user-info__username #{username}
.hero__btns
a(href="#").scroll-down Скролл
a(href="#about").scroll-down Скролл
2 changes: 1 addition & 1 deletion src/components/reviews.pug
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
section.reviews
section.reviews(id="reviews")
.container
.reviews__title
h2.section__title.reviews__title-text Что обо мне говорят
Expand Down
2 changes: 1 addition & 1 deletion src/components/skills.pug
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
section.skills
section.skills(id="skills")
.container.skills__container
.skills__image
+image('decor/bag.jpg', 'skills__image-pic')
Expand Down
4 changes: 2 additions & 2 deletions src/components/works.pug
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
section.works
section.works(id="works")
.container
h2.section__title.works__title Мои работы
.works__content
Expand All @@ -9,7 +9,7 @@ section.works
ul.works-slider__previews
- var previews = [1,2,3,4]
each preview in previews
li.works-slider__preview-item
li.works-slider__preview-item(class=preview == 1 ? 'active': '')
button(type="button").works-slider__preview-btn
+image(`content/works/${preview}.jpg`, 'works-slider__preview-img')
.works-slider__buttons.slider-btns
Expand Down
2 changes: 1 addition & 1 deletion src/index.pug
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ html(lang="en")
include ./components/works
+triangles('top', 'triangles--bottom')
.feedback
+paralax('budda', 'paralax--features')
+paralax('budda')
include ./components/reviews
include ./components/contacts

Expand Down
16 changes: 12 additions & 4 deletions src/mixins.pug
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,19 @@ mixin image(path, className)

mixin menu
nav.nav
- var menu = ['Главная', 'Обо мне', 'Навыки', 'Работы', 'Отзывы', 'Связаться'];
-
var menu = [
['Главная', 'hero'],
['Обо мне', 'about'],
['Навыки', 'skills'],
['Работы', 'works'],
['Отзывы', 'reviews'],
['Связаться', 'contacts']
];
ul.nav__list
each item in menu
li.nav__item
a(href="#").nav__link #{item}
a(href=`#${item[1]}`).nav__link #{item[0]}

mixin socials(modifyClass)
- var icons = ['inst', 'vk', 'github'];
Expand All @@ -38,8 +46,8 @@ mixin triangles(direction, className)
else
polygon(points="0,0 0,100 1000,0")

mixin paralax(image, className)
.paralax(class=className)
mixin paralax(image)
.paralax
.paralax__container
.paralax__image
+image(`bg/${image}.jpg`, 'paralax__image-pic')
4 changes: 4 additions & 0 deletions src/styles/blocks/custom-btn.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,8 @@
font-size: 18px;
font-weight: 700;
padding: 30px 120px;

&:hover {
background: linear-gradient(to right, #bb00ff 0%, #5900ff 100%);
}
}
1 change: 1 addition & 0 deletions src/styles/blocks/features.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
position: relative;
padding-top: 150px;
background: $white;
padding-bottom: 120px;
}
4 changes: 2 additions & 2 deletions src/styles/blocks/form.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
opacity: .3;
font-weight: 600;
margin-bottom: 20px;
margin-left: 50px;
margin-left: 45px;
}

.form__block-wrap {
Expand All @@ -53,7 +53,7 @@
height: 30px;
fill: currentColor;
opacity: .3;
margin-right: 20px;
margin-right: 15px;
}

.form__block-field {
Expand Down
10 changes: 10 additions & 0 deletions src/styles/blocks/nav.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@
.nav__item {
margin-right: 50px;

&:hover,
&:active {
font-weight: 600;
}

&:active {
border-bottom: 3px solid $main;
color: $main;
}

&:last-child {
margin-right: 0;
}
Expand Down
6 changes: 2 additions & 4 deletions src/styles/blocks/paralax.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
left: 50%;
transform: translate(-50%, -50%);
min-width: 1800px;

&--features {
top: 48.6%
}
width: 100%;
height: 100%;
}

.paralax__image-pic {
Expand Down
4 changes: 2 additions & 2 deletions src/styles/blocks/reviews.pcss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.reviews {
position: relative;
margin-bottom: 145px;
padding-top: 165px;
margin-bottom: 155px;
padding-top: 230px;
}

.reviews__title {
Expand Down
7 changes: 7 additions & 0 deletions src/styles/blocks/slider-btn.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@
outline: none;
border: none;

&:hover {
background-color: #5500f2;
.slider-btn__icon {
opacity: 1;
}
}

&--prev {
.slider-btn__icon {
transform: rotate(90deg);
Expand Down
12 changes: 12 additions & 0 deletions src/styles/blocks/socials.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
border-radius: 50%;
opacity: .3;

&:hover {
.social__icon {
fill: currentColor;
}
}

&:last-child {
margin-right: 0;
}
Expand All @@ -28,6 +34,12 @@
.social__item {
margin-right: 40px;

&:hover {
.social__icon {
fill: $main;
}
}

&:last-child {
margin-right: 0;
}
Expand Down
1 change: 1 addition & 0 deletions src/styles/blocks/triangles.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

&--bottom {
margin-top: 0;
margin-bottom: -89px;

.triangles__item {
height: 90px;
Expand Down
60 changes: 24 additions & 36 deletions src/styles/blocks/works-slider.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,38 @@

.works-slider__preview-item {
height: 100px;
position: relative;

&:after {
content: "";
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
background-color: transparent;
z-index: 5;
}

&.active {
&:after {
outline: 3px solid #dc9322;
}
}


&.active,
&:hover {
outline: 3px solid #dc9322;
&::after {
outline: 3px solid #dc9322;
background-color: rgba(85, 0, 242, 0.3);
}
}
}

.works-slider__preview-btn {
display: block;
height: 100%;
width: 100%;
outline: none;
border: none;
padding: 0;
Expand All @@ -99,40 +121,6 @@
right: 0;
}

.works-slider__button {
width: 50px;
height: 50px;
background: #353e4e;
padding: 0;
outline: none;
border: none;

&:hover {
.works-slider__button-icon {
opacity: 1;
}
}

&--prev {
.works-slider__button-icon {
transform: rotate(90deg);
}
}

&--next {
.works-slider__button-icon {
transform: rotate(-90deg);
}
}
}

.works-slider__button-icon {
width: 10px;
height: 10px;
opacity: .3;
fill: $white;
}

.works-slider__link {
font-size: 18px;
font-weight: 700;
Expand Down
4 changes: 0 additions & 4 deletions src/styles/blocks/works.pcss
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
.works {
padding-bottom: 120px;
}

.works__title {
margin-bottom: 90px;
}
5 changes: 3 additions & 2 deletions src/styles/variables.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"main": "#5500f2",
"font": "#464d62",
"footer": "#252830",
"href": "#4b6f47",
"white": "#fff"
"href": "#586ed3",
"white": "#fff",
"tag": "#859ec2"
}
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const TerserPlugin = require("terser-webpack-plugin");

module.exports = (env, argv) => {
const isProductionBuild = argv.mode === "production";
const publicPath = '/';
const publicPath = '/stogniy-ls/';

const pcss = {
test: /\.(p|post|)css$/,
Expand Down

0 comments on commit 93442d2

Please sign in to comment.