From 2704b8bc04f4f5f07c4af063033728db247dc01f Mon Sep 17 00:00:00 2001
From: Tom Robinson <tlrobinson@gmail.com>
Date: Tue, 14 Jul 2015 15:57:56 -0700
Subject: [PATCH] Revert star icon to previous path, size query builder header
favorite button to match others
---
resources/frontend_client/app/components/icons/icons.js | 4 ++--
resources/frontend_client/app/icon_paths.js | 5 +----
.../app/query_builder/card_favorite_button.react.js | 5 +++--
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/resources/frontend_client/app/components/icons/icons.js b/resources/frontend_client/app/components/icons/icons.js
index 7b20df2123b..c49bebc86b9 100644
--- a/resources/frontend_client/app/components/icons/icons.js
+++ b/resources/frontend_client/app/components/icons/icons.js
@@ -15,8 +15,8 @@ angular.module('corvus.components')
return {
restrict: 'E',
- // NOTE: can't use ng-attr-viewBox because Angular doesn't preserve the case pre-v1.3.7
- template: '<svg viewBox={{viewBox}} ng-attr-class="{{className}}" ng-attr-width="{{width}}" ng-attr-height="{{height}}" ng-attr-fill="{{fill}}"><path ng-attr-d="{{path}}" /></svg>',
+ // NOTE: can't use ng-attr-viewBox because Angular doesn't preserve the case pre-v1.3.7 :(
+ template: '<svg viewBox="0 0 32 32" ng-attr-class="{{className}}" ng-attr-width="{{width}}" ng-attr-height="{{height}}" ng-attr-fill="{{fill}}"><path ng-attr-d="{{path}}" /></svg>',
scope: {
width: '@?', // a value in PX to define the width of the icon
height: '@?', // a value in PX to define the height of the icon
diff --git a/resources/frontend_client/app/icon_paths.js b/resources/frontend_client/app/icon_paths.js
index 8c3aa58c619..11da7e4b5fb 100644
--- a/resources/frontend_client/app/icon_paths.js
+++ b/resources/frontend_client/app/icon_paths.js
@@ -47,10 +47,7 @@ export var ICON_PATHS = {
return:'M15.3040432,11.8500793 C22.1434689,13.0450349 27.291257,18.2496116 27.291257,24.4890512 C27.291257,25.7084278 27.0946472,26.8882798 26.7272246,28.0064033 L26.7272246,28.0064033 C25.214579,22.4825472 20.8068367,18.2141694 15.3040432,17.0604596 L15.3040432,25.1841972 L4.70874296,14.5888969 L15.3040432,3.99359668 L15.3040432,3.99359668 L15.3040432,11.8500793 Z',
reference: 'M15.9670388,2.91102126 L14.5202438,1.46422626 L14.5202438,13.9807372 C14.5202438,15.0873683 13.6272253,15.9844701 12.5215507,15.9844701 L2.89359,15.9844701 C2.16147687,15.9844701 1.446795,15.6184135 1.446795,14.5376751 L11.0747557,14.5376751 C12.1786034,14.5376751 13.0734488,13.6501624 13.0734488,12.5467556 L13.0734488,0 L2.17890813,0 C0,0 0,0 0,2.17890813 L0,14.5202438 C0,16.6991519 1.81285157,17.4312651 3.62570313,17.4312651 L13.9704736,17.4312651 C15.0731461,17.4312651 15.9670388,16.5448165 15.9670388,15.4275322 L15.9670388,2.91102126 Z',
search: 'M12 0 A12 12 0 0 0 0 12 A12 12 0 0 0 12 24 A12 12 0 0 0 18.5 22.25 L28 32 L32 28 L22.25 18.5 A12 12 0 0 0 24 12 A12 12 0 0 0 12 0 M12 4 A8 8 0 0 1 12 20 A8 8 0 0 1 12 4 ',
- star: {
- path: 'M9,13.5 L3.70993273,16.2811529 L4.72024568,10.3905765 L0.440491353,6.21884705 L6.35496636,5.35942353 L9,0 L11.6450336,5.35942353 L17.5595086,6.21884705 L13.2797543,10.3905765 L14.2900673,16.2811529 L9,13.5 Z',
- attrs: { viewBox: '0 0 17.119 16.2812' }
- },
+ star: 'M16 0 L21 11 L32 12 L23 19 L26 31 L16 25 L6 31 L9 19 L0 12 L11 11',
statemap: 'M19.4375,6.97396734 L27,8.34417492 L27,25.5316749 L18.7837192,23.3765689 L11.875,25.3366259 L11.875,25.3366259 L11.875,11.0941749 L11.1875,11.0941749 L11.1875,25.5316749 L5,24.1566749 L5,7.65667492 L11.1875,9.03167492 L18.75,6.90135976 L18.75,22.0941749 L19.4375,22.0941749 L19.4375,6.97396734 Z',
table: 'M13.6373197,13.6373197 L18.3626803,13.6373197 L18.3626803,18.3626803 L13.6373197,18.3626803 L13.6373197,13.6373197 Z M18.9533504,18.9533504 L23.6787109,18.9533504 L23.6787109,23.6787109 L18.9533504,23.6787109 L18.9533504,18.9533504 Z M13.6373197,18.9533504 L18.3626803,18.9533504 L18.3626803,23.6787109 L13.6373197,23.6787109 L13.6373197,18.9533504 Z M8.32128906,18.9533504 L13.0466496,18.9533504 L13.0466496,23.6787109 L8.32128906,23.6787109 L8.32128906,18.9533504 Z M8.32128906,8.32128906 L13.0466496,8.32128906 L13.0466496,13.0466496 L8.32128906,13.0466496 L8.32128906,8.32128906 Z M8.32128906,13.6373197 L13.0466496,13.6373197 L13.0466496,18.3626803 L8.32128906,18.3626803 L8.32128906,13.6373197 Z M18.9533504,8.32128906 L23.6787109,8.32128906 L23.6787109,13.0466496 L18.9533504,13.0466496 L18.9533504,8.32128906 Z M18.9533504,13.6373197 L23.6787109,13.6373197 L23.6787109,18.3626803 L18.9533504,18.3626803 L18.9533504,13.6373197 Z M13.6373197,8.32128906 L18.3626803,8.32128906 L18.3626803,13.0466496 L13.6373197,13.0466496 L13.6373197,8.32128906 Z',
};
diff --git a/resources/frontend_client/app/query_builder/card_favorite_button.react.js b/resources/frontend_client/app/query_builder/card_favorite_button.react.js
index dac4e007c71..105a4f02ea1 100644
--- a/resources/frontend_client/app/query_builder/card_favorite_button.react.js
+++ b/resources/frontend_client/app/query_builder/card_favorite_button.react.js
@@ -77,13 +77,14 @@ export default React.createClass({
var iconClasses = cx({
'mx1': true,
'transition-color': true,
- 'text-grey-3': !this.state.favorite,
+ 'text-grey-4': !this.state.favorite,
+ 'text-brand-hover': !this.state.favorite,
'text-gold': this.state.favorite
});
return (
<a className={iconClasses} href="#" onClick={this.toggleFavorite}>
- <Icon name="star" viewBox="0 0 32 32"></Icon>
+ <Icon name="star" viewBox="0 0 58 58"></Icon>
</a>
);
}
--
GitLab