diff --git a/lib/gui/app/scss/desktop.css b/lib/gui/app/scss/desktop.css deleted file mode 100644 index e830430f..00000000 --- a/lib/gui/app/scss/desktop.css +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2016 balena.io - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* Prevent text selection */ -body { - -webkit-user-select: none; -} - - -/* Allow window to be dragged from anywhere */ -#app-header { - -webkit-app-region: drag; -} - -.modal-body { - -webkit-app-region: no-drag; -} - -button, -a, -input { - -webkit-app-region: no-drag; -} - -/* Prevent WebView bounce effect in OS X */ -html, -body { - height: 100%; - width: 100%; -} - -html { - overflow: hidden; -} - -body { - overflow: hidden; - -webkit-overflow-scrolling: touch; -} - -/* Prevent blue outline */ -a:focus, -input:focus, -button:focus, -[tabindex]:focus { - outline: none !important; -} - -/* Titles don't have margins on desktop apps */ -h1, h2, h3, h4, h5, h6 { - margin: 0; -} diff --git a/lib/gui/app/scss/main.scss b/lib/gui/app/scss/main.scss index 84b6cc64..5fc0c8c0 100644 --- a/lib/gui/app/scss/main.scss +++ b/lib/gui/app/scss/main.scss @@ -16,11 +16,8 @@ $disabled-opacity: 0.2; -@import "./modules/theme"; -@import "./desktop"; - @font-face { - font-family: "Source Sans Pro"; + font-family: "SourceSansPro"; src: url("./fonts/SourceSansPro-Regular.ttf") format("truetype"); font-weight: 500; font-style: normal; @@ -28,75 +25,43 @@ $disabled-opacity: 0.2; } @font-face { - font-family: "Source Sans Pro"; + font-family: "SourceSansPro"; src: url("./fonts/SourceSansPro-SemiBold.ttf") format("truetype"); font-weight: 600; font-style: normal; font-display: block; } -// Prevent white flash when running application -html { - background-color: $palette-theme-dark-background; - margin: 0; -} - +html, body { margin: 0; - background-color: $palette-theme-dark-background; - letter-spacing: 0.1px; - display: flex; - flex-direction: column; - font-family: "SourceSansPro"; + overflow: hidden; - > header { - flex: 0 0 auto; - } + // Prevent white flash when running application + background-color: #4d5057; - > main { - flex: 1; - display: flex; - } - - > footer { - flex: 0 0 auto; - } + // Prevent WebView bounce effect in OS X + height: 100%; + width: 100%; } -.section-loader { - webview { - flex: 0 1; - height: 0; - width: 0; - } - - &.isFinish webview { - flex: initial; - position: absolute; - bottom: 0; - left: 0; - width: 100%; - height: 320px; - } +// Prevent text selection +body { + -webkit-user-select: none; + -webkit-overflow-scrolling: touch; } -.featured-project { - webview { - flex: 0 1; - height: 0; - width: 0; - } +// Allow window to be dragged from header +#app-header { + -webkit-app-region: drag; +} - &.fp-visible webview { - width: 480px; - height: 360px; - position: absolute; - z-index: 1; - left: 30px; - top: 45px; - border-radius: 7px; - overflow: hidden; - } +// Prevent blue outline +a:focus, +input:focus, +button:focus, +[tabindex]:focus { + outline: none !important; } .disabled { diff --git a/lib/gui/app/scss/modules/_theme.scss b/lib/gui/app/scss/modules/_theme.scss deleted file mode 100644 index 1ce922b3..00000000 --- a/lib/gui/app/scss/modules/_theme.scss +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2016 balena.io - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -$palette-theme-dark-foreground: #fff; -$palette-theme-dark-background: #4d5057; -$palette-theme-light-foreground: #666; -$palette-theme-light-background: #fff; -$palette-theme-dark-soft-foreground: #ddd; -$palette-theme-dark-soft-background: #64686a; -$palette-theme-light-soft-foreground: #b3b3b3; -$palette-theme-dark-disabled-background: #3a3c41; -$palette-theme-dark-disabled-foreground: #787c7f; -$palette-theme-light-disabled-background: #d5d5d5; -$palette-theme-light-disabled-foreground: #787c7f; -$palette-theme-default-background: #ececec; -$palette-theme-default-foreground: #b3b3b3; -$palette-theme-primary-background: #2297de; -$palette-theme-primary-foreground: #fff; -$palette-theme-warning-background: #ff912f; -$palette-theme-warning-foreground: #fff; -$palette-theme-danger-background: #d9534f; -$palette-theme-danger-foreground: #fff; -$palette-theme-success-background: #5fb835; -$palette-theme-success-foreground: #fff; diff --git a/lib/gui/app/theme.ts b/lib/gui/app/theme.ts index 13a18949..20ab7c32 100644 --- a/lib/gui/app/theme.ts +++ b/lib/gui/app/theme.ts @@ -65,10 +65,14 @@ export const colors = { }, }; +const font = 'SourceSansPro'; + export const theme = { colors, + font, global: { font: { + family: font, size: 16, }, text: { diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index d5617014..30c7d59c 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -14941,12 +14941,6 @@ } } }, - "roboto-fontface": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/roboto-fontface/-/roboto-fontface-0.10.0.tgz", - "integrity": "sha512-OlwfYEgA2RdboZohpldlvJ1xngOins5d7ejqnIBWr9KaMxsnBqotpptRXTyfNRLnFpqzX6sTDt+X+a+6udnU8g==", - "dev": true - }, "run-async": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz", diff --git a/package.json b/package.json index 6a3d323c..0094b362 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,6 @@ "rendition": "^15.2.1", "request": "^2.81.0", "resin-corvus": "^2.0.5", - "roboto-fontface": "^0.10.0", "sass": "^1.26.5", "sass-lint": "^1.12.1", "sass-loader": "^8.0.2",