diff --git a/Gruntfile.js b/Gruntfile.js index 6a243b2b4..623b6c8ad 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -9,6 +9,7 @@ const toConcatForApp = [ 'node_modules/long/dist/long.js', 'components/protobuf/**/*.js', 'node_modules/mustache/mustache.js', + 'node_modules/underscore/underscore-min.js', 'node_modules/backbone/backbone.js', ]; diff --git a/package.json b/package.json index 645c953a3..29a31bd85 100644 --- a/package.json +++ b/package.json @@ -120,7 +120,6 @@ "sanitize.css": "^12.0.1", "semver": "5.4.1", "styled-components": "5.1.1", - "underscore": "^1.13.2", "uuid": "3.3.2" }, "devDependencies": { diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss index f45ffd83e..52f1e3560 100644 --- a/stylesheets/_modules.scss +++ b/stylesheets/_modules.scss @@ -6,17 +6,7 @@ flex-direction: column; align-items: flex-start; overflow-x: hidden; -} - -.create-group-button { - background-color: #383c46; - color: #ffffff; - margin: 4px; - padding: 4px; -} - -.create-group-button:focus { - outline: 0; + font-weight: 400; } .module-contact-name span { diff --git a/stylesheets/_session_constants.scss b/stylesheets/_session_constants.scss index c9c4f479a..4660b45e7 100644 --- a/stylesheets/_session_constants.scss +++ b/stylesheets/_session_constants.scss @@ -10,32 +10,18 @@ $session-font-mono: 'SpaceMono'; font-family: $session-font-mono; src: url('../fonts/SpaceMono-Regular.ttf') format('truetype'); } -@font-face { - font-family: $session-font-mono; - src: url('../fonts/SpaceMono-Bold.ttf') format('truetype'); - font-weight: bold; -} -@font-face { - font-family: $session-font-mono; - src: url('../fonts/SpaceMono-Italic.ttf') format('truetype'); - font-style: italic; -} -@font-face { - font-family: $session-font-mono; - src: url('../fonts/SpaceMono-BoldItalic.ttf') format('truetype'); - font-weight: bold; - font-style: italic; -} // Roboto is an open replacement for $session-font-default @font-face { font-family: $session-font-default; src: url('../fonts/Roboto-Regular.ttf') format('truetype'); + font-weight: 300; } @font-face { font-family: $session-font-default; src: url('../fonts/Roboto-Italic.ttf') format('truetype'); font-style: italic; + font-weight: 300; } @font-face { font-family: $session-font-default; diff --git a/yarn.lock b/yarn.lock index e09c6221b..8c07ffba9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9414,11 +9414,6 @@ underscore@>=1.8.3: resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.2.tgz#0c8d6f536d6f378a5af264a72f7bec50feb7cf2f" integrity sha512-D39qtimx0c1fI3ya1Lnhk3E9nONswSKhnffBI0gME9C99fYOkNi04xs8K6pePLhvl1frbDemkaBQ5ikWllR2HQ== -underscore@^1.13.2: - version "1.13.2" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.2.tgz#276cea1e8b9722a8dbed0100a407dda572125881" - integrity sha512-ekY1NhRzq0B08g4bGuX4wd2jZx5GnKz6mKSqFL4nqBlfyMGiG10gDFhDTMEfYmDL6Jy0FUIZp7wiRB+0BP7J2g== - union-value@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"