ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix linebreak on tags, add spacing and remove commas (Fixes #2147)

Browse Source
This commit is contained in:
Joel Macht 2016-06-08 21:27:10 +02:00 committed by joelmacht
parent 9a88717dab
commit b7d83e786f
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -21,3 +21,4 @@ Authors of OpenSlides in chronological order of first contribution:
Erik Steenman <eriksteenman@gmail.com> Erik Steenman <eriksteenman@gmail.com>
Sean Engelhardt <sean.f.t.engelhardt@gmail.com> Sean Engelhardt <sean.f.t.engelhardt@gmail.com>
Maximilian Krambach <maximilian.krambach@gmx.de> Maximilian Krambach <maximilian.krambach@gmx.de>
Joel Macht <joel.macht@web.de>

8
openslides/core/static/css/app.css
View File

@ -714,6 +714,14 @@ img {
margin-bottom: 0; margin-bottom: 0;
} }
/* override booststrap's label class to fix linebreak and add spacing */
.label {
display: inline-block;
padding: .3em .6em;
margin-right: .2em;
}
/* for angular-csv-import form */ /* for angular-csv-import form */
.import { .import {
margin-left: 15px; margin-left: 15px;

2
openslides/motions/static/templates/motions/motion-list.html
View File

@ -163,7 +163,7 @@
<td ng-if="!motion.quickEdit" ng-mouseover="motion.hover=true" ng-mouseleave="motion.hover=false"> <td ng-if="!motion.quickEdit" ng-mouseover="motion.hover=true" ng-mouseleave="motion.hover=false">
<strong><a ui-sref="motions.motion.detail({id: motion.id})">{{ motion.getTitle() }}</a></strong> <strong><a ui-sref="motions.motion.detail({id: motion.id})">{{ motion.getTitle() }}</a></strong>
<span ng-repeat="tag in motion.tags" class="label label-default"> <span ng-repeat="tag in motion.tags" class="label label-default">
{{ tag.name }}{{$last ? '' : ', '}} {{ tag.name }}
</span> </span>
<div ng-if="motion.isAllowed('update')" class="hoverActions" ng-class="{'hiddenDiv': !motion.hover}"> <div ng-if="motion.isAllowed('update')" class="hoverActions" ng-class="{'hiddenDiv': !motion.hover}">
<span ng-if="motion.isAllowed('update')"> <span ng-if="motion.isAllowed('update')">