Skip to content
Snippets Groups Projects
Commit 130657cf authored by uhensler's avatar uhensler
Browse files

OO-4610: Libsass compatibility

parent 40d563e1
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 21 additions and 51 deletions
.gitignore
+ 2
− 0
View file @ 130657cf
......@@ -36,3 +36,5 @@ src/test/java/org/olat/selenium/SeleniumTest.java
*/.project
.idea
**/*/.sass-cache
src/main/webapp/static/themes/compiletheme.sh
+ 1
− 1
View file @ 130657cf
......@@ -48,7 +48,7 @@ doCompile () {
fi
echo "Compiling SASS: $TARGET $STYLE"
sass --version
sass --style $STYLE --no-cache $UPDATE $TARGET:$TARGET --load-path light light/modules
sass --style $STYLE $UPDATE $TARGET:$TARGET --load-path light light/modules
echo "sass --style $STYLE $UPDATE $TARGET:$TARGET --load-path light light/modules"
echo "done"
}
......
src/main/webapp/static/themes/light/content.css
+ 1
− 2
View file @ 130657cf
This diff is collapsed.
src/main/webapp/static/themes/light/content.css.map
+ 1
− 7
View file @ 130657cf
This diff is collapsed.
src/main/webapp/static/themes/light/content.scss
+ 3
− 3
View file @ 130657cf
......@@ -35,9 +35,9 @@
*/
$fa-font-path : "../../font-awesome/fonts" !default;
$fa-css-prefix : "o_icon" !default;
@import "../../../font-awesome/scss/variables";
@import "../../../font-awesome/scss/path";
@import "../../../font-awesome/scss/core";
@import "../../font-awesome/scss/variables";
@import "../../font-awesome/scss/path";
@import "../../font-awesome/scss/core";
/*
OpenOLAT includes
......
src/main/webapp/static/themes/light/email.css
+ 1
− 2
View file @ 130657cf
.o_email_body{font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;max-width:768px}.o_email_body .o_email_content{margin:14px 0 14px 0;padding-left:12px}.o_email_body .o_email_content h1{background-color:#337ab7;color:#fff;padding:20px 0 20px 12px;margin-bottom:30px;margin-left:-12px;font-size:x-large}.o_email_body .o_email_content strong{color:#337ab7}.o_email_body .o_email_footer{font-size:smaller;color:#aaa;border-top:5px solid #337ab7;padding:4px 12px;margin-top:1em}.o_email_body .o_email_footer a{color:#aaa}.o_mail_message .o_email_body{font-family:inherit}.o_email_body .o_email_button{color:#fff;background-color:#337ab7;border-color:#2e6da4;border-radius:4px;padding:6px 12px;text-align:center;white-space:nowrap;vertical-align:middle;touch-action:manipulation;cursor:pointer;text-decoration:none}.o_email_body .o_email_button_group{margin-top:1em;margin-bottom:1em;text-align:center}.o_email_body .o_email_button_group a{margin-right:5px;margin-bottom:0.5em;font-weight:bold}.o_email_body .o_email_button_group a:last-child{margin-right:0}.o_email_body .o_email_button_group_left{text-align:left}.o_email_body .o_email_button_group_right{text-align:right}
/*# sourceMappingURL=email.css.map */
.o_email_body{font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;max-width:768px}.o_email_body .o_email_content{margin:14px 0 14px 0;padding-left:12px}.o_email_body .o_email_content h1{background-color:#337ab7;color:#fff;padding:20px 0 20px 12px;margin-bottom:30px;margin-left:-12px;font-size:x-large}.o_email_body .o_email_content strong{color:#337ab7}.o_email_body .o_email_footer{font-size:smaller;color:#aaa;border-top:5px solid #337ab7;padding:4px 12px;margin-top:1em}.o_email_body .o_email_footer a{color:#aaa}.o_mail_message .o_email_body{font-family:inherit}.o_email_body .o_email_button{color:#fff;background-color:#337ab7;border-color:#2e6da4;border-radius:4px;padding:6px 12px;text-align:center;white-space:nowrap;vertical-align:middle;touch-action:manipulation;cursor:pointer;text-decoration:none}.o_email_body .o_email_button_group{margin-top:1em;margin-bottom:1em;text-align:center}.o_email_body .o_email_button_group a{margin-right:5px;margin-bottom:.5em;font-weight:bold}.o_email_body .o_email_button_group a:last-child{margin-right:0}.o_email_body .o_email_button_group_left{text-align:left}.o_email_body .o_email_button_group_right{text-align:right}/*# sourceMappingURL=email.css.map */
src/main/webapp/static/themes/light/email.css.map
+ 1
− 7
View file @ 130657cf
{
"version": 3,
"mappings": "AAkBA,aAAc,CACb,WAAW,CCy0Be,wGAA8G,CDx0BxI,SAAS,CCy0BgB,KAAK,CDv0B9B,8BAAiB,CAChB,MAAM,CCu0BsB,aAAc,CDt0B1C,YAAY,CCu0BoB,IAAI,CDr0BpC,iCAAG,CACF,gBAAgB,CC20BK,OAAe,CD10BpC,KAAK,CCy0BkB,IAAkB,CDx0BzC,OAAO,CAAE,gBAAyC,CAClD,aAAa,CAAE,IAAI,CACnB,WAAW,CAAE,KAA8B,CAC3C,SAAS,CAAE,OAAO,CAGnB,qCAAO,CACN,KAAK,CCk0BgB,OAAe,CD/zBtC,6BAAgB,CACf,SAAS,CAAE,OAAO,CAClB,KAAK,CC0zBqB,IAAgB,CDzzB1C,UAAU,CAAE,iBAAmC,CAC/C,OAAO,CAAE,QAAQ,CACjB,UAAU,CAAE,GAAG,CAEf,+BAAE,CACD,KAAK,CCozBoB,IAAgB,CD7yB3C,6BAAc,CACb,WAAW,CAAE,OAAO,CAWrB,6BAAgB,CACf,KAAK,CCkyBmB,IAAkB,CDjyB1C,gBAAgB,CCkyBM,OAAe,CDjyBrC,YAAY,CCkyBiB,OAAmB,CDjyBhD,aAAa,CCkyBiB,GAAG,CDjyBjC,OAAO,CAAE,QAAQ,CACjB,UAAU,CAAE,MAAM,CAClB,WAAW,CAAE,MAAM,CACnB,cAAc,CAAE,MAAM,CACtB,YAAY,CAAE,YAAY,CAC1B,MAAM,CAAE,OAAO,CACf,eAAe,CAAE,IAAI,CAGtB,mCAAsB,CACrB,UAAU,CAAE,GAAG,CACf,aAAa,CAAE,GAAG,CAClB,UAAU,CAAE,MAAM,CAElB,qCAAE,CACD,YAAY,CAAE,GAAG,CACjB,aAAa,CAAE,KAAK,CACpB,WAAW,CAAE,IAAI,CACjB,gDAAa,CACZ,YAAY,CAAE,CAAC,CAMlB,wCAA2B,CAC1B,UAAU,CAAE,IAAI,CAEjB,yCAA4B,CAC3B,UAAU,CAAE,KAAK",
"sources": ["email.scss","_config.scss"],
"names": [],
"file": "email.css"
}
\ No newline at end of file
{"version":3,"sourceRoot":"","sources":["email.scss","_config.scss","../../bootstrap/stylesheets/bootstrap/_variables.scss"],"names":[],"mappings":"AAkBA,cACC,YCy0B0B,yGDx0B1B,UCy0ByB,MDv0BzB,+BACC,OCu0B4B,cDt0B5B,aCu0BgC,KDr0BhC,kCACC,iBENqB,QFOrB,MEkI8B,KFjI9B,yBACA,mBACA,kBACA,kBAGD,sCACC,MEfqB,QFkBvB,8BACC,kBACA,MC0zB0B,KDzzB1B,6BACA,iBACA,eAEA,gCACC,MCozByB,KD7yB3B,8BACC,oBAWD,8BACC,ME2F+B,KF1F/B,iBE/CsB,QFgDtB,aE2F+B,QF1F/B,cCkyB8B,IDjyB9B,iBACA,kBACA,mBACA,sBACA,0BACA,eACA,qBAGD,oCACC,eACA,kBACA,kBAEA,sCACC,iBACA,mBACA,iBACA,iDACC,eAMH,yCACC,gBAED,0CACC","file":"email.css"}
\ No newline at end of file
src/main/webapp/static/themes/openolat/content.css
+ 2
− 3
View file @ 130657cf
This diff is collapsed.
src/main/webapp/static/themes/openolat/email.css
+ 1
− 2
View file @ 130657cf
.o_email_body{font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;max-width:768px}.o_email_body .o_email_content{margin:14px 0 14px 0;padding-left:12px}.o_email_body .o_email_content h1{background-color:#209d9e;color:#fff;padding:20px 0 20px 12px;margin-bottom:30px;margin-left:-12px;font-size:x-large}.o_email_body .o_email_content strong{color:#209d9e}.o_email_body .o_email_footer{font-size:smaller;color:#aaa;border-top:5px solid #209d9e;padding:4px 12px;margin-top:1em}.o_email_body .o_email_footer a{color:#aaa}.o_mail_message .o_email_body{font-family:inherit}.o_email_body .o_email_button{color:#fff;background-color:#209d9e;border-color:#1c8889;border-radius:4px;padding:6px 12px;text-align:center;white-space:nowrap;vertical-align:middle;touch-action:manipulation;cursor:pointer;text-decoration:none}.o_email_body .o_email_button_group{margin-top:1em;margin-bottom:1em;text-align:center}.o_email_body .o_email_button_group a{margin-right:5px;margin-bottom:0.5em;font-weight:bold}.o_email_body .o_email_button_group a:last-child{margin-right:0}.o_email_body .o_email_button_group_left{text-align:left}.o_email_body .o_email_button_group_right{text-align:right}
/*# sourceMappingURL=email.css.map */
.o_email_body{font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;max-width:768px}.o_email_body .o_email_content{margin:14px 0 14px 0;padding-left:12px}.o_email_body .o_email_content h1{background-color:#209d9e;color:#fff;padding:20px 0 20px 12px;margin-bottom:30px;margin-left:-12px;font-size:x-large}.o_email_body .o_email_content strong{color:#209d9e}.o_email_body .o_email_footer{font-size:smaller;color:#aaa;border-top:5px solid #209d9e;padding:4px 12px;margin-top:1em}.o_email_body .o_email_footer a{color:#aaa}.o_mail_message .o_email_body{font-family:inherit}.o_email_body .o_email_button{color:#fff;background-color:#209d9e;border-color:#1c8889;border-radius:4px;padding:6px 12px;text-align:center;white-space:nowrap;vertical-align:middle;touch-action:manipulation;cursor:pointer;text-decoration:none}.o_email_body .o_email_button_group{margin-top:1em;margin-bottom:1em;text-align:center}.o_email_body .o_email_button_group a{margin-right:5px;margin-bottom:.5em;font-weight:bold}.o_email_body .o_email_button_group a:last-child{margin-right:0}.o_email_body .o_email_button_group_left{text-align:left}.o_email_body .o_email_button_group_right{text-align:right}/*# sourceMappingURL=email.css.map */
src/main/webapp/static/themes/openolat/email.css.map
+ 1
− 7
View file @ 130657cf
{
"version": 3,
"mappings": "AAkBA,aAAc,CACb,WAAW,CCy0Be,wGAA8G,CDx0BxI,SAAS,CCy0BgB,KAAK,CDv0B9B,8BAAiB,CAChB,MAAM,CCu0BsB,aAAc,CDt0B1C,YAAY,CCu0BoB,IAAI,CDr0BpC,iCAAG,CACF,gBAAgB,CC20BK,OAAe,CD10BpC,KAAK,CCy0BkB,IAAkB,CDx0BzC,OAAO,CAAE,gBAAyC,CAClD,aAAa,CAAE,IAAI,CACnB,WAAW,CAAE,KAA8B,CAC3C,SAAS,CAAE,OAAO,CAGnB,qCAAO,CACN,KAAK,CCk0BgB,OAAe,CD/zBtC,6BAAgB,CACf,SAAS,CAAE,OAAO,CAClB,KAAK,CC0zBqB,IAAgB,CDzzB1C,UAAU,CAAE,iBAAmC,CAC/C,OAAO,CAAE,QAAQ,CACjB,UAAU,CAAE,GAAG,CAEf,+BAAE,CACD,KAAK,CCozBoB,IAAgB,CD7yB3C,6BAAc,CACb,WAAW,CAAE,OAAO,CAWrB,6BAAgB,CACf,KAAK,CCkyBmB,IAAkB,CDjyB1C,gBAAgB,CCkyBM,OAAe,CDjyBrC,YAAY,CCkyBiB,OAAmB,CDjyBhD,aAAa,CCkyBiB,GAAG,CDjyBjC,OAAO,CAAE,QAAQ,CACjB,UAAU,CAAE,MAAM,CAClB,WAAW,CAAE,MAAM,CACnB,cAAc,CAAE,MAAM,CACtB,YAAY,CAAE,YAAY,CAC1B,MAAM,CAAE,OAAO,CACf,eAAe,CAAE,IAAI,CAGtB,mCAAsB,CACrB,UAAU,CAAE,GAAG,CACf,aAAa,CAAE,GAAG,CAClB,UAAU,CAAE,MAAM,CAElB,qCAAE,CACD,YAAY,CAAE,GAAG,CACjB,aAAa,CAAE,KAAK,CACpB,WAAW,CAAE,IAAI,CACjB,gDAAa,CACZ,YAAY,CAAE,CAAC,CAMlB,wCAA2B,CAC1B,UAAU,CAAE,IAAI,CAEjB,yCAA4B,CAC3B,UAAU,CAAE,KAAK",
"sources": ["../light/email.scss","../light/_config.scss"],
"names": [],
"file": "email.css"
}
\ No newline at end of file
{"version":3,"sourceRoot":"","sources":["../light/email.scss","../light/_config.scss","_openolat_config.scss","../../bootstrap/stylesheets/bootstrap/_variables.scss"],"names":[],"mappings":"AAkBA,cACC,YCy0B0B,yGDx0B1B,UCy0ByB,MDv0BzB,+BACC,OCu0B4B,cDt0B5B,aCu0BgC,KDr0BhC,kCACC,iBEtBgB,QFuBhB,MGkI8B,KHjI9B,yBACA,mBACA,kBACA,kBAGD,sCACC,ME/BgB,QFkClB,8BACC,kBACA,MC0zB0B,KDzzB1B,6BACA,iBACA,eAEA,gCACC,MCozByB,KD7yB3B,8BACC,oBAWD,8BACC,MG2F+B,KH1F/B,iBE/DiB,QFgEjB,aG2F+B,QH1F/B,cCkyB8B,IDjyB9B,iBACA,kBACA,mBACA,sBACA,0BACA,eACA,qBAGD,oCACC,eACA,kBACA,kBAEA,sCACC,iBACA,mBACA,iBACA,iDACC,eAMH,yCACC,gBAED,0CACC","file":"email.css"}
\ No newline at end of file
src/main/webapp/static/themes/openolat/theme.css
+ 2
− 3
View file @ 130657cf
This diff is collapsed.
src/main/webapp/static/themes/openolat/theme.css.map
+ 1
− 7
View file @ 130657cf
This diff is collapsed.
src/main/webapp/static/themes/themes.README
+ 3
− 0
View file @ 130657cf
......@@ -64,10 +64,13 @@ A good way is to start with a copy of "openolat" (i.e. copy openolat to mytheme)
- Rename mytheme/_openolat_config.scss to mytheme/_mytheme_config.scss
- Rename mytheme/_openolat_theme.scss to mytheme/_mytheme_theme.scss
- Rename mytheme/_openolat_content.scss to mytheme/_mytheme_content.scss
- Rename mytheme/_openolat_email.scss to mytheme/_mytheme_email.scss
- Open mytheme/theme.sass and replace the references to the files you just renamed
(openolat_config -> mytheme_config, openolat_theme -> mytheme_theme)
- Open mytheme/content.sass and replace the references to the files you just renamed
(openolat_config -> mytheme_config, openolat_content -> mytheme_content)
- Open mytheme/email.sass and replace the references to the files you just renamed
(openolat_config -> mytheme_config, openolat_email -> mytheme_email)
- Open mytheme/_mytheme_config.scss and add all bootstrap and OpenOLAT SASS variables you want to
override. As references yo can look at the following files:
- for all bootstrap variables: ../../bootstrap/stylesheets/bootstrap/_variables.scss
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment