progresses

This commit is contained in:
Henrique Dias 2016-06-19 21:33:55 +01:00
parent a397e89d20
commit 8879f22932
6 changed files with 52 additions and 77 deletions

View File

@ -37,7 +37,7 @@ module.exports = function(grunt) {
expand: true, expand: true,
flatten: true, flatten: true,
src: ['node_modules/font-awesome/fonts/**'], src: ['node_modules/font-awesome/fonts/**'],
dest: 'assets/dist/public/fonts' dest: 'dist/public/fonts'
}], }],
}, },
}, },
@ -50,7 +50,7 @@ module.exports = function(grunt) {
expand: true, expand: true,
cwd: 'temp/css/', cwd: 'temp/css/',
src: ['*.css', '!*.min.css'], src: ['*.css', '!*.min.css'],
dest: 'assets/public/css/', dest: 'dist/public/css/',
ext: '.min.css' ext: '.min.css'
}] }]
} }
@ -69,7 +69,7 @@ module.exports = function(grunt) {
}, },
main: { main: {
files: { files: {
'assets/dist/public/js/app.min.js': ['src/js/**/*.js'] 'dist/public/js/app.min.js': ['src/js/**/*.js']
} }
} }
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -4,15 +4,20 @@
{{ if or (eq $value.Type "object") (eq $value.Type "array") }} {{ if or (eq $value.Type "object") (eq $value.Type "array") }}
<fieldset id="{{ $value.Name }}" data-type="{{ $value.Type }}"> <fieldset id="{{ $value.Name }}" data-type="{{ $value.Type }}">
<h3>{{ SplitCapitalize $value.Title }}</h3> <h3>{{ SplitCapitalize $value.Title }}</h3>
<button class="delete" data-delete="{{ $value.Name }}">remove</button> <span class="actions">
{{ if (eq $value.Type "array") }}<div class="itens">{{ end }}{{ template "frontmatter" $value.Content }}{{ if (eq $value.Type "array") }}<button class="add">&#43;</button></div>{{ end }} <button class="add">&#43;</button>
<button class="delete">&#8722;</button>
</span>
{{ template "frontmatter" $value.Content }}
</fieldset> </fieldset>
{{ else }} {{ else }}
{{ if not (eq $value.Parent.Type "array") }} {{ if not (eq $value.Parent.Type "array") }}
<div class="block" id="block-{{ $value.Name }}" data-content="{{ $value.Name }}"> <div class="block" id="block-{{ $value.Name }}" data-content="{{ $value.Name }}">
<label for="{{ $value.Name }}">{{ SplitCapitalize $value.Title }}</label> <label for="{{ $value.Name }}">{{ SplitCapitalize $value.Title }}</label>
<button class="delete">remove</button> <span class="actions">
<button class="delete">&#8722;</button>
</span>
{{ end }} {{ end }}
@ -31,7 +36,7 @@
{{ if not (eq $value.Parent.Type "array") }}</div>{{ end }} {{ if not (eq $value.Parent.Type "array") }}</div>{{ end }}
{{ if eq $value.Parent.Type "array" }} {{ if eq $value.Parent.Type "array" }}
<span class="actions"><button class="delete">&#215;</button></span></div> <span class="actions"><button class="delete">&#8722;</button></span></div>
{{ end }} {{ end }}
{{ end }} {{ end }}

View File

