github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-25 06:14:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added search input types to 3 inputs total, closes #726

Browse Source 
* Added type search to search bar (forum)
* Added CSS `box-sizing: inherit` to search <input> because bootstrap styles mess up the search box
* Added type color to both color settings in appearance (admin)
This commit is contained in:
David Sevilla Martin 2016-11-27 19:39:47 -05:00
parent ab912ba1ad
commit fcdf36b3d0
No known key found for this signature in database
GPG Key ID: 5E58124CB6615509
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/admin/dist/app.js vendored
View File

@ -17834,8 +17834,8 @@ System.register('flarum/components/AppearancePage', ['flarum/components/Page', '
m( m(
'div', 'div',
{ className: 'AppearancePage-colors-input' }, { className: 'AppearancePage-colors-input' },
m('input', { className: 'FormControl', placeholder: '#aaaaaa', value: this.primaryColor(), onchange: m.withAttr('value', this.primaryColor) }), m('input', { className: 'FormControl', type: 'color', placeholder: '#aaaaaa', value: this.primaryColor(), onchange: m.withAttr('value', this.primaryColor) }),
m('input', { className: 'FormControl', placeholder: '#aaaaaa', value: this.secondaryColor(), onchange: m.withAttr('value', this.secondaryColor) }) m('input', { className: 'FormControl', type: 'color', placeholder: '#aaaaaa', value: this.secondaryColor(), onchange: m.withAttr('value', this.secondaryColor) })
), ),
Switch.component({ Switch.component({
state: this.darkMode(), state: this.darkMode(),

4
js/admin/src/components/AppearancePage.js
View File

@ -28,8 +28,8 @@ export default class AppearancePage extends Page {
</div> </div>
<div className="AppearancePage-colors-input"> <div className="AppearancePage-colors-input">
<input className="FormControl" placeholder="#aaaaaa" value={this.primaryColor()} onchange={m.withAttr('value', this.primaryColor)}/> <input className="FormControl" type="color" placeholder="#aaaaaa" value={this.primaryColor()} onchange={m.withAttr('value', this.primaryColor)}/>
<input className="FormControl" placeholder="#aaaaaa" value={this.secondaryColor()} onchange={m.withAttr('value', this.secondaryColor)}/> <input className="FormControl" type="color" placeholder="#aaaaaa" value={this.secondaryColor()} onchange={m.withAttr('value', this.secondaryColor)}/>
</div> </div>
{Switch.component({ {Switch.component({

1
js/forum/dist/app.js vendored
View File

@ -26653,6 +26653,7 @@ System.register('flarum/components/Search', ['flarum/Component', 'flarum/compone
'div', 'div',
{ className: 'Search-input' }, { className: 'Search-input' },
m('input', { className: 'FormControl', m('input', { className: 'FormControl',
type: 'search',
placeholder: extractText(app.translator.trans('core.forum.header.search_placeholder')), placeholder: extractText(app.translator.trans('core.forum.header.search_placeholder')),
value: this.value(), value: this.value(),
oninput: m.withAttr('value', this.value), oninput: m.withAttr('value', this.value),

1
js/forum/src/components/Search.js
View File

@ -83,6 +83,7 @@ export default class Search extends Component {
})}> })}>
<div className="Search-input"> <div className="Search-input">
<input className="FormControl" <input className="FormControl"
type="search"
placeholder={extractText(app.translator.trans('core.forum.header.search_placeholder'))} placeholder={extractText(app.translator.trans('core.forum.header.search_placeholder'))}
value={this.value()} value={this.value()}
oninput={m.withAttr('value', this.value)} oninput={m.withAttr('value', this.value)}

1
less/lib/Search.less
View File

@ -60,6 +60,7 @@
padding-left: 32px; padding-left: 32px;
padding-right: 32px; padding-right: 32px;
.transition(all 0.4s); .transition(all 0.4s);
box-sizing: inherit !important;
} }
.Button { .Button {
float: left; float: left;