From ef26bb2b4aeb57d23928a9a728d2d8df6b2077c3 Mon Sep 17 00:00:00 2001 From: tekay <tom.kaesler@mni.thm.de> Date: Mon, 4 Apr 2016 11:32:42 +0200 Subject: [PATCH] fix Layout for specific range --- .../client/css/hashtagmanagement.css | 3 +++ arsnova.click/client/js/hashtagmanagement.js | 22 ++++++++++++++++++- .../client/templates/hashtagmanagement.html | 18 +++++++-------- 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/arsnova.click/client/css/hashtagmanagement.css b/arsnova.click/client/css/hashtagmanagement.css index 73c996a63..7c5c4a685 100644 --- a/arsnova.click/client/css/hashtagmanagement.css +++ b/arsnova.click/client/css/hashtagmanagement.css @@ -36,3 +36,6 @@ cursor: inherit; display: block; } +.alignGlyphicon { + padding-top: 5px; +} \ No newline at end of file diff --git a/arsnova.click/client/js/hashtagmanagement.js b/arsnova.click/client/js/hashtagmanagement.js index 44a130823..17fb5ef50 100644 --- a/arsnova.click/client/js/hashtagmanagement.js +++ b/arsnova.click/client/js/hashtagmanagement.js @@ -22,6 +22,16 @@ Template.hashtagManagement.onCreated(function () { }); }); +Template.hashtagManagement.onRendered(function () { + $(window).resize(function () { + labelManagement(); + }); +}); + +Template.hashtagManagement.rendered = function () { + labelManagement(); +}; + Template.hashtagManagement.helpers({ serverHashtags: function () { return localData.getAllHashtags(); @@ -101,4 +111,14 @@ Template.hashtagManagement.events({ fileReader.readAsBinaryString(fileList[i]); } } -}); \ No newline at end of file +}); + +function labelManagement () { + var windowWidth = $(window).width(); + if (windowWidth < 1220 && windowWidth > 990) { + $('.buttonLabels').hide(); + } + else { + $('.buttonLabels').show(); + } +} \ No newline at end of file diff --git a/arsnova.click/client/templates/hashtagmanagement.html b/arsnova.click/client/templates/hashtagmanagement.html index 6f628be93..8d801302d 100644 --- a/arsnova.click/client/templates/hashtagmanagement.html +++ b/arsnova.click/client/templates/hashtagmanagement.html @@ -17,9 +17,9 @@ --> <template name="hashtagManagement"> - {{> titel titelText = "Import | Export" }} - <div class="row answer-options distance-top"> - <div class="col-xs-12"> + <div class="row"> + <div class="col-md-12 contentFrame"> + {{> titel titelText = "Import | Export" }} {{#each serverHashtags}} <div class="row" id="{{this}}"> <div class="col-xs-6"> @@ -29,14 +29,14 @@ </div> <div class="col-xs-3"> <button type="button" class="js-export btn btn-info btn-lg btn-answerOption"> - <span class="glyphicon glyphicon-export glyph-left" aria-hidden="true"></span> - <span class="ansBtn">Export</span> + <span class="glyphicon glyphicon-export glyph-left alignGlyphicon" aria-hidden="true"></span> + <span class="buttonLabels ansBtn">Export</span> </button> </div> <div class="col-xs-3"> <button type="button" class="js-delete btn btn-info btn-lg btn-answerOption"> - <span class="glyphicon glyphicon-trash glyph-left" aria-hidden="true"></span> - <span class="ansBtn">Löschen</span> + <span class="glyphicon glyphicon-trash glyph-left alignGlyphicon" aria-hidden="true"></span> + <span class="buttonLabels ansBtn">Löschen</span> </button> </div> </div> @@ -44,8 +44,8 @@ </div> </div> <div class="row"> - <div class="col-xs-12"> - <span class="btn btn-lg btn-warning btn-file distance-top"> + <div class="col-md-12"> + <span class="btn btn-lg btn-warning btn-file distance-top btn-answerOption"> Import <input id="js-import" type="file" accept="application/json" multiple> </span> </div> -- GitLab