Jelajahi Sumber

Ticket #2169 - Back to 16px = 1rem and related changes.

AntonLV 7 tahun lalu
induk
melakukan
6c193478b2

+ 2 - 2
modules/boonex/decorous/install/sql/install.sql

@@ -416,7 +416,7 @@ INSERT INTO `sys_options_categories`(`type_id`, `name`, `caption`, `order`) VALU
 SET @iCategoryId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `extra`, `check`, `check_error`, `order`) VALUES
-(@iCategoryId, CONCAT(@sName, '_vpt_font_size_scale'), '_bx_decorous_stg_cpt_option_vpt_font_size_scale', '93.75%', 'digit', '', '', '', 1);
+(@iCategoryId, CONCAT(@sName, '_vpt_font_size_scale'), '_bx_decorous_stg_cpt_option_vpt_font_size_scale', '100%', 'digit', '', '', '', 1);
 
 -- SETTINGS: Decorous template Viewport Mobile
 INSERT INTO `sys_options_categories`(`type_id`, `name`, `caption`, `order`) VALUES 
@@ -424,7 +424,7 @@ INSERT INTO `sys_options_categories`(`type_id`, `name`, `caption`, `order`) VALU
 SET @iCategoryId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `extra`, `check`, `check_error`, `order`) VALUES
-(@iCategoryId, CONCAT(@sName, '_vpm_font_size_scale'), '_bx_decorous_stg_cpt_option_vpm_font_size_scale', '85%', 'digit', '', '', '', 1);
+(@iCategoryId, CONCAT(@sName, '_vpm_font_size_scale'), '_bx_decorous_stg_cpt_option_vpm_font_size_scale', '87.5%', 'digit', '', '', '', 1);
 
 
 -- STUDIO PAGE & WIDGET

+ 0 - 8
modules/boonex/lucid/data/template/system/scripts/BxTemplConfig.php

@@ -20,14 +20,6 @@ class BxTemplConfig extends BxBaseConfig
 
         //--- Defaults
         $this->_aConfig['aLessConfig'] = array_merge($this->_aConfig['aLessConfig'], array(
-            'bx-margin' => '16px',
-            'bx-margin-sec' => '8px',
-            'bx-margin-thd' => '4px',
-
-            'bx-padding' => '16px',
-            'bx-padding-sec' => '8px',
-            'bx-padding-thd' => '4px',
-
             'bx-size-thumb' => '32px'
         ));
 

+ 4 - 4
modules/boonex/lucid/install/sql/install.sql

@@ -495,7 +495,7 @@ INSERT INTO `sys_options_categories`(`type_id`, `name`, `caption`, `order`) VALU
 SET @iCategoryId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `extra`, `check`, `check_error`, `order`) VALUES
-(@iCategoryId, CONCAT(@sName, '_vpt_font_size_scale'), '_bx_lucid_stg_cpt_option_vpt_font_size_scale', '93.75%', 'digit', '', '', '', 1);
+(@iCategoryId, CONCAT(@sName, '_vpt_font_size_scale'), '_bx_lucid_stg_cpt_option_vpt_font_size_scale', '100%', 'digit', '', '', '', 1);
 
 -- SETTINGS: Lucid template Viewport Mobile
 INSERT INTO `sys_options_categories`(`type_id`, `name`, `caption`, `order`) VALUES 
@@ -503,7 +503,7 @@ INSERT INTO `sys_options_categories`(`type_id`, `name`, `caption`, `order`) VALU
 SET @iCategoryId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `extra`, `check`, `check_error`, `order`) VALUES
-(@iCategoryId, CONCAT(@sName, '_vpm_font_size_scale'), '_bx_lucid_stg_cpt_option_vpm_font_size_scale', '85%', 'digit', '', '', '', 1);
+(@iCategoryId, CONCAT(@sName, '_vpm_font_size_scale'), '_bx_lucid_stg_cpt_option_vpm_font_size_scale', '87.5%', 'digit', '', '', '', 1);
 
 
 -- MIXES
@@ -694,9 +694,9 @@ INSERT INTO `sys_options_mixes2options` (`option`, `mix_id`, `value`) VALUES
 ('bx_lucid_card_content_padding', @iMixId, '1rem'),
 ('bx_lucid_popup_bg_color', @iMixId, 'rgba(255, 255, 255, 1)'),
 ('bx_lucid_card_shadow', @iMixId, '0px 2px 6px 0px rgba(0, 0, 0, 0.05)'),
-('bx_lucid_vpt_font_size_scale', @iMixId, '93.75%'),
+('bx_lucid_vpt_font_size_scale', @iMixId, '100%'),
 ('bx_lucid_card_border_radius', @iMixId, '8px'),
-('bx_lucid_vpm_font_size_scale', @iMixId, '85%'),
+('bx_lucid_vpm_font_size_scale', @iMixId, '87.5%'),
 ('bx_lucid_card_border_size', @iMixId, '1px'),
 ('bx_lucid_card_border_color', @iMixId, 'rgba(20, 80, 100, 0.1)'),
 ('bx_lucid_styles_custom', @iMixId, 'div.bx-market-unit-cover div.bx-base-text-unit-no-thumb {\r\n border-width: 0px;\r\n}'),

