+
-
+
@@ -360,7 +389,7 @@ export default {
+
-
+
+
-
-
-
+
+
+
+ {{ timeDiff?spot.lang('your_time', absTime):absTime }}
+ {{ relTime }}
+
+
@@ -151,7 +155,7 @@
diff --git a/src/components/projectRelTime.vue b/src/components/projectRelTime.vue
index 55d17cf..f4e9844 100644
--- a/src/components/projectRelTime.vue
+++ b/src/components/projectRelTime.vue
@@ -11,10 +11,6 @@ export default {
{{ localTime.substr(-5) }}
- {{ ' '+offset }}
+ {{ ' '+offset }}
\ No newline at end of file
diff --git a/src/scripts/spot.js b/src/scripts/spot.js
index 2a14063..4694187 100755
--- a/src/scripts/spot.js
+++ b/src/scripts/spot.js
@@ -117,12 +117,14 @@ export default class Spot {
lang(sKey, asParams) {
asParams = asParams || [];
- if(typeof asParams == 'string') asParams = [asParams];
-
+ if(typeof asParams != 'object') asParams = [asParams];
+
var sLang = '';
if(sKey in this.consts.lang) {
sLang = this.consts.lang[sKey];
- for(let i in asParams) sLang = sLang.replace('$'+i, asParams[i]);
+ for(let i in asParams) {
+ sLang = sLang.replace('$'+i, asParams[i]);
+ }
}
else {
console.log('missing translation: '+sKey);
diff --git a/src/styles/_fa.scss b/src/styles/_fa.scss
index 0207bd9..005710d 100644
--- a/src/styles/_fa.scss
+++ b/src/styles/_fa.scss
@@ -95,7 +95,7 @@ $fa-css-prefix: fa;
.#{$fa-css-prefix}-video-shot:before { content: fa-content($fa-var-camcorder); }
.#{$fa-css-prefix}-image-shot:before { content: fa-content($fa-var-camera-alt); }
.#{$fa-css-prefix}-link:before { content: fa-content($fa-var-link); }
-.#{$fa-css-prefix}-link.copied:before { content: fa-content($fa-var-check); }
+.#{$fa-css-prefix}-copied:before { content: fa-content($fa-var-check); }
/* Feed - Poster */
.#{$fa-css-prefix}-poster:before { content: fa-content($fa-var-comment-edit); }
diff --git a/src/styles/_page.project.feed.scss b/src/styles/_page.project.feed.scss
index 908bee7..b9c0bcf 100644
--- a/src/styles/_page.project.feed.scss
+++ b/src/styles/_page.project.feed.scss
@@ -65,7 +65,7 @@
padding: 0 $block-spacing;
position: relative;
- span {
+ div {
display: inline-block;
font-size: 0.8em;
padding: $elem-spacing 0px;
@@ -73,7 +73,7 @@
&.index {
width: 25%;
- .link, .link:visited, .link_copied {
+ .link {
margin-left: $elem-spacing;
padding: 0;
line-height: 1;
diff --git a/src/styles/_page.project.map.scss b/src/styles/_page.project.map.scss
new file mode 100644
index 0000000..4bb8b11
--- /dev/null
+++ b/src/styles/_page.project.map.scss
@@ -0,0 +1,110 @@
+#map {
+ position: absolute;
+ left: 0;
+ top: 0;
+ bottom: 0;
+ width: 100%;
+
+ /* Leaflet Popup */
+ .leaflet-popup-content {
+
+ h1 {
+ font-size: 1.4em;
+ margin: 0;
+ font-weight: bold;
+ }
+
+ .separator {
+ border-top: 1px solid #CCC;
+ margin: $elem-spacing 0 $block-spacing 0;
+ }
+
+ /* Marker Popup */
+ .info-window {
+ h1 .message-type {
+ color: #CCC;
+ font-weight: normal;
+ font-size: calc(1em / 1.4);
+ margin-left: 0.5em;
+ vertical-align: text-bottom;
+ }
+
+ p {
+ font-size: 1.0em;
+ margin: $elem-spacing 0 0 0;
+
+ a {
+ color: $post-color;
+ }
+ }
+
+ .medias {
+ line-height: 0;
+
+ a {
+ display: inline-block;
+
+ margin: $block-spacing $block-spacing 0 0;
+ &:last-child {
+ margin-right: 0;
+ }
+
+ &.drill {
+ font-size: 2em;
+
+ .fa-drill-image {
+ color: transparent;
+ }
+ .fa-drill-video {
+ color: rgba(255, 255, 255, 0.5);
+ }
+
+ &:hover {
+ .fa-drill-video, .fa-drill-image {
+ color: rgba(255, 255, 255, 0.75);
+ }
+ }
+ }
+
+ img {
+ width: auto;
+ height: auto;
+ max-width: 200px;
+ max-height: 100px;
+ border-radius: $block-radius;
+ image-orientation: from-image;
+ transition: All 0.2s;
+ }
+ }
+ }
+ }
+
+ /* Track Popup */
+ .track_tooltip {
+ p {
+ margin: 0;
+
+ &.description {
+ font-size: 1.15em;
+ }
+ }
+
+ h1, .description {
+ @include no-text-overflow();
+ }
+ .body {
+ padding-left: calc(1.25em*1.4 + #{$elem-spacing} );
+
+ .details {
+ margin-top: -$block-spacing;
+
+ p.detail {
+ margin-top: $block-spacing;
+ width: 50%;
+ display: inline-block;
+ }
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/styles/_page.project.scss b/src/styles/_page.project.scss
index f588370..2a238ea 100644
--- a/src/styles/_page.project.scss
+++ b/src/styles/_page.project.scss
@@ -26,6 +26,7 @@ $track-off-track-color: #0000ff;
$track-hitchhiking-color: #FF7814;
$legend-color: $post-color;
+@import 'page.project.map';
@import 'page.project.panel';
@import 'page.project.feed';
@import 'page.project.settings';
@@ -64,117 +65,6 @@ $legend-color: $post-color;
}
}
- #map {
- position: absolute;
- left: 0;
- top: 0;
- bottom: 0;
- width: 100%;
-
- /* Leaflet Popup */
- .leaflet-popup-content {
-
- h1 {
- font-size: 1.4em;
- margin: 0;
- font-weight: bold;
- }
-
- .separator {
- border-top: 1px solid #CCC;
- margin: $elem-spacing 0 $block-spacing 0;
- }
-
- /* Marker Popup */
- .info-window {
- h1 .message-type {
- color: #CCC;
- font-weight: normal;
- font-size: calc(1em / 1.4);
- margin-left: 0.5em;
- vertical-align: text-bottom;
- }
-
- p {
- font-size: 1.0em;
- margin: $elem-spacing 0 0 0;
-
- a {
- color: $post-color;
- }
- }
-
- .medias {
- line-height: 0;
-
- a {
- display: inline-block;
-
- margin: $block-spacing $block-spacing 0 0;
- &:last-child {
- margin-right: 0;
- }
-
- &.drill {
- font-size: 2em;
-
- .fa-drill-image {
- color: transparent;
- }
- .fa-drill-video {
- color: rgba(255, 255, 255, 0.5);
- }
-
- &:hover {
- .fa-drill-video, .fa-drill-image {
- color: rgba(255, 255, 255, 0.75);
- }
- }
- }
-
- img {
- width: auto;
- height: auto;
- max-width: 200px;
- max-height: 100px;
- border-radius: $block-radius;
- image-orientation: from-image;
- transition: All 0.2s;
- }
- }
- }
- }
-
- /* Track Popup */
- .track_tooltip {
- p {
- margin: 0;
-
- &.description {
- font-size: 1.15em;
- }
- }
-
- h1, .description {
- @include no-text-overflow();
- }
- .body {
- padding-left: calc(1.25em*1.4 + #{$elem-spacing} );
-
- .details {
- margin-top: -$block-spacing;
-
- p.detail {
- margin-top: $block-spacing;
- width: 50%;
- display: inline-block;
- }
- }
- }
- }
- }
- }
-
/* Drill & Map icons */
a.drill {
diff --git a/src/styles/_vue.scss b/src/styles/_vue.scss
new file mode 100644
index 0000000..0244bc1
--- /dev/null
+++ b/src/styles/_vue.scss
@@ -0,0 +1,9 @@
+.fade-enter-active,
+.fade-leave-active {
+ transition: opacity 0.3s ease;
+}
+
+.fade-enter-from,
+.fade-leave-to {
+ opacity: 0;
+}
\ No newline at end of file
diff --git a/src/styles/spot.scss b/src/styles/spot.scss
index ec35abe..8129175 100755
--- a/src/styles/spot.scss
+++ b/src/styles/spot.scss
@@ -5,7 +5,8 @@
/* Modules */
@import 'fa';
@import 'lightbox';
-@import '../../node_modules/simplebar/dist/simplebar.css';
+@import '../../node_modules/simplebar-vue/dist/simplebar.min.css';
+@import 'vue';
/* Pages Specific CSS */
@import 'page.project';