Skip to content

Commit 6a0e5ec

Browse files
Merge pull request #382 from markusweigelt/adjust-viewer-controls
[IMPROVEMENT] Document functions and 3D viewer
2 parents 73a44ed + 323f731 commit 6a0e5ec

File tree

4 files changed

+33
-41
lines changed

4 files changed

+33
-41
lines changed

Resources/Private/Less/components/controls.less

Lines changed: 28 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,13 @@
2525
height: 40px;
2626
.text-hide();
2727
border-radius: 20px;
28-
margin: 0 5px;
2928
background: #fff url(../Images/controlIcons.svg) no-repeat 0 0;
3029
background-size: auto 120px;
3130
}
3231
> span {
3332
opacity: 0.5;
3433
}
3534
@media screen and (min-width: @tabletLandscapeViewportWidth) {
36-
> a, > span {
37-
margin: 0 2px;
38-
}
3935
a {
4036
.no-touchevents & {
4137
.transition();
@@ -47,8 +43,31 @@
4743
}
4844
}
4945
@media screen and (min-width: @desktopViewportWidth) {
50-
> a, > span {
51-
margin: 0 4px;
46+
}
47+
}
48+
}
49+
50+
form {
51+
select {
52+
color: desaturate(lighten(@base-blue,20%),20%);
53+
background: #fff url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyMCIgaGVpZ2h0PSIxMiIgdmlld0JveD0iMCAwIDIwIDEyIj48c3R5bGUgdHlwZT0idGV4dC9jc3MiPi5zdDB7ZmlsbDpub25lO3N0cm9rZTojNjg4N0EzO3N0cm9rZS13aWR0aDoyO3N0cm9rZS1saW5lY2FwOnJvdW5kO3N0cm9rZS1saW5lam9pbjpyb3VuZDtzdHJva2UtbWl0ZXJsaW1pdDoxMDt9PC9zdHlsZT48ZyBpZD0iWE1MSURfMV8iPjxwYXRoIGNsYXNzPSJzdDAiIGQ9Ik0xMy40IDMuMmwtNi40IDYuNC02LjQtNi40Ii8+PC9nPjwvc3ZnPg==') no-repeat right center;
54+
background-size: 20px 12px;
55+
font-size: 16px;
56+
font-weight: 700;
57+
line-height: 1.2;
58+
width: auto;
59+
padding: 10px 20px 10px 14px;
60+
margin: 0 2px;
61+
outline: none;
62+
border-radius: 20px;
63+
border: 1px solid desaturate(lighten(@light-blue,10%),20%);
64+
cursor: pointer;
65+
appearance: none;
66+
.no-touchevents & {
67+
.transition();
68+
&:hover {
69+
border: 1px solid lighten(@light-blue,12%);
70+
background-color: lighten(@light-blue,20%);
5271
}
5372
}
5473
}
@@ -58,6 +77,9 @@
5877
/* ==============[ document functions for downloads, doublepage eg. ]===================== */
5978
.document-functions {
6079
> ul {
80+
display: flex;
81+
justify-content: center;
82+
gap: 10px;
6183
bottom: 15px;
6284
left: 15px;
6385
right: 15px;
@@ -356,7 +378,6 @@
356378
}
357379

358380
/* ==============[ view functions for zoom, rotate and other view related functions ]===== */
359-
.viewer-selection,
360381
.view-functions {
361382
ul {
362383
position: relative;
@@ -386,7 +407,6 @@
386407
background-position: -720px 0;
387408
}
388409
}
389-
&.viewers,
390410
&.pages {
391411
position: relative;
392412
top: auto;
@@ -396,29 +416,6 @@
396416
position: absolute;
397417
top: 0;
398418
right: 0;
399-
select {
400-
color: desaturate(lighten(@base-blue,20%),20%);
401-
background: #fff url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyMCIgaGVpZ2h0PSIxMiIgdmlld0JveD0iMCAwIDIwIDEyIj48c3R5bGUgdHlwZT0idGV4dC9jc3MiPi5zdDB7ZmlsbDpub25lO3N0cm9rZTojNjg4N0EzO3N0cm9rZS13aWR0aDoyO3N0cm9rZS1saW5lY2FwOnJvdW5kO3N0cm9rZS1saW5lam9pbjpyb3VuZDtzdHJva2UtbWl0ZXJsaW1pdDoxMDt9PC9zdHlsZT48ZyBpZD0iWE1MSURfMV8iPjxwYXRoIGNsYXNzPSJzdDAiIGQ9Ik0xMy40IDMuMmwtNi40IDYuNC02LjQtNi40Ii8+PC9nPjwvc3ZnPg==') no-repeat right center;
402-
background-size: 20px 12px;
403-
font-size: 16px;
404-
font-weight: 700;
405-
line-height: 1.2;
406-
width: auto;
407-
padding: 10px 20px 10px 14px;
408-
margin: 0 2px;
409-
outline: none;
410-
border-radius: 20px;
411-
border: 1px solid desaturate(lighten(@light-blue,10%),20%);
412-
cursor: pointer;
413-
appearance: none;
414-
.no-touchevents & {
415-
.transition();
416-
&:hover {
417-
border: 1px solid lighten(@light-blue,12%);
418-
background-color: lighten(@light-blue,20%);
419-
}
420-
}
421-
}
422419
}
423420
}
424421
&.fullscreen {
@@ -552,14 +549,6 @@
552549
}
553550
}
554551

555-
/* ==============[ the viewer selection tools ]========================================= */
556-
.viewer-selection {
557-
> ul {
558-
top: 0;
559-
right: -254px;
560-
}
561-
}
562-
563552
/* ==============[ the image manipulation tools ]========================================= */
564553
.image-manipulation {
565554
position: absolute;

Resources/Private/Less/structure.less

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,9 @@ a {
308308
top: 0;
309309
left: 33%;
310310
padding: 0;
311+
.tx-dlf-embedded3dviewer {
312+
margin-top: 80px;
313+
}
311314
.tx-dlf-map {
312315
top: 0;
313316
.tx-dlf-score-visible & {

Resources/Public/Css/allStyles.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Resources/Public/Css/webStyles.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)