Merge pull request #1785 from emanuelschuetze/fix-template-bugs
Fix template bugs
This commit is contained in:
commit
7843cc2ec0
@ -1,4 +1,4 @@
|
||||
<div ng-controller="SlideItemDetailCtrl" class="content">
|
||||
<div ng-controller="SlideItemDetailCtrl" class="content scrollcontent">
|
||||
<h1>
|
||||
{{ item.title }}
|
||||
<span translate>List of speakers</span>
|
||||
|
@ -1,4 +1,4 @@
|
||||
<div ng-controller="SlideItemListCtrl" class="content">
|
||||
<div ng-controller="SlideItemListCtrl" class="content scrollcontent">
|
||||
<h1 translate>Agenda</h1>
|
||||
|
||||
<table class="tablelist">
|
||||
|
@ -1,4 +1,4 @@
|
||||
<div ng-controller="SlideAssignmentCtrl" class="content">
|
||||
<div ng-controller="SlideAssignmentCtrl" class="content scrollcontent">
|
||||
<h1>{{ assignment.title }}</h1>
|
||||
<div class="white-space-pre-line">{{ assignment.description }}</div>
|
||||
</div>
|
||||
|
@ -60,6 +60,8 @@ body{
|
||||
right: 40px;
|
||||
z-index: -1;
|
||||
line-height: normal;
|
||||
}
|
||||
.scrollcontent {
|
||||
transition-property: margin, font-size;
|
||||
transition-duration: 1s;
|
||||
}
|
||||
|
@ -65,7 +65,7 @@ angular.module('OpenSlidesApp.core.projector', ['OpenSlidesApp.core'])
|
||||
console.error("Error for slide " + element.name + ": " + element.error);
|
||||
}
|
||||
});
|
||||
$scope.scroll = -10 * Projector.get(1).scroll;
|
||||
$scope.scroll = -5 * Projector.get(1).scroll;
|
||||
$scope.scale = 100 + 20 * Projector.get(1).scale;
|
||||
});
|
||||
});
|
||||
|
@ -1,4 +1,4 @@
|
||||
<div ng-controller="SlideMotionCtrl" class="content">
|
||||
<div ng-controller="SlideMotionCtrl" class="content scrollcontent">
|
||||
<h1>{{ motion.getTitle() }}</h1>
|
||||
<div class="white-space-pre-line">{{ motion.getText() }}</div>
|
||||
</div>
|
||||
|
@ -1,3 +1,3 @@
|
||||
<div ng-controller="SlideUserCtrl" class="content">
|
||||
<div ng-controller="SlideUserCtrl" class="content scrollcontent">
|
||||
<h1>{{ user.get_full_name() }}</h1>
|
||||
</div>
|
||||
|
@ -1,6 +1,6 @@
|
||||
<div class="header">
|
||||
<div class="title">
|
||||
<h1 translate>Edit profil</h1>
|
||||
<h1 translate>Edit profile</h1>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user