Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-24 23:59:47 +02:00
Code Releases Activity

Merge branch 'master' into trello-improvements

Browse source
This commit is contained in:
Elliott Stoneham 2016-09-11 15:36:30 +01:00
commit 2106f615e0
12 changed files with 798 additions and 835 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/app/helpers/user-initials.js
View file

@ -1,11 +1,11 @@
// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
//
// This software (Documize Community Edition) is licensed under
// This software (Documize Community Edition) is licensed under
// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
//
// You can operate outside the AGPL restrictions by purchasing
// Documize Enterprise Edition and obtaining a commercial license
// by contacting <sales@documize.com>.
// by contacting <sales@documize.com>.
//
// https://documize.com
@ -16,7 +16,14 @@ export function userInitials(params) {
let firstname = params[0];
let lastname = params[1];
if (is.undefined(firstname)) {
firstname = " ";
}
if (is.undefined(lastname)) {
lastname = " ";
}
return (firstname.substring(0, 1) + lastname.substring(0, 1)).toUpperCase();
}
export default Ember.Helper.helper(userInitials);
export default Ember.Helper.helper(userInitials);

142
app/app/styles/section/github.scss
View file

@ -40,107 +40,79 @@
}
.section-github-render {
h3 {
margin-bottom: 0px;
}
h6 {
font-size: 18px;
margin: 0;
display: inline;
}
h6 a {
color: inherit;
}
p {
margin-top: 5px;
}
.github-board {
margin-top: 30px;
}
table {
margin-left: 0px!important;
border: none!important;
}
thead.github th {
background-color: #f8f8f8;
text-align: left;
padding: 4px 30px;
font-family: "open_sanssemibold";
border-bottom: 1px solid #e1e1e1 !important;
}
tbody.github td {
.github-table {
margin: 0 !important;
border: none !important;
padding: 8px 30px !important;
vertical-align: top;
}
line-height: 30px;
span.label-private {
font-weight: normal;
color: #4c4a42;
background-color: #ffefc6;
padding: 3px 4px;
font-size: 12px;
border-radius: 2px;
box-shadow: inset 0 -1px 0 rgba(0,0,0,0.12);
line-height: 1;
margin-left: 10px;
}
table.label-table {
margin-top:30px !important;
}
table.milestone-table {
progress[value] {
background-color: #eeeeee;
border-radius: 3px;
height: 15px;
width: 50%;
td {
border: none !important;
vertical-align: top;
}
}
.github-issue-label {
.heading {
font-size: 1.6rem;
margin: 30px 0 0 0;
}
.issue-label {
font-size: 11px;
color: white;
padding: 0px 4px;
color: $color-white;
padding: 0px 8px;
margin-right: 5px;
border-radius: 2px;
box-shadow: inset 0 -1px 0 rgba(0,0,0,0.12);
display: inline-block;
line-height: 22px;
}
.date-meta {
color: #767676;
font-size: 13px;
}
.dataid {
color: #767676;
font-size: 13px;
}
.repo {
font-size: 16px;
progress[value] {
background-color: $color-off-white;
border-radius: 3px;
height: 15px;
width: 150px;
}
.progress-meta {
color: $color-gray;
font-size: 1rem;
font-family: "arial";
}
.contributor-name {
line-height: 15px;
}
.milestone-name, .issue-name, .contributor-name {
font-size: 1.2rem;
}
.milestone-symbol {
padding-top: 3px;
}
.issue-symbol {
padding-top: 3px;
}
.contributor-meta {
line-height: 30px;
}
.milestone-meta, .issue-meta, .contributor-meta {
color: $color-gray;
font-size: 1rem;
}
.github-avatar {
border-radius: 4px;
width: 36px;
height: 36px;
margin-right: 5px;
}
.branch {
font-family: "open_sanssemibold";
}
.milestone {
font-size: 15px;
}
.github-avatar {
border-radius: 4px;
}
}

2
app/app/styles/view/document/wysiwyg.scss
View file

@ -1,7 +1,7 @@
.wysiwyg {
// font-size: 1rem;
font-size: 15px;
line-height: 30px;
line-height: 30px;
color: #3c3c3c;
table

11
app/app/templates/components/document/document-sidebar.hbs
View file

@ -2,9 +2,12 @@
{{#if session.authenticated}}
<div class="summary-line hidden-xs hidden-sm">
<ul class="items">
<li class="item">
<div id="owner-avatar" class="avatar" data-tooltip="{{owner.fullname}}" data-tooltip-position="right middle">{{owner.initials}}</div>
</li>
<li class="item" {{action 'showToc'}}>
<div class="metric">
<div class="number">{{pages.length}}</div>
<div class="label">sections</div>
</div>
</li>
<li class="divider" />
<li class="item" {{action 'showViews'}}>
<div class="metric">
@ -31,11 +34,9 @@
gotoPage=(action 'gotoPage')}}
{{/if}}
{{#if showViews}}
{{document/document-sidebar-close-action close=(action 'showToc')}}
{{document/document-sidebar-viewers meta=meta}}
{{/if}}
{{#if showContributions}}
{{document/document-sidebar-close-action close=(action 'showToc')}}
{{document/document-sidebar-edits pages=pages meta=meta}}
{{/if}}
</div>