Skip to content

Commit 084179d

Browse files
author
shin
committed
Merge branch 'develop'
2 parents 952a2ca + 85ac9f5 commit 084179d

20 files changed

Lines changed: 10669 additions & 5706 deletions

‎dashboard/dashboard.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ function execute_live_search() {
374374
if ( 'true' === $full_content ) {
375375
$output .= sprintf(
376376
'<li class="tm_dashboard_no_res">%1$s</li>',
377-
esc_html__( 'No results found', 'bloom' )
377+
esc_html__( 'No results found', 'tm_builder' )
378378
);
379379
}
380380
} else {

‎dashboard/includes/options.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
//Array of all sections. All sections will be added into sidebar navigation except for the 'header' section.
88
$all_sections = array(
99
'newsletter' => array(
10-
'title' => esc_html__( 'Newsletter Settings', 'tm_builder_plugin' ),
10+
'title' => esc_html__( 'Newsletter Settings', 'tm_builder' ),
1111
'contents' => array(
12-
'main' => esc_html__( 'Main', 'bloom' ),
12+
'main' => esc_html__( 'Main', 'tm_builder' ),
1313
),
1414
),
1515
);
@@ -35,7 +35,7 @@
3535

3636
'newsletter_title' => array(
3737
'type' => 'main_title',
38-
'title' => esc_html__( 'Newsletter Settings', 'tm_builder_plugin' ),
38+
'title' => esc_html__( 'Newsletter Settings', 'tm_builder' ),
3939
),
4040

4141
'end_of_section' => array(

‎framework/admin/assets/css/min/style.min.css‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎framework/admin/assets/css/style.css‎

Lines changed: 3898 additions & 4 deletions
Large diffs are not rendered by default.

‎framework/admin/assets/scss/_option-container.scss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@
7979
border-radius: 0;
8080
background-color: $form_control_color;
8181
padding: 7px;
82+
& .wp-picker-holder{
83+
position: absolute;
84+
}
8285
&.wp-picker-active{
8386
.wp-picker-input-wrap{
8487
margin-top: 5px;

‎framework/assets/css/style.css‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1819,6 +1819,7 @@
18191819
width: 100%;
18201820
padding-bottom: 30px;
18211821
text-align: center;
1822+
position: relative;
18221823
margin: 30px -1px 0 0; }
18231824
@media (min-width: 768px) {
18241825
#tm_builder_outer_content .tm_pb_pricing_table {
@@ -1877,6 +1878,35 @@
18771878
color: #999;
18781879
font-size: 16px; }
18791880

1881+
#tm_builder_outer_content .tm_pb_sticker_inner {
1882+
position: relative; }
1883+
#tm_builder_outer_content .tm_pb_sticker_inner .tm-pb-icon {
1884+
line-height: 0; }
1885+
1886+
#tm_builder_outer_content .tm_pb_pricing_sticker {
1887+
position: absolute;
1888+
display: flex;
1889+
justify-content: center;
1890+
align-items: center;
1891+
width: 90px;
1892+
height: 90px;
1893+
padding: 20px;
1894+
margin-top: -45px;
1895+
border-radius: 50%;
1896+
background-size: cover;
1897+
background-repeat: no-repeat;
1898+
background-position: 50%; }
1899+
#tm_builder_outer_content .tm_pb_pricing_sticker.sticker-top-right {
1900+
top: 0;
1901+
right: 0; }
1902+
#tm_builder_outer_content .tm_pb_pricing_sticker.sticker-top-center {
1903+
top: 0;
1904+
left: 50%;
1905+
margin-left: -45px; }
1906+
#tm_builder_outer_content .tm_pb_pricing_sticker.sticker-top-left {
1907+
top: 0;
1908+
left: 0; }
1909+
18801910
#tm_builder_outer_content .tm_pb_dollar_sign {
18811911
font-size: 18px;
18821912
font-weight: 400;

‎framework/assets/scss/modules/_pricing-tables.scss‎

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
width: 100%;
1212
padding-bottom: 30px;
1313
text-align: center;
14+
position: relative;
1415
margin: 30px -1px 0 0;
1516
@include media-breakpoint-up(md) {
1617
width: 33.33%;
@@ -97,6 +98,43 @@
9798
font-size: 16px;
9899
}
99100

