Skip to content

Commit d1eddc8

Browse files
zanileezanilee
committed
MAGETWO-34893: Required marker is displayed on wrong line in Backend
1 parent 14ccbdd commit d1eddc8

File tree

6 files changed

+6
-250
lines changed

6 files changed

+6
-250
lines changed

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
}
4646
}
4747

48-
4948
.tab-nav {
5049
&.block {
5150
margin-bottom: 40px;
@@ -94,8 +93,7 @@
9493
display: block;
9594
position: absolute;
9695
z-index: 2;
97-
.url('images/loader-2.gif');
98-
background: url("@{url}") no-repeat 50% 50%;
96+
background: url('../images/loader-2.gif') no-repeat 50% 50%;
9997
background-size: 120px;
10098
width: 20px;
10199
height: 20px;
@@ -131,8 +129,6 @@
131129
}
132130
}
133131

134-
135-
136132
.listing-tiles {
137133
overflow: hidden;
138134
margin-top: -10px;

‎app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_tabnav.less

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@
8080
display: block;
8181
position: absolute;
8282
z-index: 2;
83-
.url('images/loader-2.gif');
84-
background: url("@{url}") no-repeat 50% 50%;
83+
background: url('../images/loader-2.gif') no-repeat 50% 50%;
8584
background-size: 120px;
8685
width: 2rem;
8786
height: 2rem;

‎app/design/adminhtml/Magento/backend/web/css/override.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4328,7 +4328,7 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {
43284328
display: block;
43294329
position: absolute;
43304330
z-index: 2;
4331-
background: url("../images/loader-2.gif") no-repeat 50% 50%;
4331+
background: url('../images/loader-2.gif') no-repeat 50% 50%;
43324332
background-size: 120px;
43334333
width: 2rem;
43344334
height: 2rem;

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

Lines changed: 1 addition & 238 deletions
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,7 @@ input.mage-error ~ .addafter {
980980
width: 8px;
981981
height: 14px;
982982
line-height: 14px;
983-
background: url(Magento_Backend::images/draggable-handle-vertical.png) no-repeat 0 0;
983+
background: url(../Magento_Backend/images/draggable-handle-vertical.png) no-repeat 0 0;
984984
cursor: ns-resize;
985985
color: #b2b0ad;
986986
}
@@ -1767,243 +1767,6 @@ address {
17671767
margin-top: inherit !important;
17681768
}
17691769

1770-
/*
1771-
Login page
1772-
-------------------------------------- */
1773-
.page-login {
1774-
height: 100%;
1775-
}
1776-
1777-
.page-login .wrapper {
1778-
min-height: 100%;
1779-
padding: 0;
1780-
}
1781-
1782-
.page-login .wrapper-inner {
1783-
overflow: auto;
1784-
padding-bottom: 140px;
1785-
}
1786-
1787-
.adminhtml-auth-login,
1788-
.page-login {
1789-
background: #f2ebde;
1790-
}
1791-
1792-
.page-login .footer {
1793-
clear: both;
1794-
height: 100px;
1795-
margin-top: -100px;
1796-
position: relative;
1797-
box-sizing: border-box;
1798-
}
1799-
1800-
.page-login .footer-content {
1801-
max-width: none;
1802-
min-width: 0;
1803-
}
1804-
1805-
.page-login .footer-copyright {
1806-
text-align: left;
1807-
}
1808-
1809-
.page-login .form-login {
1810-
width: 280px;
1811-
margin: 160px auto 60px;
1812-
padding: 30px 25px;
1813-
border: 1px solid #e3ded5;
1814-
border-radius: 5px;
1815-
background: #f7f2ec;
1816-
}
1817-
1818-
.page-login .fieldset {
1819-
background: transparent;
1820-
border: 0;
1821-
border-radius: 0;
1822-
margin: 0;
1823-
padding: 0;
1824-
}
1825-
1826-
.page-login .fieldset > .legend {
1827-
border-bottom: 0;
1828-
margin-bottom: 15px;
1829-
}
1830-
1831-
.page-login .fieldset > .legend span {
1832-
font-size: 32px;
1833-
line-height: 32px;
1834-
padding: 0;
1835-
color: #8a847c;
1836-
display: inline;
1837-
}
1838-
1839-
.page-login .fieldset .field {
1840-
margin: 0 0 13px;
1841-
}
1842-
1843-
.page-login .form-inline .label {
1844-
width: auto;
1845-
padding: 0;
1846-
margin-bottom: 13px;
1847-
}
1848-
1849-
.page-login .field-username label,
1850-
.page-login .field-password label,
1851-
.page-login .field-confirmation label {
1852-
display: none;
1853-
}
1854-
1855-
.page-login .form-inline .label + .control {
1856-
width: auto;
1857-
float: none;
1858-
}
1859-
1860-
.page-login .header {
1861-
margin-bottom: 30px;
1862-
background: transparent;
1863-
padding: 0;
1864-
z-index: auto;
1865-
position: static;
1866-
}
1867-
1868-
.page-login .header .logo {
1869-
display: block;
1870-
width: 262px;
1871-
height: 64px;
1872-
text-indent: -999em;
1873-
.url('images/logo-magento.png', 'Magento_Backend');
1874-
background: url("@{url}") no-repeat;
1875-
}
1876-
1877-
.page-login {
1878-
button {
1879-
border-radius: 2px;
1880-
}
1881-
button:not(.primary) {
1882-
background-image: none;
1883-
background-color: #f7f3eb;
1884-
padding: 0 13px;
1885-
color: #676056;
1886-
border: 1px solid #ada89e;
1887-
cursor: pointer;
1888-
display: inline-block;
1889-
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
1890-
font-size: 13px;
1891-
font-weight: 500;
1892-
line-height: 26px;
1893-
box-sizing: border-box;
1894-
margin: 0;
1895-
vertical-align: middle;
1896-
}
1897-
button:not(.primary):focus,
1898-
button:not(.primary):active {
1899-
background-color: #cac3b4;
1900-
border: 1px solid #989287;
1901-
}
1902-
button:not(.primary):hover {
1903-
background-color: #cac3b4;
1904-
}
1905-
button:not(.primary).disabled,
1906-
button:not(.primary)[disabled] {
1907-
cursor: default;
1908-
pointer-events: none;
1909-
opacity: .5;
1910-
}
1911-
button.primary {
1912-
background-image: none;
1913-
background-color: #007dbd;
1914-
padding: 0 13px;
1915-
color: #fff;
1916-
border: 1px solid #0a6c9f;
1917-
cursor: pointer;
1918-
display: inline-block;
1919-
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
1920-
font-size: 13px;
1921-
font-weight: 500;
1922-
line-height: 26px;
1923-
box-sizing: border-box;
1924-
vertical-align: middle;
1925-
}
1926-
button.primary:focus,
1927-
button.primary:active {
1928-
background-color: #026294;
1929-
border: 1px solid #004c74;
1930-
color: #fff;
1931-
}
1932-
button.primary:hover {
1933-
background-color: #026294;
1934-
border: 1px solid #026294;
1935-
}
1936-
button.primary.disabled,
1937-
button.primary[disabled] {
1938-
cursor: default;
1939-
pointer-events: none;
1940-
opacity: .5;
1941-
}
1942-
}
1943-
1944-
.page-login .form-actions {
1945-
padding: 0;
1946-
margin: 0;
1947-
box-sizing: border-box;
1948-
}
1949-
1950-
.page-login .actions,
1951-
.page-login .links {
1952-
display: inline-block;
1953-
vertical-align: middle;
1954-
}
1955-
1956-
.page-login input[type=text],
1957-
.page-login input[type=password] {
1958-
border-color: #cac3b4;
1959-
font-size: 18px;
1960-
padding: 12px 12px 14px;
1961-
height: auto;
1962-
&:focus {
1963-
border-color: #007bdb;
1964-
}
1965-
}
1966-
1967-
.page-login :-ms-input-placeholder {
1968-
color: #bebab1 !important;
1969-
}
1970-
1971-
.page-login ::-webkit-input-placeholder {
1972-
color: #bebab1 !important;
1973-
}
1974-
1975-
.page-login :-moz-placeholder {
1976-
color: #bebab1 !important;
1977-
}
1978-
1979-
.page-login button.action-login,
1980-
.page-login button.action-retrieve {
1981-
font-size: 22px;
1982-
padding: 14px 22px 16px;
1983-
}
1984-
1985-
.page-login button.action-retrieve,
1986-
.page-login button.action-reset {
1987-
font-size: 18px;
1988-
padding: 10px 17px 10px;
1989-
}
1990-
1991-
.page-login .action-forgotpassword,
1992-
.page-login .action-back {
1993-
font-size: 12px;
1994-
color: #1c8bb8;
1995-
text-decoration: underline;
1996-
position: absolute;
1997-
left: 0;
1998-
bottom: -70px;
1999-
}
2000-
2001-
.page-login .action-forgotpassword:hover,
2002-
.page-login .action-back:hover {
2003-
text-decoration: none;
2004-
}
2005-
2006-
20071770
/*
20081771
Page Structure
20091772
-------------------------------------- */

‎app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@
6868
height: @loading__size;
6969
border-radius: @loading__size/2;
7070
z-index: 999;
71-
.url("images/loader-1.gif");
72-
background: rgba(255, 255, 255, .7) url("@{url}") no-repeat 50% 50%;
71+
background: rgba(255, 255, 255, .7) url('../images/loader-1.gif') no-repeat 50% 50%;
7372
}
7473
}
7574

‎app/design/frontend/Magento/luma/web/css/source/_forms.less

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ fieldset.field {
7171
appearance: none;
7272
border: 1px solid @border-color__base;
7373
height: 32px;
74-
.url("images/select-bg.svg");
75-
background: @select__background url("@{url}") no-repeat 100% 45%;
74+
background: @select__background url('../images/select-bg.svg') no-repeat 100% 45%;
7675
background-size: 30px 60px;
7776
padding-right: 25px;
7877
text-indent: .01em;

0 commit comments

Comments
 (0)