gatsby-matrix-theme 7.0.1 → 7.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/CHANGELOG.md +18 -0
  2. package/package.json +1 -1
  3. package/src/gatsby-core-theme/components/atoms/author/author.module.scss +63 -4
  4. package/src/gatsby-core-theme/components/atoms/author/index.js +1 -1
  5. package/src/hooks/tabs/index.js +29 -29
  6. package/src/hooks/tabs/tabs.module.scss +21 -6
package/CHANGELOG.md CHANGED
@@ -1,3 +1,21 @@
1
+ ## [7.0.2](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v7.0.1...v7.0.2) (2022-05-09)
2
+
3
+
4
+ ### Bug Fixes
5
+
6
+ * alignment for toplist tabs ([37c0f39](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/37c0f39a5e9d35bfff0a11c94d102793cfc38de4))
7
+ * moved tabs aboved module-introduction and fixed layout ([480edba](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/480edbaf6e1ed588923996e099fea31484d70a8c))
8
+
9
+
10
+ ### Code Refactoring
11
+
12
+ * author card alignment ([c856e84](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/c856e84877e496b136fb13714c224c5f4894d3f1))
13
+ * theme styles to match IL ([8099473](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/80994733d4227f38f7999cea67654a70d6a783f4))
14
+
15
+
16
+ * Merge branch 'tm-2689-include-a-paragraph-in-all-module' into 'master' ([0e3e26b](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/0e3e26b203a3b708834a5415253804c80c62f917))
17
+ * Merge branch 'tm-2801-fact-checker' into 'master' ([29ea252](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/29ea252b432f524a8592c339f2a870fbe483cab0))
18
+
1
19
  ## [7.0.1](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v7.0.0...v7.0.1) (2022-05-05)
2
20
 
3
21
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "gatsby-matrix-theme",
3
- "version": "7.0.1",
3
+ "version": "7.0.2",
4
4
  "main": "index.js",
5
5
  "description": "Matrix Theme NPM Package",
6
6
  "author": "",
package/src/gatsby-core-theme/components/atoms/author/author.module.scss CHANGED
@@ -1,13 +1,25 @@
1
1
  .authorWraper {
2
- display: grid;
3
- grid-template-rows: repeat(2, 1fr);
2
+ display: flex;
3
+ flex-wrap: wrap;
4
4
  align-items: center;
5
+ justify-content: flex-end;
5
6
  font-size: var(--author-text-fontSize);
6
7
  color: var(--author-primary-text-color);
8
+ max-width: 370px;
9
+ column-gap: 0.5rem;
10
+
11
+ > div {
12
+ display: flex;
13
+ justify-content: flex-end;
14
+ }
15
+
7
16
  .infoContainer {
8
17
  display: flex;
9
18
  align-items: center;
10
19
  white-space: nowrap;
20
+ order: 1;
21
+ flex: 1 1 auto;
22
+
11
23
  .prefixStyle {
12
24
  margin: 0px;
13
25
  }
@@ -34,21 +46,64 @@
34
46
  padding: 0px 2px;
35
47
  }
36
48
  }
49
+
50
+ @include max(mobile) {
51
+ justify-content: flex-start;
52
+ }
37
53
  }
38
54
  .dateTimeWrapper {
39
55
  display: flex;
40
56
  align-items: center;
41
57
  white-space: nowrap;
58
+ order: 4;
59
+ flex: 0 0 auto;
60
+ gap: 0.5rem;
61
+
42
62
  .readingWithBorder {
43
63
  &:before {
44
64
  content: '|';
45
65
  padding: 0px 3px;
46
66
  }
47
67
  }
68
+
69
+ @include max(mobile){
70
+ order: 2;
71
+
72
+ span {
73
+ display: none;
74
+ }
75
+ }
76
+ }
77
+
78
+ .readingWithBorder {
79
+ order: 2;
80
+ flex: 0 0 auto;
81
+ gap: 0.5rem;
82
+
83
+ @include max(mobile){
84
+ order: 4;
85
+ }
48
86
  }
49
87
 
50
- @include min(tablet) {
51
- display: flex;
88
+ .reviewer {
89
+ order: 3;
90
+ flex: 1 1 auto;
91
+ gap: 0.5rem;
92
+
93
+ > a {
94
+ color: var(--author-link-text-color);
95
+ font-weight: var(--author-fontweight);
96
+ text-decoration: underline;
97
+ }
98
+
99
+ @include max(mobile) {
100
+ justify-content: flex-start;
101
+ }
102
+ }
103
+
104
+ @include max(mobile) {
105
+ max-width: 100%;
106
+ margin: 0.8rem 0 0.2rem;
52
107
  }
53
108
  }
54
109
 
@@ -58,6 +113,10 @@
58
113
  justify-content: space-between;
59
114
  color: var( --author-card-text-color);
60
115
 
