Skip to content

Commit 7480f9a

Browse files
committed
MAGETWO-44581: Contribute Ogre Bugfixes
- move and merge remaining less files
1 parent 5518c89 commit 7480f9a

File tree

3 files changed

+82
-12
lines changed

3 files changed

+82
-12
lines changed

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

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,13 @@
33
// * See COPYING.txt for license details.
44
// */
55

6-
//
7-
// IE9 styles
8-
// ---------------------------------------------
9-
10-
.ie9 {
6+
.ie9 & {
117
.giftcard-info-container {
12-
.fieldset {
13-
.admin__field {
14-
.admin__field-label {
15-
display: table;
16-
span {
17-
display: table-cell;
18-
}
8+
.admin__field {
9+
.admin__field-label {
10+
display: table;
11+
span {
12+
display: table-cell;
1913
}
2014
}
2115
}
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
// /**
2+
// * Copyright © 2015 Magento. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
//
7+
// Reward Page
8+
// _____________________________________________
9+
10+
//
11+
// Variables
12+
// ---------------------------------------------
13+
14+
@boundary__margin: 30px;
15+
@boundary__ratio: 1.75;
16+
17+
.adminhtml-reward-rate-edit {
18+
.field-rate {
19+
.admin__field-control {
20+
&:extend(.abs-clearfix all);
21+
}
22+
.boundary {
23+
float: left;
24+
width: 125px;
25+
}
26+
.boundary-upper {
27+
margin-left: @boundary__margin;
28+
position: relative;
29+
&:before {
30+
content: '»';
31+
left: -(@boundary__margin / @boundary__ratio);
32+
position: absolute;
33+
top: 25%;
34+
}
35+
label {
36+
.lib-visibility-hidden();
37+
display: block;
38+
}
39+
}
40+
}
41+
}
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// /**
2+
// * Copyright © 2015 Magento. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
//
7+
// Hierarchy styles
8+
// _____________________________________________
9+
10+
.cms-hierarchy {
11+
&:extend(.abs-clearfix all);
12+
13+
.cms-hierarchy-tree,
14+
.cms-hierarchy-node {
15+
float: left;
16+
width: 50%;
17+
}
18+
19+
.cms_page_grid_container {
20+
clear: both;
21+
}
22+
23+
.admin__page-section-title {
24+
.actions {
25+
float: right;
26+
}
27+
}
28+
29+
.buttons-set {
30+
margin: 0 0 1.14rem;
31+
button {
32+
margin-right: 0.36rem;
33+
}
34+
}
35+
}

0 commit comments

Comments
 (0)