101+
.tm_pb_sticker_inner {
102+
position: relative;
103+
.tm-pb-icon {
104+
line-height: 0;
105+
}
106+
}
107+
108+
.tm_pb_pricing_sticker {
109+
position: absolute;
110+
display: flex;
111+
justify-content: center;
112+
align-items: center;
113+
width: 90px;
114+
height: 90px;
115+
padding: 20px;
116+
margin-top: -45px;
117+
border-radius: 50%;
118+
background-size: cover;
119+
background-repeat: no-repeat;
120+
background-position: 50%;
121+
&.sticker-top-right {
122+
top: 0;
123+
right: 0;
124+
}
125+
126+
&.sticker-top-center {
127+
top: 0;
128+
left: 50%;
129+
margin-left: -45px;
130+
}
131+
132+
&.sticker-top-left {
133+
top: 0;
134+
left: 0;
135+
}
136+
}
137+
100138
.tm_pb_dollar_sign {
101139
font-size: 18px;
102140
font-weight: 400;
@@ -163,4 +201,4 @@
163201
.tm_pb_pricing_table_button {
164202
display: inline-block;
165203
}
166-
}
204+
}

‎framework/functions.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ function tm_builder_accent_color( $default_color = '#7EBEC5' ) {
433433
endif;
434434

435435
if ( ! function_exists( 'tm_builder_secondary_color' ) ) :
436-
function tm_builder_secondary_color( $default_color = '#7EBEC5' ) {
436+
function tm_builder_secondary_color( $default_color = '#FFFFFF' ) {
437437
$accent_color = tm_get_option( 'regular_accent_color_2', $default_color );
438438
return apply_filters( 'tm_builder_secondary_color', $accent_color );
439439
}

‎framework/includes/class-builder-element.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1543,7 +1543,7 @@ function render_field( $field ) {
15431543
$field_el = sprintf(
15441544
'<div id="%1$s"><%%= typeof( %2$s ) !== \'undefined\' ? %2$s : \'\' %%></div>',
15451545
esc_attr( $main_content_field_name ),
1546-
esc_html( $main_content_property_name )
1546+
$main_content_property_name
15471547
);
15481548

15491549
break;

‎framework/includes/class-global-settings.php‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ private static function set_values() {
8585
'tm_pb_pricing_tables-price_line_height' => '82px',
8686
'tm_pb_pricing_tables-body_line_height' => '24px',
8787

88+
'tm_pb_pricing_tables-sticker_font_size' => '22px',
89+
'tm_pb_pricing_tables-sticker_line_height' => '1.7em',
90+
'tm_pb_pricing_tables-sticker_letter_spacing' => '0',
91+
8892
'tm_pb_fullwidth_post_title-title_font_size' => '26px',
8993
'tm_pb_fullwidth_post_title-title_line_height' => '1em',
9094
'tm_pb_fullwidth_post_title-title_letter_spacing' => $font_defaults['letter_spacing'],
@@ -145,6 +149,11 @@ private static function set_values() {
145149
'tm_pb_pricing_table-price_line_height' => '82px',
146150
'tm_pb_pricing_table-body_line_height' => '24px',
147151
'tm_pb_audio-title_font_size' => '26',
152+
153+
'tm_pb_pricing_table-sticker_font_size' => '22px',
154+
'tm_pb_pricing_table-sticker_line_height' => '1.7em',
155+
'tm_pb_pricing_table-sticker_letter_spacing' => '0',
156+
148157
'tm_pb_audio-title_letter_spacing' => $font_defaults['letter_spacing'],
149158
'tm_pb_audio-title_line_height' => $font_defaults['line_height'],
150159
'tm_pb_audio-title_font_style' => '',
@@ -420,4 +429,4 @@ public static function get_checkbox_value( $name, $get_value = 'actual', $source
420429
}
421430

422431
function tm_builder_init_global_settings() { TM_Global_Settings::init();
423-
}
432+
}

0 commit comments

Comments
 (0)