Parcourir la source

https://github.com/openNAMU/openNAMU/issues/1764

잉여개발기 (SPDV) il y a 3 ans
Parent
commit
2e4ca7b943
2 fichiers modifiés avec 8 ajouts et 3 suppressions
  1. 7 2
      route/tool/func_render_namumark.py
  2. 1 1
      version.json

+ 7 - 2
route/tool/func_render_namumark.py

@@ -690,6 +690,7 @@ class class_do_render_namumark:
                     file_align = ''
                     file_bgcolor = ''
                     file_turn = ''
+                    file_radius = ''
 
                     file_split_regex = r'(?:^|&) *((?:(?!&).)+)'
                     file_split_sub_regex = r'(^[^=]+) *= *([^=]+)'
@@ -713,6 +714,8 @@ class class_do_render_namumark:
                                         file_turn = 'dark'
                                     elif data_sub[1] == 'light':
                                         file_turn = 'light'
+                                elif data_sub[0] == 'border-radius':
+                                    file_radius = self.get_tool_px_add_check(data_sub[1])
 
                     link_main_org = ''
                     link_sub = link_main
@@ -770,12 +773,14 @@ class class_do_render_namumark:
                     if file_bgcolor != '':
                         file_bgcolor = 'background:' + self.get_tool_css_safe(file_bgcolor) + ';'
 
+                    if file_radius != '':
+                        file_radius = 'border-radius:' + self.get_tool_css_safe(file_radius) + ';'
 
                     image_set = get_main_skin_set(self.curs, self.flask_session, 'main_css_image_set', self.ip)
                     if image_set == 'new_click' or image_set == 'click':
-                        file_end = '<img style="' + file_width + file_height + file_align_style + file_bgcolor + '" id="opennamu_image_' + str(image_count) + '" alt="' + link_sub + '" src="">'
+                        file_end = '<img style="' + file_width + file_height + file_align_style + file_bgcolor + file_radius + '" id="opennamu_image_' + str(image_count) + '" alt="' + link_sub + '" src="">'
                     else:
-                        file_end = '<img style="' + file_width + file_height + file_align_style + file_bgcolor + '" alt="' + link_sub + '" src="' + link_main + '">'
+                        file_end = '<img style="' + file_width + file_height + file_align_style + file_bgcolor + file_radius + '" alt="' + link_sub + '" src="' + link_main + '">'
 
                     if file_align == 'center':
                         file_end = '<div style="text-align:center;">' + file_end + '</div>'

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.6-RC3-dev162",
+        "r_ver" : "v3.4.6-RC3-dev163",
         "c_ver" : "3500361",
         "s_ver" : "3500111"
     }