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

Commit

Permalink
WIP – refactored and delete unnecessary code
Browse files Browse the repository at this point in the history
  • Loading branch information
Kikobeats committed Feb 21, 2015
1 parent db930bb commit a3fad93
Show file tree
Hide file tree
Showing 11 changed files with 52 additions and 88 deletions.
2 changes: 1 addition & 1 deletion assets/css/uno.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/src/__init.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

$ ->
window.Uno = Uno =
version: '2.0'
version: '2.0.0'

cover:
width: -> $(".cover").width()
Expand Down
2 changes: 1 addition & 1 deletion assets/js/src/cover.coffee
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"use strict"
'use strict'

$ ->
el = document.body
Expand Down
4 changes: 2 additions & 2 deletions assets/js/src/search.coffee
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"use strict"
'use strict'

showSearch = ->
$(".content-wrapper__inner").hide()
Expand All @@ -10,7 +10,7 @@ hideSearch = ->
$('#search-results').css "padding-top", "0"
$('#search-results').css "margin-bottom", "0"

$(document).ready ->
$ ->
$("#search-field").ghostHunter
results : "#search-results"
zeroResultsInfo : false
Expand Down
2 changes: 1 addition & 1 deletion assets/js/uno.js

Large diffs are not rendered by default.

32 changes: 11 additions & 21 deletions assets/scss/components/_loading.scss
Original file line number Diff line number Diff line change
@@ -1,34 +1,24 @@
// more in http://github.hubspot.com/pace/docs/welcome/

.pace {
-webkit-pointer-events: none;
pointer-events: none;

-webkit-user-select: none;
-moz-user-select: none;
user-select: none;
-webkit-pointer-events: none;
}
.pace.pace-inactive .pace-progress {

.pace-inactive {
display: none;
}

.pace .pace-progress {
background: $primary-color;
position: fixed;
top: 0;
right: 0;
z-index: 2000;
width: 5rem;
height: 5rem;
-webkit-transform: translate3d(0, 0, 0) !important;
-ms-transform: translate3d(0, 0, 0) !important;
transform: translate3d(0, 0, 0) !important;
}
.pace .pace-progress:after {
position: absolute;
top: 0;
right: .5rem;
display: block;
font-family: "Helvetica Neue", sans-serif;
font-size: 5rem;
font-weight: 100;
line-height: 1;
color: rgba(darken($gray, 2%), .7);
text-align: right;
content: attr(data-progress-text);
right: 100%;
width: 100%;
height: 2px;
}
7 changes: 2 additions & 5 deletions assets/scss/components/_post.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,13 @@
&.meta {
margin: .7em 0;
font-size: .85rem;
color: darken($gray, 2%);
color: $gray;
}
&.tags {
font-size: .85em;
color: darken($gray, 2%);
a {
padding: .166666666666667rem .25rem;
font-size: .3rem;
color: darken($primary-color,
100%);
color: darken($primary-color, 100%);
color: white;
text-transform: uppercase;
background-color: rgba($primary-color,
Expand Down
81 changes: 29 additions & 52 deletions assets/scss/modules/_global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -116,61 +116,39 @@ ol {
ul {
list-style-type: disc;
}
code {
padding: .1em .4em;
font-family: Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;
font-size: .85em;
color: #999;
text-shadow: none;
background: 0 0;
border: 1.5px solid #d9d9d9;
border-radius: 3px;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}

pre {
padding: 1em 2.5%;
margin-bottom: 1.3em;
font-family: Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;
font-size: .9em;
font-weight: 400;
line-height: 1.3em;
color: #999;
color: $gray-dark;
word-wrap: break-word;
background: 0 0;
border: 1px solid #d9d9d9;
border-radius: 3px;

> code {
padding: 0;
font-family: Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;
font-size: .85em;
color: $gray-dark;
text-shadow: none;
background: 0 0;
border: none;
border-radius: 3px;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
}
pre code {
padding: 0;
background: 0 0;
border: none;
}

code:hover,
pre:hover {
color: $gray-darkest;
}
// .date,
// .time,
// .author,
// .tags {
// font-size: .85em;
// color: darken($gray, 2%);
// a {
// padding: .166666666666667rem .25rem;
// font-size: .3rem;
// color: darken($primary-color, 100%);
// color: white;
// text-transform: uppercase;
// background-color: rgba($primary-color, .7);
// border-radius: .25rem;
// &:hover {
// background-color: rgba($primary-color, 1);
// }
// }
// }

.intro {
font-family: $serif-font;
font-size: 1.2em;
Expand Down Expand Up @@ -213,19 +191,19 @@ pre:hover {
bottom: 0;
left: 400px;
padding: 40px 5%;
> .content {
padding: 50px 0;
margin: 0 10%;
> footer {
display: block;
padding: 2em 0 0;
font-size: .7em;
color: lighten($gray-dark, 10%);
border-top: 2px solid $gray-light;
}
}
}
.content {
padding: 50px 0;
margin: 0 10%;
}
.footer {
display: block;
padding: 2em 0 0;
font-size: .7em;
color: lighten($gray-dark, 10%);
border-top: 2px solid $gray-light;
}
.footer__copyright {
.copyright {
display: block;
margin-bottom: .7em;
a {
Expand All @@ -237,7 +215,6 @@ pre:hover {
}
}
}

// ------------------------------
// DIVIDERS
// ------------------------------
Expand Down
2 changes: 1 addition & 1 deletion default.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
{{> aside}}

<article class="main">
<section id="results"></section>
<section id="search-results"></section>
<section class="content">
{{{body}}}
{{> footer}}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "uno-zen",
"description": "Minimalist and Elegant theme for Ghost",
"version": "1.3.2",
"version": "2.0.0",
"author": {
"name": "Kiko Beats",
"url": "https://github.com/kikobeats"
Expand Down
4 changes: 2 additions & 2 deletions partials/footer.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<footer class="footer">
<span class="footer__copyright">
<footer>
<span class="copyright">
&copy; {{date format="YYYY"}}. All rights reserved. Built with Ghost + Uno Zen theme.
</span>
</footer>

0 comments on commit a3fad93

Please sign in to comment.