Skip to content

Commit 4be090f

Browse files
committed
MAGETWO-34984: Invert new admin styles scope
1 parent c9dbabe commit 4be090f

File tree

11 files changed

+22
-40
lines changed

11 files changed

+22
-40
lines changed

app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $numColumns = sizeof($block->getColumns());
1414
<?php if ($block->getCollection()): ?>
1515
<div class="dashboard-item-content">
1616
<?php if ($block->getCollection()->getSize()>0): ?>
17-
<table class="dashboard-data" id="<?php echo $block->getId() ?>_table">
17+
<table class="table dashboard-data" id="<?php echo $block->getId() ?>_table">
1818
<?php
1919
/* This part is commented to remove all <col> tags from the code. */
2020
/* foreach ($block->getColumns() as $_column): ?>

app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ protected function _prepareForm()
166166
}
167167

168168
$legend = $this->getShowLegend() ? __('Tax Rate Information') : '';
169-
$fieldset = $form->addFieldset('base_fieldset', ['legend' => $legend]);
169+
$fieldset = $form->addFieldset('base_fieldset', ['legend' => $legend, 'class' => 'form-inline']);
170170

171171
if (isset($formData['tax_calculation_rate_id']) && $formData['tax_calculation_rate_id'] > 0) {
172172
$fieldset->addField(

app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,8 @@ require([
194194

195195
var topMargin = $(this).closest('.ui-dialog').children('.ui-dialog-titlebar').outerHeight() + 30;
196196
$(this).closest('.ui-dialog').css('margin-top', topMargin);
197+
198+
$(this).addClass('admin__scope-old'); // ToDo UI: remove with old styles removal
197199
},
198200
close: function() {
199201
$(this).closest('.ui-dialog').removeClass('ui-dialog-active');

app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
<script id="translate-form-template" type="text/x-magento-template">
1818
<form id="<%- data.id %>">
1919
<% _.each(data.items, function(item, i) { %>
20-
<div class="magento_table_container"><table cellspacing="0">
20+
<div class="magento_table_container">
21+
<table cellspacing="0" class="table">
2122
<% _.each(item, function(value, index) { %>
2223
<tr>
2324
<th class="label" style="text-transform: capitalize;"><%- index %>:</th>

app/code/Magento/Translation/view/frontend/templates/translate_inline.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<form id="<%- data.id %>">
2020
<% _.each(data.items, function(item, i) { %>
2121
<div class="magento_table_container">
22-
<table cellspacing="0">
22+
<table cellspacing="0" class="table">
2323
<% _.each(item, function(value, index) { %>
2424
<tr>
2525
<th class="label" style="text-transform: capitalize;"><%- index %>:</th>

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_dashboard.less

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@
2727
padding-left: 0;
2828
}
2929
}
30-
th {
31-
border-top: 0;
30+
.table& {
31+
th {
32+
border-top: 0;
33+
}
3234
}
3335

3436
// Primary column

app/design/adminhtml/Magento/backend/Magento_Tax/web/css/source/module.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// */
55

66
.action-add.mselect-button-add {
7-
&:extend(button all);
7+
&:extend(.admin__scope-old button all);
88
}
99

1010
.block.mselect-list {

app/design/adminhtml/Magento/backend/web/css/source/_tabs.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@
5858
// Tabs content
5959
.ui-tabs-panel {
6060
border-top: 1px solid @color-gray68;
61-
margin-top: 1px;
61+
margin-top: -1px;
6262
padding: 2rem;
6363
}

app/design/adminhtml/Magento/backend/web/css/source/_tooltip-temp.less

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@
3434
text-align: center;
3535
color: #ffffff;
3636
background-color: #514943;
37-
.page-main-actions & {
38-
background-color: transparent;
39-
}
4037
}
4138
span {
4239
.visually-hidden();

app/design/adminhtml/Magento/backend/web/css/styles-migration.less

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,8 @@
1212
.ie9 #html-body[class][data-container="body"] .admin__scope:extend(.ie9 all) {}
1313
#html-body[class][data-container="body"].keyfocus:extend(.keyfocus all) {}
1414

15-
// Including popups styles
16-
//#html-body[class][data-container="body"] {
17-
18-
// .popup-window:extend(.popup-window all) {}
19-
//
20-
// .overlay_magento:extend(.overlay_magento all) {}
21-
//
22-
// .ui-dialog:extend(.ui-dialog all) {}
23-
//
24-
// .ui-widget-overlay:extend(.ui-widget-overlay all) {}
25-
//
26-
// .fade:extend(.fade all) {}
27-
28-
.insert-variable:extend(.insert-variable all) {}
29-
30-
.magento_message:extend(.magento_message all) {}
31-
32-
// .ui-popup-message:extend(.ui-popup-message all) {}
33-
34-
//}
35-
3615
@import (multiple) 'override.less';
3716

38-
#html-body[class][data-container="body"] .admin__scope {
39-
box-sizing: border-box;
40-
}
4117

4218
// ToDo UI: Hidding menu (should be fixed in layouts)
4319
.attribute-popup {

0 commit comments

Comments
 (0)