Side by Side Diff: static/scss/_variables.scss
Issue 29733614:
Issue 6483 - Add Source Sans Pro as default font to website-defaults (Closed)
Base URL: https://hg.adblockplus.org/website-defaults
Patch Set:
Created March 26, 2018, 10:42 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« static/scss/_fonts.scss ('k')
|
static/scss/main.scss » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 // This file is part of website-defaults | 1 // This file is part of website-defaults |
| 2 // Copyright (C) 2016-present eyeo GmbH | 2 // Copyright (C) 2016-present eyeo GmbH |
| 3 // | 3 // |
| 4 // website-defaults is free software: you can redistribute it and/or | 4 // website-defaults is free software: you can redistribute it and/or |
| 5 // modify it under the terms of the GNU General Public License as published by | 5 // modify it under the terms of the GNU General Public License as published by |
| 6 // the Free Software Foundation, either version 3 of the License, or | 6 // the Free Software Foundation, either version 3 of the License, or |
| 7 // (at your option) any later version. | 7 // (at your option) any later version. |
| 8 // | 8 // |
| 9 // website-defaults is distributed in the hope that it will be useful, | 9 // website-defaults is distributed in the hope that it will be useful, |
| 10 // but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 // but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 49 | 49 |
| 50 // Error - Used for error messages and warnings. | 50 // Error - Used for error messages and warnings. |
| 51 | 51 |
| 52 $error: #f44336 !default; | 52 $error: #f44336 !default; |
| 53 $error-light: #ffebee !default; | 53 $error-light: #ffebee !default; |
| 54 $error-dark: #b71c1c !default; | 54 $error-dark: #b71c1c !default; |
| 55 | 55 |
| 56 // Fonts | 56 // Fonts |
| 57 //////////////////////////////////////////////////////////////////////////////// | 57 //////////////////////////////////////////////////////////////////////////////// |
| 58 | 58 |
| 59 $primary-font: sans-serif !default; | 59 $path-to-font-files: "../fonts" !default; |
| 60 | |
| 61 $primary-font: "Source Sans Pro", Arial, sans-serif !default; | |
| 60 $secondary-font: serif !default; | 62 $secondary-font: serif !default; |
| 61 $monospace-font: monospace !default; | 63 $monospace-font: monospace !default; |
| 62 | 64 |
| 63 $bold-weight: 600 !default; | 65 $bold-weight: 600 !default; |
| 64 $normal-weight: 400 !default; | 66 $normal-weight: 400 !default; |
| 65 $thin-weight: 300 !default; | 67 $thin-weight: 300 !default; |
| 66 | 68 |
| 67 // Spacing | 69 // Spacing |
| 68 //////////////////////////////////////////////////////////////////////////////// | 70 //////////////////////////////////////////////////////////////////////////////// |
| 69 | 71 |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 102 | 104 |
| 103 // Container | 105 // Container |
| 104 | 106 |
| 105 $container-width: $large-desktop-width !default; | 107 $container-width: $large-desktop-width !default; |
| 106 | 108 |
| 107 // Navbar | 109 // Navbar |
| 108 | 110 |
| 109 $navbar-branding-height: $medium-space !default; | 111 $navbar-branding-height: $medium-space !default; |
| 110 $navbar-padding: $small-space !default; | 112 $navbar-padding: $small-space !default; |
| 111 $add-horizontal-navbar-padding: true !default; | 113 $add-horizontal-navbar-padding: true !default; |
| OLD | NEW |
« no previous file with comments
|
« static/scss/_fonts.scss ('k')
|
static/scss/main.scss » ('j')
|
no next file with comments »
