Skip to content

Commit

Permalink
Merge pull request #32 from matryosshka/improv
Browse files Browse the repository at this point in the history 
Обновлен список проектов
  • Loading branch information
@matryosshka
matryosshka committed Jun 14, 2023
2 parents 4e16a06 + 17710a6 commit 25fb9cb
Show file tree
Hide file tree
Showing 5 changed files with 81 additions and 96 deletions.
Binary file added img/vp.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
69 changes: 33 additions & 36 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,16 +194,17 @@ <h3 class="portfolio__header">AirAsia</h3>

<li class="projects__item portfolio">
<div class="portfolio__item-cover">
<a href="https://matryosshka.github.io/geo-review/dist/index.html" target="_blank">
<img src="./img/yamaps.png" class="portfolio__item-img" alt="yandex map">
<a href="https://matryosshka.github.io/video-production/" target="_blank">
<img src="./img/vp.png" class="portfolio__item-img" alt="video production">
</a>
</div>

<div class="portfolio__content">
<div class="portfolio__content-header">
<a href="https://matryosshka.github.io/geo-review/dist/index.html" target="_blank">
<h3 class="portfolio__header">Yandex.Maps API</h3>
<a href="https://matryosshka.github.io/video-production/" target="_blank">
<h3 class="portfolio__header">Video Production</h3>
</a>
<a href="https://github.com/matryosshka/geo-review" target="_blank">
<a href="https://github.com/matryosshka/video-production" target="_blank">
<img src="./img/icons/git.png" class="portfolio__content-header-img" alt="octocat">
</a>
</div>
Expand All @@ -217,25 +218,17 @@ <h3 class="portfolio__header">Yandex.Maps API</h3>
</svg>

<svg class="portfolio__stack-icon">
<use xlink:href="./img/icons/sprite.svg#js"></use>
<use xlink:href="./img/icons/sprite.svg#bem"></use>
</svg>

<svg class="portfolio__stack-icon portfolio__stack-icon--flex">
<use xlink:href="./img/icons/sprite.svg#webpack"></use>
<use xlink:href="./img/icons/sprite.svg#flex"></use>
</svg>

<svg class="portfolio__stack-icon portfolio__stack-icon--github">
<use xlink:href="./img/icons/sprite.svg#github"></use>
</svg>

<svg class="portfolio__stack-icon">
<use xlink:href="./img/icons/sprite.svg#git"></use>
</svg>

<svg class="portfolio__stack-icon portfolio__stack-icon--yamaps">
<use xlink:href="./img/icons/sprite.svg#yamaps"></use>
</svg>

<svg class="portfolio__stack-icon">
<use xlink:href="./img/icons/sprite.svg#figma"></use>
</svg>
Expand All @@ -245,27 +238,18 @@ <h3 class="portfolio__header">Yandex.Maps API</h3>

<li class="projects__item portfolio">
<div class="portfolio__item-cover">
<a href="https://glassceramics.ru/" target="_blank">
<img src="./img/glassceramics.png" class="portfolio__item-img" alt="glassceramics">
<a href="https://matryosshka.github.io/geo-review/dist/index.html" target="_blank">
<img src="./img/yamaps.png" class="portfolio__item-img" alt="yandex map">
</a>
</div>
<div class="portfolio__content">
<div class="portfolio__content-header">
<h3 class="portfolio__header">
<a href="https://glassceramics.ru/" target="_blank">GlassCeramics</a>
</h3>
<img src="./img/icons/info.png"
class="portfolio__content-header-img portfolio__content-header-img--info" alt="info">

<div class="dropdown">
<ul class="dropdown__list">
<li class="dropdown__item">
Старый проект (2017), сделан безо всяких правил и знаний (помогал Google), не по стандартам и с
ноткой хаоса&#128679; Просто в качестве очень плохой демонстрации работы с Bootstrap.
</li>
</ul>
</div>

