diff --git a/client/app/scripts/components/app.js b/client/app/scripts/components/app.js index 3361c7285..05ac9bf59 100644 --- a/client/app/scripts/components/app.js +++ b/client/app/scripts/components/app.js @@ -104,7 +104,7 @@ class App extends React.Component { const isIframe = window !== window.top; return ( -
+
{showingDebugToolbar() && } {showingHelp && } diff --git a/client/app/scripts/utils/title-utils.js b/client/app/scripts/utils/title-utils.js index fed4b86a1..47f035471 100644 --- a/client/app/scripts/utils/title-utils.js +++ b/client/app/scripts/utils/title-utils.js @@ -1,5 +1,5 @@ -const PREFIX = 'Weave Scope'; +const PREFIX = document.title || 'Weave Scope'; const SEPARATOR = ' - '; export function setDocumentTitle(title) { diff --git a/client/app/styles/main.scss b/client/app/styles/main.scss index 3b23b92e6..62be5fa87 100644 --- a/client/app/styles/main.scss +++ b/client/app/styles/main.scss @@ -115,63 +115,52 @@ $label-background-color: fade-out($background-average-color, .3); } } -* { - box-sizing: border-box; - -webkit-tap-highlight-color: rgba(0, 0, 0, 0); -} -*:before, -*:after { - box-sizing: border-box; -} - -html { - -webkit-font-smoothing: antialiased; -} - -html, -body { - height: 100%; - width: 100%; -} - -/* Space out content a bit */ -body { - background: $body-background-color; - color: $text-color; - line-height: 150%; - font-family: $base-font; - font-size: 13px; - margin: 0; -} - -p { - line-height: 20px; - padding-top: 6px; - margin-bottom: 14px; - letter-spacing: 0; - font-weight: 400; - color: $text-color; -} - -h2 { - font-size: 34px; - line-height: 40px; - padding-top: 8px; - margin-bottom: 12px; - font-weight: 400; -} - .hide { opacity: 0; } -.app { - position: fixed; - top: 0; - left: 0; +.scope-app { + -webkit-font-smoothing: antialiased; + background: $body-background-color; bottom: 0; - right: 0; + color: $text-color; + font-family: $base-font; + font-size: 13px; + height: 100%; + left: 0; + line-height: 150%; + margin: 0; overflow: auto; + position: fixed; + right: 0; + top: 0; + width: 100%; + + * { + box-sizing: border-box; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); + } + *:before, + *:after { + box-sizing: border-box; + } + + p { + line-height: 20px; + padding-top: 6px; + margin-bottom: 14px; + letter-spacing: 0; + font-weight: 400; + color: $text-color; + } + + h2 { + font-size: 34px; + line-height: 40px; + padding-top: 8px; + margin-bottom: 12px; + font-weight: 400; + } } .header { diff --git a/scope b/scope index 14f3fe360..5597b50da 100755 --- a/scope +++ b/scope @@ -74,7 +74,7 @@ check_docker_access() { } # - The image embeds the weave script & Docker 1.3.1 client -# - Docker versions prior to 1.5.0 do not support --pid=host +# - Docker versions prior to 1.5.0 do not support --pid=host # - Weave needs 1.6.0 now (image pulling changes) MIN_DOCKER_VERSION=1.6.0