Skip to content

Commit

Permalink
Merge branch 'dev' into KURSP-902-uob-tabs
Browse files Browse the repository at this point in the history
  • Loading branch information
theahthodesen authored Oct 23, 2023
2 parents 7bb23ef + 1376c5b commit f438aeb
Show file tree
Hide file tree
Showing 19 changed files with 812 additions and 461 deletions.
9 changes: 8 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
{
"presets": ["@babel/preset-env"],
"plugins": ["handlebars-inline-precompile"]
"plugins": ["handlebars-inline-precompile",
[
"@vue/babel-plugin-jsx",
{
"mergeProps": false
}
]
]
}
2 changes: 1 addition & 1 deletion .github/workflows/deploy-storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
run: npm install

- name: Build Storybook
run: npm run build-storybook
run: GH_PAGES=true npm run build-storybook

- name: Deploy to GitHub Pages
uses: peaceiris/actions-gh-pages@v3
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
"@storybook/testing-library": "^0.2.0",
"@storybook/vue3": "^7.4.0",
"@storybook/vue3-webpack5": "^7.4.0",
"@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
"@vue/babel-plugin-jsx": "^1.1.5",
"@vue/cli": "^5.0.8",
"@vue/compiler-sfc": "^3.3.4",
"babel-loader": "^9.1.2",
Expand Down Expand Up @@ -88,7 +90,6 @@
"dependencies": {
"@material-symbols/font-400": "^0.13.0",
"@vimeo/player": "^2.20.1",
"fs": "^0.0.1-security",
"vue-style-loader": "^4.1.3"
}
}
145 changes: 0 additions & 145 deletions src/css/3party/canvas-uob.less
Original file line number Diff line number Diff line change
Expand Up @@ -112,151 +112,6 @@
visibility: visible;
}

/* UoB tip, info, warning and question boxes */
/*
Her er fargene Lisbeth foreslår
#ffeed5
#fcdecd
#fce3e6
#e5d4e9
#c7d3e1
#d9eef2
#ecf0d7
#e3e2e3
#ededed
*/

.uob-tip,
.pfdk-tips,
.uob-warning,
.kpas-lti-warning,
.pfdk-advarsel,
.uob-question,
.pfdk-spsm,
.uob-quote,
.pfdk-sitat,
.uob-box,
.pfdk-boks,
.uob-read,
.pfdk-les,
.pfdk-maal,
.uob-info,
.kpas-lti-info,
.pfdk-info,
.pfdk-important,
.pfdk-viktig,
.pfdk-tid,
.pfdk-verktoy,
.udir-skoleleder,
.udir-kommentar,
.udir-eksempel {
margin-top: 1em;
margin-bottom: 1em;
padding: 0.5em 0.5em 0.5em 62px;
border-radius: 4px;
border-color: silver;
border-style: solid;
border-width: 1px;
background-repeat: no-repeat;
background-position: 4px 4px;
min-height: 50px;
overflow-y: visible;
}
.pfdk-verktoy {
background-color: #ffeed5;
background-image: url('https://udirdit.blob.core.windows.net/bitmaps/pfdk_gear.png');
background-size: 40px;
background-position-y: 10px;
background-position-x: 10px;
}

.udir-kommentar {
background-color: #ffffff;
background-image: url('@{SERVER}vector_images/mmooc-icon-comment.svg');
background-size: 40px;
background-position-y: 10px;
background-position-x: 10px;
}
.udir-eksempel {
background-color: #ffffff;
background-image: url('@{SERVER}vector_images/street-view-solid.svg');
background-size: 40px;
background-position-y: 10px;
background-position-x: 10px;
}
.udir-skoleleder {
background-color:#E2E3F1;
background-image: url('@{SERVER}vector_images/mmooc-icon-principal.svg');
background-size: 40px;
background-position-y: 10px;
background-position-x: 10px;
}
.pfdk-tid {
background-color: #fcdecd;
background-image: url('https://udirdit.blob.core.windows.net/bitmaps/pfdk_time.png');
background-size: 40px;
background-position-x: 10px;
}
.pfdk-maal {
background-color: #fce3e6;
background-image: url('https://udirdit.blob.core.windows.net/bitmaps/pfdk_info.png');
background-size: 53px;
}
.pfdk-important,
.pfdk-viktig {
background-color: #e5d4e9;
background-image: url('https://udirdit.blob.core.windows.net/bitmaps/pfdk_important.png');
background-size: 53px;
}
.uob-info,
.kpas-lti-info,
.pfdk-info {
background-color: #c7d3e1;
background-image: url('https://s3.amazonaws.com/SSL_Assets/bham/images/box_info.png');
}
.uob-tip {
background-color:#FAFAC8;
background-image: url('https://s3.amazonaws.com/SSL_Assets/bham/images/box_tip.png');
color: black;
}
.pfdk-tips {
background-color: #d9eef2; /* See http://www.w3.org/WAI/RD/2012/text-customization/r11 */
background-image: url('https://s3.amazonaws.com/SSL_Assets/bham/images/box_tip.png');
color: black;
}
.uob-read,
.pfdk-les {
background-color: #ecf0d7;
background-image: url('@{SERVER}bitmaps/uia_read.png');
}
.uob-box {
background-color: #ffffff;
padding: 0.5em 0.5em 0.5em 0.5em;
}
.pfdk-boks {
background-color: #e3e2e3;
padding: 0.5em 0.5em 0.5em 0.5em;
}
.uob-question,
.pfdk-spsm {
background-color: #ededed;
background-image: url('https://s3.amazonaws.com/SSL_Assets/bham/images/box_question.png');
}
.uob-quote,
.pfdk-sitat {
background-color: #efefef;
background-image: url('https://s3.amazonaws.com/SSL_Assets/bham/images/box_quote66.png');
padding: 0.5em 62px 0.5em 62px;
position: relative;
top: 0px;
left: 0px;
}
.uob-warning,
.kpas-lti-warning,
.pfdk-advarsel {
background-color: #ffeeee;
background-image: url('https://s3.amazonaws.com/SSL_Assets/bham/images/box_warning.png');
}

.uob-accordion {
background-color: #E2E3F1;
Expand Down
Loading

0 comments on commit f438aeb

Please sign in to comment.