Fixed webpack config, groups flex thanks to @juliushaertl and groups tooltip

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
pull/8824/head
John Molakvoæ (skjnldsv) 8 years ago
parent 38b1020f52
commit 16af12e0a0
No known key found for this signature in database
GPG Key ID: 60C25B8C072916CF
  1. 5
      core/css/inputs.scss
  2. 13
      settings/js/main.js
  3. 2
      settings/js/main.js.map
  4. 3
      settings/src/components/userList/userRow.vue
  5. 4
      settings/webpack.common.js

@ -673,7 +673,7 @@ input {
}
/* selected tag */
.multiselect__tag {
flex: 1 0 calc(50% - 5px);;
flex: 1 0 0;
line-height: 20px;
padding: 1px 5px;
background-image: none;
@ -685,6 +685,9 @@ input {
/* require to override the default width
and force the tag to shring properly */
min-width: 0;
max-width: 50%;
max-width: fit-content;
max-width: -moz-fit-content;
/* css hack, detect if more than two tags
if so, flex-basis is set to half */
&:only-child {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -229,7 +229,8 @@ export default {
* @returns {string}
*/
formatGroupsTitle(groups) {
return groups.map(group => group.name).join(', ');
let names = groups.map(group => group.name);
return names.slice(2,).join(', ');
},
deleteUser() {

@ -3,9 +3,9 @@ const path = require('path')
module.exports = {
entry: './src/main.js',
output: {
path: path.resolve(__dirname, './dist'),
path: path.resolve(__dirname, './js'),
publicPath: '/dist/',
filename: 'build.js'
filename: 'main.js'
},
module: {
rules: [

Loading…
Cancel
Save