Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
S
Scinage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
11
Issues
11
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Science Computing
Scinage
Commits
10e182fc
Commit
10e182fc
authored
Dec 21, 2020
by
Troy Grandy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
css fixes.
parent
73ad8f66
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
47 additions
and
39 deletions
+47
-39
static/css/_global.css
static/css/_global.css
+12
-9
static/css/_global.scss
static/css/_global.scss
+4
-1
templates/UI/skin.html
templates/UI/skin.html
+1
-1
templates/slides/canvas.html
templates/slides/canvas.html
+29
-27
templates/slideshows/slideshows.html
templates/slideshows/slideshows.html
+1
-1
No files found.
static/css/_global.css
View file @
10e182fc
...
...
@@ -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
;
...
...
static/css/_global.scss
View file @
10e182fc
...
...
@@ -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
{
...
...
templates/UI/skin.html
View file @
10e182fc
...
...
@@ -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>
...
...
templates/slides/canvas.html
View file @
10e182fc
...
...
@@ -14,11 +14,11 @@
{% block style %}
<style>
#canvasContainer
{
position
:
absolute
;
width
:
100
vw
;
height
:
100
vh
;
position
:
fixed
;
width
:
100
%
;
height
:
100
%
;
left
:
0
;
padding-left
:
70px
;
{%
comment
%
}
padding-left
:
70
px
;
{
%
endcomment
%
}
}
.bar
{
...
...
@@ -27,17 +27,18 @@
#leftbar
{
padding-left
:
75px
;
padding-right
:
10px
;
padding-top
:
55
px
;
width
:
3
00
px
;
height
:
100
vh
;
min-height
:
100vh
;
max-height
:
100vh
;
padding-top
:
20
px
;
width
:
3
65
px
;
height
:
100
%
;
{%
comment
%
}
min-height
:
100
vh
;
max-height
:
100
vh
;
{
%
endcomment
%
}
position
:
absolute
;
top
:
0
px
;
left
:
0
px
;
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
:
9
0px
;
padding-top
:
8
0px
;
width
:
300px
;
height
:
100
vh
;
min-height
:
100vh
;
max-height
:
100vh
;
overflow-y
:
scroll
;
height
:
100
%
;
{%
comment
%
}
min-height
:
100
vh
;
max-height
:
100
vh
;
{
%
endcomment
%
}
overflow-y
:
auto
;
position
:
fixed
;
top
:
0
px
;
right
:
0
px
;
...
...
@@ -87,12 +88,12 @@
color
:
#2e6da4
;
}
#centerdiv
{
margin-left
:
3
00
px
;
margin-left
:
3
65
px
;
margin-right
:
300px
;
margin-top
:
-40px
;
padding-top
:
50px
;
margin-bottom
:
0px
;
height
:
100
vh
;
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 %}
...
...
templates/slideshows/slideshows.html
View file @
10e182fc
...
...
@@ -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"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment