From b20c41c1715d7c5745bee7c3ea05ec585ab9bd16 Mon Sep 17 00:00:00 2001 From: c0bra Date: Mon, 22 Sep 2014 16:10:41 -0500 Subject: [PATCH] feat(Selection): Updates * Make CSS classes snake-case to stay consistent with established standards * Add OK icon from fontello to ui-grid icon set config * Make unselected row header have a low-opacity check mark to hint user what the available action is. --- src/features/selection/less/selection.less | 10 ++++- .../templates/selectionRowHeaderButtons.html | 4 +- src/font/config.json | 38 +++++++++++-------- 3 files changed, 32 insertions(+), 20 deletions(-) diff --git a/src/features/selection/less/selection.less b/src/features/selection/less/selection.less index 403dff865c..dc25afaea9 100644 --- a/src/features/selection/less/selection.less +++ b/src/features/selection/less/selection.less @@ -16,10 +16,16 @@ cursor: default; } -.uiGridSelectionRowHeaderButtons { +.ui-grid-selection-row-header-buttons { cursor: pointer; + opacity: 0.1; + + &.ui-grid-row-selected { + opacity: 1; + } } -.uiGridSelectionRowHeaderCell { +// TODO: remove? I can't find this class used anywhere, even with the camelCase name +.ui-grid-selection-row-header-cell { border-bottom: solid @gridBorderWidth @borderColor; } \ No newline at end of file diff --git a/src/features/selection/templates/selectionRowHeaderButtons.html b/src/features/selection/templates/selectionRowHeaderButtons.html index 9ac8fe086f..2d9df4ca0c 100644 --- a/src/features/selection/templates/selectionRowHeaderButtons.html +++ b/src/features/selection/templates/selectionRowHeaderButtons.html @@ -1,3 +1,3 @@ -
-  +
+  
\ No newline at end of file diff --git a/src/font/config.json b/src/font/config.json index 77f931dcbe..870e5d7668 100644 --- a/src/font/config.json +++ b/src/font/config.json @@ -7,16 +7,10 @@ "ascent": 850, "glyphs": [ { - "uid": "1a5cfa186647e8c929c2b17b9fc4dac1", - "css": "plus-squared", - "code": 50000, - "src": "fontawesome" - }, - { - "uid": "f755a58fb985eeb70bd47d9b31892a34", - "css": "minus-squared", - "code": 50001, - "src": "fontawesome" + "uid": "5d2d07f112b8de19f2c0dbfec3e42c05", + "css": "spin5", + "code": 60001, + "src": "fontelico" }, { "uid": "9dd9e835aebe1060ba7190ad2b2ed951", @@ -24,12 +18,30 @@ "code": 50002, "src": "fontawesome" }, + { + "uid": "12f4ece88e46abd864e40b35e05b11cd", + "css": "ok", + "code": 59392, + "src": "fontawesome" + }, { "uid": "5211af474d3a9848f67f945e2ccaf143", "css": "cancel", "code": 50003, "src": "fontawesome" }, + { + "uid": "1a5cfa186647e8c929c2b17b9fc4dac1", + "css": "plus-squared", + "code": 50000, + "src": "fontawesome" + }, + { + "uid": "f755a58fb985eeb70bd47d9b31892a34", + "css": "minus-squared", + "code": 50001, + "src": "fontawesome" + }, { "uid": "e82cedfa1d5f15b00c5a81c9bd731ea2", "css": "info-circled", @@ -113,12 +125,6 @@ "css": "sort-alt-down", "code": 50017, "src": "fontawesome" - }, - { - "uid": "5d2d07f112b8de19f2c0dbfec3e42c05", - "css": "spin5", - "code": 60001, - "src": "fontelico" } ] } \ No newline at end of file