Commit 10e182fc authored by Troy Grandy's avatar Troy Grandy

css fixes.

parent 73ad8f66
......@@ -144,15 +144,18 @@ body {
padding: 0;
background-color: #e6e6e6; }
.ui-wrapper {
height: 100vh;
overflow-y: scroll;
width: 100vw;}
#main-body{
margin-left: auto;
margin-right: auto;
padding: 50px 30px 0 30px;
}
.ui-wrapper {
height: 100vh;
overflow-y: auto;
width: 100vw;}
#main-body{
margin-left: auto;
margin-right: auto;
padding: 50px 30px 0 30px;
/* // fixing slide editor; these might need to be specific to that view */
height: 100%;
/* width: 100%; */
}
.navbar-inverse {
margin-left: 60px;
......
......@@ -19,12 +19,15 @@ body {
.ui-wrapper {
height: 100vh;
overflow-y: scroll;
overflow-y: auto;
width: 100vw;}
#main-body{
margin-left: auto;
margin-right: auto;
padding: 50px 30px 0 30px;
// fixing slide editor; these might need to be specific to that view
height: 100%;
/* width: 100%; */
}
.navbar-inverse {
......
......@@ -171,7 +171,7 @@
<li><a href="#">Settings</a></li>
<li><a href="#">Profile</a></li>
<li><a href="#">Help</a></li>-->
{% if request.user.is_staff %}<li><a href="{% url 'dashboard' %}">Analytics</a></li>{% endif %}
{% comment %} {% if request.user.is_staff %}<li><a href="{% url 'dashboard' %}">Analytics</a></li>{% endif %} {% endcomment %}
<li><a href="/static/documentation/index.html">Help</a></li>
<li><a href="{% url 'logout' %}">Logout</a></li>
</ul>
......
......@@ -14,11 +14,11 @@
{% block style %}
<style>
#canvasContainer {
position: absolute;
width: 100vw;
height: 100vh;
position: fixed;
width: 100%;
height: 100%;
left: 0;
padding-left: 70px;
{% comment %} padding-left: 70px; {% endcomment %}
}
.bar{
......@@ -27,17 +27,18 @@
#leftbar{
padding-left: 75px;
padding-right: 10px;
padding-top:55px;
width:300px;
height:100vh;
min-height: 100vh;
max-height: 100vh;
padding-top: 20px;
width:365px;
height:100%;
{% comment %} min-height: 100vh;
max-height: 100vh; {% endcomment %}
position: absolute;
top:0px;
left:0px;
overflow-y: auto;
}
#layerlist{
width:280px;
width: 280px;
height: 300px;
max-height: 500px;
left: 10px;
......@@ -69,12 +70,12 @@
#rightbar{
padding-left: 5px;
padding-right: 5px;
padding-top:90px;
padding-top: 80px;
width:300px;
height:100vh;
min-height: 100vh;
max-height: 100vh;
overflow-y: scroll;
height:100%;
{% comment %} min-height: 100vh;
max-height: 100vh; {% endcomment %}
overflow-y: auto;
position: fixed;
top:0px;
right:0px;
......@@ -87,12 +88,12 @@
color: #2e6da4;
}
#centerdiv{
margin-left: 300px;
margin-left: 365px;
margin-right: 300px;
margin-top: -40px;
padding-top:50px;
margin-bottom: 0px;
height: 100vh;
height: 100%;
background-color: #474d57;
}
......@@ -323,16 +324,7 @@
Widget Settings <span id="refreshbutton">(refresh)</span>:
<div id="layersettings"></div>
</div>
<div id="layersModal" class="modal fade" style="z-index:2000;">
<div class="modal-dialog modal-lg">
<div class="modal-content" style="padding: 10px;">
<div id="listLayersLoader" class="modal-body"></div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal-dialog -->
</div>
<!-- /.modal -->
<div id="controls-extra"></div>
<div id="version-feedback">
......@@ -350,6 +342,16 @@
</div>
</div>
</div>
<div id="layersModal" class="modal fade" style="z-index:2000;">
<div class="modal-dialog modal-lg">
<div class="modal-content" style="padding: 10px;">
<div id="listLayersLoader" class="modal-body"></div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal-dialog -->
</div>
<!-- /.modal -->
{% endblock %}
{% block script %}
......
......@@ -16,7 +16,7 @@
{% block body %}
<page-header title="Slideshows" icon="fa-th-list">
<a href="{% url 'new_slideshow' %}" class="btn btn-primary btn-sm"><i class="fa fa-plus"></i> New slideshow</a>
<a href="{% url 'create_slideshow_from_pdf' %}" class="btn btn-primary btn-sm"><i class="fa fa-file-pdf"></i>Create from PDF</a>
{% comment %} <a href="{% url 'create_slideshow_from_pdf' %}" class="btn btn-primary btn-sm"><i class="fa fa-file-pdf"></i>Create from PDF</a> {% endcomment %}
</page-header>
<div class="container-fluid">
<div class="row">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment