Skip to content

Commit

Permalink
Merge pull request #2075 from rtCamp/pre-release
Browse files Browse the repository at this point in the history
Pre-release to Develop [ 23-09-2024 ]
  • Loading branch information
krishana7911 authored Sep 23, 2024
2 parents 11406b5 + ba898a2 commit 5bfff9a
Show file tree
Hide file tree
Showing 32 changed files with 214 additions and 98 deletions.
2 changes: 1 addition & 1 deletion app/admin/RTMediaAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -1444,7 +1444,7 @@ public function import_settings( $file_path ) {
wp_send_json( $response );
}

$settings_data = json_decode( $settings_data_json, true );
$settings_data = $settings_data_json;
if ( ! is_array( $settings_data ) || empty( $settings_data['rtm_key'] ) ) {
$response['rtm_response'] = 'error';
$response['rtm_response_msg'] = esc_html__( 'Invalid JSON Supplied!', 'buddypress-media' );
Expand Down
65 changes: 41 additions & 24 deletions app/assets/admin/css/admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@
-webkit-box-flex: 0;
-ms-flex: 0 0 auto;
flex: 0 0 auto;
padding-right: 0.5rem;
padding-left: 0.5rem;
padding-right: .5rem;
padding-left: .5rem;
width: 100%;
}

