Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code
Issues
All Issues

Delta Between Two Patch Sets: scss/_variables.scss

Issue 29361647: Issue 4607 - Default content styles (Closed)
Left Patch Set: Removed extra list items and changed image text capitilization Created Nov. 17, 2016, 4:17 p.m.
Right Patch Set: See comments for details Created Dec. 1, 2016, 2:05 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « scss/_content.scss ('k') | scss/main.scss » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /*! 1 /*!
2 * This file is part of universal-design-language 2 * This file is part of website-defaults
3 * Copyright (C) 2016 Eyeo GmbH 3 * Copyright (C) 2016 Eyeo GmbH
4 * 4 *
5 * universal-design-language is free software: you can redistribute it and/or 5 * website-defaults is free software: you can redistribute it and/or
6 * modify it under the terms of the GNU General Public License as published by 6 * modify it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation, either version 3 of the License, or 7 * the Free Software Foundation, either version 3 of the License, or
8 * (at your option) any later version. 8 * (at your option) any later version.
9 * 9 *
10 * universal-design-language is distributed in the hope that it will be useful, 10 * website-defaults is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details. 13 * GNU General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU General Public License 15 * You should have received a copy of the GNU General Public License
16 * along with web.starter-kit. If not, see <http://www.gnu.org/licenses/>. 16 * along with website-defaults. If not, see <http://www.gnu.org/licenses/>.
17 */ 17 */
18 18
19 /* UDL variables 19 /*******************************************************************************
20 * Variables
20 ******************************************************************************* 21 *******************************************************************************
21 * ~ WARNING ~ DO NOT EDIT THIS FILE! 22 * ~ WARNING ~ DO NOT EDIT THIS FILE!
22 * Set variables within project specfic SCSS before including UDL styles. 23 * Set variables within project specfic SCSS before including website defaults.
23 ******************************************************************************* 24 *******************************************************************************
24 * - Brand colors 25 * - Brand colors
25 * - Fonts 26 * - Fonts
26 * - Spacing 27 * - Spacing
27 * - Breakpoints 28 * - Breakpoints
28 ******************************************************************************/ 29 ******************************************************************************/
29 30
30 /* Brand colors 31 /* Brand colors
31 ******************************************************************************/ 32 ******************************************************************************/
32 33
33 /* Primary - The most widely used across all screens and components. */ 34 /* Primary - The most widely used across all screens and components. */
34 35
35 $primary: #212121 !default; 36 $primary: #212121 !default;
36 $primary-light: #fafafa !default; 37 $primary-light: #fff !default;
37 $primary-dark: #000 !default; 38 $primary-dark: #000 !default;
38 39
39 /* Secondary - Used to indicate a related action or information. */ 40 /* Secondary - Used to indicate a related action or information. */
40 41
41 $secondary: #9e9e9e !default; 42 $secondary: #9e9e9e !default;
42 $secondary-light: #9e9e9e !default; 43 $secondary-light: #eee !default;
43 $secondary-dark: #424242 !default; 44 $secondary-dark: #424242 !default;
44 45
45 /* Accent - Used for action buttons and interactive elements. */ 46 /* Accent - Used for action buttons and interactive elements. */
46 47
47 $accent: #1565c0 !default; 48 $accent: #1565c0 !default;
48 $accent-light: #e3f2fd !default; 49 $accent-light: #e3f2fd !default;
49 $accent-dark: #0d47a1 !default; 50 $accent-dark: #0d47a1 !default;
50 51
51 /* Error - Used for error messages and warnings. */ 52 /* Error - Used for error messages and warnings. */
52 53
(...skipping 19 matching lines...) Expand all
72 /* Spacing 73 /* Spacing
73 ******************************************************************************/ 74 ******************************************************************************/
74 75
75 $large-space: 64px !default; 76 $large-space: 64px !default;
76 $medium-space: 32px !default; 77 $medium-space: 32px !default;
77 $small-space: 16px !default; 78 $small-space: 16px !default;
78 79
79 /* Breakpoints 80 /* Breakpoints
80 ******************************************************************************/ 81 ******************************************************************************/
81 82
82 $tablet-breakpoint: 768px !default; 83 $tablet-breakpoint: 768px;
saroyanm 2016/11/24 15:18:44 We will remove "!default", because people should n
juliandoucette 2016/11/25 16:28:45 Done.
83 $desktop-breakpoint: 992px !default; 84 $desktop-breakpoint: 992px;
84 85
85 /* Container widths 86 /* Container widths
saroyanm 2016/11/21 18:44:41 Not sure if we need this variables, see my comment
juliandoucette 2016/11/22 00:54:05 Acknowledged. See my comment on the other page.
juliandoucette 2016/11/25 16:28:44 Done.
86 ******************************************************************************/ 87 ******************************************************************************/
87 88
88 $mobile-width: 540px !default; 89 $mobile-width: 540px !default;
89 $tablet-width: 720px !default; 90 $tablet-width: 720px !default;
90 $desktop-width: 960px !default; 91 $desktop-width: 960px !default;
LEFTRIGHT
« scss/_content.scss ('k') | scss/main.scss » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld