Merge pull request #13888 from Juvenv/novo_recurso

Remove inline styles from elements
phpmyadmin · Dec 27, 2017 · fbeb0ca · fbeb0ca
2 parents 73f88db + 3767d83
commit fbeb0ca
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 10 deletions.
diff --git a/js/functions.js b/js/functions.js
@@ -3517,9 +3517,9 @@ AJAX.registerOnload('functions.js', function () {
         var list_size = central_column_list[db + '_' + table].length;
         var min = (list_size <= maxRows) ? list_size : maxRows;
         for (i = 0; i < min; i++) {
-            fields += '<tr><td><div><span style="font-weight:bold">' +
+            fields += '<tr><td><div><span class="font_weight_bold">' +
                 escapeHtml(central_column_list[db + '_' + table][i].col_name) +
-                '</span><br><span style="color:gray">' + central_column_list[db + '_' + table][i].col_type;
+                '</span><br><span class="color_gray">' + central_column_list[db + '_' + table][i].col_type;
 
             if (central_column_list[db + '_' + table][i].col_attribute !== '') {
                 fields += '(' + escapeHtml(central_column_list[db + '_' + table][i].col_attribute) + ') ';
@@ -3530,7 +3530,7 @@ AJAX.registerOnload('functions.js', function () {
             fields += escapeHtml(central_column_list[db + '_' + table][i].col_extra) + '</span>' +
                 '</div></td>';
             if (pick) {
-                fields += '<td><input class="pick" style="width:100%" type="submit" value="' +
+                fields += '<td><input class="pick all100" type="submit" value="' +
                     PMA_messages.pickColumn + '" onclick="autoPopulate(\'' + colid + '\',' + i + ')"/></td>';
             }
             fields += '</tr>';
@@ -3579,9 +3579,9 @@ AJAX.registerOnload('functions.js', function () {
                     fields = '';
                     min = (list_size <= maxRows + result_pointer) ? list_size : maxRows + result_pointer;
                     for (i = result_pointer; i < min; i++) {
-                        fields += '<tr><td><div><span style="font-weight:bold">' +
+                        fields += '<tr><td><div><span class="font_weight_bold">' +
                             central_column_list[db + '_' + table][i].col_name +
-                            '</span><br><span style="color:gray">' +
+                            '</span><br><span class="color_gray">' +
                             central_column_list[db + '_' + table][i].col_type;
 
                         if (central_column_list[db + '_' + table][i].col_attribute !== '') {
@@ -3593,7 +3593,7 @@ AJAX.registerOnload('functions.js', function () {
                         fields += central_column_list[db + '_' + table][i].col_extra + '</span>' +
                             '</div></td>';
                         if (pick) {
-                            fields += '<td><input class="pick" style="width:100%" type="submit" value="' +
+                            fields += '<td><input class="pick all100" type="submit" value="' +
                                 PMA_messages.pickColumn + '" onclick="autoPopulate(\'' + colid + '\',' + i + ')"/></td>';
                         }
                         fields += '</tr>';
@@ -4249,7 +4249,7 @@ function PMA_slidingMessage (msg, $obj) {
         if ($('#PMA_slidingMessage').length === 0) {
             $('#page_content').prepend(
                 '<span id="PMA_slidingMessage" ' +
-                'style="display: inline-block;"></span>'
+                'class="pma_sliding_message"></span>'
             );
         }
         $obj = $('#PMA_slidingMessage');

diff --git a/js/messages.php b/js/messages.php
@@ -697,10 +697,10 @@ function () {
     . '<div>'
     . '<input id="pma_ignore_errors_popup" type="submit" value="'
     . __('Ignore')
-    . '" class="floatright" style="margin-top: 20px;">'
+    . '" class="floatright message_errors_found">'
     . '<input id="pma_ignore_all_errors_popup" type="submit" value="'
     . __('Ignore All')
-    . '" class="floatright" style="margin-top: 20px;">'
+    . '" class="floatright message_errors_found">'
     . '</div></div>';
 
 $js_messages['phpErrorsBeingSubmitted'] = '<div class="error">'

diff --git a/js/rte.js b/js/rte.js
@@ -169,7 +169,7 @@ RTE.COMMON = {
                 /**
                  * Display the dialog to the user
                  */
-                data.message = '<textarea cols="40" rows="15" style="width: 100%;">' + data.message + '</textarea>';
+                data.message = '<textarea cols="40" rows="15" class="all100">' + data.message + '</textarea>';
                 var $ajaxDialog = $('<div>' + data.message + '</div>').dialog({
                     width: 500,
                     buttons: button_options,

diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
@@ -636,6 +636,22 @@
     max-width:50%
 }
 
+.message_errors_found{
+    margin-top: 20px;
+}
+
+.font_weight_bold{
+    font-weight: bold;
+}
+
+.color_gray{
+    color: gray;
+}
+
+.pma_sliding_message{
+    display: inline-block;
+}
+
 /******************************************************************************/
 /* specific elements */
 

diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
@@ -917,6 +917,22 @@
     max-width:50%
 }
 
+.message_errors_found{
+    margin-top: 20px;
+}
+
+.font_weight_bold{
+    font-weight: bold;
+}
+
+.color_gray{
+    color: gray;
+}
+
+.pma_sliding_message{
+    display: inline-block;
+}
+
 /******************************************************************************/
 /* specific elements */