Skip to content

Commit

Permalink
Merge pull request #339 from matematikk-mooc/KURSP-916-override-Canva…
Browse files Browse the repository at this point in the history
…s-base

KURSP-916: Component placements
  • Loading branch information
theahthodesen authored Nov 2, 2023
2 parents 021ae09 + f0cf521 commit 33f7400
Show file tree
Hide file tree
Showing 3 changed files with 101 additions and 6 deletions.
2 changes: 2 additions & 0 deletions src/js/main.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import "../vue/design/override-base-Canvas-elements.scss";

import accordion from './modules/accordion.js';
import announcements from './modules/announcements.js';
import api from './api/api.js';
Expand Down
9 changes: 3 additions & 6 deletions src/vue/components/course-modules/CourseModule.vue
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ const toggleActiveModule = ({moduleId, isOpen}) => {
letter-spacing:0.063rem ;
display:flex;
align-items: center;
white-space: normal !important;
word-wrap: break-word !important;
}
&--active {
Expand All @@ -151,7 +153,7 @@ const toggleActiveModule = ({moduleId, isOpen}) => {
&__child-nodes {
list-style-type: none;
background: map-get($color-palette-slate, background, 200);
padding: 0.2rem 0 0.2rem 1.5rem;
padding: 0.2rem 0 0.2rem 1.5rem;
margin:0;
@include hide-show-effect;
&--hidden{
Expand All @@ -160,8 +162,3 @@ const toggleActiveModule = ({moduleId, isOpen}) => {
}
}
</style>





96 changes: 96 additions & 0 deletions src/vue/design/override-base-Canvas-elements.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
@import "colors.scss";

.ic-app-course-menu {
width: fit-content !important;
position: relative !important;
}

#left-side {
width: fit-content !important;
padding-right: 2rem !important;
padding-top: 1rem !important;
border: none !important;

}

body.with-left-side:not(.useFullWidth) {
#application.ic-app {
#main {
min-width: auto;
margin: 0 auto;
}
}
}

#right-side {
display: none !important;
}

.ic-Layout-wrapper {
margin-left: auto !important;
display: flex !important;
flex-direction: column !important;
max-width: 60% !important;
min-height: 0;

}

.ic-Layout-watermark {
display: none !important;
}


#application.ic-app {
.ic-app-nav-toggle-and-crumbs {
display: none; // Hide toggling of menu
}
margin-left: auto !important;
margin-right: auto !important;
justify-content: center !important;

display: flex !important;
flex-direction: column !important;
}

.ic-app-main-content {
margin-top: 1rem !important;
width: fit-content !important;
min-height: 85vh !important;
}

.ic-Layout-columns{
width: 100% !important;
display: flex!important;
flex-direction: row-reverse;
align-content: flex-start;
}
#right-side.ic-app-main-content__secondary{
display: hidden !important;
}
.ic-Layout-contentWrapper{
min-width:1000px !important;
max-width: 85% !important;
padding-right: 4rem !important;

}

.with-left-side {
#main {
margin-left: 0;
}

#wrapper {
margin-left: auto;
}
}

@media screen and (max-width: 1240px) {
#wrapper {
margin: 10px;
}

.with-left-side #wrapper {

margin-left: 10px;
}
}

0 comments on commit 33f7400

Please sign in to comment.