Skip to content
Snippets Groups Projects
Commit 45fa01d1 authored by David Siegfried's avatar David Siegfried
Browse files

Merge branch 'scss-and-babel-loader' into 'master'

SCSS und babel-loader

Closes #3 and #4

See merge request !13
parents 4deb62af abcee9ba
No related branches found
No related tags found
1 merge request!13SCSS und babel-loader
...@@ -46,7 +46,7 @@ class SimpleBBBConnector extends StudIPPlugin implements SystemPlugin ...@@ -46,7 +46,7 @@ class SimpleBBBConnector extends StudIPPlugin implements SystemPlugin
public function perform($unconsumed_path) public function perform($unconsumed_path)
{ {
$this->addStylesheet('assets/bbb-connector.less'); $this->addStylesheet('assets/bbb-connector.scss');
PageLayout::addScript($this->getPluginURL() . '/assets/bbb-connector-app.js'); PageLayout::addScript($this->getPluginURL() . '/assets/bbb-connector-app.js');
parent::perform($unconsumed_path); parent::perform($unconsumed_path);
} }
......
Source diff could not be displayed: it is too large. Options to address this: view the blob.
...@@ -35,11 +35,12 @@ table { ...@@ -35,11 +35,12 @@ table {
.bbb-metrics { .bbb-metrics {
.contentbox { .contentbox {
> section { > section {
.flex(); display: flex;
.flex-wrap(wrap);
flex-wrap: wrap;
div { div {
.flex-item(1 0 50%); flex: 1 0 50%;
} }
.ct-label { .ct-label {
font-size: 1.2rem; font-size: 1.2rem;
......
This diff is collapsed.
...@@ -21,8 +21,10 @@ ...@@ -21,8 +21,10 @@
}, },
"homepage": "https://github.com/Davka/StudIP-SimpleBBB-Connector#readme", "homepage": "https://github.com/Davka/StudIP-SimpleBBB-Connector#readme",
"devDependencies": { "devDependencies": {
"babel-loader": "^9.1.3",
"chart.js": "^3.7.1", "chart.js": "^3.7.1",
"webpack": "^5.72.*", "webpack": "^5.72.*",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.9.*", "webpack-dev-server": "^4.9.*",
"websocket-extensions": ">=0.1.4" "websocket-extensions": ">=0.1.4"
}, },
......
...@@ -3,4 +3,4 @@ pluginclassname=SimpleBBBConnector ...@@ -3,4 +3,4 @@ pluginclassname=SimpleBBBConnector
origin=Vec origin=Vec
version=1.4.3 version=1.4.3
studipMinVersion=4.2 studipMinVersion=4.2
studipMaxVersion=5.3.99 studipMaxVersion=5.4.99
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment