Browse Source

Merge branch 'master' of github.com:mattgodbolt/compiler-explorer into asm_doc

dev/git-series/gccdum
Rubén Rincón 6 years ago
parent
commit
a253eb3792
  1. 1
      static/analytics.js
  2. 6
      static/explorer.css
  3. 5
      static/main.js
  4. 5
      views/index.pug
  5. 21
      views/templates.pug

1
static/analytics.js

@ -119,7 +119,6 @@ define(function (require) {
}
if (options.sharingEnabled) {
create_script_element('gp', 'https://apis.google.com/js/plusone.js');
create_script_element('twitter-wjs', '//platform.twitter.com/widgets.js');
}
});

6
static/explorer.css

@ -32,7 +32,7 @@
z-index: 100;
position: absolute;
bottom: 0.5em;
right: 0.5em;
right: 2.5em;
display: inline-block;
padding: 0.25em;
font-size: x-small;
@ -54,6 +54,10 @@
min-width: 14em;
}
li.tweet {
padding: 3px 20px;
}
.diff-picker {
max-width: 20em;
width: 20em;

5
static/main.js

@ -145,7 +145,10 @@ define(function (require) {
if (!options.embedded) {
local.set('gl', JSON.stringify(config));
} else {
$('a.link').attr('href', '#' + url.serialiseState(config));
var strippedToLast = window.location.pathname;
strippedToLast = strippedToLast.substr(0,
strippedToLast.lastIndexOf('/') + 1);
$('a.link').attr('href', strippedToLast + '#' + url.serialiseState(config));
}
});

5
views/index.pug

@ -51,11 +51,8 @@ html(lang="en")
|   Source on GitHub
li: a(href="https://github.com/mattgodbolt/compiler-explorer/wiki") Wiki
li: a(href="https://github.com/mattgodbolt/compiler-explorer/issues") Report an issue
li.divider
if sharingEnabled
li: g:plusone(annotation="inline" width="150")
li: a.twitter-share-button(href="https://twitter.com/share" data-via="mattgodbolt")
li.divider
li.tweet: a.twitter-share-button(href="https://twitter.com/share" data-via="mattgodbolt")
li#thanks-to: a(href="#") Thanks to...
li: a(href="https://xania.org/201609/how-compiler-explorer-runs-on-amazon") How it works
li: a(href="mailto:matt@godbolt.org") Contact the author

21
views/templates.pug

@ -5,8 +5,9 @@
.btn-group.btn-group-sm
button.btn.btn-default.btn-sm.load-save(title="Load or save text")
span.glyphicon.glyphicon-floppy-disk
button.btn.btn-default.btn-sm.add-compiler(title="Add a new compiler for this source (click or drag)")
span.glyphicon.glyphicon-open
if !embedded
button.btn.btn-default.btn-sm.add-compiler(title="Add a new compiler for this source (click or drag)")
span.glyphicon.glyphicon-open
.monaco-placeholder
#compiler
@ -29,15 +30,17 @@
button.btn.btn-sm.active(title="Output disassembly in Intel syntax" data-bind="intel")
span Intel
include font-size.pug
.btn-group.btn-group-sm
button.btn.btn-default.btn-sm.add-compiler(title="Clone this compiler window (click or drag)")
span.glyphicon.glyphicon-new-window
if !embedded
.btn-group.btn-group-sm
button.btn.btn-default.btn-sm.add-compiler(title="Clone this compiler window (click or drag)")
span.glyphicon.glyphicon-new-window
.monaco-placeholder
.bottom-bar
.btn-group.btn-group-sm
button: span.glyphicon.glyphicon-alert.status
span.full-compiler-name
span.compile-time
if !embedded
.btn-group.btn-group-sm
button: span.glyphicon.glyphicon-alert.status
span.full-compiler-name
span.compile-time
#compiler-output
pre.content

Loading…
Cancel
Save