static/scss/main.scss - Issue 29603821: Noissue - Separated website-default utilities

Delta Between Two Patch Sets: static/scss/main.scss

Issue 29603821: Noissue - Separated website-default utilities (Closed) Base URL: https://hg.adblockplus.org/website-defaults

Left Patch Set: Rebased and re-separated Created Dec. 6, 2017, 3:55 p.m.

Right Patch Set: Addressed comments #13 Created Dec. 14, 2017, 1:36 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

LEFT	RIGHT
1 /*!	1 /*!

2 * This file is part of website-defaults	2 * This file is part of website-defaults

3 * Copyright (C) 2016-present eyeo GmbH	3 * Copyright (C) 2016-present eyeo GmbH

4 *	4 *

5 * website-defaults 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 * website-defaults 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 website-defaults. 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 @import "variables";	19 @import "variables";

	20 @import "utilities/overrides.scss";

	21 @import "utilities/colors.scss";

	22 @import "utilities/layout.scss";

	23 @import "utilities/text.scss";

	24 @import "utilities/widths.scss";

20 @import "reset";	25 @import "reset";

21 @import "base";	26 @import "base";

22 @import "content";	27 @import "content";

23 @import "grid";	28 @import "grid";

24 @import "forms/basic";	29 @import "forms/basic";

25 @import "forms/advanced";	30 @import "forms/advanced";

26 @import "forms/buttons";	31 @import "forms/buttons";

27 @import "utilities/responsive-widths.scss";
ire 2017/12/07 11:44:20 I think utilities should come earlier (after reset I think utilities should come earlier (after reset) because they could be used/extended by other styles juliandoucette 2017/12/07 12:33:57 They ( are / can be ) extended ( in / by ) imports Show quoted text On 2017/12/07 11:44:20, ire wrote: > I think utilities should come earlier (after reset) because they could be > used/extended by other styles They ( are / can be ) extended ( in / by ) imports that are listed before them AFAIK. I will move them anyway. ire 2017/12/11 15:44:03 You didn't move them? Show quoted text On 2017/12/07 12:33:57, juliandoucette wrote: > On 2017/12/07 11:44:20, ire wrote: > > I think utilities should come earlier (after reset) because they could be > > used/extended by other styles > > They ( are / can be ) extended ( in / by ) imports that are listed before them > AFAIK. > > I will move them anyway. You didn't move them? juliandoucette 2017/12/14 13:37:07 oops. Done. Show quoted text On 2017/12/11 15:44:03, ire wrote: > You didn't move them? oops. Done.
28 @import "utilities/fixed-widths.scss";
ire 2017/12/07 11:44:20 NIT: I think some of these categories are a bit to NIT: I think some of these categories are a bit too specific, meaning we will end up with loads more files for each of these utilities when we add more. I suggest having a bit more broad category names, e.g.: - "colors" instead if background-colors - "text" instead of text-alignment" - "containers" for responsive-widths and fixed-widths (Not so sure about this one, maybe "widths") (Taking inspiration from Bootstrap's naming) juliandoucette 2017/12/07 12:33:57 Agreed. Show quoted text On 2017/12/07 11:44:20, ire wrote: > NIT: I think some of these categories are a bit too specific, meaning we will > end up with loads more files for each of these utilities when we add more. I > suggest having a bit more broad category names, e.g.: > > - "colors" instead if background-colors > - "text" instead of text-alignment" > - "containers" for responsive-widths and fixed-widths (Not so sure about this > one, maybe "widths") > > (Taking inspiration from Bootstrap's naming) Agreed. juliandoucette 2017/12/08 16:11:06 Done. Show quoted text On 2017/12/07 11:44:20, ire wrote: > NIT: I think some of these categories are a bit too specific, meaning we will > end up with loads more files for each of these utilities when we add more. I > suggest having a bit more broad category names, e.g.: > > - "colors" instead if background-colors > - "text" instead of text-alignment" > - "containers" for responsive-widths and fixed-widths (Not so sure about this > one, maybe "widths") > > (Taking inspiration from Bootstrap's naming) Done.
29 @import "utilities/floats.scss";

30 @import "utilities/clearfix.scss";

31 @import "utilities/background-colors.scss";

32 @import "utilities/text-alignment.scss";

33 @import "utilities/unstyled.scss";

34 @import "utilities/screen-reader.scss";

LEFT	RIGHT