diff --git a/bower.json b/bower.json index 86ef6470d..fe26c3a5e 100644 --- a/bower.json +++ b/bower.json @@ -35,8 +35,7 @@ "ngstorage": "~0.3.11", "ngBootbox": "~0.1.3", "pdfmake-dist": "~0.1.27", - "open-sans-fontface": "https://github.com/OpenSlides/open-sans.git#1.4.2.post1", - "roboto-condensed": "~0.3.0", + "roboto-fontface": "~0.6.0", "tinymce": "~4.4.3", "tinymce-i18n": "OpenSlides/tinymce-i18n#a186ad61e0aa30fdf657e88f405f966d790f0805" }, @@ -50,6 +49,14 @@ "pdfjs-dist": { "main": "build/pdf.combined.js" }, + "roboto-fontface": { + "main": [ + "fonts/Roboto/Roboto-Regular.woff", + "fonts/Roboto/Roboto-Medium.woff", + "fonts/Roboto-Condensed/Roboto-Condensed-Regular.woff", + "fonts/Roboto-Condensed/Roboto-Condensed-Light.woff" + ] + }, "tinymce": { "main": [ "tinymce.js", diff --git a/gulpfile.js b/gulpfile.js index 3b9ba6c7c..ef19964d1 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -97,7 +97,7 @@ gulp.task('css-libs', function () { // Catches all font files from all bower components. gulp.task('fonts-libs', function() { return gulp.src(mainBowerFiles({ - filter: /\.(eot)|(svg)|(ttf)|(woff)|(woff2)$/ + filter: /\.woff$/ })) .pipe(gulp.dest(path.join(output_directory, 'fonts'))); }); diff --git a/openslides/agenda/static/templates/agenda/item-list.html b/openslides/agenda/static/templates/agenda/item-list.html index a76cc772c..4be59732f 100644 --- a/openslides/agenda/static/templates/agenda/item-list.html +++ b/openslides/agenda/static/templates/agenda/item-list.html @@ -260,22 +260,18 @@
- - - +
- - - {{ item.getListViewTitle() }} - - - {{ item.getListViewTitle() }} - - + + {{ item.getListViewTitle() }} + + + {{ item.getListViewTitle() }} +
diff --git a/openslides/assignments/static/templates/assignments/assignment-list.html b/openslides/assignments/static/templates/assignments/assignment-list.html index 8438a9221..9e5617596 100644 --- a/openslides/assignments/static/templates/assignments/assignment-list.html +++ b/openslides/assignments/static/templates/assignments/assignment-list.html @@ -224,11 +224,9 @@
- - - {{ assignment.title }} - - + + {{ assignment.title }} +
- - - +
{{ mediafile.uploader.get_full_name() }}
diff --git a/openslides/motions/static/templates/motions/motion-list.html b/openslides/motions/static/templates/motions/motion-list.html index 4bda569b7..451c56237 100644 --- a/openslides/motions/static/templates/motions/motion-list.html +++ b/openslides/motions/static/templates/motions/motion-list.html @@ -382,9 +382,7 @@
diff --git a/openslides/users/static/templates/users/user-list.html b/openslides/users/static/templates/users/user-list.html index b1ade9aab..3dc645cd3 100644 --- a/openslides/users/static/templates/users/user-list.html +++ b/openslides/users/static/templates/users/user-list.html @@ -277,18 +277,14 @@