Skip to content

Commit

Permalink
style and congfig
Browse files Browse the repository at this point in the history
  • Loading branch information
acousticrobot committed Nov 20, 2023
1 parent 851546b commit 387b038
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ github_username: acousticRobot
# Build settings
markdown: kramdown

exclude: [utilities, lib]
exclude: [utilities, lib, README.md, sftp-config.json]

kramdown:
input: GFM
Expand Down
6 changes: 3 additions & 3 deletions _includes/analytics.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-71033132-1"></script>
<!-- Google tag (gtag.js) -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-L4QDZ7LV13"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());

gtag('config', 'UA-71033132-1');
gtag('config', 'G-L4QDZ7LV13');
</script>
2 changes: 1 addition & 1 deletion _pages/toki-pona/lesson-07-modifiers.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ english_tests:
>
>* __jan mute li telo e kili jaki.__ - many people wash the dirty vegetables.
>* __jan li telo mute e kili jaki.__ - the people thoroughly wash the dirty vegetables.
>* __jan li telo e kili jaki mute.__ - the people wash may dirty vegetables.
>* __jan li telo e kili jaki mute.__ - the people wash many dirty vegetables.
>
### compound nouns
Expand Down
2 changes: 1 addition & 1 deletion _pages/toki-pona/lesson-20-colors.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ permalink: /toki-pona/colors/

url_previous: /toki-pona/syllables-3/
# url_next: /toki-pona/conjunctions/
url_next: /toki-pona/acknowledgments/
url_next: /toki-pona/acknowledgements/

toki_pona_tests:
- image: /images/t47_tokipona/kamasona/colors/wasowalo.jpg
Expand Down
2 changes: 1 addition & 1 deletion css/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ a {
blockquote {
@extend .small-text;
border-left: 2px solid $color-grey-E;
padding-left: $spacing-unit / 2;
padding-left: calc($spacing-unit / 2);
font-style: italic;

> :last-child {
Expand Down
2 changes: 1 addition & 1 deletion css/_image_index.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

.image-index__article {
margin-bottom: $spacing-unit/4;
margin-bottom: calc($spacing-unit / 4);
border-bottom: 1px solid $color-gris-C;
}

Expand Down
12 changes: 6 additions & 6 deletions css/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
.wrapper__page, .wrapper__content, .wrapper__footer {
margin-right: auto;
margin-left: auto;
padding-right: $spacing-unit / 4;
padding-left: $spacing-unit / 4;
padding-right: calc($spacing-unit / 4);
padding-left: calc($spacing-unit / 4);
@extend %clearfix;

@include media-query($tablet-breakpoint) {
Expand Down Expand Up @@ -33,7 +33,7 @@
.wrapper__footer-col {
font-size: 15px;
color: $color-grey-8;
margin-left: -$spacing-unit / 2;
margin-left: calc(($spacing-unit / 2) * -1);
@extend %clearfix;
}

Expand All @@ -45,7 +45,7 @@
border-bottom: 1px solid $color-grey-E;
min-height: 56px;
background-color: $color-background-content;
padding-left: $spacing-unit / 2;
padding-left: calc($spacing-unit / 2);
@include media-query-smaller-than($tablet-breakpoint) {
@include inverse;
border: none;
Expand Down Expand Up @@ -160,8 +160,8 @@ h1.site-header__title {

.footer-col {
float: left;
margin-bottom: $spacing-unit / 2;
padding-left: $spacing-unit / 2;
margin-bottom: calc($spacing-unit / 2);
padding-left: calc($spacing-unit / 2);
}

.footer-col-1 {
Expand Down
6 changes: 3 additions & 3 deletions css/main_200814.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $monospace-font-family: Consolas,'Lucida Console','DejaVu Sans Mono', monospace;
$content-width: 800px;

$spacing-unit: 2rem;
$spacing-unit-bottom: $spacing-unit / 2;
$spacing-unit-bottom: calc($spacing-unit / 2);

// Design mobile first, override with breakpoints:
$mobile-breakpoint: 600px;
Expand All @@ -29,8 +29,8 @@ $tablet-breakpoint: 800px;
// Use media queries like this:
// @include media-query($mobile-breakpoint) {
// .wrapper {
// padding-right: $spacing-unit / 2;
// padding-left: $spacing-unit / 2;
// padding-right: calc($spacing-unit / 2);
// padding-left: calc($spacing-unit / 2);
// }
// }
@mixin media-query($device) {
Expand Down

0 comments on commit 387b038

Please sign in to comment.