Skip to content
This repository has been archived by the owner on May 12, 2019. It is now read-only.

Commit

Permalink
Merge pull request #135 from Kikobeats/beta
Browse files Browse the repository at this point in the history
2.6.0: Some Improvements
  • Loading branch information
Kikobeats committed Dec 3, 2015
2 parents 997cfa0 + 5a911c6 commit ce0ac71
Show file tree
Hide file tree
Showing 24 changed files with 581 additions and 349 deletions.
24 changes: 19 additions & 5 deletions .bumpedrc
Original file line number Diff line number Diff line change
@@ -1,18 +1,32 @@
files: [
"package.json"
"bower.json"
'package.json'
'bower.json'
]

plugins:

prerelease:

'Linting config files':
plugin: 'bumped-finepack'

postrelease:

'Compile browser version':
'Compiling browser version':
plugin: 'bumped-terminal'
command: 'gulp build'

'Generating CHANGELOG file':
plugin: 'bumped-changelog'

'Commit the new version':
'Commiting new version':
plugin: 'bumped-terminal'
command: 'git add CHANGELOG.md bower.json package.json assets/css/uno-zen.css assets/js/uno-zen.js && git commit -m "$newVersion releases" && git push origin master'

'Publishing tag at Github':
plugin: 'bumped-terminal'
command: 'git tag $newVersion && git push origin $newVersion'

'Publishing at NPM':
plugin: 'bumped-terminal'
command: 'git add . && git commit -m "$newVersion releases"'
command: 'npm publish'
2 changes: 1 addition & 1 deletion assets/css/uno-zen.css

Large diffs are not rendered by default.

21 changes: 18 additions & 3 deletions assets/js/src/__init.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,28 @@ $ ->
else postDateInDays = "#{postDateInDays} days ago"

$(this).html(postDateInDays)
$(this).mouseover -> $(this).html(postDate)
$(this).mouseout -> $(this).html(postDateInDays)
DateInDays '.post.meta > time'
$(this).mouseover -> $(this).html postDate
$(this).mouseout -> $(this).html postDateInDays

selectorDate = if Uno.is 'home' then '#posts-list time' else '.post.meta > time'
DateInDays selectorDate

device: ->
w = window.innerWidth
h = window.innerHeight
return 'mobile' if (w <= 480)
return 'tablet' if (w <= 1024)
'desktop'

parseEmojis: ->
twemoji.parse document.body,
folder: 'svg'
ext: '.svg'
callback: (icon, options, variant) ->
switch icon
# © copyright
# ® registered trademark
when 'a9', 'ae', '2122'
# ™ trademark
return false
''.concat options.base, options.size, '/', icon, options.ext
3 changes: 2 additions & 1 deletion assets/js/src/cover.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
$ ->

isOpen = location.hash is '#open'
openButton = window.open_button or '.nav-posts > a'

_animate = ->
setTimeout(->
Expand All @@ -16,7 +17,7 @@ $ ->
$('#menu-button').click ->
$('.cover, main, #menu-button, html').toggleClass 'expanded'

$('.nav-blog > a, #avatar-link').click (event) ->
$("#{openButton}, #avatar-link").click (event) ->
if Uno.is 'page', 'home'
event.preventDefault()
location.hash = if location.hash is '' then '#open' else ''
Expand Down
1 change: 1 addition & 0 deletions assets/js/src/main.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ $ ->
el.dataset.page = Uno.context()
el.dataset.device = Uno.device()

Uno.parseEmojis()
Uno.readTime()
FastClick.attach el unless Uno.is 'device', 'desktop'

Expand Down
17 changes: 17 additions & 0 deletions assets/js/src/prism.js

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions assets/js/uno-zen.js
100755 → 100644

Large diffs are not rendered by default.

97 changes: 57 additions & 40 deletions assets/scss/components/_media-queries.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,90 +6,97 @@
main {
padding: 2.5rem 11rem;
}

.content {
margin: 0 7rem;
}
}

// ------------------------------
// < 1024px (Tablet)
// ------------------------------

@media all and (max-width:1024px) {
/* disabling element, too much information*/

.pace,
span.post.tags,
.post.reading-time,
.post.related {
display: none;
}

#search-container {
display: none !important;
}
}/* Enable element special for little devices */

/* Enable element special for little devices */
#profile-resume {
display: inherit;
}
}/* off canvas */

/* off canvas */
#menu-button {
position: fixed;
top: .5rem;
left: 13.5rem;
z-index: 2;