<a href="https://matryosshka.github.io/geo-review/dist/index.html" target="_blank">
<h3 class="portfolio__header">Yandex.Maps API</h3>
</a>
<a href="https://github.com/matryosshka/geo-review" target="_blank">
<img src="./img/icons/git.png" class="portfolio__content-header-img" alt="octocat">
</a>
</div>
<div class="portfolio__stack">
<svg class="portfolio__stack-icon">
Expand All @@ -277,19 +261,32 @@ <h3 class="portfolio__header">
</svg>

<svg class="portfolio__stack-icon">
<use xlink:href="./img/icons/sprite.svg#bootstrap"></use>
<use xlink:href="./img/icons/sprite.svg#js"></use>
</svg>

<svg class="portfolio__stack-icon portfolio__stack-icon--adaptive">
<use xlink:href="./img/icons/sprite.svg#adaptive"></use>
<svg class="portfolio__stack-icon portfolio__stack-icon--flex">
<use xlink:href="./img/icons/sprite.svg#webpack"></use>
</svg>

<svg class="portfolio__stack-icon portfolio__stack-icon--github">
<use xlink:href="./img/icons/sprite.svg#github"></use>
</svg>

<svg class="portfolio__stack-icon">
<use xlink:href="./img/icons/sprite.svg#google-maps"></use>
<use xlink:href="./img/icons/sprite.svg#git"></use>
</svg>

<svg class="portfolio__stack-icon portfolio__stack-icon--yamaps">
<use xlink:href="./img/icons/sprite.svg#yamaps"></use>
</svg>

<svg class="portfolio__stack-icon">
<use xlink:href="./img/icons/sprite.svg#figma"></use>
</svg>
</div>
</div>
</li>

</ul>
<div class="projects__button">
<a href="https://matryosshka.github.io/portfolio/projects.html" class="btn btn--projects">Moar!!!</a>
Expand Down
81 changes: 39 additions & 42 deletions projects.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,27 +302,19 @@ <h3 class="portfolio__header">Portfolio</h3>

<li class="works__item portfolio">
<div class="portfolio__item-cover">
<a href="https://glassceramics.ru/" target="_blank">
<img src="./img/glassceramics.png" class="portfolio__item-img" alt="glassceramics">
<a href="https://matryosshka.github.io/video-production/" target="_blank">
<img src="./img/vp.png" class="portfolio__item-img" alt="video production">
</a>
</div>

<div class="portfolio__content">
<div class="portfolio__content-header">
<h3 class="portfolio__header">
<a href="https://glassceramics.ru/" target="_blank">GlassCeramics</a>
</h3>
<img src="./img/icons/info.png"
class="portfolio__content-header-img portfolio__content-header-img--info" alt="info">

<div class="dropdown">
<ul class="dropdown__list">
<li class="dropdown__item">
Старый проект (2017), сделан безо всяких правил и знаний (помогал Google), не по стандартам и с
ноткой хаоса&#128679; Просто в качестве очень плохой демонстрации работы с Bootstrap.
</li>
</ul>
</div>

<a href="https://matryosshka.github.io/video-production/" target="_blank">
<h3 class="portfolio__header">Video Production</h3>
</a>
<a href="https://github.com/matryosshka/video-production" target="_blank">
<img src="./img/icons/git.png" class="portfolio__content-header-img" alt="octocat">
</a>
</div>
<div class="portfolio__stack">
<svg class="portfolio__stack-icon">
Expand All @@ -334,38 +326,47 @@ <h3 class="portfolio__header">
</svg>

<svg class="portfolio__stack-icon">
<use xlink:href="./img/icons/sprite.svg#bootstrap"></use>
<use xlink:href="./img/icons/sprite.svg#bem"></use>
</svg>

<svg class="portfolio__stack-icon portfolio__stack-icon--adaptive">
<use xlink:href="./img/icons/sprite.svg#adaptive"></use>
<svg class="portfolio__stack-icon portfolio__stack-icon--flex">
<use xlink:href="./img/icons/sprite.svg#flex"></use>
</svg>

