Skip to content

Commit 01c0497

Browse files
bklaing2bklaing2
committed
fixed broken styles for akita
1 parent d23ac9a commit 01c0497

File tree

5 files changed

+98
-81
lines changed

5 files changed

+98
-81
lines changed

‎src/stylesheets/doi.scss

+4-1
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,7 @@ Datacite - Bootstrap 5 theme
9999
@import "doi/pages/stats-portal";
100100
@import "doi/pages/metadata";
101101
@import "doi/pages/doi";
102-
@import "doi/pages/repository-finder"
102+
@import "doi/pages/repository-finder";
103+
104+
// Styles to fix things broken during the upgrade process
105+
@import "doi/globals/styles";

‎src/stylesheets/doi/components/_labels.scss

+15-15
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,21 @@ category: Components
2525
display: inline-block;
2626
margin-bottom: 3px;
2727
}
28-
// .badge-primary {
29-
// background-color: $primary-color;
30-
// }
31-
// .badge-info {
32-
// background-color: $info-color;
33-
// }
34-
// .badge-success {
35-
// background-color: $success-color;
36-
// }
37-
// .badge-warning {
38-
// background-color: $warning-color;
39-
// }
40-
// .badge-danger {
41-
// background-color: $danger-color;
42-
// }
28+
.badge-primary {
29+
background-color: $primary-color;
30+
}
31+
.badge-info {
32+
background-color: $info-color;
33+
}
34+
.badge-success {
35+
background-color: $success-color;
36+
}
37+
.badge-warning {
38+
background-color: $warning-color;
39+
}
40+
.badge-danger {
41+
background-color: $danger-color;
42+
}
4343
.badge-allocating {
4444
color: $darker-gray;
4545
background-color: $light-blue;

‎src/stylesheets/doi/components/_tabs-navs-pagination.scss

+75-65
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,35 @@
44
.nav-tabs-member {
55
padding-bottom: 0;
66
border-bottom: 1px solid $light-gray !important;
7+
border-bottom: 1px solid $light-gray !important;
78
margin-bottom: 3em;
89
margin-left: -10px;
910

10-
.nav-link {
11+
.nav-item button {
1112
padding-left: 0;
1213
margin-left: 10px;
14+
// margin-bottom: -2px;
15+
border-left: none;
16+
border-right: none;
17+
border-top: none;
1318
}
1419

1520
.nav-link.active.doi {
1621
cursor: pointer;
1722
}
1823

19-
a, a:focus, a:hover, .active {
24+
button, button:focus, button:hover, .active {
2025
font-size: $font-size-h3;
2126
}
22-
a {
27+
button {
2328
color: $darker-gray;
2429
font-weight: bold;
2530
}
26-
a:hover, .active > a:hover {
31+
button:hover, .active > button:hover {
2732
color: $medium-gray;
2833
font-weight: bold;
2934
}
30-
a:focus, > li > a:focus, .active > a, .active > a:focus, a.active {
35+
button:focus, > li > button:focus, .active > button, .active > button:focus, button.active {
3136
color: $turquoise !important;
3237
}
3338
}
@@ -41,7 +46,7 @@
4146
border-bottom: 1px solid $light-gray;
4247
margin-bottom: 30px;
4348

44-
.nav > li > a, .nav-link {
49+
.nav > li > button, .nav-link {
4550
padding-bottom: 20px;
4651
}
4752
}
@@ -58,16 +63,16 @@
5863
font-size: $font-size-base;
5964
font-weight: $font-weight-bold;
6065
> li{
61-
> a{
66+
> button{
6267
border: 0 none;
6368
color: $other-medium-gray;
6469
}
65-
> a:hover{
70+
> button:hover{
6671
color: $font-color;
6772
}
6873
}
6974

70-
li.active, a.active {
75+
li.active, button.active {
7176
color: $font-color;
7277
position: relative;
7378

@@ -76,8 +81,13 @@
7681
border-bottom: 1px solid $light-gray !important;
7782
//height: 50px;
7883
}
84+
background-color: transparent;
85+
border: 0 none;
86+
border-bottom: 1px solid $light-gray !important;
87+
//height: 50px;
88+
}
7989

80-
a.active:before{
90+
button.active:before{
8191
border-bottom: 11px solid $light-gray;
8292
border-left: 11px solid rgba(0, 0, 0, 0);
8393
border-right: 11px solid rgba(0, 0, 0, 0);
@@ -88,7 +98,7 @@
8898
bottom: 0;
8999
}
90100

91-
a.active:after{
101+
button.active:after{
92102
border-bottom: 11px solid $white-color;
93103
border-left: 11px solid rgba(0, 0, 0, 0);
94104
border-right: 11px solid rgba(0, 0, 0, 0);
@@ -106,7 +116,7 @@
106116
> li + li {
107117
margin-left: 0;
108118
}
109-
> li > a {
119+
> li > button {
110120
border: 2px solid $default-color;
111121
border-radius: 0;
112122
color: $default-color;
@@ -115,9 +125,9 @@
115125
padding: 5px 20px;
116126

117127
}
118-
> li.active > a,
119-
> li.active > a:hover,
120-
> li.active > a:focus {
128+
> li.active > button,
129+
> li.active > button:hover,
130+
> li.active > button:focus {
121131
background-color: $default-color;
122132
color: #FFFFFF;
123133
}
@@ -126,11 +136,11 @@
126136
background-color: $default-color;
127137
border: 1px solid white;
128138
}
129-
> li:first-child > a{
139+
> li:first-child > button{
130140
border-radius: 30px 0 0 30px;
131141
margin: 0;
132142
}
133-
> li:last-child > a{
143+
> li:last-child > button{
134144
border-radius: 0 30px 30px 0;
135145
}
136146

@@ -144,11 +154,11 @@
144154
}
145155
}
146156

147-
.pagination > li > a,
157+
.pagination > li > button,
148158
.pagination > li > span,
149-
.pagination > li:first-child > a,
159+
.pagination > li:first-child > button,
150160
.pagination > li:first-child > span,
151-
.pagination > li:last-child > a,
161+
.pagination > li:last-child > button,
152162
.pagination > li:last-child > span,
153163
// .page-item,
154164
.page-link {
@@ -161,14 +171,14 @@
161171
min-width: 36px;
162172
padding: 3px 12px;
163173
}
164-
.pagination > li > a:hover,
165-
.pagination > li > a:focus,
166-
.pagination > li > a:active,
167-
.pagination > li.active > a,
174+
.pagination > li > button:hover,
175+
.pagination > li > button:focus,
176+
.pagination > li > button:active,
177+
.pagination > li.active > button,
168178
.pagination > li.active > span,
169-
.pagination > li.active > a:hover,
179+
.pagination > li.active > button:hover,
170180
.pagination > li.active > span:hover,
171-
.pagination > li.active > a:focus,
181+
.pagination > li.active > button:focus,
172182
.pagination > li.active > span:focus,
173183
// .page-item,
174184
.page-link {
@@ -177,30 +187,30 @@
177187
color: $white-color;
178188
}
179189

180-
.nav-pills-primary > li > a,
181-
.pagination-primary > li > a,
190+
.nav-pills-primary > li > button,
191+
.pagination-primary > li > button,
182192
.pagination-primary > li > span,
183-
.pagination-primary > li:first-child > a,
193+
.pagination-primary > li:first-child > button,
184194
.pagination-primary > li:first-child > span,
185-
.pagination-primary > li:last-child > a,
195+
.pagination-primary > li:last-child > button,
186196
.pagination-primary > li:last-child > span,
187197
// .page-item,
188198
.page-link {
189199
border: 2px solid $gray;
190200
color: $gray;
191201
}
192202

193-
.nav-pills-primary > li.active > a,
194-
.nav-pills-primary > li.active > a:hover,
195-
.nav-pills-primary > li.active > a:focus,
196-
.pagination-primary > li > a:hover,
197-
.pagination-primary > li > a:focus,
198-
.pagination-primary > li > a:active,
199-
.pagination-primary > li.active > a,
203+
.nav-pills-primary > li.active > button,
204+
.nav-pills-primary > li.active > button:hover,
205+
.nav-pills-primary > li.active > button:focus,
206+
.pagination-primary > li > button:hover,
207+
.pagination-primary > li > button:focus,
208+
.pagination-primary > li > button:active,
209+
.pagination-primary > li.active > button,
200210
.pagination-primary > li.active > span,
201-
.pagination-primary > li.active > a:hover,
211+
.pagination-primary > li.active > button:hover,
202212
.pagination-primary > li.active > span:hover,
203-
.pagination-primary > li.active > a:focus,
213+
.pagination-primary > li.active > button:focus,
204214
.pagination-primary > li.active > span:focus,
205215
// .page-item,
206216
.page-link {
@@ -209,30 +219,30 @@
209219
color: $white-color;
210220
}
211221

212-
.nav-pills-info > li > a,
213-
.pagination-info > li > a,
222+
.nav-pills-info > li > button,
223+
.pagination-info > li > button,
214224
.pagination-info > li > span,
215-
.pagination-info > li:first-child > a,
225+
.pagination-info > li:first-child > button,
216226
.pagination-info > li:first-child > span,
217-
.pagination-info > li:last-child > a,
227+
.pagination-info > li:last-child > button,
218228
.pagination-info > li:last-child > span,
219229
// .page-item,
220230
.page-link {
221231
border: 2px solid $info-color;
222232
color: $info-color;
223233
}
224234

225-
.nav-pills-info > li.active > a,
226-
.nav-pills-info > li.active > a:hover,
227-
.nav-pills-info > li.active > a:focus,
228-
.pagination-info > li > a:hover,
229-
.pagination-info > li > a:focus,
230-
.pagination-info > li > a:active,
231-
.pagination-info > li.active > a,
235+
.nav-pills-info > li.active > button,
236+
.nav-pills-info > li.active > button:hover,
237+
.nav-pills-info > li.active > button:focus,
238+
.pagination-info > li > button:hover,
239+
.pagination-info > li > button:focus,
240+
.pagination-info > li > button:active,
241+
.pagination-info > li.active > button,
232242
.pagination-info > li.active > span,
233-
.pagination-info > li.active > a:hover,
243+
.pagination-info > li.active > button:hover,
234244
.pagination-info > li.active > span:hover,
235-
.pagination-info > li.active > a:focus,
245+
.pagination-info > li.active > button:focus,
236246
.pagination-info > li.active > span:focus,
237247
// .page-item,
238248
.page-link {
@@ -241,30 +251,30 @@
241251
color: $white-color;
242252
}
243253

244-
.nav-pills-success > li > a,
245-
.pagination-success > li > a,
254+
.nav-pills-success > li > button,
255+
.pagination-success > li > button,
246256
.pagination-success > li > span,
247-
.pagination-success > li:first-child > a,
257+
.pagination-success > li:first-child > button,
248258
.pagination-success > li:first-child > span,
249-
.pagination-success > li:last-child > a,
259+
.pagination-success > li:last-child > button,
250260
.pagination-success > li:last-child > span,
251261
// .page-item,
252262
.page-link {
253263
border: 2px solid $success-color;
254264
color: $success-color;
255265
}
256266

257-
.nav-pills-success > li.active > a,
258-
.nav-pills-success > li.active > a:hover,
259-
.nav-pills-success > li.active > a:focus,
260-
.pagination-success > li > a:hover,
261-
.pagination-success > li > a:focus,
262-
.pagination-success > li > a:active,
263-
.pagination-success > li.active > a,
267+
.nav-pills-success > li.active > button,
268+
.nav-pills-success > li.active > button:hover,
269+
.nav-pills-success > li.active > button:focus,
270+
.pagination-success > li > button:hover,
271+
.pagination-success > li > button:focus,
272+
.pagination-success > li > button:active,
273+
.pagination-success > li.active > button,
264274
.pagination-success > li.active > span,
265-
.pagination-success > li.active > a:hover,
275+
.pagination-success > li.active > button:hover,
266276
.pagination-success > li.active > span:hover,
267-
.pagination-success > li.active > a:focus,
277+
.pagination-success > li.active > button:focus,
268278
.pagination-success > li.active > span:focus,
269279
// .page-item,
270280
.page-link {

‎src/stylesheets/doi/globals/_styles.scss

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
a {
2+
text-decoration: none
3+
}

‎src/stylesheets/doi/pages/_search.scss

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ h3.member-results, h3.provider-results, h3.user-results, h3.doi-results, h3.work
77
color: $turquoise;
88
border-bottom: 1px solid $medium-gray;
99
padding: 0;
10+
margin: 0 0 .35em 0;
1011

1112
.small { font-size: $font-size-base; }
1213
}

0 commit comments

Comments
 (0)