Skip to content
Snippets Groups Projects
Commit ba0d66cf authored by iaibrys's avatar iaibrys
Browse files

Merge branch 'develop' into feature/remove-coffeescript

* develop:
  Update dtu-core dependency
parent e6c57c1d
Branches
No related tags found
No related merge requests found
Showing
with 102 additions and 97 deletions
......@@ -35,3 +35,4 @@
/yarn-error.log
yarn-debug.log*
.yarn-integrity
/deps/public
......@@ -51,6 +51,8 @@ RUN rm -rf $APP_ROOT/log
RUN mkdir -p $APP_ROOT/tmp
RUN mkdir -p $APP_ROOT/log
RUN cp -R "$(bundle show datagrid)/app/assets" vendor/datagrid
# generate cookie key
RUN PRECOMPILE=1 bundle exec rake secret
RUN PRECOMPILE=1 bundle exec rake secret > ~/secret-key-base.txt
......
//= link_tree ../images
//= link_directory ../javascripts .js
//= link application.css
//= link dtu_core_app/application.css
// This is a manifest file that'll be compiled into application.js, which will include all the files
// listed below.
//
// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
//
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
// compiled file.
//
// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
// about supported directives.
//
//= require underscore
//= require jquery
//= require jquery_ujs
//= re qui re turbolinks
//= require_tree .
//= require bootstrap-sprockets
//= require websocket_rails/main
//= require moment
//= require clipboard
//= require bootstrap-datetimepicker
//= require bootstrap-select
//= require dtu_core_app/application
$('.datetimepicker').datetimepicker();
console.error('moved to webpacker');
/*
* This is a manifest file that'll be compiled into application.css, which will include all the files
* listed below.
*
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
* or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
*
* You're free to add application-wide styles to this file and they'll appear at the bottom of the
* compiled file so the styles you add here take precedence over styles defined in any styles
* defined in the other CSS/SCSS files in this directory. It is generally better to create a new
* file per style scope.
*
*= require dtu_core_app/application.css
*/
@import 'dtu_core_app/tango_palette.scss';
$body-bg: #fff !global;
$font-size-base: 20px !global;
$light-yellow-highlight: rgba(255,245,125, 0.6);
$answer-selected: rgba(240,235,115, 0.8);
$correct-answer: rgba(115,240,115, 0.8);
$incorrect-answer: rgba(240,115,115, 0.8);
$feedback-answer: rgba(140,140,250, 0.8);
$quiz-question-separation: 5vh;
$quiz-internal-question-separation: 1vh;
$monospace_font_family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
@import "datagrid";
@import "bootstrap-sprockets";
@import "bootstrap";
@import "_bootstrap-datetimepicker";
@import "bootstrap-select";
body {
/* for the navbor fixed */
padding-top:80px;
}
@import "course";
@import "headers";
@import "quiz-list";
@import "quiz";
@import "quiz_template";
@import "quiz_templates_controller";
@import "sessions";
@import "users";
File moved
File moved
......@@ -37,12 +37,12 @@
}
tr.quiz-selected,
tr.quiz-selected:hover, {
tr.quiz-selected:hover {
background-color: $correct-answer;
}
.quiz_templates_grid tr td.select,
.quiz_templates_grid tr th.select,
.quiz_templates_grid tr th.select
{
display:none;
}
......
File moved
......@@ -15,6 +15,51 @@
// const images = require.context('../images', true)
// const imagePath = (name) => images(name, true)
import 'bootstrap/dist/js/bootstrap';
const Rails = require('rails-ujs');
Rails.start();
window.Rails = Rails;
console.log('Hello World from Webpacker');
require('bootstrap/dist/js/bootstrap');
require('../src/websocket_rails/index');
require('moment');
require('clipboard');
require('eonasdan-bootstrap-datetimepicker/src/js/bootstrap-datetimepicker');
require('bootstrap-select');
import { ClientDebug, stringifySafe, serializerSafe } from 'dtu_core_assets';
window.ClientDebug = ClientDebug;
window.stringifySafe = stringifySafe;
window.serializerSafe = serializerSafe;
$('.datetimepicker').datetimepicker();
require('../src/answers');
require('../src/code');
require('../src/connection');
require('../src/crc');
require('../src/dontknow');
require('../src/flash');
require('../src/hints');
require('../src/page_load');
require('../src/quiz');
window.QuizTemplate = require( '../src/quiz_template');
require('../src/quiz_templates');
require('../src/quiz_templates_update_summary');
require('../src/quiz_templates_view_submissions');
require('../src/scoring');
require('../src/stats');
require('../src/student_quizzes');
require('../src/timer');
require('../src/util');
window.QuizTemplate = QuizTemplate;
window.$ = $;
window.jQuery = $;
$.fn.selectpicker.Constructor.BootstrapVersion = '3';
@import '~bootstrap/dist/css/bootstrap';
@import '~dtu_core_assets/index';
@import '~dtu_core_assets/tango_palette';
$body-bg: #fff !global;
$font-size-base: 20px !global;
$light-yellow-highlight: rgba(255,245,125, 0.6);
$answer-selected: rgba(240,235,115, 0.8);
$correct-answer: rgba(115,240,115, 0.8);
$incorrect-answer: rgba(240,115,115, 0.8);
$feedback-answer: rgba(140,140,250, 0.8);
$quiz-question-separation: 5vh;
$quiz-internal-question-separation: 1vh;
$monospace_font_family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
@import "~datagrid/stylesheets/datagrid";
$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
@import '~bootstrap-sass/assets/stylesheets/_bootstrap';
@import '~eonasdan-bootstrap-datetimepicker/src/sass/bootstrap-datetimepicker';
@import "~bootstrap-select/sass/bootstrap-select";
body {
/* for the navbar fixed */
padding-top: 80px;
}
@import "../css/course";
@import "../css/headers";
@import "../css/quiz-list";
@import "../css/quiz";
@import "../css/quiz_template";
@import "../css/quiz_templates_controller";
@import "../css/sessions";
@import "../css/users";
#remote-modal {
margin: auto;
}
File moved
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment