Skip to content

Commit

Permalink
making some scss optimizations and renaming files for organization
Browse files Browse the repository at this point in the history
  • Loading branch information
zackmorgs committed Jun 11, 2018
1 parent d918eb8 commit f00954a
Show file tree
Hide file tree
Showing 16 changed files with 1,701 additions and 119 deletions.
3 changes: 3 additions & 0 deletions src/Components/Global/all-colors.css

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

File renamed without changes.
3 changes: 3 additions & 0 deletions src/Components/Global/all-typography-settings.css

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

File renamed without changes.
2 changes: 2 additions & 0 deletions src/Components/Global/animate.css

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

Empty file.
3 changes: 0 additions & 3 deletions src/Components/Global/colors.css

This file was deleted.

4 changes: 2 additions & 2 deletions src/Components/Global/global.css

Large diffs are not rendered by default.

43 changes: 27 additions & 16 deletions src/Components/Global/global.scss
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
// global styles
// no modules allowed!
@import "./../../../node_modules/normalize.css";
@import "./type.scss";
@import "./colors.scss";
@import "./grid.scss";

// scss lint : universal selector slow. whelp i like borderbox so get over it.
// placed here to assist dom model understanding what page will look like
// this saves me several lines of the box-sizing rule for page load.
body {
*, *:before, *:after {
*,
*:before,
*:after {
box-sizing: border-box;
}
}
@import "./../../../node_modules/normalize.css";
@import "./all-typography-settings.scss";
@import "./all-colors.scss";
@import "./grid-only.scss";

// instead of using important, i make the .hidden class require specificicity.
// instead of just using .hidden and using display:none important because of specificity overwrites, i make the .hidden class
// require more specificicity to overrule, it is my hope this behaves as expected more often.
// this is slower, but my other classes can coexist a bit more peacefully is my theory
div, ul, li {
&.hidden {
display:none;
Expand All @@ -22,18 +28,21 @@ div, ul, li {
}

body {
box-sizing: border-box;
// box-sizing: border-box;
max-width: 100%;
overflow-x:hidden;
}

#root {
overflow:hidden;
}
// < Navigation >
nav {
position:sticky;
top:0px;
right:0px;
left:0px;
height: 0px;

.toggle {
margin-left:auto;
border:none;
Expand All @@ -44,14 +53,13 @@ nav {
border-radius: 4px;
z-index:10;
background-color:#D5E9E8;
box-shadow: 4px 4px 4px #3d4a5152;
}
}
.navigation-open {

}
main {
// margin-top: -81px;
transition:filter 1s ease-in-out;

}
.navigation-open nav {
Expand All @@ -63,14 +71,14 @@ main {
position: absolute;
}
.navigation-open main {
// margin-top: -273px;
filter:blur(1rem);

}
.navbar {
display: flex;
align-items: stretch;
background:transparent;
background-color:rgba(255,255,255,0.25);
padding: 0 0 .5rem;

}
.nav-list {
margin: 0;
Expand All @@ -88,15 +96,15 @@ main {
transition: all 600ms;
a {
// max-height:0px;
filter:blur(12px);
// filter:blur(12px);
transition:filter 1s ease-i
}
&.collapsed {
max-height:fit-content;
transform: translateX(0);
a {
max-height:fit-content;
filter:blur(0px);
// filter:blur(0px);
}
}
}
Expand Down Expand Up @@ -146,4 +154,7 @@ main {
@media (min-width: 992px) {}

// Extra large devices (large desktops, 1200px and up)
@media (min-width: 1200px) {}
@media (min-width: 1200px) {}

// this way I have to be less specific in my css calls for faster animation toggles
@import "./animate.scss";
3 changes: 3 additions & 0 deletions src/Components/Global/grid-only.css

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

Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@ footer {
// grid-gap:0px;
// }
}


// Small devices (landscape phones, 576px and up)
@media (min-width: 576px) {

}

// Medium devices (tablets, 768px and up)
@media (min-width: 768px) {
.portfolio-grid {
grid-template-columns: repeat(4, [col-start] 1fr);
grid-template-rows: repeat(24, [row-start] 1fr);
grid-auto-rows: max(135px);
grid-gap:0px;
max-height:100%;
grid-template-columns: repeat(3, [col-start] 1fr);
grid-template-rows: repeat(5, [row-start] 1fr);

// grid-auto-rows: max(135px);
}
}

Expand All @@ -57,7 +57,7 @@ footer {

.portfolio-grid {
max-height:100%;
grid-template-columns: repeat(5, [col-start] 1fr);
grid-template-columns: repeat(4, [col-start] 1fr);
grid-template-rows: repeat(8, [row-start] 1fr);
grid-auto-rows: max(135px);
}
Expand Down
3 changes: 0 additions & 3 deletions src/Components/Global/grid.css

This file was deleted.

Loading

0 comments on commit f00954a

Please sign in to comment.