Skip to content

Commit fac6f14

Browse files
maierjmaierj
committed
implement latest feedback
1 parent 6676377 commit fac6f14

File tree

8 files changed

+81
-38
lines changed

8 files changed

+81
-38
lines changed

‎_data/navigation.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
- name: Workshops
44
dropdown:
55
- name: Overview
6-
link: /events/index.html
6+
link: /events/
77
- name: Upcoming
8-
link: /events/upcoming/index.html
8+
link: /events/upcoming/
99
- name: Past
10-
link: /events/past/index.html
10+
link: /events/past/
1111
- name: Bylaws
1212
link: /events/bylaws.html
1313
- name: Scientific Committee
@@ -17,13 +17,13 @@
1717
- name: Research
1818
dropdown:
1919
- name: Methods
20-
link: /methods/index.html
20+
link: /methods/
2121
- name: Codes
22-
link: /codes/index.html
22+
link: /codes/
2323
- name: Groups
24-
link: /groups/index.html
24+
link: /groups/
2525
- name: Projects
26-
link: /projects/index.html
26+
link: /projects/
2727
- name: References
2828
link: /references/index.html
2929
- name: About

‎_layouts/reference.html‎

Lines changed: 56 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,72 @@
88
{{ key }}
99
</div>
1010
</div>
11-
<div class="row">
12-
<div class="btn-group btn-group-xs btn-group-justified" role="group">
13-
<div class="btn-group btn-group-xs" role="group">
14-
{% if entry.abstract %}
15-
<button class="button" data-toggle="modal" data-target="#modal{{ key }}Abstract" aria-expanded="false"
16-
aria-controls="modal{{ key }}Abstract">
17-
Abstract
18-
</button>
19-
{% else %}
20-
<button class="button" disabled="disabled" data-toggle="modal" data-target="#modal{{ key }}Abstract"
21-
aria-expanded="false" aria-controls="modal{{ key }}Abstract">
22-
Abstract
23-
</button>
24-
{% endif %}
25-
</div>
26-
</div>
27-
</div>
2811
</div>
2912

3013
<div class="bibtex-ref-entry">
3114
{{ reference | trim_ieee_citation }}
3215
</div>
16+
17+
18+
<div class="row mt-4">
19+
<div class="btn-group btn-group-xs btn-group-justified" role="group">
20+
<div class="btn-group btn-group-xs" role="group">
21+
{% if entry.bibtex %}
22+
<button class="button" data-toggle="modal" data-target="#modal{{ key }}Bibtex" aria-expanded="false"
23+
aria-controls="modal{{ key }}Bibtex">
24+
BibTeX
25+
</button>
26+
{% else %}
27+
<button class="button" disabled="disabled" data-toggle="modal" data-target="#modal{{ key }}Bibtex"
28+
aria-expanded="false" aria-controls="modal{{ key }}Bibtex">
29+
BibTeX
30+
</button>
31+
{% endif %}
32+
</div>
33+
<div class="btn-group btn-group-xs" role="group">
34+
{% if entry.abstract %}
35+
<button class="button" data-toggle="modal" data-target="#modal{{ key }}Abstract" aria-expanded="false"
36+
aria-controls="modal{{ key }}Abstract">
37+
Abstract
38+
</button>
39+
{% else %}
40+
<button class="button" disabled="disabled" data-toggle="modal" data-target="#modal{{ key }}Abstract"
41+
aria-expanded="false" aria-controls="modal{{ key }}Abstract">
42+
Abstract
43+
</button>
44+
{% endif %}
45+
</div>
46+
</div>
47+
</div>
3348
</div>
34-
<div class="collapse" id="collapse{{ key }}Bibtex">
35-
<div class="row">
36-
<div class="col-md-12">
37-
<pre class="abstract">{{ entry.bibtex }}</pre>
49+
{% if entry.bibtex %}
50+
<div class="modal" id="modal{{ key }}Bibtex" tabindex="-1" role="dialog"
51+
aria-labelledby="modal{{ key }}BibtexTitle" aria-hidden="true">
52+
<div class="modal-background">
53+
<div class="modal-card">
54+
<div class="modal-content">
55+
<header class="modal-card-head">
56+
<div class="modal-card-head-content">
57+
<div>
58+
<p class="modal-card-title" id="modal{{ key }}BibtexTitle">
59+
BibTeX entry <code>{{ key }}</code>
60+
</p>
61+
</div>
62+
<button type="button" class="delete" data-dismiss="modal" aria-label="Close"><span
63+
aria-hidden="true">&times;</span></button>
64+
</div>
65+
</header>
66+
<section class="modal-card-body">
67+
<pre class="abstract">{{ entry.bibtex }}</pre>
68+
</section>
69+
</div>
3870
</div>
3971
</div>
4072
</div>
73+
{% endif %}
4174
{% if entry.abstract %}
4275
<div class="modal" id="modal{{ key }}Abstract" tabindex="-1" role="dialog"
43-
aria-labelledby="modal{{ key }}AbstractTitle" aria-hidden="true">
76+
aria-labelledby="modal{{ key }}AbstractTitle" aria-hidden="true">
4477
<div class="modal-background">
4578
<div class="modal-card">
4679
<div class="modal-content">
@@ -52,7 +85,7 @@
5285
</p>
5386
</div>
5487
<button type="button" class="delete" data-dismiss="modal" aria-label="Close"><span
55-
aria-hidden="true">&times;</span></button>
88+
aria-hidden="true">&times;</span></button>
5689
</div>
5790
</header>
5891
<section class="modal-card-body">

