Skip to content
Snippets Groups Projects
Commit d54e4ff9 authored by gnaegi's avatar gnaegi
Browse files

OO-1068 fix sass error in content.css, add qr code also to course node link

parent 65088b44
No related branches found
No related tags found
No related merge requests found
...@@ -15,12 +15,26 @@ ...@@ -15,12 +15,26 @@
</p> </p>
<div class="o_block"> <div class="o_block">
$r.translate("nodeEdit.extLink"): $r.translate("nodeEdit.extLink"):
<div class="o_copy_code">${extLink}</div> <div class="o_copy_code">
<a href="javascript:;" id="o_extlink"><i class="o_icon o_icon-lg o_icon-fw o_icon_qrcode"></i></a>
${extLink}
</div>
</div> </div>
<div class="o_block"> <div class="o_block">
$r.translate("nodeEdit.intLink"): $r.translate("nodeEdit.intLink"):
<div class="o_copy_code">${intLink}</div> <div class="o_copy_code">
${intLink}
</div>
</div> </div>
#o_togglebox_end() #o_togglebox_end()
<script type="text/javascript">
/* <![CDATA[ */
jQuery(function() {
o_QRCodePopup('o_extlink', '$extlink', 'right');
});
/* ]]> */
</script>
</fieldset> </fieldset>
#macro (o_togglebox_start $uid $title) #macro (o_togglebox_start $uid $title)
<div class="o_togglebox_wrapper o_block o_scrollblock"> <div class="o_togglebox_wrapper o_block">
<a href="#$uid" data-toggle="collapse" data-target="#${uid}" class="o_opener" onclick="jQuery(this).toggleClass('o_in'); return false;"> <a href="#$uid" data-toggle="collapse" data-target="#${uid}" class="o_opener" onclick="jQuery(this).toggleClass('o_in'); return false;">
<i class="o_icon o_icon-fw o_icon-lg"></i> <i class="o_icon o_icon-fw o_icon-lg"></i>
$title $title
......
This diff is collapsed.
...@@ -23,4 +23,5 @@ ...@@ -23,4 +23,5 @@
@import "../../bootstrap/stylesheets/bootstrap/print"; @import "../../bootstrap/stylesheets/bootstrap/print";
@import "modules/mixins"; @import "modules/mixins";
@import "modules/icons"; /* must be first include - provides classes used as extensions */
@import "modules/content"; @import "modules/content";
\ No newline at end of file
...@@ -134,8 +134,8 @@ table { ...@@ -134,8 +134,8 @@ table {
.o_blue { color: #12223F; } .o_blue { color: #12223F; }
/* special links */ /* special links */
a.o_link_extern { @extend .o_icon; @extend .o_icon_mail;} a.o_link_extern { @extend .o_icon; @extend .o_icon_link_extern;}
a.o_link_mailto { @extend .o_icon; @extend .o_icon_mail;} a.o_link_mailto { @extend .o_icon; @extend .o_icon_mail;}
a.o_link_forward { background: transparent url('../../openolat/images/arrow_right.png') no-repeat right center; padding-right:18px;} a.o_link_forward { background: transparent url('../../openolat/images/arrow_right.png') no-repeat right center; padding-right:18px;}
/* image styles */ /* image styles */
......
...@@ -86,6 +86,7 @@ $fa-css-prefix: "o_icon" !default; ...@@ -86,6 +86,7 @@ $fa-css-prefix: "o_icon" !default;
.o_icon_notification { @extend .o_icon-rss;} .o_icon_notification { @extend .o_icon-rss;}
.o_icon_language {@extend .o_icon-globe; } .o_icon_language {@extend .o_icon-globe; }
.o_icon_link {@extend .o_icon-link; } .o_icon_link {@extend .o_icon-link; }
.o_icon_link_extern {@extend .o_icon-external-link; }
.o_icon_list {@extend .o_icon-list; } .o_icon_list {@extend .o_icon-list; }
.o_icon_list_num {@extend .o_icon-list-ol; } .o_icon_list_num {@extend .o_icon-list-ol; }
.o_icon_lifecycle {@extend .o_icon-calendar;} .o_icon_lifecycle {@extend .o_icon-calendar;}
...@@ -145,7 +146,9 @@ $fa-css-prefix: "o_icon" !default; ...@@ -145,7 +146,9 @@ $fa-css-prefix: "o_icon" !default;
/* do not move link icons */ /* do not move link icons */
a.o_icon { a.o_icon {
@extend .o_undecorated; &:hover,&:focus {
text-decoration: none;
}
} }
/* repository type icons */ /* repository type icons */
......
This diff is collapsed.
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