+ 0 - 11
modules/boonex/protean/data/template/system/scripts/BxTemplConfig.php

@@ -18,17 +18,6 @@ class BxTemplConfig extends BxBaseConfig
         $sName = 'bx_protean';
         $this->_isModule = BxDolModuleQuery::getInstance()->isModuleByName($sName);
 
-        //--- Defaults
-        $this->_aConfig['aLessConfig'] = array_merge($this->_aConfig['aLessConfig'], array(
-            'bx-margin' => '20px',
-            'bx-margin-sec' => '10px',
-            'bx-margin-thd' => '5px',
-
-            'bx-padding' => '20px',
-            'bx-padding-sec' => '10px',
-            'bx-padding-thd' => '5px'
-        ));
-
         //--- Images
         $oStorage = BxDolStorage::getObjectInstance('sys_images_custom');
 

+ 8 - 8
modules/boonex/protean/install/sql/install.sql

@@ -393,7 +393,7 @@ INSERT INTO `sys_options_categories`(`type_id`, `name`, `caption`, `order`) VALU
 SET @iCategoryId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `extra`, `check`, `check_error`, `order`) VALUES
-(@iCategoryId, CONCAT(@sName, '_vpt_font_size_scale'), '_bx_protean_stg_cpt_option_vpt_font_size_scale', '93.75%', 'digit', '', '', '', 1);
+(@iCategoryId, CONCAT(@sName, '_vpt_font_size_scale'), '_bx_protean_stg_cpt_option_vpt_font_size_scale', '100%', 'digit', '', '', '', 1);
 
 -- SETTINGS: Protean template Viewport Mobile
 INSERT INTO `sys_options_categories`(`type_id`, `name`, `caption`, `order`) VALUES 
@@ -401,7 +401,7 @@ INSERT INTO `sys_options_categories`(`type_id`, `name`, `caption`, `order`) VALU
 SET @iCategoryId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `extra`, `check`, `check_error`, `order`) VALUES
-(@iCategoryId, CONCAT(@sName, '_vpm_font_size_scale'), '_bx_protean_stg_cpt_option_vpm_font_size_scale', '85%', 'digit', '', '', '', 1);
+(@iCategoryId, CONCAT(@sName, '_vpm_font_size_scale'), '_bx_protean_stg_cpt_option_vpm_font_size_scale', '87.5%', 'digit', '', '', '', 1);
 
 
 -- MIXES
@@ -525,8 +525,8 @@ INSERT INTO `sys_options_mixes2options` (`option`, `mix_id`, `value`) VALUES
 ('bx_protean_font_size_h3', @iMixId, '20px'),
 ('bx_protean_font_color_grayed', @iMixId, 'rgba(40, 60, 80, 0.5)'),
 ('bx_protean_font_color_contrasted', @iMixId, 'rgba(255, 255, 255, 1)'),
-('bx_protean_vpt_font_size_scale', @iMixId, '93.75%'),
-('bx_protean_vpm_font_size_scale', @iMixId, '85%'),
+('bx_protean_vpt_font_size_scale', @iMixId, '100%'),
+('bx_protean_vpm_font_size_scale', @iMixId, '87.5%'),
 ('bx_protean_header_bg_image_repeat', @iMixId, 'no-repeat'),
 ('bx_protean_header_bg_image_size', @iMixId, 'cover'),
 ('bx_protean_footer_bg_image_repeat', @iMixId, 'no-repeat'),
@@ -875,8 +875,8 @@ INSERT INTO `sys_options_mixes2options` (`option`, `mix_id`, `value`) VALUES
 ('bx_protean_site_logo_height', @iMixId, '48'),
 ('bx_protean_site_logo_width', @iMixId, '240'),
 ('bx_protean_styles_custom', @iMixId, 'div.bx-base-pofile-cover {\r\nborder: 1px solid rgba(136, 153, 170, 0.3);\r\nborder-bottom-width: 0;\r\n}\r\n\r\n\r\ndiv.bx-market-unit-cover div.bx-base-text-unit-no-thumb {\r\nborder-width: 0px;\r\n}\r\n\r\n\r\n.bx-def-font {\r\nline-height:18px;\r\nline-height:1.2rem;\r\n}\r\nh1,\r\n.bx-def-font-h1 {\r\nline-height:36px;\r\nline-height:2.4rem;\r\n}\r\nh2,\r\n.bx-def-font-h2 {\r\nline-height:29px;\r\nline-height:1.92rem;\r\n}\r\nh3,\r\n.bx-def-font-h3 {\r\nline-height:22px;\r\nline-height:1.44rem;\r\n}\r\n'),
-('bx_protean_vpm_font_size_scale', @iMixId, '85%'),
-('bx_protean_vpt_font_size_scale', @iMixId, '93.75%');
+('bx_protean_vpm_font_size_scale', @iMixId, '87.5%'),
+('bx_protean_vpt_font_size_scale', @iMixId, '100%');
 
 
 -- Dark Mix