@ -1,7 +1,7 @@
body { body {
font-family: 'Roboto', sans-serif; font-family: 'Roboto', sans-serif;
color: #212121; color: #212121;
background-color: #fff; background-color: #f5f5f5;
height: 100%; height: 100%;
width: 100%; width: 100%;
padding-top: 3em; padding-top: 3em;
@ -60,11 +60,12 @@ body > nav {
left: 0; left: 0;
height: 3em; height: 3em;
width: 100%; width: 100%;
background-color: #1E88E5; background-color: #0097A7;
padding: 0 1em; padding: 0 1em;
box-sizing: border-box; box-sizing: border-box;
z-index: 999; z-index: 999;
color: #eee; color: #eee;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
} }
body > nav ul { body > nav ul {
@ -116,7 +117,7 @@ body > nav ul li a:hover {
/* FOOTER */ /* FOOTER */
body > footer { body > footer {
background-color: #f5f5f5; font-size: .8em;
text-align: center; text-align: center;
padding: 1em 0; padding: 1em 0;
margin-top: 1em; margin-top: 1em;
@ -222,6 +223,7 @@ input[type="submit"] {
color: #000; color: #000;
font-weight: normal; font-weight: normal;
background-color: #FFEB3B; background-color: #FFEB3B;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.06), 0 1px 2px rgba(0, 0, 0, 0.12);
-webkit-transition: .5s ease background-color; -webkit-transition: .5s ease background-color;
transition: .5s ease background-color; transition: .5s ease background-color;
} }
@ -249,7 +251,6 @@ button.delete,
button.rename { button.rename {
color: #fff; color: #fff;
padding: 0.063em 0.375em; padding: 0.063em 0.375em;
border-radius: 50%;
} }
button.add { button.add {
@ -261,21 +262,7 @@ button.add:hover {
} }
button.delete { button.delete {
background-color: #E53935; background-color: #F44336;
}
label + .delete,
h3 + .delete {
visibility: hidden;
border-radius: .13em;
padding: 0 .3em;
font-size: .8em;
border: 1px solid #D32F2F;
}
.block:hover .delete,
fieldset:hover .delete {
visibility: visible;
} }
button.delete:hover { button.delete:hover {
@ -332,30 +319,34 @@ fieldset > .actions {
} }
.blocks { .blocks {
column-count: 2; -webkit-column-count: 4;
-moz-column-count: 4;
column-count: 4;
-webkit-column-gap: 1em;
-moz-column-gap: 1em;
column-gap: 1em; column-gap: 1em;
} }
.block, .block,
fieldset { fieldset {
display: inline-block; display: inline-block;
margin-bottom: .6em; box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
background-color: #fff;
padding: 0.6em;
box-sizing: border-box; box-sizing: border-box;
margin: 0 0 1em;
position: relative; position: relative;
width: 100%; width: 100%;
border: 0; border: 0;
padding: 0;
} }
.block label, .block label,
fieldset label, fieldset label,
fieldset h3 { fieldset h3 {
font-weight: 700; font-weight: bold;
display: block; display: block;
font-size: 1em; margin-top: 0;
margin: 0 0 .3em; font-size: 1em;
color: #424242;
display: inline-block;
} }
.block textarea { .block textarea {
@ -367,40 +358,6 @@ color: #424242;
overflow: hidden; overflow: hidden;
} }
.block input,
.block textarea,
fieldset .itens {
background-color: #fafafa;
border: 1px solid #e2e2e2;
border-radius: .2em;
padding: .4em;
color: #616161;
}
div[data-type="array-item"],
div[data-type="array-item"] + .add {
display: inline-block;
width: auto;
background-color: #2196F3;
color: #E3F2FD;
border-radius: .6em;
margin-bottom: .2em;
}
div[data-type="array-item"] input {
padding: .2em .5em;
}
div[data-type="array-item"] .actions {
display: inline-block;
padding: .2em
}
div[data-type="array-item"] .delete {
background-color: transparent;
box-shadow: 0 0 0 0;
}
input { input {
border: 0; border: 0;
outline: 0; outline: 0;
@ -413,8 +370,8 @@ input[type="submit"] {
} }
fieldset input { fieldset input {
display: inline-block; width: calc(100% - 1.57em);
width: auto; margin: 0.5em 0;
} }
.complete .block[data-content="title"] { .complete .block[data-content="title"] {
@ -707,11 +664,19 @@ fieldset input {
} }
} }
@media screen and (max-width: 900px) {
.blocks {
-webkit-column-count: 3;
-moz-column-count: 3;
column-count: 3;
}
}
@media screen and (max-width: 600px) { @media screen and (max-width: 600px) {
.blocks { .blocks {
-webkit-column-count: 1; -webkit-column-count: 2;
-moz-column-count: 1; -moz-column-count: 2;
column-count: 1; column-count: 2;
} }
body > nav span { body > nav span {
display: none; display: none;
@ -732,6 +697,11 @@ fieldset input {
} }
@media screen and (max-width: 350px) { @media screen and (max-width: 350px) {
.blocks {
-webkit-column-count: 1;
-moz-column-count: 1;
column-count: 1;
}
.browse .actions { .browse .actions {
text-align: center; text-align: center;
} }

View File

@ -1,6 +1,6 @@
//go:generate go get github.com/jteeuwen/go-bindata //go:generate go get github.com/jteeuwen/go-bindata
//go:generate go install github.com/jteeuwen/go-bindata/go-bindata //go:generate go install github.com/jteeuwen/go-bindata/go-bindata
//go:generate go-bindata -prefix assets/dist -pkg assets -o routes/assets/assets.go assets/dist/... //go:generate go-bindata -debug -prefix assets/dist -pkg assets -o routes/assets/assets.go assets/dist/...
// Package hugo makes the bridge between the static website generator Hugo // Package hugo makes the bridge between the static website generator Hugo
// and the webserver Caddy, also providing an administrative user interface. // and the webserver Caddy, also providing an administrative user interface.