ソースを参照

让全屏和正常模式下的字体调节互不干扰,给全局二位码增加边距

ecd\tbw_1357250783514014 4 年 前
コミット
b126878e74
4 ファイル変更45 行追加16 行削除
  1. 2 2
      src/chanting/evening_chanting_C.md
  2. 2 2
      theme/index.hbs
  3. 5 3
      theme/mycss/lrc.css
  4. 36 9
      theme/myjs/lrc.js

+ 2 - 2
src/chanting/evening_chanting_C.md

@@ -2,7 +2,7 @@
 
 # dhammacakkappavattanasuttaṃ
 
-<div id="lyriccontainer" style="background-image:url('http://122.114.50.251:8010/jly/img/5_bhikkhu.jpg');background-size:cover">
+<div id="lyriccontainer" style="background-image:url('http://122.114.50.251:8010/jly/img/5_bhikkhu.jpg');background-size:cover;--full-font-size: 4vmin;--default-font-size: 1.6rem;">
 	<audio id="audio" controls style="width: 100%;">
 	  <source src="http://122.114.50.251:8010/jly/audio/dhammacakka_0218.mp3" type="audio/mpeg">
 	</audio>
@@ -16,7 +16,7 @@
 	<div id="line-current" class='active'><span></span><span></span><span></span></div>
 	<div id="line-next"><span></span><span></span><span></span></div>
 </div>
-<div class="share-component" data-disabled="google,twitter,facebook" data-description="一键分享到微博,QQ空间,腾讯微博,人人,豆瓣"></div>
+<div class="share-component" data-disabled="google,twitter,facebook,tencent,diandian" data-description="一键分享到微博,微信,QQ空间,豆瓣,领英"></div>
 
 Evaṃ me sutaṃ- ekaṃ samayaṃ bhagavā bārāṇasiyaṃ viharati isipatane migadāye. 
 

+ 2 - 2
theme/index.hbs

@@ -309,9 +309,9 @@
         </script>
         {{/if}}
         {{/if}}
-		<div id="qrcode"></div>
+		<div id="qrcode" style="margin:1rem"></div>
 		<script>
-		new QRCode(document.getElementById("qrcode"), location.href);  // 设置要生成二维码的链接
+		new QRCode($('#qrcode')[0], location.href);  // 设置要生成二维码的链接
 		function openQrcode(){
 			layer.open({
 			  type: 1,

+ 5 - 3
theme/mycss/lrc.css

@@ -1,8 +1,10 @@
+
+
 #lyriccontainer:fullscreen {
 	background-color: white;
 	align-items: center;
 	justify-content: center;
-	font-size: 4vmin;
+	font-size: var(--full-font-size);
 }
 
 #lyriccontainer:fullscreen > #line-last {
@@ -26,10 +28,10 @@
 
 #lyriccontainer {
 	background: linear-gradient(to right, rgba(0,0,0,.1) 0%, rgba(202,234,206) 50%, rgba(0,0,0,.1) 100%);
-	font-size: 1.6rem;
+	font-size: var(--default-font-size);
 	display: flex;
 	width: 100%;
-	flex-direction: column;
+	flex-direction: column;	
 }
 
 #lyriccontainer .active {

+ 36 - 9
theme/myjs/lrc.js

@@ -186,6 +186,7 @@ $(function() {
 	var $container = $('#lyriccontainer');
 	var noSleep = new NoSleep();
 	var enableNoSleep = false;
+	var isFullScreen = false;
 	var btn_lyricFullscreen = document.getElementById("lyricFullscreen");
 	if (btn_lyricFullscreen) {
 		btn_lyricFullscreen.addEventListener('click',
@@ -212,7 +213,7 @@ $(function() {
 	}
 	//  监听全屏事件触发
 	var fullscreenchange = function() {
-		let isFullScreen = !!(
+		isFullScreen = !!(
         document.fullscreen ||
         document.mozFullScreen ||
         document.webkitIsFullScreen ||
@@ -252,18 +253,44 @@ $(function() {
 	var btn_lyricBigger = document.getElementById("lyricBigger");
 	//调节字体大小
 	var adjustFontSize = function (sizeOffset){
-		var size = getComputedStyle($('#lyriccontainer')[0], false)['font-size'];
-		var num = parseInt(size.substring(0, size.indexOf("px")));
-		num += sizeOffset;
-		var unit = "px";
-		size = num + unit;
-		$('#lyriccontainer')[0].style.fontSize = size;
+		var size='',num=0;
+		if(isFullScreen){
+			var styleStr=($('#lyriccontainer').attr("style")+"");
+			var styleArr=$.map(styleStr.split(";"),function(node){
+				var returnNode=node;
+				if(node.indexOf("--full-font-size")>-1){
+					num = $.trim(node.split(":")[1]);
+					var unit = "vmin";
+					num = parseFloat(num.substring(0,num.indexOf(unit)));
+					num += sizeOffset;
+					size = num + unit;
+					returnNode="--full-font-size:"+size;
+				}
+				return returnNode;
+			});
+			$('#lyriccontainer').attr("style",styleArr.join(";"));
+		}else{
+		    var styleStr=($('#lyriccontainer').attr("style")+"");
+			var styleArr=$.map(styleStr.split(";"),function(node){
+				var returnNode=node;
+				if(node.indexOf("--default-font-size")>-1){
+					num = $.trim(node.split(":")[1]);
+					var unit = "rem";
+					num = parseFloat(num.substring(0,num.indexOf(unit)));
+					num += sizeOffset;
+					size = num + unit;
+					returnNode="--default-font-size:"+size;
+				}
+				return returnNode;
+			});
+			$('#lyriccontainer').attr("style",styleArr.join(";"));
+		}
 	};
 	
 	if (btn_lyricBigger) {
 		btn_lyricBigger.addEventListener('click',
 		function() {
-			adjustFontSize(2);
+			adjustFontSize(1);
 		},
 		false);
 	}
@@ -272,7 +299,7 @@ $(function() {
 	if (btn_lyricSmaller) {
 		btn_lyricSmaller.addEventListener('click',
 		function() {
-			adjustFontSize(-2);
+			adjustFontSize(-1);
 		},
 		false);
 	}