Skip to content

Commit

Permalink
Merge pull request #3177 from weaveworks/212-enforce-theme-fonts
Browse files Browse the repository at this point in the history
Enforce theme fonts
  • Loading branch information
fbarl authored May 18, 2018
2 parents f012c23 + 941cf16 commit 5e700d9
Show file tree
Hide file tree
Showing 10 changed files with 188 additions and 16 deletions.
1 change: 1 addition & 0 deletions client/.sass-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ rules:
- 'border-top-right-radius'
- 'border-bottom-left-radius'
- 'border-bottom-right-radius'
- 'font-family'
- 'font-size'
- 'z-index'
1 change: 1 addition & 0 deletions client/.stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"border-top-right-radius",
"border-bottom-left-radius",
"border-bottom-right-radius",
"font-family",
"font-size",
"z-index"
]],
Expand Down
Binary file added client/app/fonts/proximanova-regular.woff
Binary file not shown.
Binary file added client/app/fonts/robotomono-regular.ttf
Binary file not shown.
24 changes: 14 additions & 10 deletions client/app/styles/_base.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
@import '~xterm/dist/xterm.css';
@import '~font-awesome/scss/font-awesome.scss';
@import '~rc-slider/dist/rc-slider.css';

/* sass-lint:disable variable-for-property */
@font-face {
font-family: "Roboto";
src: url("../../node_modules/materialize-css/fonts/roboto/Roboto-Regular.woff2"),
url("../../node_modules/materialize-css/fonts/roboto/Roboto-Regular.woff"),
url("../../node_modules/materialize-css/fonts/roboto/Roboto-Regular.ttf");
font-family: 'proxima-nova';
src: url('../fonts/proximanova-regular.woff');
}

@font-face {
font-family: 'Roboto Mono';
src: url('../fonts/robotomono-regular.ttf');
}
/* sass-lint:enable variable-for-property */

