瀏覽代碼

fixed responsive header tools before mobile (hamburgermenu) mode)

bach 3 年之前
父節點
當前提交
38b8321d50

文件差異過大導致無法顯示
+ 40 - 2
web/themes/custom/materiotheme/assets/dist/main.css


文件差異過大導致無法顯示
+ 0 - 1
web/themes/custom/materiotheme/assets/dist/main.js


+ 3 - 3
web/themes/custom/materiotheme/assets/styles/base/_layout.scss

@@ -49,9 +49,9 @@ body.toolbar-horizontal.toolbar-themes.toolbar-no-tabs{
 //   }
 // }
 
-@mixin col-mediaquery-min-max($i) {
-  $bp: ($column_width + $column_goutiere) * $i + 1px;
-  $upbp: ($column_width + $column_goutiere) * ($i + 1);
+@mixin col-mediaquery-min-max($min, $max) {
+  $bp: ($column_width + $column_goutiere) * $min + 1px;
+  $upbp: ($column_width + $column_goutiere) * ($max);
   @media (min-width: $bp) and (max-width: $upbp) {
     @content;
   }

+ 9 - 9
web/themes/custom/materiotheme/assets/styles/main.scss

@@ -215,9 +215,9 @@ header[role="banner"]{
       @extend %header-fs;
       cursor: pointer;
       span{
-        // @include col-mediaquery-max(5){
-        //   display:none;
-        // }
+        @include col-mediaquery-min-max(3,5){
+          display:none;
+        }
       }
     }
     .mdi-logout::before {
@@ -238,9 +238,9 @@ header[role="banner"]{
       cursor: pointer;
       &:before{padding-right: 0.2em;}
       span{
-        // @include col-mediaquery-max(5){
-        //   display:none;
-        // }
+        @include col-mediaquery-min-max(3,5){
+          display:none;
+        }
       }
     }
     ul{
@@ -355,8 +355,8 @@ header[role="banner"]{
 
   // menu
   #block-header{
-    margin-right: 1em;
-    padding-left: 1em;
+    margin-right: 0.5em;
+    padding-left: 0.5em;
     border-left: 1px solid #000;
 		#block-header-menu{
       display:none;
@@ -378,7 +378,7 @@ header[role="banner"]{
         li{
           display: inline-block;
           &:not(:first-of-type){
-            margin-left: 0.5em;
+            margin-left: 0.3em;
           }
         }
       }

+ 1 - 1
web/themes/custom/materiotheme/vuejs/api/rest-axios.js

@@ -6,7 +6,7 @@ import axios from 'axios'
 // console.log('window.location.origin', window.location.origin)
 
 export const REST = axios.create({
-  baseURL: '//' + window.location.host,
+  baseURL: window.location.origin + '/' + drupalSettings.path.pathPrefix,
   withCredentials: true,
   headers: {
     // Authorization: 'Bearer {token}',

+ 1 - 1
web/themes/custom/materiotheme/vuejs/components/User/UserTools.vue

@@ -56,7 +56,7 @@ export default {
 
 <style lang="css" scoped>
 #user-tools{
-  margin-right:0.5em;
+  margin-right:0.2em;
   /* padding-right:0.5em; */
   /* border-right:1px solid #222; */
 }

部分文件因文件數量過多而無法顯示