<svg class="portfolio__stack-icon portfolio__stack-icon--github">
<use xlink:href="./img/icons/sprite.svg#github"></use>
</svg>

<svg class="portfolio__stack-icon">
<use xlink:href="./img/icons/sprite.svg#google-maps"></use>
<use xlink:href="./img/icons/sprite.svg#figma"></use>
</svg>
</div>
</div>
</li>

<li class="works__item portfolio">
<div class="portfolio__item-cover">
<!-- <a href="#" target="_blank"> -->
<img src="./img/dev.png" class="portfolio__item-img" alt="video production">
<!-- </a> -->
<!-- <div class="portfolio__item-desc"> -->
<p class="portfolio__item-desc">👩‍🔧 <br> В разработке</p>
<!-- </div> -->
<a href="https://glassceramics.ru/" target="_blank">
<img src="./img/glassceramics.png" class="portfolio__item-img" alt="glassceramics">
</a>
</div>

<div class="portfolio__content">
<div class="portfolio__content-header">
<!-- <a href="#" target="_blank"> -->
<h3 class="portfolio__header">Video Production &#9203;</h3>
<!-- </a> -->
<!-- <a href="#" target="_blank">
<img src="./img/icons/git.png" class="portfolio__content-header-img" alt="octocat">
</a> -->
<h3 class="portfolio__header">
<a href="https://glassceramics.ru/" target="_blank">GlassCeramics</a>
</h3>
<img src="./img/icons/info.png"
class="portfolio__content-header-img portfolio__content-header-img--info" alt="info">

<div class="dropdown">
<ul class="dropdown__list">
<li class="dropdown__item">
Старый проект (2017), сделан безо всяких правил и знаний (помогал Google), не по стандартам и с
ноткой хаоса&#128679; Просто в качестве очень плохой демонстрации работы с Bootstrap.
</li>
</ul>
</div>

</div>
<div class="portfolio__stack">
<svg class="portfolio__stack-icon">
Expand All @@ -377,19 +378,15 @@ <h3 class="portfolio__header">Video Production &#9203;</h3>
</svg>

<svg class="portfolio__stack-icon">
<use xlink:href="./img/icons/sprite.svg#bem"></use>
</svg>

<svg class="portfolio__stack-icon portfolio__stack-icon--flex">
<use xlink:href="./img/icons/sprite.svg#flex"></use>
<use xlink:href="./img/icons/sprite.svg#bootstrap"></use>
</svg>

<svg class="portfolio__stack-icon portfolio__stack-icon--github">
<use xlink:href="./img/icons/sprite.svg#github"></use>
<svg class="portfolio__stack-icon portfolio__stack-icon--adaptive">
<use xlink:href="./img/icons/sprite.svg#adaptive"></use>
</svg>

<svg class="portfolio__stack-icon">
<use xlink:href="./img/icons/sprite.svg#figma"></use>
<use xlink:href="./img/icons/sprite.svg#google-maps"></use>
</svg>
</div>
</div>
Expand Down
19 changes: 5 additions & 14 deletions styles/blocks/_title.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,11 @@
margin-bottom: 55px;
}

@include small-phones {
padding-top: 40px;
margin-bottom: 40px;
}

&:before {
content: "";
background: url('../img/icons/duck.png') no-repeat;
Expand All @@ -162,11 +167,6 @@
height: 60px;

@include large-tablets {
background-size: 70%;
margin-top: 2px;
}

@include tablets {
display: none;
}

Expand Down Expand Up @@ -200,17 +200,8 @@
padding-left: 1px;

@include large-tablets {
// font-size: 32px;
display: none;
}

// @include tablets {
// font-size: 31px;
// }

// @include phones {
// display: none;
// }
}

@keyframes blink {
Expand Down
8 changes: 4 additions & 4 deletions styles/main.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 25fb9cb

Please sign in to comment.