a {
text-decoration: none;
}
Expand Down Expand Up @@ -158,7 +162,7 @@ a {
background: $body-background-color;
bottom: 0;
color: $text-color;
font-family: $base-font;
font-family: $font-family-regular;
font-size: $font-size-small;
height: auto;
left: 0;
Expand Down Expand Up @@ -429,7 +433,7 @@ a {
}

text {
font-family: $base-font;
font-family: $font-family-regular;
fill: $text-secondary-color;
}

Expand Down Expand Up @@ -704,7 +708,7 @@ a {
border-radius: $border-radius-soft;

span {
font-family: $base-font;
font-family: $font-family-regular;
font-size: $font-size-small;
margin-left: 4px;

Expand Down Expand Up @@ -1292,7 +1296,7 @@ a {
&-app &-inner { top: 0; }
&-inner {
cursor: text;
font-family: $mono-font;
font-family: $font-family-monospace;
position: absolute;
bottom: 0;
left: 0;
Expand All @@ -1307,7 +1311,7 @@ a {
}

&-status-bar {
font-family: $base-font;
font-family: $font-family-regular;
position: absolute;
bottom: 16px;
right: 16px;
Expand Down
2 changes: 0 additions & 2 deletions client/app/styles/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
$fa-font-path: "~font-awesome/fonts";
$base-font: "Roboto", sans-serif;
$mono-font: "Menlo", "DejaVu Sans Mono", "Liberation Mono", monospace;

$base-ease: ease-in-out;

Expand Down
1 change: 1 addition & 0 deletions client/app/styles/main.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
@import "variables";
@import "terminal";
@import "base";
167 changes: 167 additions & 0 deletions client/app/styles/terminal.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@
/**
* Copyright (c) 2014 The xterm.js authors. All rights reserved.
* Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)
* https://github.com/chjj/term.js
* @license MIT
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* Originally forked from (with the author's permission):
* Fabrice Bellard's javascript vt100 for jslinux:
* http://bellard.org/jslinux/
* Copyright (c) 2011 Fabrice Bellard
* The original design remains. The terminal itself
* has been extended to include xterm CSI codes, among
* other features.
*/

/**
* Default styles for xterm.js
*/

.xterm {
font-family: $font-family-monospace;
font-feature-settings: "liga" 0;
position: relative;
user-select: none;
-ms-user-select: none;
-webkit-user-select: none;
}

.xterm.focus,
.xterm:focus {
outline: none;
}

.xterm .xterm-helpers {
position: absolute;
top: 0;
/**
* The z-index of the helpers must be higher than the canvases in order for
* IMEs to appear on top.
*/
/* sass-lint:disable variable-for-property */
z-index: 10;
/* sass-lint:enable variable-for-property */
}

.xterm .xterm-helper-textarea {
/*
* HACK: to fix IE's blinking cursor
* Move textarea out of the screen to the far left, so that the cursor is not visible.
*/
position: absolute;
opacity: 0;
left: -9999em;
top: 0;
width: 0;
height: 0;
/* sass-lint:disable variable-for-property */
z-index: -10;
/* sass-lint:enable variable-for-property */
/** Prevent wrapping so the IME appears against the textarea at the correct position */
white-space: nowrap;
overflow: hidden;
resize: none;
}

.xterm .composition-view {
/* TODO: Composition position got messed up somewhere */
background: $color-black;
color: $color-white;
display: none;
position: absolute;
white-space: nowrap;
/* sass-lint:disable variable-for-property */
z-index: 1;
/* sass-lint:enable variable-for-property */
}

.xterm .composition-view.active {
display: block;
}

.xterm .xterm-viewport {
/* On OS X this is required in order for the scroll bar to appear fully opaque */
background-color: $color-black;
overflow-y: scroll;
cursor: default;
position: absolute;
right: 0;
left: 0;
top: 0;
bottom: 0;
}

.xterm .xterm-screen {
position: relative;
}

.xterm .xterm-screen canvas {
position: absolute;
left: 0;
top: 0;
}

.xterm .xterm-scroll-area {
visibility: hidden;
}

.xterm-char-measure-element {
display: inline-block;
visibility: hidden;
position: absolute;
top: 0;
left: -9999em;
line-height: normal;
}

.xterm.enable-mouse-events {
/* When mouse events are enabled (eg. tmux), revert to the standard pointer cursor */
cursor: default;
}

.xterm:not(.enable-mouse-events) {
cursor: text;
}

.xterm .xterm-accessibility,
.xterm .xterm-message {
position: absolute;
left: 0;
top: 0;
bottom: 0;
right: 0;
/* sass-lint:disable variable-for-property */
z-index: 100;
/* sass-lint:enable variable-for-property */
color: transparent;
}

.xterm .live-region {
position: absolute;
left: -9999px;
width: 1px;
height: 1px;
overflow: hidden;
}

.xterm-cursor-pointer {
cursor: pointer;
}
2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"reselect": "3.0.1",
"reselect-map": "1.0.3",
"styled-components": "2.2.4",
"weaveworks-ui-components": "0.4.73",
"weaveworks-ui-components": "0.4.76",
"whatwg-fetch": "2.0.3",
"xterm": "3.3.0"
},
Expand Down
6 changes: 3 additions & 3 deletions client/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8339,9 +8339,9 @@ wd@^0.4.0:
underscore.string "~3.0.3"
vargs "~0.1.0"

weaveworks-ui-components@0.4.73:
version "0.4.73"
resolved "https://registry.yarnpkg.com/weaveworks-ui-components/-/weaveworks-ui-components-0.4.73.tgz#0090afa71c3957e4e447a427d6134477f8158c48"
weaveworks-ui-components@0.4.76:
version "0.4.76"
resolved "https://registry.yarnpkg.com/weaveworks-ui-components/-/weaveworks-ui-components-0.4.76.tgz#0e0a28f128eb233a28db12397399bac3e395a218"
dependencies:
classnames "2.2.5"
d3-drag "1.2.1"
Expand Down

0 comments on commit 5e700d9

Please sign in to comment.