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

OO-1440 fix missing line breaks in pre tags

parent 8ce074fc
No related branches found
No related tags found
No related merge requests found
Showing
with 26 additions and 22 deletions
...@@ -15,5 +15,5 @@ ...@@ -15,5 +15,5 @@
#end #end
<h3>$r.translate("staticFolder")</h3> <h3>$r.translate("staticFolder")</h3>
<div class="o_copy_code">$extlink</div> <div class="o_copy_code o_nowrap">$extlink</div>
$r.render("staticFolder") $r.render("staticFolder")
\ No newline at end of file
<div class="o_copy_code form-control-static"><a href="javascript:;" id="o_extlink"><i class="o_icon o_icon-lg o_icon-fw o_icon_qrcode"></i></a>$resourceUrl</div> <div class="o_copy_code o_nowrap form-control-static"><a href="javascript:;" id="o_extlink"><i class="o_icon o_icon-lg o_icon-fw o_icon_qrcode"></i></a>$resourceUrl</div>
<script type="text/javascript"> <script type="text/javascript">
/* <![CDATA[ */ /* <![CDATA[ */
jQuery(function() { jQuery(function() {
......
...@@ -182,7 +182,7 @@ $r.translate('error.time') ${time} ...@@ -182,7 +182,7 @@ $r.translate('error.time') ${time}
<div class="o_box"> <div class="o_box">
#o_togglebox_start("o_stacktrace" $r.translate("error.technical")) #o_togglebox_start("o_stacktrace" $r.translate("error.technical"))
<div class="o_copy_code"> <div class="o_copy_code o_nowrap">
$listenerInfo $listenerInfo
$stacktrace $stacktrace
</div> </div>
......
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
</p> </p>
<div class="o_block"> <div class="o_block">
$r.translate("nodeEdit.extLink"): $r.translate("nodeEdit.extLink"):
<div class="o_copy_code"> <div class="o_copy_code o_nowrap">
<a href="javascript:;" id="o_extlink"><i class="o_icon o_icon-lg o_icon-fw o_icon_qrcode"></i></a> <a href="javascript:;" id="o_extlink"><i class="o_icon o_icon-lg o_icon-fw o_icon_qrcode"></i></a>
${extLink} ${extLink}
</div> </div>
</div> </div>
<div class="o_block"> <div class="o_block">
$r.translate("nodeEdit.intLink"): $r.translate("nodeEdit.intLink"):
<div class="o_copy_code"> <div class="o_copy_code o_nowrap">
${intLink} ${intLink}
</div> </div>
</div> </div>
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<div class="o_extlink clearfix o_block_large_bottom"> <div class="o_extlink clearfix o_block_large_bottom">
<h4>$r.translate("cat.externalLink")</h4> <h4>$r.translate("cat.externalLink")</h4>
#if($extLink) #if($extLink)
<div class="o_copy_code"> <div class="o_copy_code o_nowrap">
<a href="javascript:;" id="o_extlink"><i class="o_icon o_icon-lg o_icon-fw o_icon_qrcode"></i></a> <a href="javascript:;" id="o_extlink"><i class="o_icon o_icon-lg o_icon-fw o_icon_qrcode"></i></a>
$extLink $extLink
<script type="text/javascript"> <script type="text/javascript">
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
</div> </div>
#end #end
#if($guestExtLink) #if($guestExtLink)
<div class="o_copy_code"> <div class="o_copy_code o_nowrap">
<a href="javascript:;" id="o_guestextlink"><i class="o_icon o_icon-lg o_icon-fw o_icon_qrcode"></i></a> <a href="javascript:;" id="o_guestextlink"><i class="o_icon o_icon-lg o_icon-fw o_icon_qrcode"></i></a>
${guestExtLink} ${guestExtLink}
<script type="text/javascript"> <script type="text/javascript">
......
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
#end #end
<div class="o_extlink clearfix o_block_large_bottom"> <div class="o_extlink clearfix o_block_large_bottom">
<h4>$r.translate("details.extlinkheader")</h4> <h4>$r.translate("details.extlinkheader")</h4>
<div class="o_copy_code"> <div class="o_copy_code o_nowrap">
<a href="javascript:;" id="o_extlink"><i class="o_icon o_icon-lg o_icon-fw o_icon_qrcode"></i></a> <a href="javascript:;" id="o_extlink"><i class="o_icon o_icon-lg o_icon-fw o_icon_qrcode"></i></a>
$extlink $extlink
<script type="text/javascript"> <script type="text/javascript">
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
</script> </script>
</div> </div>
#if ($isGuestAllowed) #if ($isGuestAllowed)
<div class="o_copy_code"> <div class="o_copy_code o_nowrap">
<a href="javascript:;" id="o_extlink2"><i class="o_icon o_icon-lg o_icon-fw o_icon_qrcode"></i></a> <a href="javascript:;" id="o_extlink2"><i class="o_icon o_icon-lg o_icon-fw o_icon_qrcode"></i></a>
${extlink}?guest=true&amp;lang=$r.getLanguageCode() ${extlink}?guest=true&amp;lang=$r.getLanguageCode()
<script type="text/javascript"> <script type="text/javascript">
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<div class="o_extlink clearfix o_block_large_bottom"> <div class="o_extlink clearfix o_block_large_bottom">
<h5>$r.translate("extlink")</h5> <h5>$r.translate("extlink")</h5>
<div class="o_copy_code"> <div class="o_copy_code o_nowrap">
<a href="javascript:;" id="o_extlink" data-original-title="" title=""><i class="o_icon o_icon-lg o_icon-fw o_icon_qrcode"></i></a> <a href="javascript:;" id="o_extlink" data-original-title="" title=""><i class="o_icon o_icon-lg o_icon-fw o_icon_qrcode"></i></a>
$extLink $extLink
<script type="text/javascript"> <script type="text/javascript">
......
This diff is collapsed.
This diff is collapsed.
...@@ -33,9 +33,14 @@ ...@@ -33,9 +33,14 @@
@include border-bottom-radius($o-content-border-box-radius); @include border-bottom-radius($o-content-border-box-radius);
} }
.b_copy_code, p.b_copy_code, div.b_copy_code, code, pre { .b_copy_code, p.b_copy_code, div.b_copy_code, code {
@extend %o_copy_code; @extend %o_copy_code;
@extend %o_nowrap;
} }
pre {
@extend %o_copy_code;
}
div.b_scrollblock { div.b_scrollblock {
@extend %o_scrollblock; @extend %o_scrollblock;
} }
......
...@@ -149,7 +149,6 @@ ...@@ -149,7 +149,6 @@
font-size: 90%; font-size: 90%;
color: $code-color; color: $code-color;
background-color: $code-bg; background-color: $code-bg;
white-space: nowrap;
border-radius: $border-radius-base; border-radius: $border-radius-base;
} }
......
This diff is collapsed.
source diff could not be displayed: it is too large. Options to address this: view the blob.
This diff is collapsed.
This diff is collapsed.
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