Skip to content

Commit

Permalink
Merge pull request #56 from landjonathan/master
Browse files Browse the repository at this point in the history
adding margin nav <-> scrollbar, control color fix
  • Loading branch information
chriscoyier authored Nov 18, 2020
2 parents 9066448 + 68eb042 commit 5b6bf15
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 35 deletions.
38 changes: 18 additions & 20 deletions src/assets/styles/sass/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,18 @@ body {
color: var(--text);
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;

@include medium {
&::-webkit-scrollbar {
width: 10px;
background: var(--bg-main);
}

&::-webkit-scrollbar-thumb {
border-radius: 10px;
background-color: var(--bg-dark);
}
}
}

body.no-transition * {
Expand Down Expand Up @@ -159,7 +171,7 @@ label {

&::-webkit-scrollbar-thumb {
border-radius: 10px;
background-color: var(--bg-light);
background-color: var(--bg-dark);
}
}
}
Expand Down Expand Up @@ -238,17 +250,15 @@ a.fonts-nav-link {
border-radius: 6px;

@include medium {
margin: 0;
border-radius: 0;
padding: 9px 24px;
padding: 9px 12px;

&:after {
content: '';
background: {
image: url("data:image/svg+xml,%3Csvg width='15' height='15' viewBox='0 0 15 15' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M7.65685 12.7929L10.7377 7.13605L7.65685 1.47919' stroke='white' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E%0A");
size: 100%;
}
margin-right: -12px;
margin-right: -6px;
width: 15px;
height: 15px;
display: block;
Expand Down Expand Up @@ -406,11 +416,7 @@ $languages: html, css, js, charmap;
size: 12px;
weight: 500;
}
--active: var(--highlight);

html.theme-blue & {
--active: var(--bg-highlight);
}
--active: var(--bg-highlight);

label {
--inactive-text: white;
Expand Down Expand Up @@ -593,20 +599,12 @@ ul.features {
&.v {
width: 18px;
height: 13px;
background-image: url("data:image/svg+xml,%3Csvg width='18' height='13' viewBox='0 0 18 13' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M17 1L6 12L1 7' stroke='%23848484' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");

html.theme-blue & {
background-image: url("data:image/svg+xml,%3Csvg width='18' height='13' viewBox='0 0 18 13' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M17 1L6 12L1 7' stroke='%23789bab' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");
}
background-image: url("data:image/svg+xml,%3Csvg width='18' height='13' viewBox='0 0 18 13' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M17 1L6 12L1 7' stroke='%23789bab' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");
}

&.x {
width: 14px;
height: 14px;
background-image: url("data:image/svg+xml,%3Csvg width='14' height='14' viewBox='0 0 14 14' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M13 1L1 13' stroke='%23848484' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'/%3E%3Cpath d='M1 1L13 13' stroke='%23848484' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");

html.theme-blue & {
background-image: url("data:image/svg+xml,%3Csvg width='14' height='14' viewBox='0 0 14 14' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M13 1L1 13' stroke='%23789bab' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'/%3E%3Cpath d='M1 1L13 13' stroke='%23789bab' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");
}
background-image: url("data:image/svg+xml,%3Csvg width='14' height='14' viewBox='0 0 14 14' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M13 1L1 13' stroke='%23789bab' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'/%3E%3Cpath d='M1 1L13 13' stroke='%23789bab' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");
}
}
27 changes: 13 additions & 14 deletions src/assets/styles/style.css

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

2 changes: 1 addition & 1 deletion src/assets/styles/style.css.map

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

0 comments on commit 5b6bf15

Please sign in to comment.