mirror of
https://github.com/wekan/wekan.git
synced 2025-12-16 23:40:13 +01:00
Switch the font to roboto
This commit is contained in:
parent
a79599d76c
commit
8ae6abe603
15 changed files with 62 additions and 29 deletions
|
|
@ -30,8 +30,8 @@ template(name="cardLabelsPopup")
|
||||||
li
|
li
|
||||||
a.card-label-edit-button.fa.fa-pencil.js-edit-label
|
a.card-label-edit-button.fa.fa-pencil.js-edit-label
|
||||||
span.card-label.card-label-selectable.js-select-label(class="card-label-{{color}}"
|
span.card-label.card-label-selectable.js-select-label(class="card-label-{{color}}"
|
||||||
class="{{# if isLabelSelected ../_id }}active{{/ if }}")
|
class="{{# if isLabelSelected ../_id }}active{{/if}}")
|
||||||
= name
|
= name
|
||||||
if isLabelSelected ../_id
|
if(isLabelSelected ../_id)
|
||||||
i.card-label-selectable-icon.fa.fa-check
|
i.card-label-selectable-icon.fa.fa-check
|
||||||
a.quiet-button.full.js-add-label {{_ 'label-create'}}
|
a.quiet-button.full.js-add-label {{_ 'label-create'}}
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,12 @@
|
||||||
&.add-label
|
&.add-label
|
||||||
box-shadow: 0 0 0 2px darken(white, 25%) inset
|
box-shadow: 0 0 0 2px darken(white, 25%) inset
|
||||||
|
|
||||||
|
&:hover, &.is-active
|
||||||
|
box-shadow: 0 0 0 2px darken(white, 60%) inset
|
||||||
|
|
||||||
|
i.fa-plus
|
||||||
|
margin-top: 3px
|
||||||
|
|
||||||
.palette-colors
|
.palette-colors
|
||||||
display: flex
|
display: flex
|
||||||
flex-wrap: wrap
|
flex-wrap: wrap
|
||||||
|
|
|
||||||
|
|
@ -67,17 +67,6 @@
|
||||||
height: 100%
|
height: 100%
|
||||||
width: 100%
|
width: 100%
|
||||||
|
|
||||||
.minicard-title
|
|
||||||
display: block
|
|
||||||
font-weight: 400
|
|
||||||
overflow: hidden
|
|
||||||
margin-bottom: 2px
|
|
||||||
text-decoration: none
|
|
||||||
word-wrap: break-word
|
|
||||||
|
|
||||||
&::selection
|
|
||||||
background: transparent
|
|
||||||
|
|
||||||
.minicard-labels
|
.minicard-labels
|
||||||
float: right
|
float: right
|
||||||
display: flex
|
display: flex
|
||||||
|
|
|
||||||
17
client/components/main/fonts.styl
Normal file
17
client/components/main/fonts.styl
Normal file
|
|
@ -0,0 +1,17 @@
|
||||||
|
@font-face
|
||||||
|
font-family: 'Roboto'
|
||||||
|
font-style: normal
|
||||||
|
font-weight: 400
|
||||||
|
src: local('Roboto'),
|
||||||
|
local('Roboto-Regular'),
|
||||||
|
url('/fonts/roboto-regular.woff2') format('woff2'),
|
||||||
|
url('/fonts/roboto-regular.woff') format('woff')
|
||||||
|
|
||||||
|
@font-face
|
||||||
|
font-family: 'Roboto'
|
||||||
|
font-style: normal
|
||||||
|
font-weight: 700
|
||||||
|
src: local('Roboto Bold'),
|
||||||
|
local('Roboto-Bold'),
|
||||||
|
url('/fonts/roboto-bold.woff2') format('woff2'),
|
||||||
|
url('/fonts/roboto-bold.woff') format('woff')
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
#header
|
#header
|
||||||
color: white
|
color: white
|
||||||
transition: background-color 0.4s
|
transition: background-color 0.4s
|
||||||
background: #27AE60
|
background: #2980B9
|
||||||
|
|
||||||
#header-quick-access
|
#header-quick-access
|
||||||
background-color: rgba(0, 0, 0, 0.2)
|
background-color: rgba(0, 0, 0, 0.2)
|
||||||
|
|
@ -117,7 +117,7 @@
|
||||||
.board-header-btn,
|
.board-header-btn,
|
||||||
h1.is-clickable
|
h1.is-clickable
|
||||||
&.is-active,
|
&.is-active,
|
||||||
&:hover
|
&:hover:not(.is-disabled)
|
||||||
background: rgba(0, 0, 0, .15)
|
background: rgba(0, 0, 0, .15)
|
||||||
|
|
||||||
.separator
|
.separator
|
||||||
|
|
|
||||||
|
|
@ -3,13 +3,14 @@
|
||||||
global-reset()
|
global-reset()
|
||||||
|
|
||||||
html, body, input, select, textarea, button
|
html, body, input, select, textarea, button
|
||||||
font: 14px "Helvetica Neue", Arial, Helvetica, sans-serif
|
font: 14px Roboto, "Helvetica Neue", Arial, Helvetica, sans-serif
|
||||||
line-height: 18px
|
line-height: 18px
|
||||||
color: #4d4d4d
|
color: #4d4d4d
|
||||||
|
|
||||||
html
|
html
|
||||||
font-size: 100%
|
font-size: 100%
|
||||||
max-height: 100%
|
max-height: 100%
|
||||||
|
user-select: none
|
||||||
-webkit-text-size-adjust: 100%
|
-webkit-text-size-adjust: 100%
|
||||||
|
|
||||||
body
|
body
|
||||||
|
|
@ -29,9 +30,6 @@ body
|
||||||
position: relative
|
position: relative
|
||||||
flex: 1
|
flex: 1
|
||||||
|
|
||||||
div::selection
|
|
||||||
background: transparent
|
|
||||||
|
|
||||||
h1
|
h1
|
||||||
font-size: 22px
|
font-size: 22px
|
||||||
line-height: 1.2em
|
line-height: 1.2em
|
||||||
|
|
@ -81,6 +79,8 @@ strong
|
||||||
font-weight: bold
|
font-weight: bold
|
||||||
|
|
||||||
p
|
p
|
||||||
|
user-select: text
|
||||||
|
|
||||||
a
|
a
|
||||||
text-decoration: underline
|
text-decoration: underline
|
||||||
word-wrap: break-word
|
word-wrap: break-word
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,14 @@
|
||||||
Mixins.PerfectScrollbar = BlazeComponent.extendComponent({
|
Mixins.PerfectScrollbar = BlazeComponent.extendComponent({
|
||||||
onRendered: function() {
|
onRendered: function() {
|
||||||
var component = this.mixinParent();
|
var component = this.mixinParent();
|
||||||
Ps.initialize(component.find('.js-perfect-scrollbar'));
|
var domElement = component.find('.js-perfect-scrollbar');
|
||||||
|
Ps.initialize(domElement);
|
||||||
|
|
||||||
|
// XXX We should create an event map to be consistent with other components
|
||||||
|
// but since BlazeComponent doesn't merge Mixins events transparently I
|
||||||
|
// prefered to use a jQuery event (which is what an event map ends up doing)
|
||||||
|
component.$(domElement).on('mouseenter', function() {
|
||||||
|
Ps.update(domElement);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -51,10 +51,9 @@ template(name="memberPopup")
|
||||||
.miniprofile-header
|
.miniprofile-header
|
||||||
+userAvatar(userId=user._id)
|
+userAvatar(userId=user._id)
|
||||||
.info
|
.info
|
||||||
h3.bottom
|
h3
|
||||||
.js-profile
|
.js-profile= user.profile.fullname
|
||||||
= user.profile.fullname
|
p.quiet @#{user.username}
|
||||||
p.quiet.bottom @#{user.username}
|
|
||||||
|
|
||||||
if currentUser.isBoardMember
|
if currentUser.isBoardMember
|
||||||
ul.pop-over-list
|
ul.pop-over-list
|
||||||
|
|
@ -73,7 +72,7 @@ template(name="memberPopup")
|
||||||
|
|
||||||
|
|
||||||
template(name="removeMemberPopup")
|
template(name="removeMemberPopup")
|
||||||
p {{_ 'remove-member-pop' name=user.profile.fullname username=user.username boardTitle=board.title}}
|
p {{_ 'remove-member-pop' name=user.profile.name username=user.username boardTitle=board.title}}
|
||||||
button.js-confirm.negate.full(type="submit") {{_ 'remove-member'}}
|
button.js-confirm.negate.full(type="submit") {{_ 'remove-member'}}
|
||||||
|
|
||||||
template(name="addMemberPopup")
|
template(name="addMemberPopup")
|
||||||
|
|
@ -83,10 +82,10 @@ template(name="addMemberPopup")
|
||||||
ul.pop-over-member-list
|
ul.pop-over-member-list
|
||||||
+esEach(index="users")
|
+esEach(index="users")
|
||||||
li.item.js-member-item(class="{{#if isBoardMember }}disabled{{/if}}")
|
li.item.js-member-item(class="{{#if isBoardMember }}disabled{{/if}}")
|
||||||
a.name.js-select-member(title="{{ profile.fullname }} ({{ username }})")
|
a.name.js-select-member(title="{{ profile.name }} ({{ username }})")
|
||||||
+userAvatar(userId=_id)
|
+userAvatar(userId=_id)
|
||||||
span.full-name
|
span.full-name
|
||||||
= profile.fullname
|
= profile.name
|
||||||
| (<span class="username">{{ username }}</span>)
|
| (<span class="username">{{ username }}</span>)
|
||||||
if isBoardMember
|
if isBoardMember
|
||||||
.extra-text.quiet ({{_ 'joined'}})
|
.extra-text.quiet ({{_ 'joined'}})
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,11 @@
|
||||||
|
|
||||||
h3
|
h3
|
||||||
color: darken(white, 50%)
|
color: darken(white, 50%)
|
||||||
|
font-size: 1em
|
||||||
|
margin-bottom: 10px
|
||||||
|
|
||||||
|
i.fa
|
||||||
|
margin-right: 3px
|
||||||
|
|
||||||
hr
|
hr
|
||||||
margin: 13px 0
|
margin: 13px 0
|
||||||
|
|
|
||||||
|
|
@ -81,6 +81,9 @@ avatar-radius = 50%
|
||||||
justify-content: center
|
justify-content: center
|
||||||
box-shadow: 0 0 0 2px darken(white, 25%) inset
|
box-shadow: 0 0 0 2px darken(white, 25%) inset
|
||||||
|
|
||||||
|
&:hover, &.is-active
|
||||||
|
box-shadow: 0 0 0 2px darken(white, 60%) inset
|
||||||
|
|
||||||
.atMention
|
.atMention
|
||||||
background: #dbdbdb
|
background: #dbdbdb
|
||||||
border-radius: 3px
|
border-radius: 3px
|
||||||
|
|
@ -99,6 +102,7 @@ avatar-radius = 50%
|
||||||
|
|
||||||
h3, p
|
h3, p
|
||||||
margin-bottom: 0
|
margin-bottom: 0
|
||||||
|
padding-left: 0
|
||||||
|
|
||||||
p
|
p
|
||||||
padding-top: 0
|
padding-top: 0
|
||||||
|
|
|
||||||
|
|
@ -63,8 +63,13 @@ Boards.attachSchema(new SimpleSchema({
|
||||||
color: {
|
color: {
|
||||||
type: String,
|
type: String,
|
||||||
allowedValues: [
|
allowedValues: [
|
||||||
'nephritis', 'pomegranate', 'belize',
|
'belize',
|
||||||
'wisteria', 'midnight', 'pumpkin']
|
'nephritis',
|
||||||
|
'pomegranate',
|
||||||
|
'pumpkin',
|
||||||
|
'wisteria',
|
||||||
|
'midnight',
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
|
|
||||||
BIN
public/fonts/roboto-bold.woff
Normal file
BIN
public/fonts/roboto-bold.woff
Normal file
Binary file not shown.
BIN
public/fonts/roboto-bold.woff2
Normal file
BIN
public/fonts/roboto-bold.woff2
Normal file
Binary file not shown.
BIN
public/fonts/roboto-regular.woff
Normal file
BIN
public/fonts/roboto-regular.woff
Normal file
Binary file not shown.
BIN
public/fonts/roboto-regular.woff2
Normal file
BIN
public/fonts/roboto-regular.woff2
Normal file
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue