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

Merge branch 'master' into github-extension

Browse source
This commit is contained in:
Elliott Stoneham 2016-07-06 17:23:19 +01:00
commit b20a19fdb1
4 changed files with 91 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

13
.jsbeautifyrc
View file

@ -3,8 +3,9 @@
"indent_size": 4, "indent_size": 4,
"indent_level": 0, "indent_level": 0,
"indent_with_tabs": true, "indent_with_tabs": true,
"allowed_file_extensions": ["css", "scss", "sass", "less"], "preserve_newlines": true,
"max_preserve_newlines": 2 "max_preserve_newlines": 2,
"newline_between_rules": true
}, },
"html": { "html": {
"indent_size": 4, "indent_size": 4,
@ -45,13 +46,5 @@
"indent_size": 4, "indent_size": 4,
"indent_level": 0, "indent_level": 0,
"indent_with_tabs": true "indent_with_tabs": true
},
"_default": {
"indent_size": 4,
"indent_level": 0,
"indent_with_tabs": true,
"preserve_newlines": true,
"max_preserve_newlines": 2,
"wrap_line_length": 0
} }
} }

18
.tern-project
View file

@ -1,18 +0,0 @@
{
"libs": [
"browser",
"jquery",
"underscore",
"is",
"ember"
],
"loadEagerly": [
"app/app/*.js"
],
"plugins": {
"requirejs": {
"baseURL": "./",
"paths": {}
}
}
}

19
app/app/styles/view/layout.scss
View file

@ -10,7 +10,6 @@
width: 100%; width: 100%;
font-size: 1rem; font-size: 1rem;
padding: 15px 40px 15px 40px; padding: 15px 40px 15px 40px;
.content { .content {
> .title { > .title {
padding-left: 15px; padding-left: 15px;
@ -20,43 +19,36 @@
color: $color-white; color: $color-white;
text-decoration: none; text-decoration: none;
} }
> .name { > .name {
padding-right: 15px; padding-right: 15px;
font-size: 1rem; font-size: 1rem;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
} }
> .login { > .login {
padding: 15px 0 0 0; padding: 15px 0 0 0;
font-size: 1rem; font-size: 1rem;
display: inline-block; display: inline-block;
> a { > a {
color: $color-white; color: $color-white;
text-decoration: none; text-decoration: none;
} }
} }
> .search { > .search {
padding-left: 15px; padding-left: 15px;
font-size: 1rem; font-size: 1rem;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
margin-top: 5px; margin-top: 5px;
> a { > a {
color: $color-white; color: $color-white;
text-decoration: none; text-decoration: none;
> .material-icons { > .material-icons {
font-size: 1.5rem; font-size: 1.5rem;
} }
} }
} }
} }
.header-button { .header-button {
display: inline-block; display: inline-block;
position: relative; position: relative;
@ -71,17 +63,14 @@
vertical-align: middle; vertical-align: middle;
background-color: $color-white; background-color: $color-white;
text-align: center; text-align: center;
&:hover { &:hover {
@extend .z-depth-1; @extend .z-depth-1;
} }
> .material-icons { > .material-icons {
color: $color-primary; color: $color-primary;
text-align: center; text-align: center;
font-size: 1.4em; font-size: 1.4em;
} }
> .initials { > .initials {
color: $color-primary; color: $color-primary;
text-align: center; text-align: center;
@ -90,7 +79,6 @@
line-height: 2.6rem; line-height: 2.6rem;
font-family: open_sansregular; font-family: open_sansregular;
} }
&:before { &:before {
border-radius: 0; border-radius: 0;
} }
@ -100,22 +88,18 @@
.zone-header { .zone-header {
background-color: $color-header; background-color: $color-header;
padding: 0 40px 0 40px; padding: 0 40px 0 40px;
> .info { > .info {
padding: 20px 0 20px 0; padding: 20px 0 20px 0;
> .title { > .title {
color: $color-off-black; color: $color-off-black;
font-size: 1.2rem; font-size: 1.2rem;
} }
> .message { > .message {
color: $color-gray; color: $color-gray;
font-size: 1rem; font-size: 1rem;
margin-top: 10px; margin-top: 10px;
} }
} }
> .actions { > .actions {
padding: 20px 0 20px 0; padding: 20px 0 20px 0;
} }
@ -123,7 +107,7 @@
.zone-sidebar { .zone-sidebar {
height: 100%; height: 100%;
min-height:100%; min-height: 100%;
padding: 0 40px 0 40px; padding: 0 40px 0 40px;
border-right: 1px solid $color-border; border-right: 1px solid $color-border;
float: left; float: left;
@ -137,7 +121,6 @@
.copyright { .copyright {
margin-top: 50px; margin-top: 50px;
text-align: center; text-align: center;
> a { > a {
font-size: 0.8rem; font-size: 0.8rem;
color: $color-gray; color: $color-gray;

14
app/app/templates/components/layout/zone-navigation.hbs
View file

@ -1,25 +1,22 @@
<div id="zone-navigation" class="zone-navigation"> <div id="zone-navigation" class="zone-navigation">
<div class="pull-left"> <div class="pull-left content">
<div class="content">
{{#if session.authenticated}} {{#if session.authenticated}}
<div id="accounts-button" class="header-button"> <div id="accounts-button" class="header-button">
<i class="material-icons">apps</i> <i class="material-icons">apps</i>
</div> </div>
{{else}} {{else}}
{{#link-to 'application'}} {{#link-to 'application' class='title'}}
<div class="header-button" title=session.appMeta.title> <div class="header-button" title=session.appMeta.title>
<i class="material-icons">apps</i> <i class="material-icons">apps</i>
</div> </div>
{{/link-to}} {{/link-to}}
{{/if}} {{/if}}
{{#link-to 'application'}} {{#link-to 'application' class='title'}}
<div>{{session.appMeta.title}}</div> {{session.appMeta.title}}
{{/link-to}} {{/link-to}}
</div> </div>
</div>
<div class="pull-right hidden-xs hidden-sm"> <div class="pull-right hidden-xs hidden-sm content">
<div class="content">
{{#if session.authenticated}} {{#if session.authenticated}}
<div class="name">{{session.user.fullname}}</div> <div class="name">{{session.user.fullname}}</div>
<div id="user-button" class="header-button"> <div id="user-button" class="header-button">
@ -36,7 +33,6 @@
{{/link-to}} {{/link-to}}
</div> </div>
</div> </div>
</div>
{{#if session.authenticated}} {{#if session.authenticated}}
{{#dropdown-menu target="accounts-button" position="bottom left" open="click" }} {{#dropdown-menu target="accounts-button" position="bottom left" open="click" }}