‎_sass/main.scss‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,3 +213,15 @@ $primary: #36A9E1;
213213
display: flex;
214214
gap: 4px;
215215
}
216+
217+
.bibtex-entry-container .btn-group-xs {
218+
display: inline-block;
219+
}
220+
221+
.content .bibliography li + li {
222+
margin-top: 2rem;
223+
}
224+
225+
.navbar-brand {
226+
font-weight: 700;
227+
}

‎_sass/vendor/bulma/sass/components/dropdown.sass‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $dropdown-item-color: $text !default
1515
$dropdown-item-hover-color: $scheme-invert !default
1616
$dropdown-item-hover-background-color: $background !default
1717
$dropdown-item-active-color: $link-invert !default
18-
$dropdown-item-active-background-color: $link !default
18+
$dropdown-item-active-background-color: #666 !default
1919

2020
$dropdown-divider-background-color: $border-light !default
2121

‎_sass/vendor/bulma/sass/components/modal.sass‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ $modal-breakpoint: $tablet !default
5151

5252
.modal-content,
5353
.modal-card
54-
margin: 0 $modal-content-margin-mobile
54+
margin: 1rem $modal-content-margin-mobile
5555
max-height: calc(100vh - #{$modal-content-spacing-mobile})
5656
overflow: auto
5757
position: relative
5858
width: 100%
5959
// Responsiveness
6060
+from($modal-breakpoint)
61-
margin: 0 auto
61+
margin: 1rem auto
6262
max-height: calc(100vh - #{$modal-content-spacing-tablet})
6363
width: $modal-content-width
6464

‎_sass/vendor/bulma/sass/components/navbar.sass‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ $navbar-colors: $colors !default
107107
.navbar-dropdown
108108
a.navbar-item
109109
&.is-active
110-
background-color: $color
110+
background-color: #666
111111
color: $color-invert
112112
& > .container
113113
align-items: stretch

‎_sass/vendor/bulma/sass/elements/content.sass‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ $content-table-foot-cell-color: $text-strong !default
5959
h3
6060
font-size: 1.5em
6161
margin-bottom: 0.6666em
62-
&:not(:first-child)
63-
margin-top: 1.3333em
62+
margin-top: 1.3333em
6463
h4
6564
font-size: 1.25em
6665
margin-bottom: 0.8em

‎references/index.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,5 @@ <h2 id="year0004" class="year">2000 - 2004 <span class="count-stat"></span></h2>
8686
id="year90" class="year">Pre 1990 <span class="count-stat"></span></h2>
8787

8888
{% bibliography --file pint -q @*[year<=1989] %} {% include references_year_nav.html %} <script
89-
src="//cdnjs.cloudflare.com/ajax/libs/Chart.js/1.0.2/Chart.min.js" type="text/javascript">
89+
src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/1.0.2/Chart.min.js" type="text/javascript">
9090
</script>
91-
<script src="/_assets/js/bib_stats.js" type="text/javascript"></script>

0 commit comments

Comments
 (0)