zz-shopify-components 0.35.1-beta.5 → 0.35.1-beta.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -102,6 +102,14 @@
102
102
  ],
103
103
  "default": "left"
104
104
  },
105
+ {
106
+ "type": "checkbox",
107
+ "id": "separate_display",
108
+ "label": "区分显示pc还是mb",
109
+ "default": false,
110
+ "info": "区分显示pc还是mb, true时 没有配置PC与mb将不会显示。不会使用PC的配置来配置mb"
111
+
112
+ },
105
113
  {
106
114
  "type": "select",
107
115
  "id": "animation",
@@ -182,7 +190,8 @@
182
190
  mobile_font_size: block.settings.mobile_font_size,
183
191
  pc_text_align: block.settings.pc_text_align,
184
192
  mobile_text_align: block.settings.mobile_text_align,
185
- class_name: block.settings.animation
193
+ class_name: block.settings.animation,
194
+ separate_display: block.settings.separate_display,
186
195
  %}
187
196
 
188
197
  {% if block.settings.use_margin %}
@@ -153,6 +153,14 @@
153
153
  "default": false,
154
154
  "info": "Blod 高亮文字是否加粗"
155
155
 
156
+ },
157
+ {
158
+ "type": "checkbox",
159
+ "id": "separate_display",
160
+ "label": "区分显示pc还是mb",
161
+ "default": false,
162
+ "info": "区分显示pc还是mb, true时 没有配置PC与mb将不会显示。不会使用PC的配置来配置mb"
163
+
156
164
  },
157
165
 
158
166
  {
@@ -221,6 +229,7 @@
221
229
  mobile_text_align: block.settings.mobile_text_align,
222
230
  pc_font_line_height: block.settings.pc_font_line_height,
223
231
  mobile_font_line_height: block.settings.mobile_font_line_height,
232
+ separate_display: block.settings.separate_display,
224
233
  %}
225
234
 
226
235
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zz-shopify-components",
3
- "version": "0.35.1-beta.5",
3
+ "version": "0.35.1-beta.6",
4
4
  "description": "Reusable Shopify components for theme projects",
5
5
  "keywords": [
6
6
  "shopify",
@@ -10,7 +10,13 @@
10
10
  pc_text_align: pc端对齐方式
11
11
  font_weight: 字体粗细
12
12
  mobile_text_align: 移动端对齐方式
13
+ separate_display: 区分显示pc还是mb, true时 没有配置PC与mb将不会显示。不会使用PC的配置来配置mb
13
14
  {% endcomment %}
15
+ {% if separate_display == true %}
16
+ {% assign separate_display = true %}
17
+ {% else %}
18
+ {% assign separate_display = false %}
19
+ {% endif %}
14
20
 
15
21
  {% if text != blank %}
16
22
  <div class="content-text content-text-pc max-lg:tw-hidden tw-text-[#170B01B2] tw-text-[16px] tw-leading-[1.5] tw-text-left {{ class_name }} "
@@ -23,7 +29,11 @@
23
29
  </div>
24
30
  {% endif %}
25
31
 
26
- {% if mb_text != blank %}
32
+ {% assign mobile_text = mb_text %}
33
+ {% if mb_text == blank and separate_display == false %}
34
+ {% assign mobile_text = text %}
35
+ {% endif %}
36
+ {% if mobile_text != blank %}
27
37
  <div
28
38
  class="content-text content-text-mobile lg:tw-hidden tw-text-[#170B01B2] tw-text-[1.4rem] tw-leading-[1.5] tw-text-left {{ class_name }}"
29
39
  style="color: {{ text_color }};font-weight: {{ font_weight }};
@@ -31,7 +41,7 @@
31
41
  text-align: {{ mobile_text_align }};
32
42
  {% if mobile_font_line_height %}line-height: {{ mobile_font_line_height }};{% endif %}"
33
43
  >
34
- {{ mb_text | default: text }}
44
+ {{ mobile_text | default: text }}
35
45
  </div>
36
46
  {% endif %}
37
47