From 713f643b1dacf473d724b718a28e8284e45ca932 Mon Sep 17 00:00:00 2001 From: Qstick Date: Fri, 14 Sep 2018 23:13:35 -0400 Subject: [PATCH] Changed: Convert password input to standard using pass font --- .../src/AddArtist/AddNewArtist/AddNewArtist.css | 2 +- .../SelectArtist/ImportArtistSelectArtist.css | 2 +- .../Builder/DateFilterBuilderRowValue.css | 2 +- frontend/src/Components/Form/PasswordInput.css | 5 +++++ frontend/src/Components/Form/PasswordInput.js | 11 ++++++++++- frontend/src/Components/Form/TextInput.css | 2 +- frontend/src/Components/Form/TextInput.js | 6 +++++- frontend/src/Content/Fonts/fonts.css | 12 ++++++++++++ .../src/Content/Fonts/text-security-disc.ttf | Bin 0 -> 12392 bytes .../src/Content/Fonts/text-security-disc.woff | Bin 0 -> 2988 bytes .../Album/SelectAlbumModalContent.css | 2 +- .../Artist/SelectArtistModalContent.css | 2 +- .../Settings/MediaManagement/Naming/Naming.css | 2 +- .../Quality/QualityProfileItemGroup.css | 2 +- .../Quality/Definition/QualityDefinition.css | 2 +- frontend/src/Styles/Variables/fonts.js | 1 + 16 files changed, 42 insertions(+), 11 deletions(-) create mode 100644 frontend/src/Components/Form/PasswordInput.css create mode 100644 frontend/src/Content/Fonts/text-security-disc.ttf create mode 100644 frontend/src/Content/Fonts/text-security-disc.woff diff --git a/frontend/src/AddArtist/AddNewArtist/AddNewArtist.css b/frontend/src/AddArtist/AddNewArtist/AddNewArtist.css index c1ec4fbe3..0bf8b0e15 100644 --- a/frontend/src/AddArtist/AddNewArtist/AddNewArtist.css +++ b/frontend/src/AddArtist/AddNewArtist/AddNewArtist.css @@ -17,7 +17,7 @@ } .searchInput { - composes: text from 'Components/Form/TextInput.css'; + composes: input from 'Components/Form/TextInput.css'; height: 46px; border-radius: 0; diff --git a/frontend/src/AddArtist/ImportArtist/Import/SelectArtist/ImportArtistSelectArtist.css b/frontend/src/AddArtist/ImportArtist/Import/SelectArtist/ImportArtistSelectArtist.css index c5023c00d..1a7f4836e 100644 --- a/frontend/src/AddArtist/ImportArtist/Import/SelectArtist/ImportArtistSelectArtist.css +++ b/frontend/src/AddArtist/ImportArtist/Import/SelectArtist/ImportArtistSelectArtist.css @@ -64,7 +64,7 @@ } .searchInput { - composes: text from 'Components/Form/TextInput.css'; + composes: input from 'Components/Form/TextInput.css'; border-radius: 0; } diff --git a/frontend/src/Components/Filter/Builder/DateFilterBuilderRowValue.css b/frontend/src/Components/Filter/Builder/DateFilterBuilderRowValue.css index 12047c80d..fd56a4917 100644 --- a/frontend/src/Components/Filter/Builder/DateFilterBuilderRowValue.css +++ b/frontend/src/Components/Filter/Builder/DateFilterBuilderRowValue.css @@ -3,7 +3,7 @@ } .numberInput { - composes: text from 'Components/Form/TextInput.css'; + composes: input from 'Components/Form/TextInput.css'; margin-right: 3px; } diff --git a/frontend/src/Components/Form/PasswordInput.css b/frontend/src/Components/Form/PasswordInput.css new file mode 100644 index 000000000..fca96bea9 --- /dev/null +++ b/frontend/src/Components/Form/PasswordInput.css @@ -0,0 +1,5 @@ +.input { + composes: input from 'Components/Form/TextInput.css'; + + font-family: $passwordFamily; +} diff --git a/frontend/src/Components/Form/PasswordInput.js b/frontend/src/Components/Form/PasswordInput.js index 2560ce3c2..adb1e7c5a 100644 --- a/frontend/src/Components/Form/PasswordInput.js +++ b/frontend/src/Components/Form/PasswordInput.js @@ -1,13 +1,22 @@ +import PropTypes from 'prop-types'; import React from 'react'; import TextInput from './TextInput'; +import styles from './PasswordInput.css'; function PasswordInput(props) { return ( ); } +PasswordInput.propTypes = { + className: PropTypes.string.isRequired +}; + +PasswordInput.defaultProps = { + className: styles.input +}; + export default PasswordInput; diff --git a/frontend/src/Components/Form/TextInput.css b/frontend/src/Components/Form/TextInput.css index 25278adbc..7fb9f68cc 100644 --- a/frontend/src/Components/Form/TextInput.css +++ b/frontend/src/Components/Form/TextInput.css @@ -1,4 +1,4 @@ -.text { +.input { composes: input from 'Components/Form/Input.css'; } diff --git a/frontend/src/Components/Form/TextInput.js b/frontend/src/Components/Form/TextInput.js index e3a5b2c9f..92c0f4baf 100644 --- a/frontend/src/Components/Form/TextInput.js +++ b/frontend/src/Components/Form/TextInput.js @@ -24,6 +24,10 @@ class TextInput extends Component { componentWillUnmount() { window.removeEventListener('mouseup', this.onDocumentMouseUp); + + if (this._selectionTimeout) { + this._selectionTimeout = clearTimeout(this._selectionTimeout); + } } // @@ -171,7 +175,7 @@ TextInput.propTypes = { }; TextInput.defaultProps = { - className: styles.text, + className: styles.input, type: 'text', readOnly: false, autoFocus: false, diff --git a/frontend/src/Content/Fonts/fonts.css b/frontend/src/Content/Fonts/fonts.css index 483c61ca8..5b44dfe1e 100644 --- a/frontend/src/Content/Fonts/fonts.css +++ b/frontend/src/Content/Fonts/fonts.css @@ -25,3 +25,15 @@ font-family: 'Ubuntu Mono'; src: url('UbuntuMono-Regular.eot?#iefix') format('embedded-opentype'), url('UbuntuMono-Regular.woff') format('woff'), url('UbuntuMono-Regular.ttf') format('truetype'); } + +/* + * text-security-disc + */ + +@font-face { + font-weight: normal; + font-style: normal; + font-family: 'text-security-disc'; + src: url('text-security-disc.woff') format('woff'), url('text-security-disc.ttf') format('truetype'); +} + diff --git a/frontend/src/Content/Fonts/text-security-disc.ttf b/frontend/src/Content/Fonts/text-security-disc.ttf new file mode 100644 index 0000000000000000000000000000000000000000..86038dba89d7e762d5dbc458529c0d20514a3d54 GIT binary patch literal 12392 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 literal 0 HcmV?d00001 diff --git a/frontend/src/InteractiveImport/Album/SelectAlbumModalContent.css b/frontend/src/InteractiveImport/Album/SelectAlbumModalContent.css index d297be072..c22d502f5 100644 --- a/frontend/src/InteractiveImport/Album/SelectAlbumModalContent.css +++ b/frontend/src/InteractiveImport/Album/SelectAlbumModalContent.css @@ -7,7 +7,7 @@ } .filterInput { - composes: text from 'Components/Form/TextInput.css'; + composes: input from 'Components/Form/TextInput.css'; flex: 0 0 auto; margin-bottom: 20px; diff --git a/frontend/src/InteractiveImport/Artist/SelectArtistModalContent.css b/frontend/src/InteractiveImport/Artist/SelectArtistModalContent.css index d297be072..c22d502f5 100644 --- a/frontend/src/InteractiveImport/Artist/SelectArtistModalContent.css +++ b/frontend/src/InteractiveImport/Artist/SelectArtistModalContent.css @@ -7,7 +7,7 @@ } .filterInput { - composes: text from 'Components/Form/TextInput.css'; + composes: input from 'Components/Form/TextInput.css'; flex: 0 0 auto; margin-bottom: 20px; diff --git a/frontend/src/Settings/MediaManagement/Naming/Naming.css b/frontend/src/Settings/MediaManagement/Naming/Naming.css index a0fbf7f19..da27e292e 100644 --- a/frontend/src/Settings/MediaManagement/Naming/Naming.css +++ b/frontend/src/Settings/MediaManagement/Naming/Naming.css @@ -1,5 +1,5 @@ .namingInput { - composes: text from 'Components/Form/TextInput.css'; + composes: input from 'Components/Form/TextInput.css'; font-family: $monoSpaceFontFamily; } diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfileItemGroup.css b/frontend/src/Settings/Profiles/Quality/QualityProfileItemGroup.css index dc4d40e53..d0720cb6a 100644 --- a/frontend/src/Settings/Profiles/Quality/QualityProfileItemGroup.css +++ b/frontend/src/Settings/Profiles/Quality/QualityProfileItemGroup.css @@ -27,7 +27,7 @@ } .nameInput { - composes: text from 'Components/Form/TextInput.css'; + composes: input from 'Components/Form/TextInput.css'; margin-top: 4px; margin-right: 10px; diff --git a/frontend/src/Settings/Quality/Definition/QualityDefinition.css b/frontend/src/Settings/Quality/Definition/QualityDefinition.css index 089dd16b9..81fbc8577 100644 --- a/frontend/src/Settings/Quality/Definition/QualityDefinition.css +++ b/frontend/src/Settings/Quality/Definition/QualityDefinition.css @@ -60,7 +60,7 @@ } .sizeInput { - composes: text from 'Components/Form/TextInput.css'; + composes: input from 'Components/Form/TextInput.css'; display: inline-block; margin-left: 5px; diff --git a/frontend/src/Styles/Variables/fonts.js b/frontend/src/Styles/Variables/fonts.js index 6221ce5f1..b95c6f640 100644 --- a/frontend/src/Styles/Variables/fonts.js +++ b/frontend/src/Styles/Variables/fonts.js @@ -2,6 +2,7 @@ module.exports = { // Families defaultFontFamily: 'Roboto, "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif', monoSpaceFontFamily: '"Ubuntu Mono", Menlo, Monaco, Consolas, "Courier New", monospace;', + passwordFamily: 'text-security-disc', // Sizes extraSmallFontSize: '11px',