Skip to content

Commit

Permalink
linked up style sheets properly, changing nav bar
Browse files Browse the repository at this point in the history
  • Loading branch information
jswiss committed Dec 24, 2017
1 parent d5fd39f commit e699fb5
Show file tree
Hide file tree
Showing 13 changed files with 2,154 additions and 19 deletions.
1,861 changes: 1,861 additions & 0 deletions public/dist/App.bundle.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions public/dist/App.bundle.js.map

Large diffs are not rendered by default.

125 changes: 125 additions & 0 deletions public/dist/style.css

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

1 change: 1 addition & 0 deletions public/dist/style.css.map

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

1 change: 1 addition & 0 deletions public/images/icons/heart.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/images/icons/pencil.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/images/icons/review.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/images/icons/store2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/images/icons/tag.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
126 changes: 126 additions & 0 deletions public/sass/partials/_nav.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
.nav {
display: flex;
list-style: none;
margin: 0;
padding: 0;
justify-content: space-between;
background: $datpurp;
&__section {
display: flex;
&--search {
flex: 1 1 auto;
}
}
&__item {
display: flex;
}
&__link {
background: $datpurp;
color: white;
border-right: 1px solid rgba(255, 255, 255, 0.1);
text-transform: uppercase;
padding: 1.2rem 2rem 1rem 2rem;
display: block;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
transition: transform 0.2s;
border-bottom: 5px solid transparent;
svg {
width: 40px;
transition: all 0.2s;
fill: white;
margin-bottom: 1rem;
}
&:hover,
&--active {
border-bottom-color: rgba(0, 0, 0, 0.2);
border-right-color: rgba(0, 0, 0, 0.05);
svg {
transform: scale(1.2)
}
background: linear-gradient(90deg, #48ded4 0%, #a026bf 20%, #e82c75 60%, $yellow 85%, #48ded4 95%) fixed; // background: none;
}
&--logo {
&:hover {
svg {
transform: none;
}
}
svg {
width: 200px;
margin: 0;
}
}
}
}

@media all and (max-width: 1200px) {
.nav {
&__link {
padding-left: 1rem;
padding-right: 1rem;
svg {
width: 30px;
}
&--logo {
svg {
width: 100px;
}
}
}
}
}

@media all and (max-width: 900px) {
.nav {
flex-wrap: wrap;
&__section {
order: 1;
&--search {
border-top: 1px solid rgba(255, 255, 255, 0.1);
order: 2;
width: 100%;
}
}
}
}

@media all and (max-width: 650px) {
.nav {
&__section {
width: 100%;
&--user {
order: -1;
border-bottom: 1px solid rgba(255, 255, 255, 0.1);
.avatar {
min-width: 20px;
height: 20px;
}
svg {
display: none;
}
}
}
&__item {
width: 33.333333%;
}
&__link {
width: 100%;
svg {
// width: 5px;
max-width: 100%;
}
&--logo {
svg {
width: 100%;
}
}
}
}
.heart-count:before {
content: '♥️';
margin-right: 1rem;
}
}
13 changes: 13 additions & 0 deletions public/sass/partials/_variables.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
$black: #303030;
$datpurp: #38507B;
$width: 800px;
$purple: #262161;
$yellow: #FFC40E;
$pink: #EE7297;
$green: #93FF00;
$red: #E50714;
$grey: lighten(grey, 40%);
$shad: 0 0 10px rgba(0, 0, 0, 0.1),
0 5px 10px rgba(0, 0, 0, 0.05);
$grad: linear-gradient(90deg, #48ded4 0%, #a026bf 20%, #e82c75 60%, $yellow 85%, #48ded4 95%);
$verticalGrad: linear-gradient(0, #48ded4 0%, #a026bf 20%, #e82c75 60%, $yellow 85%, #48ded4 95%);
2 changes: 2 additions & 0 deletions public/sass/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import 'partials/variables';
@import 'partials/nav';
Loading

0 comments on commit e699fb5

Please sign in to comment.