playground
/
TimelineJS
mirror of https://github.com/NUKnightLab/TimelineJS.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Tweaks to responsive design

pull/127/head
Zach Wise 13 years ago
parent
7f044e8d61
commit
9db7bcfc0a
17 changed files with 61 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      compiled/css/themes/dark.css
  2. 4
      compiled/css/timeline.css
  3. 6
      compiled/js/locale/de.js
  4. 6
      compiled/js/locale/en.js
  5. 6
      compiled/js/locale/es.js
  6. 6
      compiled/js/locale/fr.js
  7. 6
      compiled/js/locale/is.js
  8. 6
      compiled/js/locale/it.js
  9. 6
      compiled/js/locale/kr.js
  10. 6
      compiled/js/locale/nl.js
  11. 6
      compiled/js/locale/pt-br.js
  12. 6
      compiled/js/locale/zh-ch.js
  13. 6
      compiled/js/locale/zh-tw.js
  14. 6
      compiled/js/timeline-min.js
  15. 12
      compiled/js/timeline.js
  16. 12
      source/js/VMM.Slider.js
  17. 7
      source/less/VMM.Slider.less

4
compiled/css/themes/dark.css
Unescape View File

@ -54,7 +54,7 @@
.slider .nav-previous,.slider .nav-next{position:absolute;top:0px;width:100px;color:#DBDBDB;font-size:11px;}.slider .nav-previous .nav-container,.slider .nav-next .nav-container{height:100px;position:absolute;}
.slider .nav-previous .icon,.slider .nav-next .icon{margin-top:12px;margin-bottom:15px;}
.slider .nav-previous .date,.slider .nav-next .date{font-size:15px;font-weight:bold;line-height:20px;text-transform:uppercase;margin-bottom:5px;}
.slider .nav-previous .date,.slider .nav-next .date,.slider .nav-previous .title,.slider .nav-next .title{line-height:14px;}.slider .nav-previous .date a,.slider .nav-next .date a,.slider .nav-previous .title a,.slider .nav-next .title a{color:#999999;}
.slider .nav-previous .date,.slider .nav-next .date,.slider .nav-previous .title,.slider .nav-next .title{line-height:14px;-webkit-hyphens:auto;-moz-hyphens:auto;-ms-hyphens:auto;hyphens:auto;word-wrap:break-word;}.slider .nav-previous .date a,.slider .nav-next .date a,.slider .nav-previous .title a,.slider .nav-next .title a{color:#999999;}
.slider .nav-previous .date small,.slider .nav-next .date small,.slider .nav-previous .title small,.slider .nav-next .title small{display:none;}
.slider .nav-previous:hover,.slider .nav-next:hover{color:#aaaaaa;cursor:pointer;}
.slider .nav-previous{float:left;text-align:left;}.slider .nav-previous .icon{margin-left:15px;height:24px;background-image:url(themes/timeline-dark.png);background-repeat:no-repeat;background-position:-160px 0;width:24px;height:24px;overflow:hidden;}
@ -145,7 +145,7 @@
.vmm-timeline h1,.vmm-timeline h2,.vmm-timeline h3,.vmm-timeline h4,.vmm-timeline h5,.vmm-timeline h6{font-weight:normal;color:#ffffff;text-transform:none;}.vmm-timeline h1 a,.vmm-timeline h2 a,.vmm-timeline h3 a,.vmm-timeline h4 a,.vmm-timeline h5 a,.vmm-timeline h6 a{color:#999999;}
.vmm-timeline h1 small,.vmm-timeline h2 small,.vmm-timeline h3 small,.vmm-timeline h4 small,.vmm-timeline h5 small,.vmm-timeline h6 small{color:#999999;}
.vmm-timeline h1.date,.vmm-timeline h2.date,.vmm-timeline h3.date,.vmm-timeline h4.date,.vmm-timeline h5.date,.vmm-timeline h6.date{font-weight:bold;}
.vmm-timeline h2.start{font-size:42px;line-height:44px;margin-bottom:15px;}
.vmm-timeline h2.start{font-size:36px;line-height:38px;margin-bottom:15px;-webkit-hyphens:auto;-moz-hyphens:auto;-ms-hyphens:auto;hyphens:auto;word-wrap:break-word;}
.vmm-timeline h1{margin-bottom:15px;font-size:32px;line-height:34px;}.vmm-timeline h1 small{font-size:18px;}
.vmm-timeline h2{margin-bottom:15px;font-size:28px;line-height:30px;}.vmm-timeline h2 small{font-size:14px;line-height:16px;}
.vmm-timeline h2.date{font-size:16px;line-height:18px;margin-bottom:3.75px;color:#999999;}

4
compiled/css/timeline.css
Unescape View File

@ -54,7 +54,7 @@
.slider .nav-previous,.slider .nav-next{position:absolute;top:0px;width:100px;color:#DBDBDB;font-size:11px;}.slider .nav-previous .nav-container,.slider .nav-next .nav-container{height:100px;position:absolute;}
.slider .nav-previous .icon,.slider .nav-next .icon{margin-top:12px;margin-bottom:15px;}
.slider .nav-previous .date,.slider .nav-next .date{font-size:15px;font-weight:bold;line-height:20px;text-transform:uppercase;margin-bottom:5px;}
.slider .nav-previous .date,.slider .nav-next .date,.slider .nav-previous .title,.slider .nav-next .title{line-height:14px;}.slider .nav-previous .date a,.slider .nav-next .date a,.slider .nav-previous .title a,.slider .nav-next .title a{color:#999999;}
.slider .nav-previous .date,.slider .nav-next .date,.slider .nav-previous .title,.slider .nav-next .title{line-height:14px;-webkit-hyphens:auto;-moz-hyphens:auto;-ms-hyphens:auto;hyphens:auto;word-wrap:break-word;}.slider .nav-previous .date a,.slider .nav-next .date a,.slider .nav-previous .title a,.slider .nav-next .title a{color:#999999;}
.slider .nav-previous .date small,.slider .nav-next .date small,.slider .nav-previous .title small,.slider .nav-next .title small{display:none;}
.slider .nav-previous:hover,.slider .nav-next:hover{color:#333333;cursor:pointer;}
.slider .nav-previous{float:left;text-align:left;}.slider .nav-previous .icon{margin-left:15px;height:24px;background-image:url(timeline.png);background-repeat:no-repeat;background-position:-160px 0;width:24px;height:24px;overflow:hidden;}
@ -145,7 +145,7 @@
.vmm-timeline h1,.vmm-timeline h2,.vmm-timeline h3,.vmm-timeline h4,.vmm-timeline h5,.vmm-timeline h6{font-weight:normal;color:#000000;text-transform:none;}.vmm-timeline h1 a,.vmm-timeline h2 a,.vmm-timeline h3 a,.vmm-timeline h4 a,.vmm-timeline h5 a,.vmm-timeline h6 a{color:#999999;}
.vmm-timeline h1 small,.vmm-timeline h2 small,.vmm-timeline h3 small,.vmm-timeline h4 small,.vmm-timeline h5 small,.vmm-timeline h6 small{color:#999999;}
.vmm-timeline h1.date,.vmm-timeline h2.date,.vmm-timeline h3.date,.vmm-timeline h4.date,.vmm-timeline h5.date,.vmm-timeline h6.date{font-weight:bold;}
.vmm-timeline h2.start{font-size:42px;line-height:44px;margin-bottom:15px;}
.vmm-timeline h2.start{font-size:36px;line-height:38px;margin-bottom:15px;-webkit-hyphens:auto;-moz-hyphens:auto;-ms-hyphens:auto;hyphens:auto;word-wrap:break-word;}
.vmm-timeline h1{margin-bottom:15px;font-size:32px;line-height:34px;}.vmm-timeline h1 small{font-size:18px;}
.vmm-timeline h2{margin-bottom:15px;font-size:28px;line-height:30px;}.vmm-timeline h2 small{font-size:14px;line-height:16px;}
.vmm-timeline h2.date{font-size:16px;line-height:18px;margin-bottom:3.75px;color:#999999;}

6
compiled/js/locale/de.js
View File

File diff suppressed because one or more lines are too long

6
compiled/js/locale/en.js
View File

File diff suppressed because one or more lines are too long

6
compiled/js/locale/es.js
View File

File diff suppressed because one or more lines are too long

6
compiled/js/locale/fr.js
View File

File diff suppressed because one or more lines are too long

6
compiled/js/locale/is.js
View File

File diff suppressed because one or more lines are too long

6
compiled/js/locale/it.js
View File

File diff suppressed because one or more lines are too long

6
compiled/js/locale/kr.js
View File

File diff suppressed because one or more lines are too long

6
compiled/js/locale/nl.js
View File

File diff suppressed because one or more lines are too long

6
compiled/js/locale/pt-br.js
View File

File diff suppressed because one or more lines are too long

6
compiled/js/locale/zh-ch.js
View File

File diff suppressed because one or more lines are too long

6
compiled/js/locale/zh-tw.js
View File

File diff suppressed because one or more lines are too long

6
compiled/js/timeline-min.js vendored
View File

File diff suppressed because one or more lines are too long

12
compiled/js/timeline.js
Unescape View File

@ -2958,6 +2958,10 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
video: {
width: 0,
height: 0
},
text: {
width: ((config.slider.content.width/100) * 40) - 30,
height: config.slider.height
}
},
media: {
@ -3019,7 +3023,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
VMM.Lib.css(".slider-item .layout-text-media .text", "display", "table-cell" );
VMM.Lib.css(".slider-item .layout-text-media .text .container", "display", "table-cell" );
VMM.Lib.css(".slider-item .layout-text-media .text .container", "width", "auto" );
VMM.Lib.css(".slider-item .layout-text-media .text .container .start", "width", mediasize.text_media.text.width );
//VMM.Lib.addClass(".slider-item .content-container", "pad-left");
VMM.Lib.removeClass(".slider-item .content-container", "pad-top");
@ -3250,8 +3254,8 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
config.duration = 500;
__duration = 1000;
//VMM.TouchSlider.createPanel($slider_container, $slider_container, VMM.Lib.width(slides[0]), config.spacing, true);
VMM.TouchSlider.createPanel($slider_container, $slider_container, slides[0].width(), config.spacing, true);
VMM.bindEvent($slider_container, onTouchUpdate, "TOUCHUPDATE");
//VMM.TouchSlider.createPanel($slider_container, $slider_container, slides[0].width(), config.spacing, true);
//VMM.bindEvent($slider_container, onTouchUpdate, "TOUCHUPDATE");
} else if (VMM.Browser.device == "mobile") {
} else {
@ -3260,8 +3264,6 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
reSize(false, true);
VMM.Lib.visible(navigation.prevBtn, false);
// GO TO FIRST SLIDE
trace("config.current_slide " + config.current_slide);
goToSlide(config.current_slide, "easeOutExpo", __duration, true, true);
_active = true;

12
source/js/VMM.Slider.js
Unescape View File

@ -309,6 +309,10 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
video: {
width: 0,
height: 0
},
text: {
width: ((config.slider.content.width/100) * 40) - 30,
height: config.slider.height
}
},
media: {
@ -370,7 +374,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
VMM.Lib.css(".slider-item .layout-text-media .text", "display", "table-cell" );
VMM.Lib.css(".slider-item .layout-text-media .text .container", "display", "table-cell" );
VMM.Lib.css(".slider-item .layout-text-media .text .container", "width", "auto" );
VMM.Lib.css(".slider-item .layout-text-media .text .container .start", "width", mediasize.text_media.text.width );
//VMM.Lib.addClass(".slider-item .content-container", "pad-left");
VMM.Lib.removeClass(".slider-item .content-container", "pad-top");
@ -601,8 +605,8 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
config.duration = 500;
__duration = 1000;
//VMM.TouchSlider.createPanel($slider_container, $slider_container, VMM.Lib.width(slides[0]), config.spacing, true);
VMM.TouchSlider.createPanel($slider_container, $slider_container, slides[0].width(), config.spacing, true);
VMM.bindEvent($slider_container, onTouchUpdate, "TOUCHUPDATE");
//VMM.TouchSlider.createPanel($slider_container, $slider_container, slides[0].width(), config.spacing, true);
//VMM.bindEvent($slider_container, onTouchUpdate, "TOUCHUPDATE");
} else if (VMM.Browser.device == "mobile") {
} else {
@ -611,8 +615,6 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
reSize(false, true);
VMM.Lib.visible(navigation.prevBtn, false);
// GO TO FIRST SLIDE
trace("config.current_slide " + config.current_slide);
goToSlide(config.current_slide, "easeOutExpo", __duration, true, true);
_active = true;

7
source/less/VMM.Slider.less
Unescape View File

@ -72,6 +72,13 @@
}
.date, .title {
line-height:14px;
//width: @feature-nav-width;
-webkit-hyphens:auto;
-moz-hyphens:auto;
-ms-hyphens:auto;
hyphens:auto;
word-wrap:break-word;
a {
color: @color-nav-description;
}

Write Preview
Loading…
Cancel
Save