mirror of
https://github.com/TeamPiped/Piped.git
synced 2024-08-14 23:57:27 +00:00
Add font Montserrat(replace globaly), video item design, video item channel view design
This commit is contained in:
parent
e53ff46482
commit
3ad37fd35c
22 changed files with 121 additions and 18 deletions
BIN
public/fonts/Montserrat-Black.ttf
Normal file
BIN
public/fonts/Montserrat-Black.ttf
Normal file
Binary file not shown.
BIN
public/fonts/Montserrat-BlackItalic.ttf
Normal file
BIN
public/fonts/Montserrat-BlackItalic.ttf
Normal file
Binary file not shown.
BIN
public/fonts/Montserrat-Bold.ttf
Normal file
BIN
public/fonts/Montserrat-Bold.ttf
Normal file
Binary file not shown.
BIN
public/fonts/Montserrat-BoldItalic.ttf
Normal file
BIN
public/fonts/Montserrat-BoldItalic.ttf
Normal file
Binary file not shown.
BIN
public/fonts/Montserrat-ExtraBold.ttf
Normal file
BIN
public/fonts/Montserrat-ExtraBold.ttf
Normal file
Binary file not shown.
BIN
public/fonts/Montserrat-ExtraBoldItalic.ttf
Normal file
BIN
public/fonts/Montserrat-ExtraBoldItalic.ttf
Normal file
Binary file not shown.
BIN
public/fonts/Montserrat-ExtraLight.ttf
Normal file
BIN
public/fonts/Montserrat-ExtraLight.ttf
Normal file
Binary file not shown.
BIN
public/fonts/Montserrat-ExtraLightItalic.ttf
Normal file
BIN
public/fonts/Montserrat-ExtraLightItalic.ttf
Normal file
Binary file not shown.
BIN
public/fonts/Montserrat-Italic.ttf
Normal file
BIN
public/fonts/Montserrat-Italic.ttf
Normal file
Binary file not shown.
BIN
public/fonts/Montserrat-Light.ttf
Normal file
BIN
public/fonts/Montserrat-Light.ttf
Normal file
Binary file not shown.
BIN
public/fonts/Montserrat-LightItalic.ttf
Normal file
BIN
public/fonts/Montserrat-LightItalic.ttf
Normal file
Binary file not shown.
BIN
public/fonts/Montserrat-Medium.ttf
Normal file
BIN
public/fonts/Montserrat-Medium.ttf
Normal file
Binary file not shown.
BIN
public/fonts/Montserrat-MediumItalic.ttf
Normal file
BIN
public/fonts/Montserrat-MediumItalic.ttf
Normal file
Binary file not shown.
BIN
public/fonts/Montserrat-Regular.ttf
Normal file
BIN
public/fonts/Montserrat-Regular.ttf
Normal file
Binary file not shown.
BIN
public/fonts/Montserrat-SemiBold.ttf
Normal file
BIN
public/fonts/Montserrat-SemiBold.ttf
Normal file
Binary file not shown.
BIN
public/fonts/Montserrat-SemiBoldItalic.ttf
Normal file
BIN
public/fonts/Montserrat-SemiBoldItalic.ttf
Normal file
Binary file not shown.
BIN
public/fonts/Montserrat-Thin.ttf
Normal file
BIN
public/fonts/Montserrat-Thin.ttf
Normal file
Binary file not shown.
BIN
public/fonts/Montserrat-ThinItalic.ttf
Normal file
BIN
public/fonts/Montserrat-ThinItalic.ttf
Normal file
Binary file not shown.
93
public/fonts/OFL.txt
Normal file
93
public/fonts/OFL.txt
Normal file
|
@ -0,0 +1,93 @@
|
|||
Copyright 2011 The Montserrat Project Authors (https://github.com/JulietaUla/Montserrat)
|
||||
|
||||
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||
This license is copied below, and is also available with a FAQ at:
|
||||
http://scripts.sil.org/OFL
|
||||
|
||||
|
||||
-----------------------------------------------------------
|
||||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||
-----------------------------------------------------------
|
||||
|
||||
PREAMBLE
|
||||
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||
development of collaborative font projects, to support the font creation
|
||||
efforts of academic and linguistic communities, and to provide a free and
|
||||
open framework in which fonts may be shared and improved in partnership
|
||||
with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely as long as they are not sold by themselves. The
|
||||
fonts, including any derivative works, can be bundled, embedded,
|
||||
redistributed and/or sold with any software provided that any reserved
|
||||
names are not used by derivative works. The fonts and derivatives,
|
||||
however, cannot be released under any other type of license. The
|
||||
requirement for fonts to remain under this license does not apply
|
||||
to any document created using the fonts or their derivatives.
|
||||
|
||||
DEFINITIONS
|
||||
"Font Software" refers to the set of files released by the Copyright
|
||||
Holder(s) under this license and clearly marked as such. This may
|
||||
include source files, build scripts and documentation.
|
||||
|
||||
"Reserved Font Name" refers to any names specified as such after the
|
||||
copyright statement(s).
|
||||
|
||||
"Original Version" refers to the collection of Font Software components as
|
||||
distributed by the Copyright Holder(s).
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||
or substituting -- in part or in whole -- any of the components of the
|
||||
Original Version, by changing formats or by porting the Font Software to a
|
||||
new environment.
|
||||
|
||||
"Author" refers to any designer, engineer, programmer, technical
|
||||
writer or other person who contributed to the Font Software.
|
||||
|
||||
PERMISSION & CONDITIONS
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||
redistribute, and sell modified and unmodified copies of the Font
|
||||
Software, subject to the following conditions:
|
||||
|
||||
1) Neither the Font Software nor any of its individual components,
|
||||
in Original or Modified Versions, may be sold by itself.
|
||||
|
||||
2) Original or Modified Versions of the Font Software may be bundled,
|
||||
redistributed and/or sold with any software, provided that each copy
|
||||
contains the above copyright notice and this license. These can be
|
||||
included either as stand-alone text files, human-readable headers or
|
||||
in the appropriate machine-readable metadata fields within text or
|
||||
binary files as long as those fields can be easily viewed by the user.
|
||||
|
||||
3) No Modified Version of the Font Software may use the Reserved Font
|
||||
Name(s) unless explicit written permission is granted by the corresponding
|
||||
Copyright Holder. This restriction only applies to the primary font name as
|
||||
presented to the users.
|
||||
|
||||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||
Software shall not be used to promote, endorse or advertise any
|
||||
Modified Version, except to acknowledge the contribution(s) of the
|
||||
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||
permission.
|
||||
|
||||
5) The Font Software, modified or unmodified, in part or in whole,
|
||||
must be distributed entirely under this license, and must not be
|
||||
distributed under any other license. The requirement for fonts to
|
||||
remain under this license does not apply to any document created
|
||||
using the Font Software.
|
||||
|
||||
TERMINATION
|
||||
This license becomes null and void if any of the above conditions are
|
||||
not met.
|
||||
|
||||
DISCLAIMER
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||
OTHER DEALINGS IN THE FONT SOFTWARE.
|
8
public/global.css
Normal file
8
public/global.css
Normal file
|
@ -0,0 +1,8 @@
|
|||
@font-face {
|
||||
font-family: Montserrat;
|
||||
src: url("/fonts/Montserrat-Regular.ttf");
|
||||
}
|
||||
|
||||
* {
|
||||
font-family: Montserrat;
|
||||
}
|
|
@ -12,6 +12,7 @@
|
|||
href="<%= BASE_URL %>opensearch.xml"
|
||||
/>
|
||||
<title><%= htmlWebpackPlugin.options.title %></title>
|
||||
<link rel="stylesheet" href="/global.css">
|
||||
</head>
|
||||
<body>
|
||||
<noscript>
|
||||
|
|
|
@ -33,16 +33,6 @@
|
|||
</div>
|
||||
</router-link>
|
||||
|
||||
<div class="uk-align-right" style="margin-left: 0; margin-bottom: 0; display: inline-block; width: 10%">
|
||||
<router-link
|
||||
:to="video.url + '&listen=1'"
|
||||
:aria-label="'Listen to ' + video.title"
|
||||
:title="'Listen to ' + video.title"
|
||||
>
|
||||
<font-awesome-icon icon="headphones"></font-awesome-icon>
|
||||
</router-link>
|
||||
</div>
|
||||
|
||||
<div style="display: flex; flex-flow: row; height: 15%">
|
||||
<router-link class="uk-link-muted" :to="video.uploaderUrl">
|
||||
<img
|
||||
|
@ -55,32 +45,34 @@
|
|||
/>
|
||||
</router-link>
|
||||
|
||||
<div style="width: calc(100% - 32px - 8px);">
|
||||
<div style="width: calc(100% - 32px - 8px);" :style="{ marginLeft: viewsMargin() }">
|
||||
<router-link
|
||||
v-if="video.uploaderUrl && video.uploaderName && !hideChannel"
|
||||
class="uk-link-muted uk-overflow-hidden"
|
||||
:to="video.uploaderUrl"
|
||||
:title="video.uploaderName"
|
||||
style="display:block; width: 90%"
|
||||
style="display:block; width: 90%; color: #ABB2C6; font-size: 14px; line-height: 18px;"
|
||||
>
|
||||
{{ video.uploaderName }} <font-awesome-icon
|
||||
:style="[{ marginLeft: '7px' }]"
|
||||
v-if="video.uploaderVerified"
|
||||
icon="check"
|
||||
></font-awesome-icon>
|
||||
</router-link>
|
||||
|
||||
<b v-if="video.views >= 0 || video.uploadedDate" class="uk-text-small">
|
||||
<span v-if="video.views >= 0">
|
||||
<font-awesome-icon icon="eye"></font-awesome-icon>
|
||||
{{ numberFormat(video.views) }} •
|
||||
</span>
|
||||
<span
|
||||
v-if="video.views >= 0 || video.uploadedDate"
|
||||
class="uk-text-small"
|
||||
style="color: #ABB2C6; font-size: 13px;"
|
||||
>
|
||||
<span v-if="video.views >= 0"> {{ numberFormat(video.views) }} • </span>
|
||||
<span v-if="video.uploadedDate">
|
||||
{{ video.uploadedDate }}
|
||||
</span>
|
||||
<span v-if="video.uploaded">
|
||||
{{ timeAgo(video.uploaded) }}
|
||||
</span>
|
||||
</b>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -99,5 +91,14 @@ export default {
|
|||
width: { type: String, default: "210" },
|
||||
hideChannel: { type: Boolean, default: false },
|
||||
},
|
||||
methods: {
|
||||
viewsMargin() {
|
||||
if (this.video.uploaderUrl && this.video.uploaderName && !this.hideChannel) {
|
||||
return "10px";
|
||||
} else {
|
||||
return "0px";
|
||||
}
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue