-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #270 from Tour-360/dev
Обновление до версии v2.1.0
- Loading branch information
Showing
61 changed files
with
687 additions
and
137 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| <!doctype html> | ||
| <html> | ||
| <head> | ||
| <meta charset="UTF-8"> | ||
| <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0"> | ||
| <link rel="stylesheet" href="../build/tour-player.css"> | ||
| <script src="../build/tour-player.js"></script> | ||
| <title>Example Tour-360 player</title> | ||
| <style> | ||
| /* Цвет всех маркеров */ | ||
| #markers .button { | ||
| background-color: rgba(0,0,0,.8); | ||
| } | ||
|
|
||
| /* Цвет информационных маркеров */ | ||
| #markers .button.info{ | ||
| background-color: #ed1c24; | ||
| } | ||
|
|
||
| /* Цвет полосы загрузки */ | ||
| #control-panel .progress-bar .value { | ||
| background: #ed1c24; | ||
| } | ||
| </style> | ||
| </head> | ||
| <body> | ||
| <div class="popup-layout"> | ||
| <div class="popups"> | ||
| <div class="close"></div> | ||
| <div class="popup" id="lana-del-rey-born-to-die"> | ||
| <img src="http://cdn1.umg3.net/89/files/2014/06/Lana-Del-Rey-Born-To-Die-Paradise-Edition-1500x1500-2012.png" alt="Lana Del Rey — Born To Die: Paradise Edition"> | ||
| <div class="content"> | ||
| <h1>Lana Del Rey — Born To Die: Paradise Edition</h1> | ||
| <p>Другой альбом: <a href="#lana-del-rey-ultraviolence">Lana Del Rey — Ultraviolence</a></p> | ||
| <p><b>«Born to Die: The Paradise Edition»</b> — переиздание американской певицы Ланы Дель Рей студийного альбома Born to Die (2012). Выпущен 9 ноября 2012 года под лейблами Polydor и Interscope. Также одновременно с переизданием был выпущен мини-альбом Paradise, в который вошли 8 новых треков, которыми был дополнен оригинальный альбом. Рик Новелл и Эмили Хейни были единственными, кто работал над двумя этими сборниками вместе.</p> | ||
| <ol> | ||
| <li>«Born to Die»</li> | ||
| <li>«Off to the Races»</li> | ||
| <li>«Blue Jeans»</li> | ||
| <li>«Video Games»</li> | ||
| <li>«Diet Mountain Dew»</li> | ||
| <li>«National Anthem»</li> | ||
| <li>«Dark Paradise»</li> | ||
| <li>«Radio»</li> | ||
| <li>«Carmen»</li> | ||
| <li>«Million Dollar Man»</li> | ||
| <li>«Summertime Sadness»</li> | ||
| <li>«This Is What Makes Us Girls»</li> | ||
| <li>«Without You»</li> | ||
| <li>«Lolita»</li> | ||
| <li>«Lucky Ones»</li> | ||
| </ol> | ||
| </div> | ||
| </div> | ||
| <div class="popup" id="lana-del-rey-ultraviolence"> | ||
| <img src="http://cdn1.umg3.net/89/files/2014/06/Lana-Del-Rey-Ultraviolence-2014-1500x1500.png" width="100" alt="Lana Del Rey — Ultraviolence"> | ||
| <div class="content"> | ||
| <h1>Lana Del Rey — Ultraviolence</h1> | ||
| <p>Другой альбом: <a href="#lana-del-rey-born-to-die">Lana Del Rey — Born To Die: Paradise Edition</a></p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <script> | ||
| Tour.init(false, { | ||
| controlPanel: true | ||
| }); | ||
| Tour.on('load', function(data) { | ||
| this.controls.autoRotate() | ||
| }) | ||
| </script> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,16 @@ | ||
| { | ||
| "name": "tour-player", | ||
| "version": "2.0.0", | ||
| "version": "2.1.0", | ||
| "description": "", | ||
| "repository": {}, | ||
| "repository": { | ||
| "type": "git", | ||
| "url": "https://github.com/Tour-360/tour-player" | ||
| }, | ||
| "scripts": { | ||
| "postinstall": "./node_modules/bower/bin/bower i && ./node_modules/gulp/bin/gulp.js build", | ||
| "start": "node index.js", | ||
| "test": "gulp lint" | ||
| }, | ||
| "repository": { | ||
| "type": "git", | ||
| "url": "https://github.com/Tour-360/tour-player" | ||
| }, | ||
| "keywords": [ | ||
| "tour", | ||
| "virtual", | ||
|
|
@@ -23,13 +22,14 @@ | |
| "author": "Maxim Borodin <[email protected]> (http://maximborodin.ru)", | ||
| "contributors": [ | ||
| { | ||
| "name" : "Maxim Borodin", | ||
| "email" : "[email protected]", | ||
| "url" : "http://maximborodin.ru" | ||
| },{ | ||
| "name" : "Denis Borodin", | ||
| "email" : "[email protected]", | ||
| "url" : "http://denisborodin.ru" | ||
| "name": "Maxim Borodin", | ||
| "email": "[email protected]", | ||
| "url": "http://maximborodin.ru" | ||
| }, | ||
| { | ||
| "name": "Denis Borodin", | ||
| "email": "[email protected]", | ||
| "url": "http://denisborodin.ru" | ||
| } | ||
| ], | ||
| "license": "MIT", | ||
|
|
||
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,3 +10,4 @@ | |
| @import "notification.styl" | ||
| @import "background-image.styl" | ||
| @import "popups.styl" | ||
| @import "gallery.styl" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| #gallery | ||
| position absolute | ||
| width 200px | ||
| left -200px | ||
| height 100% | ||
| background rgba(0,0,0,.8) | ||
| z-index 2 | ||
| transition left.3s ease | ||
| will-change left | ||
|
|
||
| &.visible | ||
| left 0 | ||
|
|
||
| .gallery-toggler | ||
| cursor pointer | ||
| position absolute | ||
| background rgba(0,0,0,.8) | ||
| top 0 | ||
| bottom 0 | ||
| margin auto 0 | ||
| right -18px | ||
| width 18px | ||
| height 50px | ||
| border-radius 0 5px 5px 0 | ||
|
|
||
| &:after | ||
| content '' | ||
| display block | ||
| position absolute | ||
| top 0 | ||
| right 0 | ||
| bottom 0 | ||
| left 0 | ||
| background-image embedurl("../img/gallery-toogler.svg", "utf8") | ||
| background-position center | ||
| background-repeat no-repeat | ||
| transform scale(-1, 1) | ||
|
|
||
| &.visible | ||
| .gallery-toggler:after | ||
| transform scale(1, 1) | ||
|
|
||
| ul | ||
| margin 0 | ||
| padding 5px | ||
| height 100% | ||
| overflow hidden | ||
| overflow-y scroll | ||
| box-sizing border-box | ||
|
|
||
| li | ||
| box-sizing border-box | ||
| background-size 100% | ||
| background-position center | ||
| position relative | ||
| cursor pointer | ||
| background-color #666 | ||
| padding 0 | ||
| margin 5px 0 | ||
| box-shadow 0 0 0 0 white | ||
| transition box-shadow.1s ease | ||
|
|
||
|
|
||
| &.active | ||
| box-shadow 0 0 0 5px $blue | ||
|
|
||
| &:hover | ||
| box-shadow 0 0 0 2px white | ||
|
|
||
| &:before | ||
| content '' | ||
| height 0 | ||
| display block | ||
| padding-top 50% | ||
|
|
||
| .item-title | ||
| position absolute | ||
| bottom 0 | ||
| margin 0 | ||
| background linear-gradient(to top,rgba(0,0,0,0.5) 40%, transparent) | ||
| color white | ||
| padding 24px 10px 8px | ||
| white-space nowrap | ||
| overflow hidden | ||
| text-overflow ellipsis | ||
| width 100% | ||
| box-sizing border-box | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,3 +11,4 @@ body | |
| top 0 | ||
| left 0 | ||
| user-select none | ||
| touch-action none | ||
Oops, something went wrong.