116
+ .infoContainer {
117
+ justify-content: flex-start;
118
+ }
119
+
61
120
  @include min(tablet){
62
121
  display: flex;
63
122
  justify-content: space-between;
package/src/gatsby-core-theme/components/atoms/author/index.js CHANGED
@@ -51,7 +51,7 @@ const Author = ({
51
51
  />
52
52
  )}
53
53
  </div>
54
- {reviewer && !isCardsAuthor && (
54
+ {reviewer.name && !isCardsAuthor && (
55
55
  <div className={date && styles.reviewer}>
56
56
  <span>{`${translate(translations, 'fact_checked_by', 'Fact checked by')}`}</span>
57
57
  {` `}
package/src/hooks/tabs/index.js CHANGED
@@ -75,21 +75,15 @@ const Tabs = ({
75
75
 
76
76
  if (module?.module_title_tag)
77
77
  return (
78
- <div>
79
- <CustomTag>
80
- {module.module_title}
81
- {currentMonth ? (
82
- <span className={styles.toplistDate}>
83
- <small>•</small>
84
- {`${currentMonth} ${year}`}
85
- </span>
86
- ) : null}
87
- </CustomTag>
88
- {module.module_introduction && (
89
- // eslint-disable-next-line react/no-danger
90
- <div dangerouslySetInnerHTML={{ __html: module?.module_introduction }} />
91
- )}
92
- </div>
78
+ <CustomTag className={styles.titleContainer}>
79
+ <div className={styles.title}>{module.module_title}</div>
80
+ {currentMonth ? (
81
+ <span className={styles.toplistDate}>
82
+ <small>•</small>
83
+ {`${currentMonth} ${year}`}
84
+ </span>
85
+ ) : null}
86
+ </CustomTag>
93
87
  );
94
88
  return (
95
89
  <span className={styles.noTag}>
@@ -111,20 +105,26 @@ const Tabs = ({
111
105
  return (
112
106
  <>
113
107
  <div className={tabHeaderClass}>
114
- {module.name === 'top_list' && getTitle(module)}
115
- {TabList && (
116
- <TabList
117
- siteName={siteName}
118
- title={title}
119
- onClick={onClickTabItem}
120
- items={children}
121
- activeTab={activeTab}
122
- activeTabClass={activeTabClass}
123
- showAll={showAll}
124
- alignRight={tabsAlign === 'right'}
125
- module={module}
126
- gtmClass={gtmClass}
127
- />
108
+ <div className={styles.titleAndTab}>
109
+ {module.name === 'top_list' && getTitle(module)}
110
+ {TabList && (
111
+ <TabList
112
+ siteName={siteName}
113
+ title={title}
114
+ onClick={onClickTabItem}
115
+ items={children}
116
+ activeTab={activeTab}
117
+ activeTabClass={activeTabClass}
118
+ showAll={showAll}
119
+ alignRight={tabsAlign === 'right'}
120
+ module={module}
121
+ gtmClass={gtmClass}
122
+ />
123
+ )}
124
+ </div>
125
+ {module.module_introduction && (
126
+ // eslint-disable-next-line react/no-danger
127
+ <div dangerouslySetInnerHTML={{ __html: module?.module_introduction }} />
128
128
  )}
129
129
  {HeaderComp && <div className={styles.headerComp}>{HeaderComp}</div>}
130
130
  </div>
package/src/hooks/tabs/tabs.module.scss CHANGED
@@ -28,16 +28,16 @@
28
28
  margin-bottom: 2rem;
29
29
  }
30
30
  }
31
- .toplistDate{
31
+ .toplistDate {
32
32
  color: var(--color-6);
33
33
  font-weight: 300;
34
34
  font-size: 1.4rem;
35
- padding-left: .5rem;
35
+ padding-left: 0.5rem;
36
36
  display: inline-block;
37
37
  position: relative;
38
38
  top: -4px;
39
- small{
40
- padding-right: .5rem;
39
+ small {
40
+ padding-right: 0.5rem;
41
41
  font-size: 1.2rem;
42
42
  font-weight: 400;
43
43
  }
@@ -50,14 +50,15 @@
50
50
  > div:first-child {
51
51
  grid-column: 2;
52
52
  }
53
- @include min(laptop){
54
- flex-direction: row;
53
+ @include min(laptop) {
54
+ // flex-direction: row;
55
55
  align-items: center;
56
56
  }
57
57
 
58
58
  > div:nth-child(2) {
59
59
  grid-column: 1;
60
60
  @include flex-align(center, flex-start);
61
+ display: block;
61
62
  }
62
63
  }
63
64
 
@@ -66,6 +67,16 @@
66
67
  }
67
68
  }
68
69
 
70
+ .titleAndTab {
71
+ width: 100%;
72
+ display: flex;
73
+ justify-content: space-between;
74
+ }
75
+
76
+ .title {
77
+ margin: 2rem 0;
78
+ }
79
+
69
80
  .headerComp {
70
81
  select {
71
82
  margin: 2rem 0;
@@ -81,3 +92,7 @@
81
92
  font-size: 1.6rem;
82
93
  }
83
94
  }
95
+
96
+ .titleContainer {
97
+ @include flex-align(center, center);
98
+ }