Skip to content

Commit 5855ef6

Browse files
author
Marc Brüderlin
committed
Merge branch 'release-1.2.0'
2 parents 5dc3d0a + 1ef1f72 commit 5855ef6

14 files changed

+164
-37
lines changed

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright © 2016 Marc Brüderlin
1+
Copyright © 2017 Marc Brüderlin
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the “Software”), to deal

‎README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,5 @@ There are several ways to get started:
2727
- [Utilities](https://marcbruederlin.github.io/comet/#utilities)
2828
- [Misc](https://marcbruederlin.github.io/comet/#misc)
2929
- [Browser Support](https://marcbruederlin.github.io/comet/#support)
30-
- [Customization](https://marcbruederlin.github.io/comet/#customization)
30+
- [Customization](https://marcbruederlin.github.io/comet/#customization)
31+
- [Comet UI](https://marcbruederlin.github.io/comet/#comet-ui)

‎bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "A minimal and robust BEM-style CSS toolkit.",
44
"main": "dist/comet.css",
55
"authors": [
6-
"Marc Brüderlin <hello@marcbruederlin.com>"
6+
"Marc Bruederlin <hello@marcbruederlin.com>"
77
],
88
"license": "MIT",
99
"keywords": [

‎dist/comet.css

+53-13
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*!
2-
* Comet v1.1.1
2+
* Comet v1.2.0
33
* https://github.com/marcbruederlin/comet
44
*
5-
* Copyright (c) 2016 Marc Bruederlin
5+
* Copyright (c) 2017 Marc Bruederlin
66
* Licensed under the MIT license
77
*/
88
/*********************************************************
@@ -434,7 +434,7 @@ html {
434434

435435
body {
436436
font-family: "Source Sans Pro", sans-serif;
437-
font-size: 1.6rem;
437+
font-size: 1.5rem;
438438
line-height: 1.6;
439439
color: #626979;
440440
-webkit-font-smoothing: antialiased;
@@ -464,6 +464,9 @@ body {
464464
a[href^="#"]:after {
465465
display: none; } }
466466

467+
/*********************************************************
468+
Functions
469+
*********************************************************/
467470
/*********************************************************
468471
Components
469472
*********************************************************/
@@ -486,9 +489,9 @@ body {
486489
*********************************************************/
487490
.button {
488491
display: inline-block;
489-
padding: 0 3rem;
492+
padding: 0 2rem;
490493
font-family: inherit;
491-
font-size: 1.2rem;
494+
font-size: 1.04167rem;
492495
font-weight: 700;
493496
line-height: 4rem;
494497
letter-spacing: .05rem;
@@ -500,28 +503,41 @@ body {
500503
border: 0.2rem solid #19e2b5;
501504
border-radius: .4rem;
502505
cursor: pointer; }
506+
.button:disabled {
507+
opacity: 0.8;
508+
cursor: not-allowed; }
509+
.button:disabled:hover {
510+
background-color: #19e2b5;
511+
border-color: #19e2b5; }
503512
.button:hover, .button:focus, .button:active {
504513
color: #fff;
505514
background-color: #0f866b;
506515
border-color: #0f866b;
507516
outline: none; }
508517
.button--small {
509518
padding: 0 1rem;
510-
font-size: 1.1rem;
519+
font-size: 0.86806rem;
511520
line-height: 3rem; }
512521
.button--large {
513522
font-size: 1.5rem;
514523
line-height: 6rem; }
515524
.button--outline {
516525
color: #19e2b5;
517526
background-color: transparent; }
527+
.button--outline:disabled:hover {
528+
color: #19e2b5;
529+
background-color: transparent; }
518530
.button--outline:hover {
519531
color: #0f866b;
520532
background-color: transparent; }
521533
.button--clear {
522534
color: #19e2b5;
523535
background-color: transparent;
524536
border-color: transparent; }
537+
.button--clear:disabled:hover {
538+
color: #19e2b5;
539+
background-color: transparent;
540+
border-color: transparent; }
525541
.button--clear:hover {
526542
color: #0f866b;
527543
background-color: transparent;
@@ -532,7 +548,7 @@ body {
532548
*********************************************************/
533549
.code {
534550
font-family: "Monaco", monospace;
535-
font-size: 1.3rem; }
551+
font-size: 1.25rem; }
536552
.code--background {
537553
padding: .5rem 1rem;
538554
background: rgba(0, 0, 0, 0.05); }
@@ -620,6 +636,7 @@ textarea {
620636
.grid--gapless .grid__col {
621637
padding: 0 !important; }
622638
.grid .grid__col {
639+
position: relative;
623640
padding: 0 1rem 1rem; }
624641
.grid .grid__col--12 {
625642
-ms-flex-preferred-size: 100%;
@@ -850,22 +867,22 @@ h1, h2, h3, h4, h5, h6 {
850867
color: #000; }
851868

852869
h1 {
853-
font-size: 7.2rem; }
870+
font-size: 4.47898rem; }
854871

855872
h2 {
856-
font-size: 5.4rem; }
873+
font-size: 3.73248rem; }
857874

858875
h3 {
859-
font-size: 3.6rem; }
876+
font-size: 3.1104rem; }
860877

861878
h4 {
862-
font-size: 2.7rem; }
879+
font-size: 2.592rem; }
863880

864881
h5 {
865-
font-size: 2.3rem; }
882+
font-size: 2.16rem; }
866883

867884
h6 {
868-
font-size: 1.9rem; }
885+
font-size: 1.5rem; }
869886

870887
p {
871888
margin: 0 0 3rem 0; }
@@ -941,3 +958,26 @@ abbr[title] {
941958
display: table; }
942959
.utility__clearfix:after, .list--inline:after {
943960
clear: both; }
961+
962+
/*********************************************************
963+
Hidden utility
964+
*********************************************************/
965+
.utility__hidden--s, .utility__hidden--m, .utility__hidden--l {
966+
display: initial;
967+
visibility: visible; }
968+
969+
@media (min-width: 769px) {
970+
.utility__hidden--m.utility__hidden--l,
971+
.utility__hidden--l.utility__hidden--s,
972+
.utility__hidden--l {
973+
display: none; } }
974+
975+
@media (max-width: 425px) {
976+
.utility__hidden--l.utility__hidden--s,
977+
.utility__hidden--s {
978+
display: none; } }
979+
980+
@media (min-width: 426px) and (max-width: 768px) {
981+
.utility__hidden--m.utility__hidden--l,
982+
.utility__hidden--m {
983+
display: none; } }

‎dist/comet.min.css

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "comet-css",
3-
"version": "1.1.1",
3+
"version": "1.2.0",
44
"description": "A minimal and robust BEM-style CSS toolkit.",
55
"main": "dist/comet.min.css",
66
"repository": {
77
"type": "git",
88
"url": "git+https://github.com/marcbruederlin/comet.git"
99
},
10-
"author": "Marc Brüderlin <hello@marcbruederlin.com>",
10+
"author": "Marc Bruederlin <hello@marcbruederlin.com>",
1111
"license": "MIT",
1212
"bugs": {
1313
"url": "https://github.com/marcbruederlin/comet/issues"
@@ -33,7 +33,7 @@
3333
"gulp-clean": "^0.3.2",
3434
"gulp-clean-css": "^2.0.13",
3535
"gulp-rename": "^1.2.2",
36-
"gulp-sass": "^2.3.2",
36+
"gulp-sass": "^3.1.0",
3737
"gulp-watch": "^4.3.10",
3838
"yargs": "^6.0.0"
3939
}

‎src/comet.scss

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*!
2-
* Comet v1.1.1
2+
* Comet v1.2.0
33
* https://github.com/marcbruederlin/comet
44
*
5-
* Copyright (c) 2016 Marc Bruederlin
5+
* Copyright (c) 2017 Marc Bruederlin
66
* Licensed under the MIT license
77
*/
88

@@ -14,6 +14,7 @@
1414
@import 'core/normalize';
1515
@import 'core/base';
1616
@import 'core/print';
17+
@import 'core/functions';
1718

1819
/*********************************************************
1920
Components
@@ -35,4 +36,5 @@
3536
*********************************************************/
3637
@import 'utilities/text';
3738
@import 'utilities/position';
38-
@import 'utilities/float';
39+
@import 'utilities/float';
40+
@import 'utilities/hidden';

‎src/components/_buttons.scss

+29-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
*********************************************************/
44
.button {
55
display: inline-block;
6-
padding: 0 3rem;
6+
padding: 0 2rem;
77
font-family: inherit;
8-
font-size: 1.2rem;
8+
font-size: font-scale(-2);
99
font-weight: 700;
1010
line-height: 4rem;
1111
letter-spacing: .05rem;
@@ -17,6 +17,16 @@
1717
border: .2rem solid $color__primary;
1818
border-radius: .4rem;
1919
cursor: pointer;
20+
21+
&:disabled {
22+
opacity: 0.8;
23+
cursor: not-allowed;
24+
25+
&:hover {
26+
background-color: $color__primary;
27+
border-color: $color__primary;
28+
}
29+
}
2030

2131
&:hover,
2232
&:focus,
@@ -29,19 +39,26 @@
2939

3040
&--small {
3141
padding: 0 1rem;
32-
font-size: 1.1rem;
42+
font-size: font-scale(-3);
3343
line-height: 3rem;
3444
}
3545

3646
&--large {
37-
font-size: 1.5rem;
47+
font-size: font-scale(0);
3848
line-height: 6rem;
3949
}
4050

4151
&--outline {
4252
color: $color__primary;
4353
background-color: transparent;
4454

55+
&:disabled {
56+
&:hover {
57+
color: $color__primary;
58+
background-color: transparent;
59+
}
60+
}
61+
4562
&:hover {
4663
color: $color__primary--dark;
4764
background-color: transparent;
@@ -53,6 +70,14 @@
5370
background-color: transparent;
5471
border-color: transparent;
5572

73+
&:disabled {
74+
&:hover {
75+
color: $color__primary;
76+
background-color: transparent;
77+
border-color: transparent;
78+
}
79+
}
80+
5681
&:hover {
5782
color: $color__primary--dark;
5883
background-color: transparent;

‎src/components/_codes.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*********************************************************/
44
.code {
55
font-family: $font__monospace;
6-
font-size: 1.3rem;
6+
font-size: font-scale(-1);
77

88
&--background {
99
padding: .5rem 1rem;

‎src/components/_grid.scss

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
}
2323

2424
& .grid__col {
25+
position: relative;
2526
padding: 0 1rem 1rem;
2627

2728
&--12 {

‎src/components/_typography.scss

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,27 @@ h1, h2, h3, h4, h5, h6 {
99
}
1010

1111
h1 {
12-
font-size: 7.2rem;
12+
font-size: font-scale(6);
1313
}
1414

1515
h2 {
16-
font-size: 5.4rem;
16+
font-size: font-scale(5);
1717
}
1818

1919
h3 {
20-
font-size: 3.6rem;
20+
font-size: font-scale(4);
2121
}
2222

2323
h4 {
24-
font-size: 2.7rem;
24+
font-size: font-scale(3);
2525
}
2626

2727
h5 {
28-
font-size: 2.3rem;
28+
font-size: font-scale(2);
2929
}
3030

3131
h6 {
32-
font-size: 1.9rem;
32+
font-size: font-scale(0);
3333
}
3434

3535
p {

‎src/core/_functions.scss

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*********************************************************
2+
Functions
3+
*********************************************************/
4+
@function power($number, $power) {
5+
$exponent: 1;
6+
7+
@if $power > 0 {
8+
@for $i from 1 through $power {
9+
$exponent: $exponent * $number;
10+
}
11+
} @else {
12+
@for $i from $power to 0 {
13+
$exponent: $exponent / $number;
14+
}
15+
}
16+
17+
@return $exponent;
18+
}
19+
20+
@function font-scale($x) {
21+
@return power($font__ratio, $x) * $font__base-font-size;
22+
};

‎src/custom/_variables.scss

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ $color__border--error: #e25c48;
2222
*********************************************************/
2323
$font__sans-serif: 'Source Sans Pro', sans-serif;
2424
$font__monospace: 'Monaco', monospace;
25-
$font__base-font-size: 1.6rem;
25+
$font__base-font-size: 1.5rem;
2626
$font__base-line-height: 1.6;
27+
$font__ratio: 1.2;
2728

2829
/*********************************************************
2930
Layout

0 commit comments

Comments
 (0)