Skip to content

Commit

Permalink
Rebase (#1)
Browse files Browse the repository at this point in the history
* Playing with Travic CI build

* Playing with Travic CI build

* Fix attempt for issue keystonejs#3979

packages.js generates a Uncaught SyntaxError: Unexpected string when minified, and fails to load the admin interface.
After some digging I found that uglifyjs compresses the typeof checks into the following format "undefined"==typeof x which triggers a syntax error after passing through another minification process when deployed.

A way to prevent this from happening is to allow semicolons in the uglifyjs command.
Also needed to add the 'aphrodite/no-important' to the required packages for the Admin UI.

* Updating contact info

* Correcting password type check in PasswordType

* fix:typo in handleError in screens/Item/index.js

* fix:module-name in import statement in EditForm.js

It was working before but the `./` was extraneous and redundant.

* Fix: model with required field that defaults to 0 can't be saved

Number.prototype.validateRequiredInput() merely checked if the getter
for the field returned a truthy value. That fails if the default happens
to be zero (which is a falsy value).

The fix is to simply check if the return value is a number.

* Fix: model with required field that defaults to false can't be saved

Boolean variant of commit d28bacc.

* Commenting out redundant code in www dir

* Removing `path` from server/initViewEngine

* Removing commented out PropTypes import

* Removing redundant import

* [WIP] Updating packages (only minors and patches)

* [WIP] Updating more packages (minor & patch)

* Updating last of the minor and patch packages

* Removing old aphropdite references

* Fixing some "Prop types declarations should be sorted alphabetically" (react/sort-prop-types) errors, allowing `npm run lint` to run

* Changes to the few dependencies that were depending on [email protected]:

- knox has been replaced with keystonejs/knox as the package is not being maintained anymore and has a `*` for `mime`
- [email protected] uses [email protected] (which is compatible with node <=6.x)

* Fixing CSRF by reverting the (well meaning) changes made in PR 3756 (keystonejs/keystone#3756). I don't know if this will resurface issue 3420 (keystonejs/keystone#3420), which the PR apparently addressed.

* Add some functionality to prevent macro injection via CSV export

* Fixing file extention

* extract password validation so users can access the validation within their own code for things like password reset

* Correcting password type check in PasswordType

* Expanding password field configuration options and improving defaults (to align with current NIST guidelines). Updating, expanding on and clarifying relevant docs.

* Escaping values in the raw value of markdown field so it can be safely displayed within an HTML document

* Sanitization update to markdown fields -- remove unsafe html tags from the markdown value before it's rendered into html

* Updating the markdown fieldtype docs to include the new sanitizer options

* Prep'ing for release as 4.0.0-beta.6

* Fixed  in Adapters.FS

* nerfed strongly worded comment

* Updating packages

* v4.0.0-beta.7

* Documentation about customizing the navigation bar

* Add packages.js build

* Fix Password `validateInput` breaking tests related to security updates

* Revert "Merge branch 'jm-fork' into master"

This reverts commit 8008781, reversing
changes made to f08baa4.

* (feat) implements image thumbnails for the File type

* moved thumb check to field level

* Fix for known security vulnerability in marked 0.3.6 dependency

* updating packages

* v4.0.0-beta.8

* Fix autocleanup for cloudinary fixes 3476 (keystonejs#4205)

* Update `cloudinaryimage` to respect autocleanup

* Fixes autocleanup for cloudinaryimages

* Remove completed TODOs

* Deprecate currency setting (keystonejs#4132)

* fix paginate to return on count error (keystonejs#4167)

* Update README.md (keystonejs#4569)

Add field type Code (http://keystonejs.com/docs/database/#fieldtypes-code)

* Should check undefined instead, otherwise value === 0 will not be able to show (keystonejs#4524)

* Update application-updates.md (keystonejs#4582)

* Update yo-generator.md (keystonejs#4581)

* Update Readme.md (keystonejs#4583)

* replace hardcode keystone to path admin variable (keystonejs#4586)

* replace knox git dependency with knox-s3 (keystonejs#4574)

- knox-s3 is a fork of knox with one difference: a mime 1.x dependency that avoids breaking changes in mime 2.x
- this matches the `keystonejs/knox` repo, but is published to npm
- allows keystone to be installed without git e.g. in a node:slim Docker container

close keystonejs#4573

* Upgrade moment for CVE-2017-18214 (keystonejs#4592)

For more info, see: https://nvd.nist.gov/vuln/detail/CVE-2017-18214

This is currently triggering github security alerts on all projects using keystone 4.x

* Fix website (keystonejs#4615)

* Update website to work

* fixing one test at a time

Signed-off-by: Dominik Wilkowski <[email protected]>

* fixed keystonejs#4628

Signed-off-by: Dominik Wilkowski <[email protected]>

* fixing some typos and unnessesary comments

Signed-off-by: Dominik Wilkowski <[email protected]>

* removed commented out tests as there are not meaningful

Signed-off-by: Dominik Wilkowski <[email protected]>

* fixing admin ui tests (thanks to Vito)

Signed-off-by: Dominik Wilkowski <[email protected]>

* Fix test failure due to password complexity requirement added in 8ecb809

* Fix the wrong link to typography

* Added the typopgrahy plugin into gatsby-config

* Update typography to latest version

* Fix typo in @keystonejs and change GitHub link to https

* Remove failing tests as discussed with @JedWatson and @dominikwilkowski

* Keystone 4 website clean up and fixing stuff

* Home page clean up, inclulding Header redesign
* Doc page clean up, refactor the navigation
* Mobile optimisations
* A lot of minor polishes

* Replace window.location.pathname with this.props.location.pathname

* Add React Helmet

* Add Twitter Butotn

* Mobile optimsations

* Linting warning fix

* Adding in the missing DayPicker-WeekdaysRow (keystonejs#4601)

* Adding in the missing DayPicker-WeekdaysRow

* Fix keystonejs#4652: Remove EOL Node releases from Travis testing

* show color swatch on color field

Fixes issue: keystonejs/keystone#4074

* Fix keystonejs#4665: Update Readme for Keystone 4.0.0-rc0

* Fix missing bullets and tweak per feedback from Jed

* Fix bullets & update RC title

* Fix Relationship Fields link

* Fix for empty relationships submitting no value

* Fix for updating single relationship values

* updating packages bundle

Signed-off-by: Dominik Wilkowski <[email protected]>

* Remove link to `keystone-starter` (currently a v0.3 demo that doesn't cleanly deploy to Heroku)

* Add mention of new File API and link to Contributor Guide

* Reorganise README sections and add Table of Contents

* Move field type overview to documentation

* Move dev & testing information to Contributor Guide

* Change Netlify doc links to https

* Change Thinkmill link to https

* Consolidate the Contributing blurb

* Update GitHub issue/PR templates

* Tidy home page text & link to current release information

* Fix keystonejs#4686: CloudinaryImage(s) fields were incorrectly marked as deprecated (keystonejs#4690)

* Update deps according to semver

* Remove --growl from Mocha options; fails on Mocha 4+ unless `growl-notify` is installed
(ref: mochajs/mocha#3088)

* Update to latest browserify

* Upgrade `debug` dependency

* Fix bug in Safari where XHR form submission fails with empty file input (keystonejs#4673)

* Provides a fix for a bug in Safari where XHR form submission fails when input[type=file] is empty

* Include keystone.version in startup message (keystonejs#4692)

* Remove unused title markdown from README.md

* updated packages bundle

Signed-off-by: Dominik Wilkowski <[email protected]>

* bumped version to RC1

Signed-off-by: Dominik Wilkowski <[email protected]>

* Added session max age cookie to match keystone.uid cookie expiry

* smooth scroll spped now based on current scroll position

* Restore/repair S3 image uploading in tinymce

* Use custom root for S3 paths

* Check that req.session.cookie exists before setting maxAge

* Make listing browser versions a more obvious PR testing requirement

* Enhance numeric fields

* Replace / with . to delimiter the file extension

* Update part-4.md

Corrected the api.event route. The "routes" was missing
app.post('/api/event', routes.api.event.post);

* Fix typo: s/gloing/going/

* Update options.md (keystonejs#4621)

Fix typo error udpatedBy -> updatedBy

* Fixed typo (keystonejs#4597)

* Added letsencrypt configuration docs for keystonejs#4181

* Added more info on Application updates with required relationships.

* Documented breaking change to `pre:routes` behaviour.

* Update `package.json` reference to rc1

* Upgrade qs to 6.5.2

* Add pointer to Keystone 4 beta/RC release notes

*  - Upgrade to Mongoose 4.13.14: https://github.com/Automattic/mongoose/blob/master/History.md#41314--2018-05-25
 - Add useMongoClient per http://thecodebarbarian.com/mongoose-4.11-use-mongo-client.html

* Update z-index of color chooser

The previous z-index of 2 was not enough for the popover to appear above the "Save" footer, which has z-index: 99

* Fix keystonejs#4706: Docs: Application Updates is 404

* Fix keystonejs#4707: Docs: Edit this page links are broken

* Fix keystonejs#4688: Deprecated File field types have broken docs link

* Remove WIP notes

* Fix keystonejs#4708: Update Getting Started page

* added semver notations to dependencies

Signed-off-by: Dominik Wilkowski <[email protected]>

* fixed typo

Signed-off-by: Dominik Wilkowski <[email protected]>

* Improve sanity checking for signin "from" param

* Minor fixes and improvements to the location field type (keystonejs#4455)

* Minor fix to location fields - no reason to depend on the order of address_components coming from Google

* Minor fix to location fields - Better handling of `address_components` returned from Google API

* Minor fix to location fields - no reason to depend on the order of address_components coming from Google

* Minor fix to location fields - Better handling of `address_components` returned from Google API

* Update to multer 1.3.1 and automatically clean uploaded files (keystonejs#4704)

* Update to multer 1.3.1 and automatically clean uploaded files

* Fix typo in bindBodyParser

* Add missing next() (thanks @ttsirkia!)

* Reviewed Getting Started documentation (keystonejs#4721)

- FIxed spelling, grammar and broken link issues with the Getting Started documentation.
- Ensured that Keystone is capitalised everywhere in the docs
- Set Mongoose docs link to V4

* updating package bundle

Signed-off-by: Dominik Wilkowski <[email protected]>

* bumped version 📣🎉

Signed-off-by: Dominik Wilkowski <[email protected]>

* FIxing broken links in README.md

FIxing broken links in README.md

* remove lock files

Signed-off-by: Dominik Wilkowski <[email protected]>

* ignore lock files

Signed-off-by: Dominik Wilkowski <[email protected]>

* Adding Favicon to Keystone 4 website

Tested with Chrome and Firefox.

* Added Google Analytics Code to V4 website

* Removed incorrect image

Removed safari-pinned-tab.svg, which was a black square.

* Created 404.js

Currently giving errors

TypeError: Cannot read property 'initial' of undefined

  - index.js:22 ExtractTextPlugin.<anonymous>
    [website]/[extract-text-webpack-plugin]/index.js:22:9

  - Array.forEach

  - index.js:21 ExtractTextPlugin.mergeNonInitialChunks
    [website]/[extract-text-webpack-plugin]/index.js:21:16

  - index.js:275 ExtractTextPlugin.<anonymous>
    [website]/[extract-text-webpack-plugin]/index.js:275:12

  - Array.forEach

  - index.js:273 ExtractTextPlugin.<anonymous>
    [website]/[extract-text-webpack-plugin]/index.js:273:21

  - async.js:52
    [website]/[async]/lib/async.js:52:16

  - async.js:236 Object.async.forEachOf.async.eachOf
    [website]/[async]/lib/async.js:236:30

  - async.js:209 Object.async.forEach.async.each
    [website]/[async]/lib/async.js:209:22

  - index.js:237 ExtractTextPlugin.<anonymous>
    [website]/[extract-text-webpack-plugin]/index.js:237:10

  - Tapable.js:71 Compilation.applyPluginsAsync
    [website]/[tapable]/lib/Tapable.js:71:13

  - Compilation.js:525 Compilation.seal
    [website]/[webpack]/lib/Compilation.js:525:7

  - Compiler.js:397 Compiler.<anonymous>
    [website]/[webpack]/lib/Compiler.js:397:15

  - Tapable.js:103
    [website]/[tapable]/lib/Tapable.js:103:11

  - Compilation.js:445 Compilation.<anonymous>
    [website]/[webpack]/lib/Compilation.js:445:10

  - Compilation.js:417
    [website]/[webpack]/lib/Compilation.js:417:12

* Fixed broken links to componants

And added a link to the logo in the header

* Tweaking the content

* Adding Google Analytics and Favicons (keystonejs#4740)

* Adding Favicon to Keystone 4 website
* Added Google Analytics Code to V4 website
* Removed safari-pinned-tab.svg, which was a black square.

* Add Netlify redirects for v3 paths to v4 equivalents

* Fixed a typo in Project-Options.md

The `name` option appears twice, instead of the 2nd being `brand`.

* Fixed links to configuration pages

* Link to 4.x release history

* Make titles for Setting Up sections consistent

* Include defaultColumns in code example

* Improve section labels for Get Started

* Clean up text & formatting

* Clean up text & formatting

* Update index.md

minor wording error fix

* Update part-4.md

* Fix keystonejs#4762: Bump kerberos & letsencrypt-express dependencies

* Correct typo in templates/views/addEvent.pug

Fix keystonejs#4805

* Fix typo in part 4 of tutorial (thanks @ebrahimamer)

* add alt test to delete button

* Fix keystonejs#4815: Typo in Getting started part 4 tutorial

* Fix keystonejs#4818: Add redirect for /guide/config

* documentation updates

* DOCS: Fix typo for TextArray Field

* Update Underscore-Methods.md

underscore instead of undercore

* Update options.md

Link is broken without `http://`

* Fixed incorrectly named API method label (fixes keystonejs#4825)

* docs(syntax): update an upper-case (keystonejs#4810)

By copying and pasting the site, I realized that the list was previously referenced with an uppercase.

* incorrect link to database docs (keystonejs#4833)

* fix: fields explorer invalid capitilisations (keystonejs#4834)

* Bug - Fix UTC DateColumn vaue display (keystonejs#4841)

Added toMoment method to allow Moment.js to use utc dates.
Updated getValue to use toMoment for proper output.

* Fixed typo in paginate() docs (keystonejs#4839)

* Refer to the newest release "4.0.0"

Probably forgot to update part of readme from the older release "4.0.0.rc.1"

* Completed opening sentence

The sentence "Once you retrieve a list from Keystone, the mongoose methods can be accessed from." seemed incomplete

* Added option to hide Today button in Date field (keystonejs#4869)

* Fixed dependsOn setting when applied to a boolean field set to false by default (keystonejs#4867)

* UPDATE deleteItem action with custom error message (keystonejs#4683)

* Return a 500 error when `item.remove` fails (keystonejs#4832)

* Return a 500 error when `item.remove` fails

Currently, errors from `item.remove` are not handled at all in the callback. This gives an empty 200 back to the frontend, which will do nothing with this response (no visual feedback on the error).
We should return an actual error. All suggestions on how to return this error Keystone style are welcome.

* directly send the `err` to `apiError`

* Build S3 upload name when not present (keystonejs#4871)

* Restore/repair S3 image uploading in tinymce

* Use custom root for S3 paths

* Build S3 upload name when not present

* Fix markup typo in quick start docs. (keystonejs#4854)

The `auto update` field was highlighted incorrectly.

* Urlfield enahancement (keystonejs#4856)

* add thumb option support to url type

* do not fix the height of form input since it the value can be out of bound
  • Loading branch information
ghbolivar authored Feb 24, 2019
1 parent fe4be86 commit 8313dfa
Show file tree
Hide file tree
Showing 250 changed files with 8,106 additions and 7,080 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ insert_final_newline = true
indent_style = tab

[*.js]
indent_size = 4
indent_size = 2

[*.json]
indent_style = space
Expand Down
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ docs/*
fields/types/**/lib/*
node_modules/*
test/*
website/*
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
Please ask questions and support requests on:
* https://stackoverflow.com/questions/tagged/keystonejs
* https://gitter.im/keystonejs/keystone
New features can be requested and voted upon on:
* https://productpains.com/product/keystonejs
Join the KeystoneJS Slack for discussion with the community & contributors:
* https://launchpass.com/keystonejs
-->

### Expected behavior
Expand All @@ -23,7 +22,7 @@

### Steps to reproduce the actual/current behavior
<!-- If you're describing a bug, tell us what steps to take to reproduce your bug -->
<!-- If you'resuggesting a change/improvement, explain how to reproduce the current behavior -->
<!-- If you're suggesting a change/improvement, explain how to reproduce the current behavior -->



Expand All @@ -33,4 +32,5 @@
| Software | Version
| ---------------- | -------
| Keystone |
| Node |
| Node.js |
| Browser |
19 changes: 10 additions & 9 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
<!--
Please make sure the following is filled in before submitting your Pull Request - thanks!
Join the KeystoneJS Slack for discussion with the community & contributors:
* https://launchpass.com/keystonejs
-->

## Description of changes



## Related issues (if any)


## Testing

- [ ] Please confirm `npm run test-all` ran successfully.
- [ ] List browser version(s) any admin UI changes were tested in:
- [ ] Please confirm you've added (or verified) test coverage for this change.
- [ ] Please confirm `npm run test-all` ran successfully.

<!--
Notes:
* To successfully have all e2e tests pass you need to have the following setup:
- a recent version of the chrome browser
- java 1.8+
* For more information on the End-2-End (E2E) testing framework for Keystone 4, see:
https://github.com/keystonejs/keystone-nightwatch-e2e
* To successfully have all E2E tests pass you need to have the following set up:
- A recent version of Chrome or Firefox
- Java Runtime Environment 1.8+
* If you are developing in Windows you may run into linebreak linting issues.
One possible workaround is to remove the "linebreak-style" rule in `node_modules/eslint-config-keystone/eslintrc.json`.
-->

5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,9 @@ reports

test/e2e/drivers/*

package-lock.json
yarn.lock

# Website dependencies
website/.cache
website/public
19 changes: 3 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,21 +44,7 @@ matrix:
- npm run test-admin
env:
- JOB=unit_tests_node_6
- node_js: '5'
script:
- npm run test-admin
env:
- JOB=unit_tests_node_5
- node_js: '4'
script:
- npm run test-admin
env:
- JOB=unit_tests_node_4
- node_js: '0.12'
script:
- npm run test-admin
env:
- JOB=unit_tests_node_0.12


before_script:
- sleep 15
Expand All @@ -76,8 +62,9 @@ services:
git:
depth: 10
cache:
yarn: true
directories:
- node_modules
- node_modules
addons:
apt:
sources:
Expand Down
3 changes: 3 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

KeystoneJS is maintained by [@JedWatson](https://github.com/JedWatson) and an amazing team of contributors. All contributions are given credit here except for Jed's.

Release notes for Keystone 4 beta & release candidates can be found on the [GitHub releases]( https://github.com/keystonejs/keystone/releases) page.

Changes for production releases are included below.

## v0.3.22 / 2016-07-22

Expand Down
157 changes: 49 additions & 108 deletions README.md

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions admin/client/App/components/Navigation/Primary/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ var PrimaryNavigation = React.createClass({

return this.props.sections.map((section) => {
// Get the link and the class name
const href = section.lists[0].external ? section.lists[0].path : `${Keystone.adminPath}/${section.lists[0].path}`;
const to = !section.lists[0].external && `${Keystone.adminPath}/${section.lists[0].path}`;
const href = section.lists[0].external && section.lists[0].path;
const isActive = this.props.currentSectionKey && this.props.currentSectionKey === section.key;
const className = isActive ? 'primary-navbar__item--active' : null;

Expand All @@ -101,7 +102,8 @@ var PrimaryNavigation = React.createClass({
key={section.key}
label={section.label}
className={className}
to={href}
to={to}
href={href}
>
{section.label}
</PrimaryNavItem>
Expand Down
14 changes: 7 additions & 7 deletions admin/client/App/elemental/Button/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class Button extends Component {
render () {
var {
active,
aphroditeStyles,
cssStyles,
block,
className,
color,
Expand All @@ -43,7 +43,7 @@ class Button extends Component {
block ? commonClasses.block : null,
disabled ? commonClasses.disabled : null,
active ? variantClasses.active : null,
...aphroditeStyles
...cssStyles
);
if (className) {
props.className += (' ' + className);
Expand All @@ -64,23 +64,23 @@ class Button extends Component {

Button.propTypes = {
active: PropTypes.bool,
aphroditeStyles: PropTypes.arrayOf(PropTypes.shape({
_definition: PropTypes.object,
_name: PropTypes.string,
})),
block: PropTypes.bool,
color: PropTypes.oneOf(BUTTON_COLORS),
component: PropTypes.oneOfType([
PropTypes.func,
PropTypes.string,
]),
cssStyles: PropTypes.arrayOf(PropTypes.shape({
_definition: PropTypes.object,
_name: PropTypes.string,
})),
disabled: PropTypes.bool,
href: PropTypes.string,
size: PropTypes.oneOf(BUTTON_SIZES),
variant: PropTypes.oneOf(BUTTON_VARIANTS),
};
Button.defaultProps = {
aphroditeStyles: [],
cssStyles: [],
color: 'default',
variant: 'fill',
};
Expand Down
10 changes: 5 additions & 5 deletions admin/client/App/elemental/FormField/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class FormField extends Component {
render () {
const { formLayout = 'basic', labelWidth } = this.context;
const {
aphroditeStyles,
cssStyles,
children,
className,
cropLabel,
Expand All @@ -31,7 +31,7 @@ class FormField extends Component {
classes.FormField,
classes['FormField--form-layout-' + formLayout],
offsetAbsentLabel ? classes['FormField--offset-absent-label'] : null,
aphroditeStyles
cssStyles
);
if (className) {
props.className += (' ' + className);
Expand Down Expand Up @@ -75,12 +75,12 @@ FormField.childContextTypes = {
formFieldId: PropTypes.string,
};
FormField.propTypes = {
aphroditeStyles: PropTypes.oneOfType([
children: PropTypes.node,
cropLabel: PropTypes.bool,
cssStyles: PropTypes.oneOfType([
PropTypes.arrayOf(PropTypes.shape(stylesShape)),
PropTypes.shape(stylesShape),
]),
children: PropTypes.node,
cropLabel: PropTypes.bool,
htmlFor: React.PropTypes.string,
label: React.PropTypes.string,
offsetAbsentLabel: React.PropTypes.bool,
Expand Down
6 changes: 3 additions & 3 deletions admin/client/App/elemental/FormInput/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class FormInput extends Component {
}
render () {
const {
aphroditeStyles,
cssStyles,
className,
disabled,
id,
Expand All @@ -36,7 +36,7 @@ class FormInput extends Component {
classes['FormInput__size--' + size],
disabled ? classes['FormInput--disabled'] : null,
formLayout ? classes['FormInput--form-layout-' + formLayout] : null,
...concatClassnames(aphroditeStyles)
...concatClassnames(cssStyles)
);
if (className) {
props.className += (' ' + className);
Expand All @@ -61,7 +61,7 @@ const stylesShape = {
};

FormInput.propTypes = {
aphroditeStyles: PropTypes.oneOfType([
cssStyles: PropTypes.oneOfType([
PropTypes.arrayOf(PropTypes.shape(stylesShape)),
PropTypes.shape(stylesShape),
]),
Expand Down
1 change: 0 additions & 1 deletion admin/client/App/elemental/FormInput/noedit.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ const classes = {
borderWidth: theme.input.border.width,
color: theme.color.gray80,
display: 'inline-block',
height: theme.input.height,
lineHeight: theme.input.lineHeight,
padding: `0 ${theme.input.paddingHorizontal}`,
transition: 'border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s',
Expand Down
12 changes: 6 additions & 6 deletions admin/client/App/elemental/FormLabel/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React, { PropTypes } from 'react';
import classes from './styles';

function FormLabel ({
aphroditeStyles,
cssStyles,
className,
component: Component,
cropText,
Expand All @@ -20,7 +20,7 @@ function FormLabel ({
classes.FormLabel,
formLayout ? classes['FormLabel--form-layout-' + formLayout] : null,
cropText ? classes['FormLabel--crop-text'] : null,
aphroditeStyles
cssStyles
);
if (className) {
props.className += (' ' + className);
Expand All @@ -41,15 +41,15 @@ const stylesShape = {
};

FormLabel.propTypes = {
aphroditeStyles: PropTypes.oneOfType([
PropTypes.arrayOf(PropTypes.shape(stylesShape)),
PropTypes.shape(stylesShape),
]),
component: PropTypes.oneOfType([
PropTypes.string,
PropTypes.func,
]),
cropText: PropTypes.bool,
cssStyles: PropTypes.oneOfType([
PropTypes.arrayOf(PropTypes.shape(stylesShape)),
PropTypes.shape(stylesShape),
]),
};
FormLabel.defaultProps = {
component: 'label',
Expand Down
12 changes: 6 additions & 6 deletions admin/client/App/elemental/Glyph/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import classes from './styles';
// font and CSS; inflating the project size

function Glyph ({
aphroditeStyles,
cssStyles,
className,
color,
component: Component,
Expand All @@ -24,7 +24,7 @@ function Glyph ({
classes.glyph,
colorIsValidType && classes['color__' + color],
classes['size__' + size],
aphroditeStyles
cssStyles
) + ` ${octicons[name]}`;
if (className) {
props.className += (' ' + className);
Expand All @@ -40,14 +40,14 @@ function Glyph ({
};

Glyph.propTypes = {
aphroditeStyles: PropTypes.shape({
_definition: PropTypes.object,
_name: PropTypes.string,
}),
color: PropTypes.oneOfType([
PropTypes.oneOf(Object.keys(colors)),
PropTypes.string, // support random color strings
]),
cssStyles: PropTypes.shape({
_definition: PropTypes.object,
_name: PropTypes.string,
}),
name: PropTypes.oneOf(Object.keys(octicons)).isRequired,
size: PropTypes.oneOf(Object.keys(sizes)),
};
Expand Down
2 changes: 1 addition & 1 deletion admin/client/App/elemental/GlyphButton/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function GlyphButton ({

const icon = (
<Glyph
aphroditeStyles={classes.glyph}
cssStyles={classes.glyph}
color={glyphColor}
name={glyph}
size={glyphSize}
Expand Down
4 changes: 2 additions & 2 deletions admin/client/App/elemental/GlyphField/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function GlyphField ({

const icon = (
<Glyph
aphroditeStyles={classes.glyph}
cssStyles={classes.glyph}
color={glyphColor}
name={glyph}
size={glyphSize}
Expand All @@ -30,7 +30,7 @@ function GlyphField ({
);

return (
<Field aphroditeStyles={classes.wrapper} {...props}>
<Field cssStyles={classes.wrapper} {...props}>
{isLeft && icon}
{children}
{isRight && icon}
Expand Down
Loading

0 comments on commit 8313dfa

Please sign in to comment.