Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updating to Bootstrap v4 #248

Merged
merged 29 commits into from
Aug 3, 2018
Merged

Updating to Bootstrap v4 #248

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
d166dda
Started updating Bootstrap to v4
n1474335 Mar 2, 2018
5a7bb09
Fixed popovers in Bootstrap v4
n1474335 Mar 2, 2018
bcc8804
Updated buttons, fonts and collapse
n1474335 Mar 2, 2018
1ce6e32
Merged ESM into feature-bootstrap4. Started work on text inputs.
n1474335 Jun 9, 2018
27b0505
Merged ESM into feature-bootstrap4
n1474335 Jun 9, 2018
2bacd64
Converted operation arguments to material design
n1474335 Jun 10, 2018
7d410fc
Converted op-icons to material design and improved controls.
n1474335 Jun 10, 2018
4147ec7
Converted modals to Bootstrap 4 Material Design
n1474335 Jun 17, 2018
ab9bc7e
Fixed boolean arg checkboxes
n1474335 Jun 17, 2018
fa523e0
Changed banner icons to Material Design
n1474335 Jun 17, 2018
974ab29
Switched toggle string dropdown sides and removed form-control padding
n1474335 Jun 17, 2018
ba79144
Operation arguments are now arranged using CSS Grid
n1474335 Jun 18, 2018
7504f89
Fixed flow control operation argument text colour
n1474335 Jun 19, 2018
67dffbe
Actually fixed flow control operation argument text colour
n1474335 Jun 19, 2018
4338e26
Replaced Bootstrap alert with Material Design snackbar
n1474335 Jun 19, 2018
dcf3152
Operation cursor now indicates that it can be dragged
n1474335 Jun 19, 2018
052c32e
Arguments are now bordered white boxes again
n1474335 Jul 12, 2018
d182261
Switched to unbordered args
n1474335 Jul 13, 2018
a39e2c1
Fixed input and output cards
n1474335 Jul 13, 2018
ab44100
Changed table-condensed to table-sm
n1474335 Jul 13, 2018
651ca6c
Fixed all HTML operations
n1474335 Jul 15, 2018
ba5c503
Added Magic button and tweaked margins for Windows
n1474335 Jul 26, 2018
541e4ff
Added functionality to Magic button and improved the icon
n1474335 Jul 27, 2018
33b2fd8
Improved magic and staleness indicator animations
n1474335 Jul 27, 2018
035b6df
Added font and icon
n1474335 Jul 27, 2018
c3a3538
Linted
n1474335 Jul 27, 2018
2a55f13
Fixed themes for MD
n1474335 Aug 2, 2018
53b92ae
Further CSS tweaks
n1474335 Aug 3, 2018
a947e06
Added option to turn off background auto magic
n1474335 Aug 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed input and output cards
  • Loading branch information
@n1474335
n1474335 committed Jul 13, 2018
commit a39e2c165d62d4aa4d75b46c8bb609cae2cdf5fe
2 changes: 1 addition & 1 deletion src/web/Manager.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ class Manager {
this.addMultiEventListener("#output-text", "mousedown dblclick select", this.highlighter.outputMousedown, this.highlighter);
this.addMultiEventListener("#output-html", "mousedown dblclick select", this.highlighter.outputHtmlMousedown, this.highlighter);
this.addDynamicListener("#output-file-download", "click", this.output.downloadFile, this.output);
this.addDynamicListener("#output-file-slice", "click", this.output.displayFileSlice, this.output);
this.addDynamicListener("#output-file-slice i", "click", this.output.displayFileSlice, this.output);
document.getElementById("show-file-overlay").addEventListener("click", this.output.showFileOverlayClick.bind(this.output));

// Options
Expand Down
6 changes: 4 additions & 2 deletions src/web/html/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,10 +294,12 @@
<img aria-hidden="true" src="<%- require('../static/images/file-128x128.png') %>" alt="File icon"/>
<div class="card-body">
Size: <span id="output-file-size"></span><br>
<button id="output-file-download" type="button" class="btn btn-primary">Download</button>
<button id="output-file-download" type="button" class="btn btn-primary btn-outline">Download</button>
<div class="input-group">
<span class="input-group-btn">
<button id="output-file-slice" type="button" class="btn btn-secondary" title="View slice">&#x1f50d;</button>
<button id="output-file-slice" type="button" class="btn btn-secondary bmd-btn-icon" title="View slice">
<i class="material-icons">search</i>
</button>
</span>
<input type="number" class="form-control" id="output-file-slice-from" placeholder="From" value="0" step="1024" min="0">
<div class="input-group-addon">to</div>
Expand Down
5 changes: 3 additions & 2 deletions src/web/stylesheets/components/_pane.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
color: var(--primary-font-colour);
line-height: 30px;
background-color: var(--primary-background-colour);
flex-direction: row;
}

.card:hover {
Expand All @@ -63,7 +64,7 @@
.card-body .close {
position: absolute;
right: 10px;
top: 10px;
top: 4px;
}

.card-body {
Expand All @@ -77,7 +78,7 @@
}

.card-body>.btn {
margin-bottom: 15px;
margin-bottom: 5px;
margin-top: 5px;
}

Expand Down