display: block;

transition: all $aside-animation-time;

&.expanded {
left: .85rem;
}

> a {
> i {
color: $hover-color;
}
}
}

.cover {
width: 16rem;

transition: width $aside-animation-time $aside-animation,
transform $aside-animation-time $aside-animation,
border-right $aside-animation-time*1.8 $aside-animation,
box-shadow $aside-animation-time*1.8 $aside-animation;
transform $aside-animation-time $aside-animation,
border-right $aside-animation-time * 1.8 $aside-animation,
box-shadow $aside-animation-time * 1.8 $aside-animation;
transform: translate3d(-16rem, 0, 0);

border-right: none;
border-right: 0;
box-shadow: none;

&.expanded {
width: 16rem;

transform: translate3d(0, 0, 0);

border-right: 1px solid $gray;
box-shadow: 11px -10px 1px -9px $gray-light;
}

&.animated {
transition: all $aside-animation-time;
}
}

.profile {
width: 100%;
height: 100%;
max-width: 100%;

&.contact {
> nav {
padding: 0;
}
}

> a {
> img {
width: 8rem;
margin-bottom: 1rem;
}
}

> p {
display: none;
}

.divider {
display: none;
}
Expand All @@ -101,50 +108,64 @@

> a {
padding: .85rem 1.25rem;

font-size: 1rem;
}
}
}

#avatar-link {
display: inline-block;
margin-top: 4rem;
}

.navigation {
width: 100%;

&.right {
margin: 0;
}

&.left {
.links.item {
width: 100%;
}
}
}

main {
left: 0;

transition: all $aside-animation-time;
transform: translate3d(0, 0, 0);

&.expanded {
transform: translate3d(14rem, 0, 0);
}
}
}

// ------------------------------
// < 480px (Mobile)
// ------------------------------

@media all and (max-width:480px) {
.btn {
display: block;
margin-bottom: .4em;
.post .tags,
.post .meta > time,
.pagination > span {
display: none;
}

main {
padding: 1rem 0;
}

.btn {
display: block;
margin-bottom: .4em;
}

.mayday {
width: auto;

> h2 {
font-size: 20px;
line-height: 25px;
Expand All @@ -167,32 +188,28 @@
#panic-button {
margin-bottom: 1rem;
}
#post-title {
margin: 2.5rem 0;
}

.post .tags,
.post .meta > time,
.pagination > span {
display: none;
.posts.newer,
.posts.older {
margin: 1rem 0;
}

.post {
&.newer,
&.older {
padding: 1rem;
}
&.newer {
margin: 0 0 1.2rem;
}
&.older {
margin: 0 0 10px;
#posts-list{
margin: 3rem 0;
text-align: center;
> li {
margin-bottom: 2rem;

> time {
display: block;
float: none;
letter-spacing: 1px;
padding: 0;
}
}
}

blockquote {
> p {
margin: 2rem -1rem;
}
#post-title {
margin: 2.5rem 0;
}
}
12 changes: 3 additions & 9 deletions assets/scss/components/_page-error.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
body[data-page="error"] {
width: 100%;
height: 100%;

font-size: 1rem;
font-weight: normal;
line-height: 25px;

text-align: center;

@include background-filter;

> article {
Expand All @@ -22,28 +19,25 @@ body[data-page="error"] {
> h2 {
font-size: 24px;
line-height: 35px;

color: $gray-lightest;
text-shadow: 0 1px 1px rgba(0, 0, 0, .4);
}
}

.astro-wrap {
position: relative;

width: $astronaut-size;
height: $astronaut-size * 1.6;
margin: auto;
}

.astronaut {
position: absolute;
top: 0;
left: 0;

width: $astronaut-size;
height: $astronaut-size * 1.6;

transform: translate(0, 50px);
animation: move 10s infinite;

background: url("/assets/img/astronaut.png") center/cover no-repeat;
background: url('/assets/img/astronaut.png') center / cover no-repeat;
}
18 changes: 13 additions & 5 deletions assets/scss/components/_pagination.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
.pagination {
margin: 0 0 2.5rem;
}
.posts.index {
margin-right: 1rem;
margin-left: 1rem;

font-size: .8rem;
.posts {

color: $gray-dark;
&.index {
font-size: .8rem;
color: $gray-dark;
}

&.newer {
margin-right: 1rem;
}

&.older {
margin-left: 1rem;
}
}
Loading

0 comments on commit ce0ac71

Please sign in to comment.