cleaned up layout

This commit is contained in:
Naeltard 2015-10-24 12:20:12 +02:00
parent e8ff9b4c49
commit de74d2f1df
8 changed files with 19 additions and 19 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

View File

@ -1,7 +1,9 @@
body {
padding-bottom: 40px;
}
btn_logout:hover{
cursor: pointer;
}
/*.list {
border: 2px solid #ccc;
}*/

View File

@ -1,3 +1,2 @@
<form class="navbar-form navbar-right" id="form_logout" style="margin: 0; padding: 0;">
<button id="btn_logout" type="submit" class="btn btn-primary"><span class="glyphicon glyphicon-log-out"></span>&nbsp;&nbsp;Logout</button>
</form>
<a id="btn_logout">&nbsp;&nbsp;Logout</a>

View File

@ -4,8 +4,6 @@
<li><a href="#!list"><span class="glyphicon glyphicon-edit"></span>&nbsp;Abstimmen</a></li>
<li><a href="#!analysis"><span class="glyphicon glyphicon-stats"></span>&nbsp;Auswerten</a></li>
<!--<li><a href="#!start(user_main(my))"><span class="glyphicon glyphicon-cog"></span>&nbsp;Mithelfen</a></li>-->
<li style="float: right"><a href="#!start(user_main(imp))"><span class="glyphicon glyphicon-tags"></span>&nbsp;Impressum</a></li>
<li style="float: right">${loginform}</li>
</ul>
</div>

View File

@ -3,6 +3,5 @@
<li class="active"><a href="#!start(user_main(start))"><span class="glyphicon glyphicon-home"></span>&nbsp;Start</a></li>
<li><a href="#!start(user_main(news))"><span class="glyphicon glyphicon-bullhorn"></span>&nbsp;News</a></li>
<li><a href="#!start(user_main(imp))"><span class="glyphicon glyphicon-tags"></span>&nbsp;&nbsp;Impressum</a></li>
<li style="float: right">${loginform}</li>
</ul>
</div>

View File

@ -13,6 +13,10 @@
<body style="background: url(${frontend_logos}tapete.gif); background-attachment: fixed;">
<div class="container" id="site-content">
<div class="row" style="margin-top: 15px;">
<div class="row" style="text-align: right">
<a href="#!start(user_main(imp))">&nbsp;&nbsp;Impressum</a>
${loginform}
</div>
<div class="col-md-12">
<img class="img-responsive" src="${frontend_logos}logo.png" style="width: 100%"/>
</div>

View File

@ -1,6 +1,6 @@
<div id="poll_body" class="row">
<div class="col-md-4">
<div class="row">
<div class="row" style="padding: 0; margin: 0;">
<div class="panel-group" id="poll_3">
<div class="panel panel-default panel-info">
<div class="panel-heading">
@ -9,18 +9,16 @@
</h4>
</div>
<div class="panel-body row" id="poll_3_body">
<div class="row">
<div class="col-md-12">
<h4 style="word-break: break-all;">${title}</h4>
${openvote_help_text}
${title} abstimmen.
</div>
<div class="col-md-12">
<h4 style="word-break: break-all;">${title}</h4>
${openvote_help_text}
${title} abstimmen.
</div>
</div>
</div>
</div>
</div><div class="row">
</div>
<div class="row" style="padding: 0; margin: 0;">
<div class="panel-group" id="poll_7">
<div class="panel panel-default panel-info">
<div class="panel-heading">
@ -41,7 +39,7 @@
</div>
</div>
</div>
<div class="row">
<div class="row" style="padding: 0; margin: 0;">
<div class="panel-group" id="poll_6">
<div class="panel panel-default panel-info">
<div class="panel-heading">
@ -114,5 +112,5 @@
</div>
</div>
</div>