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

Commit

Permalink
add prism as dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
Kikobeats committed Nov 15, 2015
1 parent f150cdc commit 2f8aaf5
Show file tree
Hide file tree
Showing 6 changed files with 287 additions and 77 deletions.
17 changes: 17 additions & 0 deletions assets/js/src/prism.js

Large diffs are not rendered by default.

131 changes: 69 additions & 62 deletions assets/scss/modules/_global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,20 @@
html {
height: 100%;
max-height: 100%;

font-size: $unit;

&.expanded {
overflow-y: hidden;
}
}
html, body {
html,
body {
height: 100%;
}
body {
font-family: $sans-font;

color: $gray-darker;
}
mark {
Expand All @@ -27,58 +30,74 @@ mark {
::scrollbar {
display: none;
}

hr {
border: none;
}

// ------------------------------
// TYPOGRAPHY
// ------------------------------

a {
position: relative;

transition: all $aside-animation-time;
text-decoration: none;

color: $link-color;

&:hover {
color: $hover-color;
}
}
h1, h2, h3, h4, h5, h5 {
h1,
h2,
h3,
h4,
h5,
h5 {
font-family: $serif-font;
-webkit-font-smoothing: antialiased;
font-weight: lighter;

color: $gray-darkest;
}
h1 {
margin: $margin-h1 0;

font-size: $font-h1;
line-height: 3rem;
}
h2 {
margin: $margin-h2 0;

font-size: $font-h2;
}
h3 {
margin: $margin-h3 0;

font-size: $font-h3;
}
h4 {
margin: $margin-h4 0;

font-size: $font-h4;
}
h5 {
margin: $margin-h5 0;

font-size: $font-h5;
}
h6 {
margin: $margin-h6 0;

font-size: $font-h6;
}
p {
margin-bottom: 1.3rem;
line-height: 1.7rem;

> code {
@include inline-code-style;
}
line-height: 1.7rem;
}
strong {
font-weight: bold;
Expand All @@ -89,11 +108,13 @@ em {
blockquote {
> p {
margin: 2.5rem -3rem;

font-family: $quote-font;
font-size: 1.2rem;
-webkit-font-smoothing: antialiased;
font-style: italic;
line-height: 1.4;

text-align: center;
letter-spacing: .01rem;
word-wrap: break-word;
Expand All @@ -103,14 +124,17 @@ blockquote {
// BASIC STYLING
// ------------------------------

ol, ul {
ol,
ul {
margin: 0 0 1.3rem 2.5rem;

li {
margin: 0 0 .2rem 0;

line-height: 1.6rem;
}
ol, ul {
ol,
ul {
margin: .1rem 0 .2rem 2rem;
}
}
Expand All @@ -120,64 +144,35 @@ ol {
ul {
list-style-type: disc;
}
li > code {
@include inline-code-style;
}
pre {
padding: 1rem 2.5%;
margin-bottom: 1.3rem;
font-family: $code-font;
font-size: .9rem;
font-weight: $font-weight-normal;
line-height: 1.3rem;
word-wrap: break-word;
color: $gray-dark;
border: 1px solid #d9d9d9;
border-radius: 3px;

> code {
font-family: $code-font;
font-size: .85rem;
color: $gray-dark;
}
}
code:hover, pre:hover {
color: $gray-darkest;
}

.block-heading {
position: relative;
bottom: -15px;

font-size: .8rem;
font-weight: bold;

text-align: center;
letter-spacing: 1px;
text-transform: uppercase;

@include column(12);
}
.label {
// position: relative;
// display: inline-block;
padding: 8px 18px 9px;
// color: $gray-lightest;
// text-align: center;
// background: $primary-color;
// border-radius: $border-radius;
}

// ------------------------------
// MAIN LAYOUT
// ------------------------------

.container {
position: relative;
width: $total-width - $gutter-width;
margin: 0 auto;
}
main {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 22.5rem;

padding: 2rem 3rem;

> .content {
Expand All @@ -190,18 +185,48 @@ main {
> footer {
display: block;
padding: 2em 0 0;

font-size: .7em;

color: lighten($gray-dark, 10%);
border-top: 2px solid $gray-light;
}
}
}

.divider {
margin: 10px auto;

border-top: 1px solid $divider-color;

&.long {
width: 30%;
}
&.short {
width: 15%;
}
&.post {
width: 30%;
margin: 1.7rem 0;

border-top: 1px solid $gray-light;
}
}

.container {
position: relative;

width: $total-width - $gutter-width;
margin: 0 auto;
}

.copyright {
display: block;
margin-bottom: .7em;

a {
text-decoration: underline;

color: lighten($gray-dark, 5%);

&:hover {
Expand All @@ -214,24 +239,6 @@ main {
width: 1em !important;
height: 1em !important;
margin: 0 .05em 0 .1em !important;
vertical-align: -.1em !important;
}
.divider {
margin: 10px auto;
border-top: 1px solid $divider-color;

&.long {
width: 30%;
}
&.short {
width: 15%;
}
&.post {
width: 30%;
margin: 1.7rem 0;
border-top: 1px solid $gray-light;
}
}
hr {
border: none;
vertical-align: -.1em !important;
}
Loading

2 comments on commit 2f8aaf5

@jloh
Copy link
Contributor

@jloh jloh commented on 2f8aaf5 Nov 15, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to move prism.js into a separate file that can be included optionally? I already include Prism.js outside of uno-zen and use plugins that aren't included in the version you include. I don't know if by adding them again will cause errors.

@Kikobeats
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I want to provide a prismjs experience by default...

I think that can be simple for your fork: paste your prism code into js/css files, have to be enough!

Please sign in to comment.