Skip to content

Commit 190d5ad

Browse files
Portugal, MarceloPortugal, Marcelo
authored andcommitted
v4.2.3
1 parent 364b89a commit 190d5ad

File tree

10 files changed

+448
-152
lines changed

10 files changed

+448
-152
lines changed

CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
<a name="v4.2.3"></a>
2+
### v4.2.3 (2018-02-02)
3+
4+
5+
#### Bug Fixes
6+
7+
* **exporter:** Fix bug where selection column width was included ([d6aeb166](http://github.com/angular-ui/ng-grid/commit/d6aeb166c9931d6da6f464807e6d6575b6b2addf))
8+
* **importer.js:** Remove unnecessary on destroy event. ([497a554b](http://github.com/angular-ui/ng-grid/commit/497a554bc01fe1148aa804732804c0b41b0c2ced))
9+
* **selection.js:** Allow selection in tables that use grouping (#6556) ([f3d2a7f1](http://github.com/angular-ui/ng-grid/commit/f3d2a7f1019d269df567047be901e07523cefcb4))
10+
* **ui-grid-header-cell:** Improved styles with grid menu. ([c6b8d3bc](http://github.com/angular-ui/ng-grid/commit/c6b8d3bcf5095e7543603e1622499aefa2d5c0a4))
11+
12+
13+
#### Features
14+
15+
* **i18n:** Add Arabic translation (#6551) ([24be1fb6](http://github.com/angular-ui/ng-grid/commit/24be1fb6f78bc9c5c55af0b88dfa0ef87967c395))
16+
117
<a name="v4.2.2"></a>
218
### v4.2.2 (2018-01-17)
319

@@ -153,6 +169,12 @@
153169
* output aria text for cells that come from selection feature ([6d951b2a](http://github.com/angular-ui/ng-grid/commit/6d951b2a7ac33f53b8512a6f3ad5d5498cd079c9))
154170
* **gridEdit:** Pass triggerEvent to cellEditableCondition fn call ([219ea716](http://github.com/angular-ui/ng-grid/commit/219ea7165ff1f6030c7d125550020181fa1fc3ae))
155171

172+
173+
#### Breaking Changes
174+
175+
* Menu Items's title should now be a function
176+
([df10da91](https://github.com/angular-ui/ui-grid/commit/df10da916eb52ffe5636041b56eb88242ecfdd0d#diff-3baddc9493adec1550b73c74401d4b46))
177+
156178
<a name="v4.0.6"></a>
157179
### v4.0.6 (2017-06-14)
158180

less/footer.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
.ui-grid-footer-panel-background {
3-
.gradient(@headerBackgroundColor, @headerGradientStart, @headerGradientStop);
3+
background-color: @headerBackgroundColor;
44
}
55

66
@topPanelRadius: @gridBorderRadius - @gridBorderWidth;
@@ -71,7 +71,7 @@
7171
}
7272

7373
input[type="text"].ui-grid-filter-input {
74-
padding: 0;
74+
padding: 0 18px 0 0;
7575
margin: 0;
7676
border: 0;
7777
width: 100%;
@@ -82,4 +82,4 @@ input[type="text"].ui-grid-filter-input {
8282
&:hover {
8383
border: @gridBorderWidth solid @borderColor;
8484
}
85-
}
85+
}

less/header.less

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
.ui-grid-top-panel-background {
3-
.gradient(@headerBackgroundColor, @headerGradientStart, @headerGradientStop);
3+
background-color: @headerBackgroundColor;
44
}
55

66
@topPanelRadius: @gridBorderRadius - @gridBorderWidth;
@@ -104,8 +104,24 @@
104104
}
105105
}
106106

107-
.ui-grid-column-menu-button-last-col {
108-
margin-right: 25px;
107+
.ui-grid-header-cell-last-col {
108+
.ui-grid-cell-contents,
109+
.ui-grid-filter-container,
110+
.ui-grid-column-menu-button,
111+
& + .ui-grid-column-resizer.right {
112+
margin-right: 13px;
113+
}
114+
}
115+
116+
.ui-grid-render-container-right {
117+
.ui-grid-header-cell-last-col {
118+
.ui-grid-cell-contents,
119+
.ui-grid-filter-container,
120+
.ui-grid-column-menu-button,
121+
& + .ui-grid-column-resizer.right {
122+
margin-right: 28px;
123+
}
124+
}
109125
}
110126

111127
.ui-grid-column-menu {
@@ -195,7 +211,7 @@
195211
}
196212

197213
input[type="text"].ui-grid-filter-input {
198-
padding: 0;
214+
padding: 0 18px 0 0;
199215
margin: 0;
200216
border: 0;
201217
width: 100%;

less/menu.less

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,49 @@
44
right: 0;
55
top: 0;
66
background: @headerBackgroundColor;
7-
border: @gridBorderWidth solid @borderColor;
7+
border: 0;
8+
border-left: @gridBorderWidth solid @borderColor;
9+
border-bottom: @gridBorderWidth solid @borderColor;
810
cursor: pointer;
9-
height: 31px;
11+
height: 32px;
1012
font-weight: normal;
1113
}
1214

1315
.ui-grid-menu-button .ui-grid-icon-container {
14-
margin-top: 3px;
16+
margin-top: 5px;
17+
margin-left: 2px;
1518
}
1619

1720
.ui-grid-menu-button .ui-grid-menu {
1821
right: 0;
1922
.ui-grid-menu-mid {
2023
overflow: scroll;
21-
border: @gridBorderWidth solid @borderColor;
2224
}
2325
}
2426

2527
.ui-grid-menu {
28+
max-width: 320px;
2629
z-index: 2; // So it shows up over grid canvas
2730
position: absolute;
2831
padding: 0 10px 20px 10px;
2932
cursor: pointer;
3033
box-sizing: border-box;
3134
}
3235

36+
.ui-grid-menu-item {
37+
width: 100%;
38+
overflow: hidden;
39+
text-overflow: ellipsis;
40+
white-space: nowrap;
41+
}
42+
3343
.ui-grid-menu .ui-grid-menu-inner {
34-
background: @headerBackgroundColor;
44+
background: @menuBackgroundColor;
3545
border: @gridBorderWidth solid @borderColor;
3646
position: relative;
3747
white-space: nowrap;
3848

3949
.rounded(@gridBorderRadius);
40-
.box-shadow(e("0 10px 20px rgba(0, 0, 0, 0.2), inset 0 12px 12px -14px rgba(0, 0, 0, 0.2)"));
4150
}
4251

4352
.ui-grid-menu .ui-grid-menu-inner ul {
@@ -48,6 +57,7 @@
4857
li {
4958
padding: 0px;
5059
button {
60+
color: @menuTextColor;
5161
min-width: 100%;
5262
padding: 8px;
5363
text-align: left;
@@ -57,12 +67,10 @@
5767
// Show a shadow when hovering over a menu item
5868
&:hover,
5969
&:focus {
60-
// background-color: negation(@headerBackgroundColor, #fff);
61-
.inner-shadow(@vertical: 0, @blur: 14px, @alpha: 0.2);
70+
background-color: @menuHoverColor;
6271
}
6372
&.ui-grid-menu-item-active {
64-
.inner-shadow(@vertical: 0, @blur: 14px, @alpha: 0.2);
65-
background-color: @selectedColor;
73+
background-color: @menuSelectedColor;
6674
}
6775
}
6876
}

less/variables.less

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
@gridBorderWidth: 1px;
1212
@gridBorderRadius: 0px;
1313
@borderColor: #d4d4d4;
14-
14+
@focusColor: #b3c4c7;
15+
@activeColor: darken(@focusColor, 8%);
1516

1617
/**
1718
* @section Header styles
@@ -32,7 +33,13 @@
3233
@rowColorEven: #f3f3f3;
3334
@rowColorOdd: #fdfdfd;
3435

35-
// TODO: colors for buttons
36+
/**
37+
* @section Grid Menu colors
38+
*/
39+
@menuBackgroundColor: #fff;
40+
@menuHoverColor: @focusColor;
41+
@menuSelectedColor: @activeColor;
42+
@menuTextColor: #000;
3643

3744
/**
3845
* @section Sort arrow colors
@@ -42,18 +49,17 @@
4249
@sortArrowBorderColor: #777777;
4350

4451

45-
// TODO: color for menu background
4652
@rowHeaderCell: #F0F0EE;
4753
@rowSelected: #C9DDE1;
4854
@rowSavingForeground: #848484;
4955
@rowErrorForeground: #FF0000;
5056
@rowDirtyForeground: #610B38;
5157

5258
// TODO: color for cell selections
53-
@focusedCell: #b3c4c7;
59+
@focusedCell: @focusColor;
5460

5561
// Color to use for enabled or selected settings/items/cells, etc. Should probably override the one above
56-
@selectedColor: #cecece;
62+
@selectedColor: @activeColor;
5763

5864
/**
5965
* @section Scrollbar styles

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"data grid"
2828
],
2929
"license": "MIT",
30-
"version": "4.2.2",
30+
"version": "4.2.3",
3131
"files": [
3232
"less",
3333
"ui-grid.css",

0 commit comments

Comments
 (0)