@@ -1127,8 +1127,8 @@ INSERT INTO `sys_options_mixes2options` (`option`, `mix_id`, `value`) VALUES
 ('bx_protean_site_logo_height', @iMixId, '48'),
 ('bx_protean_site_logo_width', @iMixId, '240'),
 ('bx_protean_styles_custom', @iMixId, 'div.bx-base-pofile-cover {\r\nborder: 1px solid rgba(136, 153, 170, 0.3);\r\nborder-bottom-width: 0;\r\n}\r\n\r\n\r\ndiv.bx-market-unit-cover div.bx-base-text-unit-no-thumb {\r\nborder-width: 0px;\r\n}\r\n\r\n.sys-cpf-header,\r\n.sys-cpf-title,\r\n.sys-cpf-submenu-cnt ul li {\r\nborder-bottom-color: rgba(136, 153, 170, 0.3);\r\n}\r\n\r\n.sys-cpf-submenu-cnt ul li.bx-menu-inter-act {\r\nborder-bottom-color: rgb(17, 34, 51);\r\n}\r\n\r\n\r\n.bx-def-font {\r\nline-height:18px;\r\nline-height:1.2rem;\r\n}\r\nh1,\r\n.bx-def-font-h1 {\r\nline-height:36px;\r\nline-height:2.4rem;\r\n}\r\nh2,\r\n.bx-def-font-h2 {\r\nline-height:29px;\r\nline-height:1.92rem;\r\n}\r\nh3,\r\n.bx-def-font-h3 {\r\nline-height:22px;\r\nline-height:1.44rem;\r\n}\r\n\r\n.bx-def-label {\r\nbackground-color: rgba(245, 250, 255, 0.5);\r\n}\r\n.bx-def-label,\r\n.bx-def-label a,\r\n.bx-def-label .sys-icon {\r\ncolor: rgba(51, 68, 85, 1);\r\n}\r\n\r\n/*--- Informers ---*/\r\n.bx-informer-msg-info {\r\nbackground-color: rgba(60, 164, 85, 1.0);\r\n}\r\n.bx-informer-msg-alert {\r\nbackground-color: rgba(230, 115, 55, 1.0);\r\n}\r\n.bx-informer-msg-error {\r\nbackground-color: rgba(200, 64, 64, 1.0);\r\n}\r\n\r\n\r\n/*--- Menus ---*/\r\n.bx-menu-notif li.bx-menu-tab-active a, \r\n.bx-menu-verlit li.bx-menu-tab-active a, \r\n.bx-menu-ver li.bx-menu-tab-active a,\r\n.bx-menu-hor li.bx-menu-tab-active a {\r\ncolor: rgba(252, 253, 254, 1);\r\n}\r\n\r\n/*--- Forms ---*/\r\n.bx-form-value .bx-form-input-autotoken b {\r\ncolor: rgba(243, 244, 245, 1);\r\n}\r\n.bx-popup .dropzone {\r\nbackground-color: rgba(17, 34, 51, 1);\r\n}\r\n\r\n/*--- Timeline ---*/\r\ndiv.bx-tl-view-timeline div.bx-tl-items:before,\r\ndiv.bx-tl-view-timeline div.bx-tl-item-circle {\r\nbackground-color: rgba(51, 68, 85, 1);\r\n}\r\ndiv.bx-tl-il-embed {\r\npadding: 0.5rem;\r\nbackground-color: rgba(255, 255, 255, 0.8);\r\nborder-radius:  5px;\r\n}\r\n'),
-('bx_protean_vpm_font_size_scale', @iMixId, '85%'),
-('bx_protean_vpt_font_size_scale', @iMixId, '93.75%');
+('bx_protean_vpm_font_size_scale', @iMixId, '87.5%'),
+('bx_protean_vpt_font_size_scale', @iMixId, '100%');
 
 
 -- STUDIO PAGE & WIDGET

+ 1 - 1
template/css/media-desktop.css

@@ -1,6 +1,6 @@
 
 html.bx-media-desktop {
-    font-size:93.75%;
+    font-size:100%;
 }
 
 .bx-media-desktop .bx-def-media-desktop-hide {

+ 1 - 1
template/css/media-tablet.css

@@ -1,6 +1,6 @@
 
 html.bx-media-tablet {
-    font-size:93.75%;
+    font-size:100%;
 }
 
 .bx-media-tablet .bx-def-media-tablet-hide {

+ 6 - 6
template/scripts/BxBaseConfig.php

@@ -14,13 +14,13 @@ class BxBaseConfig extends BxDol implements iBxDolSingleton
         'aLessConfig' => array (
             'bx-page-width' => '1000px',
 
-            'bx-margin' => '20px',
-            'bx-margin-sec' => '10px',
-            'bx-margin-thd' => '5px',
+            'bx-margin' => '16px',
+            'bx-margin-sec' => '8px',
+            'bx-margin-thd' => '4px',
 
-            'bx-padding' => '20px',
-            'bx-padding-sec' => '10px',
-            'bx-padding-thd' => '5px',
+            'bx-padding' => '16px',
+            'bx-padding-sec' => '8px',
+            'bx-padding-thd' => '4px',
 
             'bx-font-family' => 'Helvetica, Arial, sans-serif',