JohnHammond
/
CTFd
mirror of https://github.com/JohnHammond/CTFd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Seperate out admin theme from core more to fix #1200 (#1202) 

* Separate out admin theme from core more to fix #1200
bulk-clear-sessions
Kevin Chung 2020-01-03 22:18:05 -05:00 committed by GitHub
parent b8d0f80d01
commit d5128c2fa4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CTFd/themes/admin/assets/css/codemirror.scss Normal file
View File

@ -0,0 +1 @@
@import "~codemirror/lib/codemirror.css";

4
CTFd/themes/admin/static/css/codemirror.dev.css Normal file
View File

File diff suppressed because one or more lines are too long

1
CTFd/themes/admin/static/css/codemirror.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
CTFd/themes/admin/templates/challenges/challenge.html
View File

@ -118,6 +118,6 @@
var CHALLENGE_ID = {{ challenge.id }}; var CHALLENGE_ID = {{ challenge.id }};
var CHALLENGE_NAME = {{ challenge.name | tojson }}; var CHALLENGE_NAME = {{ challenge.name | tojson }};
</script> </script>
<script defer src="{{ url_for('views.themes', theme='core', path='js/plotly.bundle.js') }}"></script> <script defer src="{{ url_for('views.themes', theme='admin', path='js/plotly.bundle.js') }}"></script>
<script defer src="{{ request.script_root }}{{ update_script }}"></script> <script defer src="{{ request.script_root }}{{ update_script }}"></script>
{% endblock %} {% endblock %}

2
CTFd/themes/admin/templates/editor.html
View File

@ -1,7 +1,7 @@
{% extends "admin/base.html" %} {% extends "admin/base.html" %}
{% block stylesheets %} {% block stylesheets %}
<link rel="stylesheet" type="text/css" href="{{ url_for('views.themes', theme='core', path='css/codemirror.css') }}"> <link rel="stylesheet" type="text/css" href="{{ url_for('views.themes', theme='admin', path='css/codemirror.css') }}">
{% endblock %} {% endblock %}
{% block content %} {% block content %}

2
CTFd/themes/admin/templates/modals/users/create.html
View File

@ -1,4 +1,4 @@
<form id="user-info-create-form"> <form id="user-info-create-form" method="POST">
<input type="hidden" name="id"> <input type="hidden" name="id">
<div class="form-group"> <div class="form-group">
<label for="name">User Name</label> <label for="name">User Name</label>

4
CTFd/themes/admin/templates/teams/new.html
View File

@ -22,8 +22,8 @@
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
<script defer src="{{ url_for('views.themes', theme='core', path='js/plotly.bundle.js') }}"></script> <script defer src="{{ url_for('views.themes', theme='admin', path='js/plotly.bundle.js') }}"></script>
<script defer src="{{ url_for('views.themes', theme='core', path='js/graphs.js') }}"></script> <script defer src="{{ url_for('views.themes', theme='admin', path='js/graphs.js') }}"></script>
{% endblock %} {% endblock %}
{% block entrypoint %} {% block entrypoint %}

4
CTFd/themes/admin/templates/users/new.html
View File

@ -22,8 +22,8 @@
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
<script defer src="{{ url_for('views.themes', theme='core', path='js/plotly.bundle.js') }}"></script> <script defer src="{{ url_for('views.themes', theme='admin', path='js/plotly.bundle.js') }}"></script>
<script defer src="{{ url_for('views.themes', theme='core', path='js/graphs.js') }}"></script> <script defer src="{{ url_for('views.themes', theme='admin', path='js/graphs.js') }}"></script>
{% endblock %} {% endblock %}
{% block entrypoint %} {% block entrypoint %}

1
webpack.config.js
View File

@ -31,6 +31,7 @@ const roots = {
'css': { 'css': {
'admin': 'assets/css/admin.scss', 'admin': 'assets/css/admin.scss',
'challenge-board': 'assets/css/challenge-board.scss', 'challenge-board': 'assets/css/challenge-board.scss',
'codemirror': 'assets/css/codemirror.scss',
}, },
'js': { 'js': {
'pages/main': 'assets/js/pages/main.js', 'pages/main': 'assets/js/pages/main.js',