Expand Down Expand Up @@ -365,10 +365,10 @@
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
-webkit-transition: all .2s ease-in-out;
transition: all .2s ease-in-out;
margin: 5px 0;
border: 1px solid rgb(211, 211, 211);
border: 1px solid lightgray;
border-radius: 12px;
white-space: nowrap;
overflow: hidden;
Expand All @@ -377,15 +377,15 @@
.rtm-sidebar .button span.dashicons {
font-size: 25px;
margin-right: 15px;
-webkit-transition: all 0.3s ease-in-out;
transition: all 0.3s ease-in-out;
-webkit-transition: all .3s ease-in-out;
transition: all .3s ease-in-out;
}
.rtm-sidebar .button span.icon-message {
-webkit-transform: translateX(0px);
-ms-transform: translateX(0px);
transform: translateX(0px);
-webkit-transition: all 0.1s ease-in-out;
transition: all 0.1s ease-in-out;
-webkit-transition: all .1s ease-in-out;
transition: all .1s ease-in-out;
opacity: 1;
color: #303030;
}
Expand All @@ -404,7 +404,7 @@
background: -webkit-linear-gradient(left, #45b0e3 0%, #fff 100%);
background: linear-gradient(to right, #45b0e3 0%, #fff 100%);
box-shadow: 0px 10px 30px rgba(0, 0, 0, 0.1);
border: 1px solid rgb(211, 211, 211);
border: 1px solid lightgray;
}
.rtm-social-share .twitter:hover span.dashicons {
-webkit-transform: translateX(70px);
Expand All @@ -427,7 +427,7 @@
background: -webkit-linear-gradient(left, #3b5998 0%, #fff 100%);
background: linear-gradient(to right, #3b5998 0%, #fff 100%);
box-shadow: 0px 10px 30px rgba(0, 0, 0, 0.1);
border: 1px solid rgb(211, 211, 211);
border: 1px solid lightgray;
}
.rtm-social-share .facebook:hover span.dashicons {
-webkit-transform: translateX(70px);
Expand All @@ -450,7 +450,7 @@
background: -webkit-linear-gradient(left, #21759b 0%, #fff 100%);
background: linear-gradient(to right, #21759b 0%, #fff 100%);
box-shadow: 0px 10px 30px rgba(0, 0, 0, 0.1);
border: 1px solid rgb(211, 211, 211);
border: 1px solid lightgray;
}
.rtm-social-share .wordpress:hover span.dashicons {
-webkit-transform: translateX(70px);
Expand All @@ -473,7 +473,7 @@
background: -webkit-linear-gradient(left, #FF6600 0%, #fff 100%);
background: linear-gradient(to right, #FF6600 0%, #fff 100%);
box-shadow: 0px 10px 30px rgba(0, 0, 0, 0.1);
border: 1px solid rgb(211, 211, 211);
border: 1px solid lightgray;
}
.rtm-social-share .rss:hover span.dashicons {
-webkit-transform: translateX(70px);
Expand Down Expand Up @@ -622,7 +622,7 @@

.rtm-addon-license {
border: 1px solid #ddd;
margin: 0.5rem 0;
margin: .5rem 0;
background-color: #fff;
}
.rtm-addon-license .dashicons-privacy {
Expand Down Expand Up @@ -661,7 +661,7 @@ form.license-form {
padding: 0;
margin: 0;
}
form.license-form input[type=text] {
form.license-form input[type="text"] {
width: 40%;
height: 40px;
background-color: #f3f3f3 !important;
Expand All @@ -671,7 +671,7 @@ form.license-form input[type=text] {
margin-right: 10px;
background: transparent;
}
form.license-form input[type=submit] {
form.license-form input[type="submit"] {
margin: 10px 0 0;
}
form.license-form .button-secondary {
Expand Down Expand Up @@ -809,7 +809,7 @@ form.license-form .button-secondary:hover, form.license-form .button-secondary:f
}
.rtm-tabs .active:after {
background: #FFFFFF;
content: " ";
content: ' ';
height: 100%;
position: absolute;
right: -1px;
Expand Down Expand Up @@ -900,7 +900,7 @@ horizontal tab css
.switch-label:before, .switch-label:after {
position: absolute;
top: 50%;
margin-top: -0.5em;
margin-top: -.5em;
line-height: 1;
-webkit-transition: inherit;
transition: inherit;
Expand Down Expand Up @@ -941,7 +941,7 @@ input[type=checkbox]:checked ~ .switch-label:after {
transition: left 0.15s ease-out;
}
.switch-handle:before {
content: "";
content: '';
position: absolute;
top: 50%;
left: 50%;
Expand Down Expand Up @@ -1009,7 +1009,7 @@ input[type=checkbox]:checked ~ .switch-handle {
top: 100%;
left: 50%;
border: solid transparent;
content: " ";
content: ' ';
height: 0;
width: 0;
position: absolute;
Expand Down Expand Up @@ -1231,21 +1231,24 @@ ol.rtm-hire-points .dashicons {
line-height: 20px;
}

@media only screen and (min-width:1025px) {
@media only screen and (min-width: 1025px) {
.rtm-setting-container {
float: left;
width: 78.2%;
}

.rtm-sidebar {
float: right;
width: 20%;
}
.rtm-sidebar .postbox {
min-width: 0;
}

.rtm-field-wrap {
max-width: 92%;
}

.rtm-tip:after, .rtm-tip:before {
right: 100%;
top: 15px;
Expand All @@ -1268,12 +1271,13 @@ ol.rtm-hire-points .dashicons {
border-width: 7px;
margin-top: -7px;
}

.rtm-support-form .bp-media-input, .rtm-support-form .bp-media-textarea {
float: left;
width: 40%;
}
}
@media only screen and (min-width:641px) and (max-width:1024px) {
@media only screen and (min-width: 641px) and (max-width: 1024px) {
.rtm-sidebar {
width: 100%;
}
Expand All @@ -1299,7 +1303,7 @@ ol.rtm-hire-points .dashicons {
top: 100%;
left: 50%;
border: solid transparent;
content: " ";
content: ' ';
height: 0;
width: 0;
position: absolute;
Expand All @@ -1317,24 +1321,29 @@ ol.rtm-hire-points .dashicons {
border-width: 7px;
margin-left: -7px;
}

#rtmedia-custom-css-settings .form-table:last-child .rtm-field-wrap {
width: 100%;
}

.rtm-field-wrap input[type=text] {
max-width: 140px !important;
}

.theme-browser .theme:nth-child(2n+1) {
margin-right: 4%;
}

.rtmedia-settings-submit {
margin-bottom: 0 !important;
}

.upload_attachment {
width: 230px;
padding: 0 !important;
}
}
@media only screen and (min-width:641px) {
@media only screen and (min-width: 641px) {
.rtm-pro-feature-list li:nth-child(3n+1) {
clear: left;
}
Expand All @@ -1343,6 +1352,7 @@ ol.rtm-hire-points .dashicons {
.rtm-option-wrapper .form-table td {
display: table-cell;
}

.rtm-option-wrapper .form-table th {
display: table-cell;
}
Expand All @@ -1354,6 +1364,7 @@ ol.rtm-hire-points .dashicons {
.rtm-pro-feature-list li:nth-child(2n+1) {
clear: left;
}

.rtm-tabs {
width: 40px;
}
Expand All @@ -1374,13 +1385,15 @@ ol.rtm-hire-points .dashicons {
padding: 0 0 0 28px;
position: absolute;
}

.rtm-support-form label {
width: 100%;
margin-bottom: 5px;
}
.rtm-support-form .bp-media-input, .rtm-support-form .bp-media-textarea {
width: 70%;
}

.rtm-button-wrapper {
padding-left: 0;
}
Expand All @@ -1390,6 +1403,7 @@ ol.rtm-hire-points .dashicons {
display: inline-block;
float: none;
}

.rtm-theme-browser .rtm-themes .rtm-theme {
margin: 0 0 20px;
width: 100%;
Expand All @@ -1400,13 +1414,16 @@ ol.rtm-hire-points .dashicons {
padding-bottom: 15px;
width: 100%;
}

#rtmedia-types .form-table th,
#rtmedia-custom-css-settings .form-table th {
width: 100%;
}

.rtm-pro-feature-list li {
width: 100%;
}

.rtm-tip-top {
right: -115px;
}
Expand Down
8 changes: 7 additions & 1 deletion app/assets/admin/css/admin.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/assets/admin/css/admin.min.css

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion app/assets/admin/css/admin.min.css.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions app/assets/admin/css/rtm-upload-terms.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions app/assets/admin/css/rtm-upload-terms.min.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/assets/admin/css/widget.css
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
}
#rtmedia_dashboard_widget .rtm-meta-links li:after {
background: #ddd;
content: " ";
content: ' ';
height: 14px;
position: absolute;
right: -1px;
Expand Down
8 changes: 7 additions & 1 deletion app/assets/admin/css/widget.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/assets/admin/css/widget.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion app/assets/admin/css/widget.min.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions app/assets/css/rtm-upload-terms.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions app/assets/css/rtm-upload-terms.min.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5bfff9a

Please sign in to comment.