Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions app/assets/stylesheets/_z-index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
@use 'sass:map';

@function above($element) {
@return $element + 1;
}

@function below($element) {
@return $element - 1;
}

// z-index values from libraries
$navbar-static-top: 1000;
$mui-tooltip-popper: 1500;

$base: 0;

// z-index values can be accessed with map-get($z-index, {element})
$z-index: (
'sidebar-container': above($base),
'footer': above(above($base)),
'show-sidebar': below($navbar-static-top),
'body-nav': 1201,
'ck-body-wrapper': $mui-tooltip-popper,
);
2 changes: 1 addition & 1 deletion app/assets/stylesheets/course/layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ $sidebar-margin-side: 1.5rem;
#show-sidebar {
border: 0;
position: absolute;
z-index: 999;
z-index: map-get($z-index, 'show-sidebar');
}

#full-sidebar {
Expand Down
1 change: 1 addition & 0 deletions app/assets/stylesheets/layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@import 'bootstrap';

@import 'variables';
@import 'z-index';
@import 'bootstrap-datetimepicker';
@import 'bootstrap-select';
@import 'tokenfield-typeahead';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/* Below are needed to ensure ckeditor popup (eg link)
is rendered properly in MUI dialog */
@import 'z-index';

.ck-body-wrapper {
position: absolute;
z-index: 1500;
z-index: map-get($z-index, 'ck-body-wrapper');
}
2 changes: 1 addition & 1 deletion client/app/lib/components/core/fields/CKEditorRichText.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { cyan } from '@mui/material/colors';

import axios from 'lib/axios';

import './CKEditor.css';
import './CKEditor.scss';

interface Props {
inputId: string;
Expand Down
8 changes: 5 additions & 3 deletions client/app/lib/components/core/layouts/layout.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
@import 'z-index';

body {
padding-top: 60px;

& > nav {
z-index: 1201 !important;
z-index: map-get($z-index, 'body-nav');
}
}

.sidebarContainer {
& > div {
z-index: 1;
z-index: map-get($z-index, 'sidebar-container');

@media (min-width: 600px) {
flex-basis: 33.33333%;
Expand All @@ -29,7 +31,7 @@ body {

footer {
background-color: #ffffff;
z-index: 2;
z-index: map-get($z-index, 'footer');
}

img {
Expand Down
42 changes: 35 additions & 7 deletions client/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ const { WebpackManifestPlugin } = require('webpack-manifest-plugin');
const Dotenv = require('dotenv-webpack');
const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');

const styleLoader = 'style-loader';
const cssLoader = 'css-loader';
const sassLoader = 'sass-loader';

module.exports = {
entry: {
coursemology: [
Expand Down Expand Up @@ -76,41 +80,65 @@ module.exports = {
},
{
test: /\.css$/,
use: ['style-loader', 'css-loader'],
use: [styleLoader, cssLoader],
include: [
resolve(__dirname, 'node_modules/rc-slider/assets'),
resolve(
__dirname,
'node_modules/react-image-crop/dist/ReactCrop.css',
),
resolve(__dirname, 'app/lib/components/core/fields/CKEditor.css'),
],
},
{
test: /\.css$/,
use: ['style-loader', 'css-loader', 'postcss-loader'],
use: [styleLoader, cssLoader, 'postcss-loader'],
include: [resolve(__dirname, 'app/theme/index.css')],
},
{
test: /\.scss$/,
use: ['style-loader', 'css-loader', 'sass-loader'],
use: [styleLoader, cssLoader, sassLoader],
include: [resolve(__dirname, 'app/lib/styles')],
exclude: /node_modules/,
},
{
test: /\.scss$/,
use: [
'style-loader',
styleLoader,
{
loader: 'css-loader',
loader: cssLoader,
options: {
importLoaders: 1,
modules: {
localIdentName: '[path]___[name]__[local]___[hash:base64:5]',
},
},
},
'sass-loader',
sassLoader,
],
exclude: [
/node_modules/,
resolve(__dirname, 'app/lib/styles'),
resolve(__dirname, 'app/lib/components/core/layouts/layout.scss'),
resolve(__dirname, 'app/lib/components/core/fields/CKEditor.scss'),
],
},
{
test: /\.scss$/,
use: [
styleLoader,
cssLoader,
{
loader: sassLoader,
options: {
sassOptions: {
includePaths: [join(__dirname, '..', 'app/assets/stylesheets')],
},
},
},
],
include: [
resolve(__dirname, 'app/lib/components/core/layouts/layout.scss'),
resolve(__dirname, 'app/lib/components/core/fields/CKEditor.scss'),
],
exclude: [/node_modules/, resolve(__dirname, 'app/lib/styles')],
},
Expand Down