mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-04-21 15:26:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Started updating Bootstrap to v4

Browse source
This commit is contained in:
n1474335 2018-03-02 14:04:58 +00:00
parent 8360c9e9f9
commit d166dda229
8 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/web/HTMLOperation.js
View file

@ -50,8 +50,9 @@ HTMLOperation.prototype.toStubHtml = function(removeIcon) {
let html = "<li class='operation'";
if (this.description) {
html += " data-container='body' data-toggle='popover' data-placement='auto right'\
data-content=\"" + this.description + "\" data-html='true' data-trigger='hover'";
html += " data-container='body' data-toggle='popover' data-placement='right'\
data-content=\"" + this.description + "\" data-html='true' data-trigger='hover'\
data-boundary='viewport'";
}
html += ">" + this.name;

2
src/web/OperationsWaiter.js
View file

@ -179,7 +179,7 @@ OperationsWaiter.prototype.enableOpsListPopovers = function(el) {
setTimeout(function() {
// Determine if the popover associated with this element is being hovered over
if ($(_this).data("bs.popover") &&
($(_this).data("bs.popover").$tip && !$(_this).data("bs.popover").$tip.is(":hover"))) {
($(_this).data("bs.popover").tip && !$($(_this).data("bs.popover").tip).is(":hover"))) {
$(_this).popover("hide");
}
}, 50);

8
src/web/html/index.html
View file

@ -108,15 +108,15 @@
<span id="alert-content"></span>
</div>
<div id="content-wrapper">
<div id="banner">
<div class="col-md-4" style="text-align: left; padding-left: 10px;">
<div id="banner" class="row">
<div class="col" style="text-align: left; padding-left: 10px;">
<% if (htmlWebpackPlugin.options.inline) { %>
<span>Version <%= htmlWebpackPlugin.options.version %></span>
<% } else { %>
<a href="cyberchef.htm" download>Download CyberChef<img aria-hidden="true" src="<%- require('../static/images/download-24x24.png') %>" alt="Download Icon"/></a>
<% } %>
</div>
<div class="col-md-4" style="text-align: center;">
<div class="col" style="text-align: center;">
<span id="notice">
<script type="text/javascript">
// Must be text/javascript rather than application/javascript otherwise IE won't recognise it...
@ -128,7 +128,7 @@
<noscript>JavaScript is not enabled. Good luck.</noscript>
</span>
</div>
<div class="col-md-4" style="text-align: right; padding-right: 0;">
<div class="col" style="text-align: right; padding-right: 0;">
<a href="#" id="options">Options<img aria-hidden="true" src="<%- require('../static/images/settings-22x22.png') %>" alt="Settings Icon"/></a>
<a href="#" id="support" data-toggle="modal" data-target="#support-modal">About / Support<img aria-hidden="true" src="<%- require('../static/images/help-22x22.png') %>" alt="Question Mark Icon"/></a>
</div>

2
src/web/stylesheets/index.js
View file

@ -10,7 +10,7 @@
import "highlight.js/styles/vs.css";
/* Frameworks */
import "./vendors/bootstrap.less";
import "bootstrap/dist/css/bootstrap.css";
import "bootstrap-switch/dist/css/bootstrap3/bootstrap-switch.css";
import "bootstrap-colorpicker/dist/css/bootstrap-colorpicker.css";

1
src/web/stylesheets/layout/_banner.css
View file

@ -14,6 +14,7 @@
border-bottom: 1px solid var(--primary-border-colour);
color: var(--banner-font-colour);
background-color: var(--banner-bg-colour);
margin: 0;
}
#banner img {

4
src/web/stylesheets/utils/_overrides.css
View file

@ -143,8 +143,8 @@ optgroup {
border-color: var(--popover-border-colour);
}
.popover-content {
max-height: 90vh;
.popover-body {
max-height: 95vh;
overflow-y: auto;
}