Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
mbklein committed Jul 5, 2024
1 parent 575cfd0 commit dd1ea90
Show file tree
Hide file tree
Showing 34 changed files with 1,122 additions and 800 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ config/initializers/rubyhorn.rb
config/secrets.yml
#config/lti.yml

public/assets
public/media_objects
public/streams
public/**/*.m3u8
Expand Down
10 changes: 5 additions & 5 deletions app/assets/stylesheets/admin.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
* Copyright 2011-2024, The Trustees of Indiana University and Northwestern
/*
* Copyright 2011-2020, The Trustees of Indiana University and Northwestern
* University. Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
*
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software distributed
* under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
Expand Down
21 changes: 8 additions & 13 deletions app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
* Copyright 2011-2024, The Trustees of Indiana University and Northwestern
/*
* Copyright 2011-2020, The Trustees of Indiana University and Northwestern
* University. Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
*
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software distributed
* under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
Expand All @@ -30,20 +30,20 @@
* Require stylesheets for our gems
*
*= require jquery-ui/datepicker
*= require datatables
*
* Require all of our vendored stylesheets
*= require_tree ../../../vendor/assets/stylesheets/.
*= require_self
*/

@import 'bootstrap-sprockets';
// @import 'bootstrap-sprockets';
@import 'nulib/base/variables';
@import 'branding';
@import 'bootstrap';
@import 'bootstrap-toggle';
@import 'font-awesome';
@import 'browse_everything/browse_everything_bootstrap4';
@import 'browse_everything';

@import 'cropperjs/dist/cropper.min';

Expand All @@ -55,9 +55,4 @@

@import 'nestable';
@import 'avalon';

@import "datatables";

@import "video.js/dist/video-js.css";
@import "@silvermine/videojs-quality-selector/dist/css/quality-selector.css";
@import 'nulib/styles.scss';
Loading

0 comments on commit dd1ea90

Please sign in to comment.