Skip to content

Commit 0a78a15

Browse files
bklaing2bklaing2
authored
Revert "2.0.1 (#16)"
This reverts commit 1e4cb0a.
1 parent 1e4cb0a commit 0a78a15

9 files changed

+94
-104
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"repository": "https://github.com/datacite/maltipoo",
1111
"license": "MIT",
1212
"devDependencies": {
13-
"bootstrap": "^5.3.3",
13+
"bootstrap": "4",
1414
"bootstrap-sass": "^3.4.3",
1515
"cssnano": "^7.0.1",
1616
"postcss": "^8.4.38",

‎src/stylesheets/doi.scss

+10-11
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
/*
2-
Datacite - Bootstrap 5 theme
2+
Datacite - Bootstrap 4 theme
33
---------------------------------------------*/
44

55
@import "variables.scss";
66

77
// Core variables and mixins
8-
@import "../../node_modules/bootstrap/scss/bootstrap";
8+
@import "../../node_modules/bootstrap/scss/functions";
9+
@import "../../node_modules/bootstrap/scss/variables";
10+
@import "../../node_modules/bootstrap/scss/mixins";
911

1012
// Reset and dependencies
1113
// @import "../../node_modules/bootstrap/scss/normalize";
12-
// @import "../../node_modules/bootstrap/scss/print";
14+
@import "../../node_modules/bootstrap/scss/print";
1315
// @import "bootstrap/glyphicons";
1416

1517
// Core CSS
1618
// @import "../../node_modules/bootstrap/scss/scaffolding";
1719
@import "../../node_modules/bootstrap/scss/type";
18-
// @import "../../node_modules/bootstrap/scss/code";
20+
@import "../../node_modules/bootstrap/scss/code";
1921
@import "../../node_modules/bootstrap/scss/grid";
2022
@import "../../node_modules/bootstrap/scss/tables";
2123
@import "../../node_modules/bootstrap/scss/forms";
@@ -25,19 +27,19 @@ Datacite - Bootstrap 5 theme
2527
// @import "../../node_modules/bootstrap/scss/component-animations";
2628
@import "../../node_modules/bootstrap/scss/dropdown";
2729
@import "../../node_modules/bootstrap/scss/button-group";
28-
// @import "../../node_modules/bootstrap/scss/input-group";
30+
@import "../../node_modules/bootstrap/scss/input-group";
2931
@import "../../node_modules/bootstrap/scss/nav";
3032
@import "../../node_modules/bootstrap/scss/navbar";
3133
@import "../../node_modules/bootstrap/scss/breadcrumb";
3234
@import "../../node_modules/bootstrap/scss/pagination";
3335
// @import "../../node_modules/bootstrap/scss/pager";
3436
// @import "../../node_modules/bootstrap/scss/labels";
3537
@import "../../node_modules/bootstrap/scss/badge";
36-
// @import "../../node_modules/bootstrap/scss/jumbotron";
38+
@import "../../node_modules/bootstrap/scss/jumbotron";
3739
// @import "../../node_modules/bootstrap/scss/thumbnails";
3840
@import "../../node_modules/bootstrap/scss/alert";
3941
@import "../../node_modules/bootstrap/scss/progress";
40-
// @import "../../node_modules/bootstrap/scss/media";
42+
@import "../../node_modules/bootstrap/scss/media";
4143
@import "../../node_modules/bootstrap/scss/list-group";
4244
// @import "../../node_modules/bootstrap/scss/panels";
4345
// @import "../../node_modules/bootstrap/scss/responsive-embed";
@@ -99,7 +101,4 @@ Datacite - Bootstrap 5 theme
99101
@import "doi/pages/stats-portal";
100102
@import "doi/pages/metadata";
101103
@import "doi/pages/doi";
102-
@import "doi/pages/repository-finder";
103-
104-
// Styles to fix things broken during the upgrade process
105-
@import "doi/globals/styles";
104+
@import "doi/pages/repository-finder"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ textarea.form-control {
424424
height: 45px;
425425
}
426426

427-
.btn-close {
427+
.close {
428428
z-index: 2;
429429
position: relative;
430430
color: $turquoise;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
h4 {
99
margin: 0;
1010
}
11-
.btn-close {
11+
.close {
1212
padding-left: 10px;
1313
font-size: 30px;
1414
}

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

+65-70
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,27 @@
77
margin-bottom: 3em;
88
margin-left: -10px;
99

10-
.nav-item button {
10+
.nav-link {
1111
padding-left: 0;
1212
margin-left: 10px;
13-
// margin-bottom: -2px;
14-
border-left: none;
15-
border-right: none;
16-
border-top: none;
1713
}
1814

1915
.nav-link.active.doi {
2016
cursor: pointer;
2117
}
2218

23-
button, button:focus, button:hover, .active {
19+
a, a:focus, a:hover, .active {
2420
font-size: $font-size-h3;
2521
}
26-
button {
22+
a {
2723
color: $darker-gray;
2824
font-weight: bold;
2925
}
30-
button:hover, .active > button:hover {
26+
a:hover, .active > a:hover {
3127
color: $medium-gray;
3228
font-weight: bold;
3329
}
34-
35-
button:focus, > li > button:focus, .active > button, .active > button:focus, button.active {
30+
a:focus, > li > a:focus, .active > a, .active > a:focus, a.active {
3631
color: $turquoise !important;
3732
}
3833
}
@@ -46,7 +41,7 @@
4641
border-bottom: 1px solid $light-gray;
4742
margin-bottom: 30px;
4843

49-
.nav > li > button, .nav-link {
44+
.nav > li > a, .nav-link {
5045
padding-bottom: 20px;
5146
}
5247
}
@@ -63,16 +58,16 @@
6358
font-size: $font-size-base;
6459
font-weight: $font-weight-bold;
6560
> li{
66-
> button{
61+
> a{
6762
border: 0 none;
6863
color: $other-medium-gray;
6964
}
70-
> button:hover{
65+
> a:hover{
7166
color: $font-color;
7267
}
7368
}
7469

75-
li.active, button.active {
70+
li.active, a.active {
7671
color: $font-color;
7772
position: relative;
7873

@@ -82,7 +77,7 @@
8277
//height: 50px;
8378
}
8479

85-
button.active:before{
80+
a.active:before{
8681
border-bottom: 11px solid $light-gray;
8782
border-left: 11px solid rgba(0, 0, 0, 0);
8883
border-right: 11px solid rgba(0, 0, 0, 0);
@@ -93,7 +88,7 @@
9388
bottom: 0;
9489
}
9590

96-
button.active:after{
91+
a.active:after{
9792
border-bottom: 11px solid $white-color;
9893
border-left: 11px solid rgba(0, 0, 0, 0);
9994
border-right: 11px solid rgba(0, 0, 0, 0);
@@ -111,7 +106,7 @@
111106
> li + li {
112107
margin-left: 0;
113108
}
114-
> li > button {
109+
> li > a {
115110
border: 2px solid $default-color;
116111
border-radius: 0;
117112
color: $default-color;
@@ -120,9 +115,9 @@
120115
padding: 5px 20px;
121116

122117
}
123-
> li.active > button,
124-
> li.active > button:hover,
125-
> li.active > button:focus {
118+
> li.active > a,
119+
> li.active > a:hover,
120+
> li.active > a:focus {
126121
background-color: $default-color;
127122
color: #FFFFFF;
128123
}
@@ -131,11 +126,11 @@
131126
background-color: $default-color;
132127
border: 1px solid white;
133128
}
134-
> li:first-child > button{
129+
> li:first-child > a{
135130
border-radius: 30px 0 0 30px;
136131
margin: 0;
137132
}
138-
> li:last-child > button{
133+
> li:last-child > a{
139134
border-radius: 0 30px 30px 0;
140135
}
141136

@@ -149,11 +144,11 @@
149144
}
150145
}
151146

152-
.pagination > li > button,
147+
.pagination > li > a,
153148
.pagination > li > span,
154-
.pagination > li:first-child > button,
149+
.pagination > li:first-child > a,
155150
.pagination > li:first-child > span,
156-
.pagination > li:last-child > button,
151+
.pagination > li:last-child > a,
157152
.pagination > li:last-child > span,
158153
// .page-item,
159154
.page-link {
@@ -166,14 +161,14 @@
166161
min-width: 36px;
167162
padding: 3px 12px;
168163
}
169-
.pagination > li > button:hover,
170-
.pagination > li > button:focus,
171-
.pagination > li > button:active,
172-
.pagination > li.active > button,
164+
.pagination > li > a:hover,
165+
.pagination > li > a:focus,
166+
.pagination > li > a:active,
167+
.pagination > li.active > a,
173168
.pagination > li.active > span,
174-
.pagination > li.active > button:hover,
169+
.pagination > li.active > a:hover,
175170
.pagination > li.active > span:hover,
176-
.pagination > li.active > button:focus,
171+
.pagination > li.active > a:focus,
177172
.pagination > li.active > span:focus,
178173
// .page-item,
179174
.page-link {
@@ -182,30 +177,30 @@
182177
color: $white-color;
183178
}
184179

185-
.nav-pills-primary > li > button,
186-
.pagination-primary > li > button,
180+
.nav-pills-primary > li > a,
181+
.pagination-primary > li > a,
187182
.pagination-primary > li > span,
188-
.pagination-primary > li:first-child > button,
183+
.pagination-primary > li:first-child > a,
189184
.pagination-primary > li:first-child > span,
190-
.pagination-primary > li:last-child > button,
185+
.pagination-primary > li:last-child > a,
191186
.pagination-primary > li:last-child > span,
192187
// .page-item,
193188
.page-link {
194189
border: 2px solid $gray;
195190
color: $gray;
196191
}
197192

198-
.nav-pills-primary > li.active > button,
199-
.nav-pills-primary > li.active > button:hover,
200-
.nav-pills-primary > li.active > button:focus,
201-
.pagination-primary > li > button:hover,
202-
.pagination-primary > li > button:focus,
203-
.pagination-primary > li > button:active,
204-
.pagination-primary > li.active > button,
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,
205200
.pagination-primary > li.active > span,
206-
.pagination-primary > li.active > button:hover,
201+
.pagination-primary > li.active > a:hover,
207202
.pagination-primary > li.active > span:hover,
208-
.pagination-primary > li.active > button:focus,
203+
.pagination-primary > li.active > a:focus,
209204
.pagination-primary > li.active > span:focus,
210205
// .page-item,
211206
.page-link {
@@ -214,30 +209,30 @@
214209
color: $white-color;
215210
}
216211

217-
.nav-pills-info > li > button,
218-
.pagination-info > li > button,
212+
.nav-pills-info > li > a,
213+
.pagination-info > li > a,
219214
.pagination-info > li > span,
220-
.pagination-info > li:first-child > button,
215+
.pagination-info > li:first-child > a,
221216
.pagination-info > li:first-child > span,
222-
.pagination-info > li:last-child > button,
217+
.pagination-info > li:last-child > a,
223218
.pagination-info > li:last-child > span,
224219
// .page-item,
225220
.page-link {
226221
border: 2px solid $info-color;
227222
color: $info-color;
228223
}
229224

230-
.nav-pills-info > li.active > button,
231-
.nav-pills-info > li.active > button:hover,
232-
.nav-pills-info > li.active > button:focus,
233-
.pagination-info > li > button:hover,
234-
.pagination-info > li > button:focus,
235-
.pagination-info > li > button:active,
236-
.pagination-info > li.active > button,
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,
237232
.pagination-info > li.active > span,
238-
.pagination-info > li.active > button:hover,
233+
.pagination-info > li.active > a:hover,
239234
.pagination-info > li.active > span:hover,
240-
.pagination-info > li.active > button:focus,
235+
.pagination-info > li.active > a:focus,
241236
.pagination-info > li.active > span:focus,
242237
// .page-item,
243238
.page-link {
@@ -246,30 +241,30 @@
246241
color: $white-color;
247242
}
248243

249-
.nav-pills-success > li > button,
250-
.pagination-success > li > button,
244+
.nav-pills-success > li > a,
245+
.pagination-success > li > a,
251246
.pagination-success > li > span,
252-
.pagination-success > li:first-child > button,
247+
.pagination-success > li:first-child > a,
253248
.pagination-success > li:first-child > span,
254-
.pagination-success > li:last-child > button,
249+
.pagination-success > li:last-child > a,
255250
.pagination-success > li:last-child > span,
256251
// .page-item,
257252
.page-link {
258253
border: 2px solid $success-color;
259254
color: $success-color;
260255
}
261256

262-
.nav-pills-success > li.active > button,
263-
.nav-pills-success > li.active > button:hover,
264-
.nav-pills-success > li.active > button:focus,
265-
.pagination-success > li > button:hover,
266-
.pagination-success > li > button:focus,
267-
.pagination-success > li > button:active,
268-
.pagination-success > li.active > button,
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,
269264
.pagination-success > li.active > span,
270-
.pagination-success > li.active > button:hover,
265+
.pagination-success > li.active > a:hover,
271266
.pagination-success > li.active > span:hover,
272-
.pagination-success > li.active > button:focus,
267+
.pagination-success > li.active > a:focus,
273268
.pagination-success > li.active > span:focus,
274269
// .page-item,
275270
.page-link {

0 commit comments

Comments
 (0)