Skip to content

Commit bb2958c

Browse files
kprovancekprovance
committed
Signed-off-by:KProvance <[email protected]>
1 parent e422002 commit bb2958c

File tree

8 files changed

+73
-17
lines changed

8 files changed

+73
-17
lines changed

‎README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ Send me an email at [email protected] so I can add you to our user sp
7878

7979
### Master ###
8080

81+
= 3.3.3.1 =
82+
* Modified: #1412 - Redesigned text label, placeholder fix.
83+
8184
= 3.3.2.10 =
8285
* Fixed: #1408 & #1357 - Typography subsets losing value after multiple saves on other panels.
8386

‎ReduxCore/assets/css/redux.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ReduxCore/framework.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class ReduxFramework {
6363
// ATTENTION DEVS
6464
// Please update the build number with each push, no matter how small.
6565
// This will make for easier support when we ask users what version they are using.
66-
public static $_version = '3.3.3';
66+
public static $_version = '3.3.3.1';
6767
public static $_dir;
6868
public static $_url;
6969
public static $_upload_dir;

‎ReduxCore/inc/fields/text/field_text.css

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,36 @@
11
.redux-container-text label {
2-
float: left;
3-
clear: left;
2+
/* float: left;
3+
clear: left;
4+
display: block;
5+
line-height: 28px;
6+
min-width: 7em !important;*/
47
display: block;
5-
line-height: 28px;
6-
min-width: 7em !important;
8+
position: relative;
9+
font-size: 12px !important;
10+
text-align: left;
11+
color: #999999;
12+
margin: 4px 0 2px 0 !important;
13+
cursor: default;
14+
top: 5px;
15+
width: 100px;
716
}
817
.redux-container-text input {
918
clear: left;
1019
}
20+
.redux-container-text .input_wrapper {
21+
display: block;
22+
position: relative;
23+
/*margin: 0 4px 0 5px;*/
24+
padding: 0;
25+
width: 23%;
26+
max-width: 23%;
27+
min-width: 70px;
28+
float: left;
29+
clear: left;
30+
height: 57px;
31+
-webkit-box-sizing: border-box;
32+
-moz-box-sizing: border-box;
33+
-o-box-sizing: border-box;
34+
box-sizing: border-box;
35+
vertical-align: baseline;
36+
}

‎ReduxCore/inc/fields/text/field_text.less

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,39 @@
11
.redux-container-text {
22
label {
3-
float: left;
3+
/* float: left;
44
clear: left;
55
display: block;
66
line-height: 28px;
7-
min-width: 7em !important;
8-
7+
min-width: 7em !important;*/
8+
display: block;
9+
position: relative;
10+
font-size: 12px !important;
11+
text-align: left;
12+
color: #999999;
13+
margin: 4px 0 2px 0 !important;
14+
cursor: default;
15+
top: 5px;
16+
width: 100px;
917
}
1018
input {
1119
clear: left;
1220
}
21+
22+
.input_wrapper {
23+
display: block;
24+
position: relative;
25+
/*margin: 0 4px 0 5px;*/
26+
padding: 0;
27+
width: 23%;
28+
max-width: 23%;
29+
min-width: 70px;
30+
float: left;
31+
clear: left;
32+
height: 57px;
33+
-webkit-box-sizing: border-box;
34+
-moz-box-sizing: border-box;
35+
-o-box-sizing: border-box;
36+
box-sizing: border-box;
37+
vertical-align: baseline;
38+
}
1339
}

‎ReduxCore/inc/fields/text/field_text.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ function __construct( $field = array(), $value = '', $parent ) {
2727
* @since ReduxFramework 1.0.0
2828
*/
2929
function render() {
30-
3130
if ( ! empty( $this->field['data'] ) && empty( $this->field['options'] ) ) {
3231
if ( empty( $this->field['args'] ) ) {
3332
$this->field['args'] = array();
@@ -41,8 +40,6 @@ function render() {
4140
$this->value = $this->field['options'];
4241
}
4342

44-
$placeholder = ( isset( $this->field['placeholder'] ) && ! is_array( $this->field['placeholder'] ) ) ? ' placeholder="' . esc_attr( $this->field['placeholder'] ) . '" ' : '';
45-
4643
//if (isset($this->field['text_hint']) && is_array($this->field['text_hint'])) {
4744
$qtip_title = isset( $this->field['text_hint']['title'] ) ? 'qtip-title="' . $this->field['text_hint']['title'] . '" ' : '';
4845
$qtip_text = isset( $this->field['text_hint']['content'] ) ? 'qtip-content="' . $this->field['text_hint']['content'] . '" ' : '';
@@ -51,17 +48,21 @@ function render() {
5148
$readonly = isset( $this->field['readonly'] ) ? ' readonly="readonly"' : '';
5249

5350
if ( isset( $this->field['options'] ) && ! empty( $this->field['options'] ) ) {
54-
$placeholder = ( isset( $this->field['placeholder'] ) && ! is_array( $this->field['placeholder'] ) ) ? ' placeholder="' . esc_attr( $this->field['placeholder'] ) . '" ' : '';
51+
//$placeholder = ( isset( $this->field['placeholder'] ) && is_array( $this->field['placeholder'] ) ) ? ' placeholder="' . esc_attr( $this->field['placeholder'] ) . '" ' : '';
52+
$placeholder = $this->field['placeholder'];
5553
foreach ( $this->field['options'] as $k => $v ) {
5654
if ( ! empty( $placeholder ) ) {
5755
$placeholder = ( is_array( $this->field['placeholder'] ) && isset( $this->field['placeholder'][ $k ] ) ) ? ' placeholder="' . esc_attr( $this->field['placeholder'][ $k ] ) . '" ' : '';
5856
}
59-
60-
echo '<label for="' . $this->field['id'] . '-text-' . $k . '"><strong>' . $v . '</strong></label> ';
57+
58+
echo '<div class="input_wrapper">';
59+
echo '<label for="' . $this->field['id'] . '-text-' . $k . '">' . $v . '</label> ';
6160
echo '<input ' . $qtip_title . $qtip_text . 'type="text" id="' . $this->field['id'] . '-text-' . $k . '" name="' . $this->field['name'] . '[' . $k . ']' . $this->field['name_suffix'] . '" ' . $placeholder . 'value="' . esc_attr( $this->value[ $k ] ) . '" class="regular-text ' . $this->field['class'] . '"' . $readonly . ' /><br />';
61+
echo '</div>';
6262
}
6363
//foreach
6464
} else {
65+
$placeholder = ( isset( $this->field['placeholder'] ) && ! is_array( $this->field['placeholder'] ) ) ? ' placeholder="' . esc_attr( $this->field['placeholder'] ) . '" ' : '';
6566
echo '<input ' . $qtip_title . $qtip_text . 'type="text" id="' . $this->field['id'] . '-text" name="' . $this->field['name'] . $this->field['name_suffix'] . '" ' . $placeholder . 'value="' . esc_attr( $this->value ) . '" class="regular-text ' . $this->field['class'] . '"' . $readonly . ' />';
6667
}
6768
}

‎class.redux-plugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class ReduxFrameworkPlugin {
2525
* @const string VERSION The plugin version, used for cache-busting and script file references
2626
* @since 3.0.0
2727
*/
28-
const VERSION = '3.3.2.10';
28+
const VERSION = '3.3.3.1';
2929

3030
/**
3131
* @access protected

‎redux-framework.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Description: Redux is a simple, truly extensible options framework for WordPress themes and plugins.
1313
* Author: Team Redux
1414
* Author URI: http://reduxframework.com
15-
* Version: 3.3.3
15+
* Version: 3.3.3.1
1616
* Text Domain: redux-framework
1717
* License: GPL3+
1818
* License URI: http://www.gnu.org/licenses/gpl-3.0.txt

0 commit comments

Comments
 (0)