diff --git a/arsnova.click/client/css/default/default.scss b/arsnova.click/client/css/default/default.scss index 7c69acad81ab912c73b5faf421cb75207dddfb25..31932bc7104356cb138d461c1b9b45d6b8c4a49b 100644 --- a/arsnova.click/client/css/default/default.scss +++ b/arsnova.click/client/css/default/default.scss @@ -103,11 +103,11 @@ button:disabled { .footer-gradient { /* Permalink - use to edit and share this gradient: http://colorzilla.com/gradient-editor/#fafafa+0,bfbfbf+100 */ - background: $footer-background-color; /* Old browsers */ - background: -moz-linear-gradient(top, $footer-background-color 0%, $footer-background-color 100%); /* FF3.6-15 */ - background: -webkit-linear-gradient(top, $footer-background-color 0%, $footer-background-color 100%); /* Chrome10-25,Safari5.1-6 */ - background: linear-gradient(to bottom, $footer-background-color 0%, $footer-background-color 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */ - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='$footer-background-color', endColorstr='$footer-background-color', GradientType=0); /* IE6-9 */ + /*background: $footer-background-color; /* Old browsers */ + /*background: -moz-linear-gradient(top, $footer-background-color 0%, $footer-background-color 100%); /* FF3.6-15 */ + /*background: -webkit-linear-gradient(top, $footer-background-color 0%, $footer-background-color 100%); /* Chrome10-25,Safari5.1-6 */ + /*background: linear-gradient(to bottom, $footer-background-color 0%, $footer-background-color 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */ + /*filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='$footer-background-color', endColorstr='$footer-background-color', GradientType=0); /* IE6-9 */ color: $footer-text-color; } diff --git a/arsnova.click/client/css/default/default_classes.scss b/arsnova.click/client/css/default/default_classes.scss index 299e792e63fcec17b990acb1af8e86e51459afcb..5c89ecaf9a27c642a6db9d829f970be8ca20ade2 100644 --- a/arsnova.click/client/css/default/default_classes.scss +++ b/arsnova.click/client/css/default/default_classes.scss @@ -2,7 +2,8 @@ @import "appearance"; .center-vertical { - position: relative; + position: absolute; + width: 100%; top: 50%; /* TODO: IE 8 and Opera 8 doesn't support translateY*/ transform: translateY(-50%); @@ -44,6 +45,7 @@ font-size: 2em; font-weight: 800; color: $input-group-letter-color; + min-width: 50px; } .button:hover, .button:active:focus { @@ -105,7 +107,8 @@ bottom: 25px; width: 100%; left: 0; - padding: 30px; + background-color: steelblue; + padding: 10px 15px 25px 15px; } .content-with-navigation-buttons { diff --git a/arsnova.click/client/css/footer.css b/arsnova.click/client/css/footer.css index 5c29f2f7d99c92f5c8eb646e52d661abaa6d1dca..aa406109f2032f3a5790258e8010ec310a79f8a4 100644 --- a/arsnova.click/client/css/footer.css +++ b/arsnova.click/client/css/footer.css @@ -1,7 +1,7 @@ .footer { min-height: 20px; - margin-top: 10px; + /*margin-top: 10px;*/ border: 0px; } @@ -12,3 +12,7 @@ .footer a:first-child div { border: none; } + +.footer .container-fluid { + padding: 0; +} diff --git a/arsnova.click/client/css/mainLayout.css b/arsnova.click/client/css/mainLayout.css index 0f4805d2d8ed41e0f0437b2ffdbb102290eb9c96..33e9593338a80d32a7506d8af7c25fb1b269b42b 100644 --- a/arsnova.click/client/css/mainLayout.css +++ b/arsnova.click/client/css/mainLayout.css @@ -10,8 +10,10 @@ * -50px because of the header height * -20px because of the footer height */ - height: calc(100% - 114px - 20px); - top: 10%; + /*height: calc(100% - 114px - 20px);*/ + /*top: 10%;*/ + height: 100%; + overflow-x: auto; } .contentPosition > .row { @@ -50,6 +52,7 @@ a:focus { p, ul.list-unstyled { margin-left: 30px; + margin-right: 30px; text-align: justify; } @@ -62,12 +65,12 @@ p, ul.list-unstyled { color: white; text-align: center; font-size: 6vw; - margin-top: 20px; + /*margin-top: 20px;*/ width: 100%; } .titel + .margin-title { - margin-top: 60px; + margin-top: 10px; } .answer-options { @@ -97,4 +100,8 @@ p, ul.list-unstyled { .titel { font-size: 3.5vw; } +} + +.toggleCorrect:hover { + cursor: pointer; } \ No newline at end of file diff --git a/arsnova.click/client/css/memberlist.css b/arsnova.click/client/css/memberlist.css index 0a7999c8fe9e639eec4e23b811e891b44854ed1b..c74b4262397e8296221e94f00588b463476564bd 100644 --- a/arsnova.click/client/css/memberlist.css +++ b/arsnova.click/client/css/memberlist.css @@ -1,7 +1,7 @@ -.learner-title { +/*.learner-title { margin: 10px 0; } - +*/ .btn-learner { margin-bottom: 20px; width: 100%; diff --git a/arsnova.click/client/js/memberlist.js b/arsnova.click/client/js/memberlist.js index 0744f57ea1c12b4f699852cce757696cd172339e..52f3c5a55a11ed3fc23e22f325b695bec75aa32a 100644 --- a/arsnova.click/client/js/memberlist.js +++ b/arsnova.click/client/js/memberlist.js @@ -30,6 +30,23 @@ Template.memberlist.events({ } }); +Template.memberlist.onRendered(function () { + $(window).resize(function () { + + var final_height = $(window).height() - $(".navbar").height(); + $(".titel").css("margin-top", $(".navbar").height()); + $(".container").css("height", final_height); + + + }); +}); + +Template.memberlist.rendered = function () { + var final_height = $(window).height() - $(".navbar").height(); + $(".titel").css("margin-top", $(".navbar").height()); + $(".container").css("height", final_height); +}; + Template.memberlist.helpers({ hashtag: function () { return Session.get("hashtag"); @@ -83,6 +100,8 @@ Template.memberlist.helpers({ } return !Session.get("isOwner") && (doc.isReadingConfirmationRequired == 1); } + + }); function calculateButtonCount () { diff --git a/arsnova.click/client/js/splashscreen.js b/arsnova.click/client/js/splashscreen.js index 63786eb824ea3bcc15d1b2f95c255067e9c4afe7..858cc009003c4fe30671d64bb49454bbb0bf1fcf 100644 --- a/arsnova.click/client/js/splashscreen.js +++ b/arsnova.click/client/js/splashscreen.js @@ -11,7 +11,7 @@ Template.splashscreen.rendered = function () { keyboard: false }); } - + /* if (templateParams.timerClose) { if (isNaN(templateParams.timerClose)) { templateParams.timerClose = 5000; @@ -21,7 +21,7 @@ Template.splashscreen.rendered = function () { closeSplashscreen(); } }, templateParams.timerClose); - } + }*/ splashscreen.modal('show'); /*var wpwSessionData = { diff --git a/arsnova.click/client/js/titel.js b/arsnova.click/client/js/titel.js new file mode 100644 index 0000000000000000000000000000000000000000..4af9d6cbc6e8f19afae1a090b0df132344cbcab9 --- /dev/null +++ b/arsnova.click/client/js/titel.js @@ -0,0 +1,23 @@ +/** + * Created by antoschka on 08.03.16. + */ + +Template.titel.onRendered(function () { + $(window).resize(function () { + + var final_height = $(window).height() - $(".navbar").height(); + $(".margin-to-logo").css("margin-top", $(".navbar").height()); + $(".container").css("height", final_height); + console.log("test"); + + }); +}); + + +Template.titel.rendered = function () { + var final_height = $(window).height() - $(".navbar").height(); + + $(".margin-to-logo").css("margin-top", $(".navbar").height()); + $(".container").css("height", final_height); + console.log("test"); +}; \ No newline at end of file diff --git a/arsnova.click/client/templates/agb.html b/arsnova.click/client/templates/agb.html index 5f53ee24ce9a30e4fa20a6c8ae6c9767c7880568..78e501fb7e0ebb081b99782b84f030ce8d7aff67 100644 --- a/arsnova.click/client/templates/agb.html +++ b/arsnova.click/client/templates/agb.html @@ -1,8 +1,7 @@ <template name="agb"> - <div class="container text-light contentContainer col-md-12"> - <h1> - Allgemeine Geschäftsbedingungen - </h1> + <div class="container text-light contentContainer col-md-12 "> + + {{> titel titelText="Allgemeine Geschäftsbedingungen"}} <h3> Lorem ipsum dolor sit amet </h3> diff --git a/arsnova.click/client/templates/datenschutz.html b/arsnova.click/client/templates/datenschutz.html index 39f29c47c955082c9da040289c4e193e04402b73..cabc54c813106e8921d5d24e2ebae1d8db3ca130 100644 --- a/arsnova.click/client/templates/datenschutz.html +++ b/arsnova.click/client/templates/datenschutz.html @@ -1,9 +1,8 @@ <template name="datenschutz"> <div class="container text-light contentContainer col-md-12"> - <h1> - Datenschutzerklärung - </h1> + + {{> titel titelText="Datenschutzerklärung"}} <h3> Geltungsbereich </h3> diff --git a/arsnova.click/client/templates/impressum.html b/arsnova.click/client/templates/impressum.html index 78db7b1754afc0e95c10ef004c7748e0052161d6..ee6e846239c4ceb8d0559f6a0cd40f6f54d27df7 100644 --- a/arsnova.click/client/templates/impressum.html +++ b/arsnova.click/client/templates/impressum.html @@ -1,10 +1,7 @@ <template name="impressum"> <div class="container text-light contentContainer col-md-12"> - <h1> - Impressum - </h1> - + {{> titel titelText="Impressum"}} <p> Installation und Betrieb der Website und Webapp arsnova.click sind eine Dienstleistung der: </p> diff --git a/arsnova.click/client/templates/readconfirmationrequired.html b/arsnova.click/client/templates/readconfirmationrequired.html index 35e4cb7593ad83e42573884879f909a8b0a60d84..78209c604e2b5ee06343c98a738c9f3990421f0b 100644 --- a/arsnova.click/client/templates/readconfirmationrequired.html +++ b/arsnova.click/client/templates/readconfirmationrequired.html @@ -7,7 +7,8 @@ {{#if isReadConfirmationRequired}} <button id="isReadConfirmationRequiredButton" class="button down button-purple">Lesebestätigung ?</button> {{else}} - <button id="isReadConfirmationRequiredButton" class="button button-purple">Lesebestätigung ?</button> + <button id="isReadConfirmationRequiredButton" class="button button-warning">Lesebestätigung ? + </button> {{/if}} </div> </div> diff --git a/arsnova.click/client/templates/titel.html b/arsnova.click/client/templates/titel.html index 37efd18f86fbe286e81a96def361c4985f9883d7..c3185345530c0127b3237d3176e69866bbd658f8 100644 --- a/arsnova.click/client/templates/titel.html +++ b/arsnova.click/client/templates/titel.html @@ -1,7 +1,7 @@ <template name="titel"> - <div class="row titel learner-title"> + <div class="row"> <h3 class=" titel-relative text-light text-center"> - <div class="titel ">{{titelText}}</div> + <div class="titel margin-to-logo">{{titelText}}</div> </h3> </div> </template> \ No newline at end of file diff --git a/arsnova.click/client/templates/ueber.html b/arsnova.click/client/templates/ueber.html index 0f4717897df1da9aa3c06a2cbd13ee0d6c9a2d8e..b037b8414008704f9816b9950a89fc596cb6855f 100644 --- a/arsnova.click/client/templates/ueber.html +++ b/arsnova.click/client/templates/ueber.html @@ -1,8 +1,7 @@ <template name="ueber"> - <div class="container text-light contentContainer"> - <h1> - Über arsnova.click - </h1> + <div class="container text-light contentContainer col-md-12"> + + {{> titel titelText="Über arsnova.click"}} <h3> <span class="glyphicon glyphicon-check" aria-hidden="true"></span> Lorem ipsum dolor sit amet </h3>