Skip to content
This repository has been archived by the owner on Sep 4, 2020. It is now read-only.

Commit

Permalink
Updated grommet styling.
Browse files Browse the repository at this point in the history
  • Loading branch information
alansouzati committed Apr 29, 2015
1 parent e697246 commit 5004f90
Show file tree
Hide file tree
Showing 6 changed files with 75 additions and 73 deletions.
3 changes: 2 additions & 1 deletion css/grommet-hpe.css
Original file line number Diff line number Diff line change
Expand Up @@ -2436,7 +2436,8 @@ a.active > .label .label__icon.control-icon svg {
margin: -24px; }
.tiles > * {
-webkit-flex: 0 0 192px;
flex: 0 0 192px; }
flex: 0 0 192px;
flex-grow: 1; }
.tiles--small > * {
-webkit-flex-basis: 96px;
flex-basis: 96px; }
Expand Down
2 changes: 1 addition & 1 deletion css/grommet-hpe.min.css

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion css/grommet.css
Original file line number Diff line number Diff line change
Expand Up @@ -2462,7 +2462,8 @@ a.active > .label .label__icon.control-icon svg {
margin: -24px; }
.tiles > * {
-webkit-flex: 0 0 192px;
flex: 0 0 192px; }
flex: 0 0 192px;
flex-grow: 1; }
.tiles--small > * {
-webkit-flex-basis: 96px;
flex-basis: 96px; }
Expand Down
2 changes: 1 addition & 1 deletion css/grommet.min.css

Large diffs are not rendered by default.

128 changes: 64 additions & 64 deletions grommet.js
Original file line number Diff line number Diff line change
Expand Up @@ -19699,8 +19699,8 @@ var Grommet =
* Module dependencies.
*/

var Emitter = __webpack_require__(128);
var reduce = __webpack_require__(129);
var Emitter = __webpack_require__(129);
var reduce = __webpack_require__(130);

/**
* Root reference for iframes.
Expand Down Expand Up @@ -21520,7 +21520,7 @@ var Grommet =

var React = __webpack_require__(48);
var IndexRouter = __webpack_require__(60);
var IndexAttribute = __webpack_require__(130);
var IndexAttribute = __webpack_require__(128);
var StatusIcon = __webpack_require__(40);
var Link = __webpack_require__(13);

Expand Down Expand Up @@ -21664,7 +21664,7 @@ var Grommet =
var IndexRouter = __webpack_require__(60);
var Tiles = __webpack_require__(24);
var Tile = __webpack_require__(25);
var IndexAttribute = __webpack_require__(130);
var IndexAttribute = __webpack_require__(128);

var IndexTiles = React.createClass({displayName: "IndexTiles",

Expand Down Expand Up @@ -23975,6 +23975,65 @@ var Grommet =
/* 128 */
/***/ function(module, exports, __webpack_require__) {

// (C) Copyright 2014-2015 Hewlett-Packard Development Company, L.P.

var React = __webpack_require__(48);
var IndexActivity = __webpack_require__(147);
var StatusIcon = __webpack_require__(40);
var Timestamp = __webpack_require__(127);

var IndexAttribute = React.createClass({displayName: "IndexAttribute",

render: function() {
var member = this.props.member;
var attribute = this.props.attribute;
var content = (React.createElement("span", null, "'?'"));
var value;

//console.log('!!! IndexAttribute render', attribute.name, attribute);
if (attribute.hasOwnProperty('render')) {

content = attribute.render(member);

} else {

if (member.hasOwnProperty(attribute.name)) {
value = member[attribute.name];
} else if (member.attributes &&
member.attributes.hasOwnProperty(attribute.name)) {
value = member.attributes[attribute.name];
}

if ('status' === attribute.name) {
content = (
React.createElement(StatusIcon, {className: 'index-attribute__status-icon',
value: value.toLowerCase(), small: true})
);
} else if ('created' === attribute.name || 'modified' === attribute.name) {
content = (
React.createElement(Timestamp, {value: new Date(value), format: "MM/DD/YY h:mm:ss a"})
);
} else if ('_activity' === attribute.name) {
content = (
React.createElement(IndexActivity, {member: member})
);
} else {
content = (React.createElement("span", null, value));
}
}

return content;
}

});

module.exports = IndexAttribute;


/***/ },
/* 129 */
/***/ function(module, exports, __webpack_require__) {


/**
* Expose `Emitter`.
Expand Down Expand Up @@ -24142,7 +24201,7 @@ var Grommet =


/***/ },
/* 129 */
/* 130 */
/***/ function(module, exports, __webpack_require__) {


Expand Down Expand Up @@ -24170,65 +24229,6 @@ var Grommet =
return curr;
};

/***/ },
/* 130 */
/***/ function(module, exports, __webpack_require__) {

// (C) Copyright 2014-2015 Hewlett-Packard Development Company, L.P.

var React = __webpack_require__(48);
var IndexActivity = __webpack_require__(147);
var StatusIcon = __webpack_require__(40);
var Timestamp = __webpack_require__(127);

var IndexAttribute = React.createClass({displayName: "IndexAttribute",

render: function() {
var member = this.props.member;
var attribute = this.props.attribute;
var content = (React.createElement("span", null, "'?'"));
var value;

//console.log('!!! IndexAttribute render', attribute.name, attribute);
if (attribute.hasOwnProperty('render')) {

content = attribute.render(member);

} else {

if (member.hasOwnProperty(attribute.name)) {
value = member[attribute.name];
} else if (member.attributes &&
member.attributes.hasOwnProperty(attribute.name)) {
value = member.attributes[attribute.name];
}

if ('status' === attribute.name) {
content = (
React.createElement(StatusIcon, {className: 'index-attribute__status-icon',
value: value.toLowerCase(), small: true})
);
} else if ('created' === attribute.name || 'modified' === attribute.name) {
content = (
React.createElement(Timestamp, {value: new Date(value), format: "MM/DD/YY h:mm:ss a"})
);
} else if ('_activity' === attribute.name) {
content = (
React.createElement(IndexActivity, {member: member})
);
} else {
content = (React.createElement("span", null, value));
}
}

return content;
}

});

module.exports = IndexAttribute;


/***/ },
/* 131 */
/***/ function(module, exports, __webpack_require__) {
Expand Down
10 changes: 5 additions & 5 deletions grommet.min.js

Large diffs are not rendered by default.

0 comments on commit 5004f90

Please sign in to comment.