fnp
/
wolnelektury.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
581ffb9
)
one of many positioning fixes
author
Radek Czajka
<rczajka@rczajka.pl>
Fri, 14 Jun 2024 13:51:41 +0000
(15:51 +0200)
committer
Radek Czajka
<rczajka@rczajka.pl>
Fri, 14 Jun 2024 13:51:41 +0000
(15:51 +0200)
src/catalogue/templates/catalogue/book_text.html
patch
|
blob
|
history
src/wolnelektury/static/2022/styles/layout/_text.scss
patch
|
blob
|
history
src/wolnelektury/static/js/book_text/references.js
patch
|
blob
|
history
diff --git
a/src/catalogue/templates/catalogue/book_text.html
b/src/catalogue/templates/catalogue/book_text.html
index
22106b4
..
dbe9259
100644
(file)
--- a/
src/catalogue/templates/catalogue/book_text.html
+++ b/
src/catalogue/templates/catalogue/book_text.html
@@
-223,7
+223,6
@@
</div>
<div id="qbox" class="qbox"
</div>
<div id="qbox" class="qbox"
- data-default-leftoffset="105"
data-attach-bottom="true"
>
<div class="content">
data-attach-bottom="true"
>
<div class="content">
@@
-270,9
+269,13
@@
/
<a href="{% url 'register' %}?next={{ request.path }}"> Załóż konto
</a>
/
<a href="{% url 'register' %}?next={{ request.path }}"> Załóż konto
</a>
+ </div>
+ <div class="zakladka-tool zakladka-tool_sluchaj">
+ Słuchaj od tego miejsca
+ </div>
+ </div>
{% endif %}
{% endif %}
- </div>
<div class="pointer pointer-bottom"></div>
<div class="pointer pointer-top"></div>
<div class="pointer pointer-bottom"></div>
<div class="pointer pointer-top"></div>
diff --git
a/src/wolnelektury/static/2022/styles/layout/_text.scss
b/src/wolnelektury/static/2022/styles/layout/_text.scss
index
1c617c7
..
d744968
100644
(file)
--- a/
src/wolnelektury/static/2022/styles/layout/_text.scss
+++ b/
src/wolnelektury/static/2022/styles/layout/_text.scss
@@
-468,7
+468,7
@@
div.kwestia div.stanza {
p.paragraph {
text-align: justify;
p.paragraph {
text-align: justify;
- margin: 0
0 0 44px
;
+ margin: 0;
text-indent: 1.5em;
}
text-indent: 1.5em;
}
@@
-565,7
+565,7
@@
table.border td, table.border th {
float: left;
clear: left;
font-size: .8em;
float: left;
clear: left;
font-size: .8em;
- margin-left:
0
;
+ margin-left:
-40px
;
width: 36px;
height: auto;
padding: 2px;
width: 36px;
height: auto;
padding: 2px;
@@
-738,7
+738,6
@@
a.reference.interesting:after {
border-radius: 22px;
background: white;
box-shadow: 6px 6px 10px 0px rgba(0, 120, 128, 0.35);
border-radius: 22px;
background: white;
box-shadow: 6px 6px 10px 0px rgba(0, 120, 128, 0.35);
- overflow: hidden;
&.copied {
.content:after {
&.copied {
.content:after {
@@
-753,9
+752,10
@@
a.reference.interesting:after {
color: black;
justify-content: center;
align-items: center;
color: black;
justify-content: center;
align-items: center;
+ border-radius: 22px;
}
}
}
}
-
+
.content {
overflow: hidden;
display: flex;
.content {
overflow: hidden;
display: flex;
diff --git
a/src/wolnelektury/static/js/book_text/references.js
b/src/wolnelektury/static/js/book_text/references.js
index
87c8061
..
6abd103
100644
(file)
--- a/
src/wolnelektury/static/js/book_text/references.js
+++ b/
src/wolnelektury/static/js/book_text/references.js
@@
-139,10
+139,11
@@
leftoffset = x - margin;
} else {
right = '';
leftoffset = x - margin;
} else {
right = '';
-
- // default position.
- leftoffset = 40;
+
leftoffset = $elem.data('default-leftoffset');
leftoffset = $elem.data('default-leftoffset');
+ if (leftoffset === undefined) {
+ leftoffset = $elem.width() / 2;
+ }
nx = x - leftoffset;
nx = x - leftoffset;
@@
-157,12
+158,8
@@
// Do we need to move away from the right?
if (nx + boxwidth > maxx) {
// Do we need to move away from the right?
if (nx + boxwidth > maxx) {
- // ACTUALLY CALCULATE STUFF
- // if maxx - minx < 470 px -- daj z lewej do prawej i już!
-
right = '';
let d = nx + boxwidth - maxx;
right = '';
let d = nx + boxwidth - maxx;
- //if (leftoffset + d > $elem.width() - 10) d = $elem.width() - leftoffset - 10;
nx -= d;
leftoffset += d;
}
nx -= d;
leftoffset += d;
}