Skip to content

Commit 948df6f

Browse files
author
Bogdan Plieshka
committed
MAGETWO-32250: Header
- Page main action bar - Fixed global buttons, tooltips - Removed calendar duplicate
1 parent ed27475 commit 948df6f

File tree

11 files changed

+168
-648
lines changed

11 files changed

+168
-648
lines changed

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less

Lines changed: 26 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,17 @@
2121

2222
//
2323

24-
.page-main-actions {
24+
.page-main-actions,
25+
.page-actions.fixed {
2526
.extend__clearfix();
2627
background: @page-main-actions__background-color;
2728
border-bottom: 1px solid @page-main-actions__border-color;
2829
border-top: 1px solid @page-main-actions__border-color;
29-
margin: 0 0 2rem;
3030
padding: @page-main-actions__padding-side;
31-
&:empty {
32-
display: none;
33-
}
31+
}
32+
33+
.page-main-actions {
34+
margin: 0 0 2rem;
3435
}
3536

3637
//
@@ -41,6 +42,26 @@
4142
@_page-action__indent: 1.3rem;
4243

4344
float: right;
45+
&.fixed {
46+
position: fixed;
47+
top: 0;
48+
left: @page-wrapper__indent-left;
49+
right: 0;
50+
z-index: @page-actions__fixed__z-index;
51+
.page-actions-inner {
52+
&:before {
53+
content: attr(data-title);
54+
float: left;
55+
font-size: @page-title__font-size;
56+
max-width: 50%;
57+
margin-top: .3rem;
58+
color: @page-title__color;
59+
overflow: hidden;
60+
text-overflow: ellipsis;
61+
white-space: nowrap;
62+
}
63+
}
64+
}
4465
button,
4566
.page-actions-buttons > button {
4667
&:extend(.abs-action-l all);
@@ -101,49 +122,3 @@
101122
background-color: transparent;
102123
}
103124
}
104-
105-
//
106-
// Old styles
107-
// _____________________________________________
108-
109-
.page-main-actions {
110-
.page-actions {
111-
112-
// Fixed page actions
113-
&.fixed {
114-
position: fixed;
115-
top: 0;
116-
left: 0;
117-
right: 0;
118-
z-index: 10;
119-
padding: 0;
120-
background: -webkit-linear-gradient(top, rgba(245, 242, 237, 1) 0%, rgba(245, 242, 237, 1) 56%, rgba(245, 242, 237, 0) 100%); // Use in 4.3 Android
121-
background: -ms-linear-gradient(top, rgba(245, 242, 237, 1) 0%, rgba(245, 242, 237, 1) 56%, rgba(245, 242, 237, 0) 100%); // Use in 10 IE
122-
background: linear-gradient(to bottom, rgba(245, 242, 237, 1) 0%, rgba(245, 242, 237, 1) 56%, rgba(245, 242, 237, 0) 100%);
123-
background: #e0dace;
124-
.page-actions-inner {
125-
position: relative;
126-
padding-top: 15px;
127-
padding-bottom: 15px;
128-
min-height: 36px;
129-
text-align: right;
130-
.clearfix();
131-
box-sizing: border-box;
132-
&:before {
133-
text-align: left;
134-
content: attr(data-title);
135-
float: left;
136-
font-size: 20px;
137-
max-width: 50%;
138-
overflow: hidden;
139-
text-overflow: ellipsis;
140-
white-space: nowrap;
141-
}
142-
.lt-ie10 & {
143-
background: #f5f2ed;
144-
}
145-
}
146-
}
147-
}
148-
}
149-

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,31 @@ body {
6363
margin-bottom: 20px;
6464
}
6565

66+
button {
67+
border-radius: 2px;
68+
.button();
69+
&.primary {
70+
.button-primary();
71+
}
72+
}
73+
74+
.actions-split {
75+
button {
76+
margin-left: 0 !important;
77+
}
78+
.dropdown-split(
79+
@_toggle-selector: ~".action-toggle",
80+
@_button-selector: ~".action-default",
81+
@_options-selector : ~".dropdown-menu",
82+
@_dropdown-split-button-border-radius-fix: true,
83+
@_dropdown-split-list-min-width: 175px
84+
);
85+
vertical-align: middle;
86+
.action-toggle:after {
87+
height: 13px;
88+
}
89+
}
90+
6691
//
6792
// Icons
6893
//--------------------------------------

0 commit comments

Comments
 (0)