diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-12-17 21:41:33 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-12-17 21:41:33 +0100 |
| commit | 0b898678003b154fde1abd57da27e9246606085f (patch) | |
| tree | 87e7c5575cc9a269b3807a58499db52854d48e47 /p | |
| parent | 930026df2159b027bc035f4ed15c39a43eb0e9fe (diff) | |
| parent | 875b8a72f97429c4e4df6d292daf4261fb7a45bd (diff) | |
Merge branch 'dev' into 252-extensions
Conflicts:
app/i18n/en/admin.php
app/i18n/en/feedback.php
app/i18n/en/gen.php
app/i18n/fr/admin.php
app/i18n/fr/feedback.php
app/i18n/fr/gen.php
app/views/index/normal.phtml
Diffstat (limited to 'p')
| -rw-r--r-- | p/themes/base-theme/template.css | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 80f76e80b..25f206106 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -693,14 +693,7 @@ br + br + br { min-width: 260px; max-width: 640px; margin-bottom: 30px; -} -.slides * { - user-select: none; - -ms-user-select: none; - -moz-user-select: none; - -khtml-user-select: none; - -webkit-user-select: none; - -webkit-touch-callout: none; + border: 1px solid #aaa; } .slides input { display: none; @@ -741,13 +734,18 @@ br + br + br { padding: 0; } .properties { - bottom: -35px; - position: absolute; - width: 100%; display: none; + bottom: 0; + left: 0; right: 0; + position: absolute; + padding: 5px; + background: rgba(255, 255, 255, 0.7); + color: #000; + border-top: 1px solid #aaa; + z-index: 10; } .properties .page-number { - right: 0; + right: 5px; top: 0; position: absolute; } |