fix: remove mixin to fix print layout (#391)

Removes the desktop_and_print mixin as it resulted in broken print layout.
lxndrblz · Mar 26, 2023 · 7981438 · 7981438
1 parent 86586db
commit 7981438
Show file tree

Hide file tree

Showing 22 changed files with 33 additions and 35 deletions.
diff --git a/assets/scss/modules/_config.scss b/assets/scss/modules/_config.scss
@@ -16,16 +16,6 @@
   }
 }
 
-@mixin desktop_and_print {
-  @include desktop {
-    @content;
-  }
-
-  @include print {
-    @content;
-  }
-}
-
 @mixin ltr {
   @if $text-direction == ltr {
     @content;

diff --git a/assets/scss/partials/components/_footer.scss b/assets/scss/partials/components/_footer.scss
@@ -32,13 +32,13 @@
   &__sidebar {
     display: none;
 
-    @include desktop_and_print {
+    @include desktop {
       display: inline-block;
     }
   }
 
   &__base {
-    @include desktop_and_print {
+    @include desktop {
       display: none;
     }
   }

diff --git a/assets/scss/partials/components/_portfolio.scss b/assets/scss/partials/components/_portfolio.scss
@@ -5,7 +5,7 @@
   padding-bottom: 0px;
   padding-top: 48px;
 
-  @include desktop_and_print {
+  @include desktop {
     padding: 48px;
   }
 
@@ -19,7 +19,7 @@
     background: transparent;
     border-radius: 0.5em;
 
-    @include desktop_and_print {
+    @include desktop {
       @include themed() {
         border: t('border');
       }
@@ -62,7 +62,7 @@
           background-color: t('accent');
         }
 
-        @include desktop_and_print {
+        @include desktop {
           width: 60%;
           object-fit: contain;
           max-width: none;
@@ -72,14 +72,14 @@
       }
 
       &--left {
-        @include desktop_and_print {
+        @include desktop {
           margin-right: auto;
           margin-left: 0;
         }
       }
 
       &--right {
-        @include desktop_and_print {
+        @include desktop {
           margin-right: 0;
           margin-left: auto;
         }
@@ -95,7 +95,7 @@
       background-color: t('accent');
     }
 
-    @include desktop_and_print {
+    @include desktop {
       padding: 48px;
       border-radius: 0.5em;
 
@@ -112,7 +112,7 @@
         border-bottom: t('border');
       }
 
-      @include desktop_and_print {
+      @include desktop {
         @include themed() {
           background: t('primary-lighter');
         }
@@ -123,7 +123,7 @@
     }
 
     &--right {
-      @include desktop_and_print {
+      @include desktop {
         margin-left: auto;
       }
     }

diff --git a/assets/scss/partials/components/_sidebar.scss b/assets/scss/partials/components/_sidebar.scss
@@ -1,7 +1,7 @@
 .sidebar {
   margin-top: 40px;
 
-  @include desktop_and_print {
+  @include desktop {
     z-index: 2;
     position: fixed;
     height: 100%;
@@ -24,7 +24,7 @@
   }
 
   &__content {
-    @include desktop_and_print {
+    @include desktop {
       display: flex;
       flex-direction: column;
       flex-grow: 1;

diff --git a/assets/scss/partials/components/_wrapper.scss b/assets/scss/partials/components/_wrapper.scss
@@ -13,7 +13,7 @@
   &__main {
     width: 100%;
 
-    @include desktop_and_print {
+    @include desktop {
       width: $content-width;
     }
 
@@ -24,7 +24,7 @@
     &--fullscreen {
       margin-top: 20px;
 
-      @include desktop_and_print {
+      @include desktop {
         width: 100%;
         margin-top: 0px;
       }
@@ -39,7 +39,7 @@
     width: 100%;
     padding: 16px 0;
 
-    @include desktop_and_print {
+    @include desktop {
       width: $sidebar-width;
       padding: 0;
     }

diff --git a/assets/scss/partials/layout/_nav.scss b/assets/scss/partials/layout/_nav.scss
@@ -3,7 +3,7 @@
 
   display: none;
 
-  @include desktop_and_print {
+  @include desktop {
     display: flex;
     justify-content: space-between;
     align-items: center;
@@ -20,7 +20,7 @@
       background-color: t('primary-lighter');
     }
 
-    @include desktop_and_print {
+    @include desktop {
       display: flex;
       padding: $py-desktop 30px;
 

diff --git a/...resources/_gen/assets/scss/scss/anatole.rtl.scss_91e1ad794daba18680ca1041efc12aed.content b/...resources/_gen/assets/scss/scss/anatole.rtl.scss_91e1ad794daba18680ca1041efc12aed.content
diff --git a/...te/resources/_gen/assets/scss/scss/anatole.rtl.scss_91e1ad794daba18680ca1041efc12aed.json b/...te/resources/_gen/assets/scss/scss/anatole.rtl.scss_91e1ad794daba18680ca1041efc12aed.json
@@ -0,0 +1 @@
+{"Target":"scss/main.rtl.min.afb781d764f2b83b63ec6dd90788a35093c19a6a1ec9f8a2252b9cd3c4f01084.css","MediaType":"text/css","Data":{"Integrity":"sha256-r7eB12TyuDtj7G3ZB4ijUJPBmmoeyfiiJSuc08TwEIQ="}}
diff --git a/...resources/_gen/assets/scss/scss/anatole.rtl.scss_97af51e696731e38130ed73ef4f4756e.content b/...resources/_gen/assets/scss/scss/anatole.rtl.scss_97af51e696731e38130ed73ef4f4756e.content
diff --git a/...te/resources/_gen/assets/scss/scss/anatole.rtl.scss_97af51e696731e38130ed73ef4f4756e.json b/...te/resources/_gen/assets/scss/scss/anatole.rtl.scss_97af51e696731e38130ed73ef4f4756e.json
@@ -1 +1 @@
-{"Target":"scss/main.rtl.min.a5eecfb30c244001796ebc324fb94c5c70ec99f77efddd26487bb075c44eb931.css","MediaType":"text/css","Data":{"Integrity":"sha256-pe7PswwkQAF5brwyT7lMXHDsmfd+/d0mSHuwdcROuTE="}}
+{"Target":"scss/main.rtl.min.2729eba917180e5aafe266bae3afdc453fae08a509853c392ea0d0a086d98424.css","MediaType":"text/css","Data":{"Integrity":"sha256-JynrqRcYDlqv4ma646/cRT+uCKUJhTw5LqDQoIbZhCQ="}}
diff --git a/...ite/resources/_gen/assets/scss/scss/anatole.scss_6dd5ee34d337299a377a4ab7b84829ac.content b/...ite/resources/_gen/assets/scss/scss/anatole.scss_6dd5ee34d337299a377a4ab7b84829ac.content
diff --git a/...leSite/resources/_gen/assets/scss/scss/anatole.scss_6dd5ee34d337299a377a4ab7b84829ac.json b/...leSite/resources/_gen/assets/scss/scss/anatole.scss_6dd5ee34d337299a377a4ab7b84829ac.json
@@ -0,0 +1 @@
+{"Target":"scss/main.min.afcf7a74c48633d6afc6447bf52d6af2c1bbc24b0cb0ce6d834cc98f49bfba77.css","MediaType":"text/css","Data":{"Integrity":"sha256-r896dMSGM9avxkR79S1q8sG7wksMsM5tg0zJj0m/unc="}}
diff --git a/...ite/resources/_gen/assets/scss/scss/anatole.scss_dcc8b7002348ef29d44bd1c4b6ae0aca.content b/...ite/resources/_gen/assets/scss/scss/anatole.scss_dcc8b7002348ef29d44bd1c4b6ae0aca.content
diff --git a/...leSite/resources/_gen/assets/scss/scss/anatole.scss_dcc8b7002348ef29d44bd1c4b6ae0aca.json b/...leSite/resources/_gen/assets/scss/scss/anatole.scss_dcc8b7002348ef29d44bd1c4b6ae0aca.json
@@ -1 +1 @@
-{"Target":"scss/main.min.5794be192d21535bdd301561e043a96b6adbad2b5c08279deff459e4661c613f.css","MediaType":"text/css","Data":{"Integrity":"sha256-V5S+GS0hU1vdMBVh4EOpa2rbrStcCCed7/RZ5GYcYT8="}}
+{"Target":"scss/main.min.b8b237b391418778d0814b850b954825076f5ebbc0da1d1530c888e654ddcf4b.css","MediaType":"text/css","Data":{"Integrity":"sha256-uLI3s5FBh3jQgUuFC5VIJQdvXrvA2h0VMMiI5lTdz0s="}}
diff --git a/resources/_gen/assets/scss/scss/anatole.rtl.scss_91e1ad794daba18680ca1041efc12aed.content b/resources/_gen/assets/scss/scss/anatole.rtl.scss_91e1ad794daba18680ca1041efc12aed.content
diff --git a/resources/_gen/assets/scss/scss/anatole.rtl.scss_91e1ad794daba18680ca1041efc12aed.json b/resources/_gen/assets/scss/scss/anatole.rtl.scss_91e1ad794daba18680ca1041efc12aed.json
@@ -0,0 +1 @@
+{"Target":"scss/main.rtl.min.afb781d764f2b83b63ec6dd90788a35093c19a6a1ec9f8a2252b9cd3c4f01084.css","MediaType":"text/css","Data":{"Integrity":"sha256-r7eB12TyuDtj7G3ZB4ijUJPBmmoeyfiiJSuc08TwEIQ="}}
diff --git a/resources/_gen/assets/scss/scss/anatole.rtl.scss_97af51e696731e38130ed73ef4f4756e.content b/resources/_gen/assets/scss/scss/anatole.rtl.scss_97af51e696731e38130ed73ef4f4756e.content
diff --git a/resources/_gen/assets/scss/scss/anatole.rtl.scss_97af51e696731e38130ed73ef4f4756e.json b/resources/_gen/assets/scss/scss/anatole.rtl.scss_97af51e696731e38130ed73ef4f4756e.json
@@ -1 +1 @@
-{"Target":"scss/main.rtl.min.a5eecfb30c244001796ebc324fb94c5c70ec99f77efddd26487bb075c44eb931.css","MediaType":"text/css","Data":{"Integrity":"sha256-pe7PswwkQAF5brwyT7lMXHDsmfd+/d0mSHuwdcROuTE="}}
+{"Target":"scss/main.rtl.min.2729eba917180e5aafe266bae3afdc453fae08a509853c392ea0d0a086d98424.css","MediaType":"text/css","Data":{"Integrity":"sha256-JynrqRcYDlqv4ma646/cRT+uCKUJhTw5LqDQoIbZhCQ="}}
diff --git a/resources/_gen/assets/scss/scss/anatole.scss_6dd5ee34d337299a377a4ab7b84829ac.content b/resources/_gen/assets/scss/scss/anatole.scss_6dd5ee34d337299a377a4ab7b84829ac.content
diff --git a/resources/_gen/assets/scss/scss/anatole.scss_6dd5ee34d337299a377a4ab7b84829ac.json b/resources/_gen/assets/scss/scss/anatole.scss_6dd5ee34d337299a377a4ab7b84829ac.json
@@ -0,0 +1 @@
+{"Target":"scss/main.min.afcf7a74c48633d6afc6447bf52d6af2c1bbc24b0cb0ce6d834cc98f49bfba77.css","MediaType":"text/css","Data":{"Integrity":"sha256-r896dMSGM9avxkR79S1q8sG7wksMsM5tg0zJj0m/unc="}}
diff --git a/resources/_gen/assets/scss/scss/anatole.scss_dcc8b7002348ef29d44bd1c4b6ae0aca.content b/resources/_gen/assets/scss/scss/anatole.scss_dcc8b7002348ef29d44bd1c4b6ae0aca.content
diff --git a/resources/_gen/assets/scss/scss/anatole.scss_dcc8b7002348ef29d44bd1c4b6ae0aca.json b/resources/_gen/assets/scss/scss/anatole.scss_dcc8b7002348ef29d44bd1c4b6ae0aca.json
@@ -1 +1 @@
-{"Target":"scss/main.min.5794be192d21535bdd301561e043a96b6adbad2b5c08279deff459e4661c613f.css","MediaType":"text/css","Data":{"Integrity":"sha256-V5S+GS0hU1vdMBVh4EOpa2rbrStcCCed7/RZ5GYcYT8="}}
+{"Target":"scss/main.min.b8b237b391418778d0814b850b954825076f5ebbc0da1d1530c888e654ddcf4b.css","MediaType":"text/css","Data":{"Integrity":"sha256-uLI3s5FBh3jQgUuFC5VIJQdvXrvA2h0VMMiI5lTdz0s="}}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"Target":"scss/main.rtl.min.afb781d764f2b83b63ec6dd90788a35093c19a6a1ec9f8a2252b9cd3c4f01084.css","MediaType":"text/css","Data":{"Integrity":"sha256-r7eB12TyuDtj7G3ZB4ijUJPBmmoeyfiiJSuc08TwEIQ="}}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"Target":"scss/main.rtl.min.a5eecfb30c244001796ebc324fb94c5c70ec99f77efddd26487bb075c44eb931.css","MediaType":"text/css","Data":{"Integrity":"sha256-pe7PswwkQAF5brwyT7lMXHDsmfd+/d0mSHuwdcROuTE="}}
		{"Target":"scss/main.rtl.min.2729eba917180e5aafe266bae3afdc453fae08a509853c392ea0d0a086d98424.css","MediaType":"text/css","Data":{"Integrity":"sha256-JynrqRcYDlqv4ma646/cRT+uCKUJhTw5LqDQoIbZhCQ="}}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"Target":"scss/main.min.afcf7a74c48633d6afc6447bf52d6af2c1bbc24b0cb0ce6d834cc98f49bfba77.css","MediaType":"text/css","Data":{"Integrity":"sha256-r896dMSGM9avxkR79S1q8sG7wksMsM5tg0zJj0m/unc="}}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"Target":"scss/main.min.5794be192d21535bdd301561e043a96b6adbad2b5c08279deff459e4661c613f.css","MediaType":"text/css","Data":{"Integrity":"sha256-V5S+GS0hU1vdMBVh4EOpa2rbrStcCCed7/RZ5GYcYT8="}}
		{"Target":"scss/main.min.b8b237b391418778d0814b850b954825076f5ebbc0da1d1530c888e654ddcf4b.css","MediaType":"text/css","Data":{"Integrity":"sha256-uLI3s5FBh3jQgUuFC5VIJQdvXrvA2h0VMMiI5lTdz0s="}}