Skip to content

Commit fd30cf1

Browse files
birdofpreyrubirdofpreyru
committed
A bit more fixes for the previous commit
1 parent 32f45df commit fd30cf1

11 files changed

+578
-1550
lines changed

‎package-lock.json

Lines changed: 505 additions & 1453 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
"serve-favicon": "^2.4.1",
9696
"shortid": "^2.2.8",
9797
"style-loader": "^0.18.2",
98-
"stylefmt": "^6.0.0",
9998
"stylelint": "^8.0.0",
10099
"stylelint-config-standard": "^17.0.0",
101100
"supertest": "^3.0.0",
@@ -125,7 +124,7 @@
125124
"redux-devtools-log-monitor": "^1.2.0",
126125
"redux-mock-store": "^1.2.3",
127126
"sinon": "^2.3.8",
128-
"stylefmt": "^5.3.0",
127+
"stylefmt": "^6.0.0",
129128
"webpack-dev-middleware": "^1.10.1",
130129
"webpack-hot-middleware": "^2.17.1"
131130
}

‎src/shared/components/examples/Tags/index.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import {
77
} from 'components/tags';
88
import { ThemeProvider } from 'react-css-themr';
99

10-
import primaryDataScienceTagStyle from '../../tags/primaryDataScience.scss';
11-
import primaryDevelopTagStyle from '../../tags/primaryDevelop.scss';
12-
import eventDevelopTagStyle from '../../tags/eventDevelop.scss';
13-
import eventDataScienceTagStyle from '../../tags/eventDataScience.scss';
10+
import primaryDataScienceTagStyle from 'components/tags/primaryDataScience.scss';
11+
import primaryDevelopTagStyle from 'components/tags/primaryDevelop.scss';
12+
import eventDevelopTagStyle from 'components/tags/eventDevelop.scss';
13+
import eventDataScienceTagStyle from 'components/tags/eventDataScience.scss';
1414

1515
import style from './style.scss';
1616

‎src/shared/components/tags/default.scss

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
&:active,
88
&:focus,
99
&:hover {
10-
color: $tc-gray-80;
10+
color: $tc-gray-80 !important;
1111
background-color: $tc-dark-blue-30;
1212
}
1313

@@ -16,24 +16,17 @@
1616
}
1717
}
1818

19-
div,
20-
span {
21-
.tag,
22-
a.tag {
23-
display: inline-block;
24-
text-align: center;
25-
padding: 0 7px;
26-
line-height: 20px;
27-
background-color: $tc-gray-neutral-dark;
28-
font-size: 11px;
29-
font-family: Roboto;
30-
font-weight: 500;
31-
color: $tc-gray-80;
32-
margin-right: 5px;
33-
border-radius: 4px;
34-
margin-bottom: 2px;
35-
cursor: pointer;
19+
.tag {
20+
display: inline-block;
21+
text-align: center;
22+
padding: 0 7px;
23+
background-color: $tc-gray-neutral-dark;
24+
font: bold 11px/20px Roboto;
25+
color: $tc-gray-80;
26+
margin-right: 5px;
27+
border-radius: 4px;
28+
margin-bottom: 2px;
29+
cursor: pointer;
3630

37-
@include feedback;
38-
}
31+
@include feedback;
3932
}

‎src/shared/components/tags/eventDataScience.scss

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,18 @@
88
&:active,
99
&:focus,
1010
&:hover {
11-
color: $tc-orange;
12-
background-color: $tc-light-blue-10;
11+
color: $tc-orange !important;
12+
background-color: $tc-orange-10;
1313
}
1414

1515
&:visited {
1616
color: $tc-orange;
1717
}
1818
}
1919

20-
div,
21-
span {
22-
.tag,
23-
a.tag {
24-
color: $tc-orange;
25-
background-color: $tc-light-blue-10;
20+
.tag {
21+
color: $tc-orange;
22+
background-color: $tc-orange-10;
2623

27-
@include feedback;
28-
}
24+
@include feedback;
2925
}

‎src/shared/components/tags/eventDesign.scss

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
&:active,
99
&:focus,
1010
&:hover {
11-
color: $tc-dark-blue-90;
11+
color: $tc-dark-blue-90 !important;
1212
background-color: $tc-light-blue-10;
1313
}
1414

@@ -17,18 +17,14 @@
1717
}
1818
}
1919

