소스 검색

Merge branch 'staging' of https://github.com/Musare/Musare into staging

Kristian Vos 3 년 전
부모
커밋
b2b807f656
2개의 변경된 파일14개의 추가작업 그리고 0개의 파일을 삭제
  1. 7 0
      frontend/src/components/modals/ManageStation/index.vue
  2. 7 0
      frontend/src/pages/Station/index.vue

+ 7 - 0
frontend/src/components/modals/ManageStation/index.vue

@@ -725,6 +725,8 @@ export default {
 						margin: 0;
 						font-size: 36px;
 						line-height: 0.8;
+						text-overflow: ellipsis;
+						overflow: hidden;
 					}
 
 					i {
@@ -744,8 +746,13 @@ export default {
 				}
 
 				p {
+					display: -webkit-box;
 					max-width: 700px;
 					margin-bottom: 10px;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 3;
 				}
 			}
 

+ 7 - 0
frontend/src/pages/Station/index.vue

@@ -2491,6 +2491,8 @@ export default {
 						margin: 0;
 						font-size: 36px;
 						line-height: 0.8;
+						text-overflow: ellipsis;
+						overflow: hidden;
 					}
 
 					i {
@@ -2510,8 +2512,13 @@ export default {
 				}
 
 				p {
+					display: -webkit-box;
 					max-width: 700px;
 					margin-bottom: 10px;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 3;
 				}
 			}