20-
div,
21-
span {
22-
.tag,
23-
a.tag {
24-
border-radius: 3px;
25-
font-size: 10px;
26-
margin: 5px 5px 0 0;
27-
padding: 0 5px;
28-
font-weight: 700;
29-
color: $tc-dark-blue-90;
30-
background-color: $tc-light-blue-10;
20+
.tag {
21+
border-radius: 3px;
22+
font-size: 10px;
23+
margin: 5px 5px 0 0;
24+
padding: 0 5px;
25+
font-weight: 700;
26+
color: $tc-dark-blue-90;
27+
background-color: $tc-light-blue-10;
3128

32-
@include feedback;
33-
}
29+
@include feedback;
3430
}

‎src/shared/components/tags/eventDevelop.scss

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,18 @@
88
&:active,
99
&:focus,
1010
&:hover {
11-
color: $tc-green;
12-
background-color: $tc-light-blue-10;
11+
color: $tc-green !important;
12+
background-color: $tc-green-10;
1313
}
1414

1515
&:visited {
1616
color: $tc-green;
1717
}
1818
}
1919

20-
div,
21-
span {
22-
.tag,
23-
a.tag {
24-
color: $tc-green;
25-
background-color: $tc-light-blue-10;
20+
.tag {
21+
color: $tc-green;
22+
background-color: $tc-green-10;
2623

27-
@include feedback;
28-
}
24+
@include feedback;
2925
}

‎src/shared/components/tags/index.jsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ import defaultTag from './default.scss';
77
import primaryDesignTag from './primaryDesign.scss';
88
import eventDesignTag from './eventDesign.scss';
99

10+
/* TODO: Well, this is basically a copy/paste of generic button code.
11+
* We should just import and reuse that button. It will demand just some
12+
* corrections of the styles. */
13+
1014
/* Generic button, not wrapped by themr, but accepting theme property.
1115
* In most cases you will want to use some of the themable exports below
1216
* instead. */
@@ -22,7 +26,7 @@ export function GenericTag({
2226
if (to) {
2327
return (
2428
<Link
25-
className={`${theme.tag}`}
29+
className={theme.tag}
2630
enforceA={enforceA}
2731
onClick={onClick}
2832
openNewTab={openNewTab}
@@ -33,7 +37,7 @@ export function GenericTag({
3337
}
3438
return (
3539
<a
36-
className={`${theme.tag}`}
40+
className={theme.tag}
3741
onClick={onClick}
3842
role="button"
3943
tabIndex={0}

‎src/shared/components/tags/primaryDataScience.scss

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
* Primary tag, colored with colors of data science track (orange).
33
*/
44

5-
@import "~styles/tc-styles";
5+
@import "./default";
66

77
@mixin feedback {
88
&:active,
99
&:focus,
1010
&:hover {
11-
color: $tc-white;
11+
color: $tc-white !important;
1212
background-color: $tc-orange;
1313
}
1414

@@ -17,13 +17,12 @@
1717
}
1818
}
1919

20-
div,
21-
span {
22-
.tag,
23-
a.tag {
24-
color: $tc-white;
25-
background-color: $tc-orange;
20+
.tag {
21+
background-color: $tc-orange;
22+
border-radius: 3px;
23+
color: $tc-white;
24+
margin: 5px 5px 0 0;
25+
padding: 0 5px;
2626

27-
@include feedback;
28-
}
27+
@include feedback;
2928
}

‎src/shared/components/tags/primaryDesign.scss

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,21 @@
88
&:active,
99
&:focus,
1010
&:hover {
11-
color: $tc-white;
12-
background-color: $tc-dark-blue-90;
11+
color: $tc-white !important;
12+
background-color: $tc-light-blue;
1313
}
1414

1515
&:visited {
1616
color: $tc-white;
1717
}
1818
}
1919

20-
div,
21-
span {
22-
.tag,
23-
a.tag {
24-
border-radius: 3px;
25-
font-size: 10px;
26-
margin: 5px 5px 0 0;
27-
padding: 0 5px;
28-
font-weight: 700;
29-
color: $tc-white;
30-
background-color: $tc-dark-blue-90;
20+
.tag {
21+
background-color: $tc-light-blue;
22+
border-radius: 3px;
23+
color: $tc-white;
24+
margin: 5px 5px 0 0;
25+
padding: 0 5px;
3126

32-
@include feedback;
33-
}
27+
@include feedback;
3428
}

‎src/shared/components/tags/primaryDevelop.scss

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
* Primary tag, colored with colors of develop track (green).
33
*/
44

5-
@import "~styles/tc-styles";
5+
@import "./default";
66

77
@mixin feedback {
88
&:active,
99
&:focus,
1010
&:hover {
11-
color: $tc-white;
11+
color: $tc-white !important;
1212
background-color: $tc-green;
1313
}
1414

@@ -17,13 +17,12 @@
1717
}
1818
}
1919

20-
div,
21-
span {
22-
.tag,
23-
a.tag {
24-
color: $tc-white;
25-
background-color: $tc-green;
20+
.tag {
21+
background-color: $tc-green;
22+
border-radius: 3px;
23+
color: $tc-white;
24+
margin: 5px 5px 0 0;
25+
padding: 0 5px;
2626

27-
@include feedback;
28-
}
27+
@include feedback;
2928
}

0 commit comments

Comments
 (0)