Skip to content

Commit

Permalink
package.json cleanup, use npm package dependencies (instead of github…
Browse files Browse the repository at this point in the history
…), adjustments to latest changes in the typography avalanche package (separate headline styling component)
  • Loading branch information
maoberlehner committed Mar 6, 2016
1 parent 27be649 commit 0ec8d6c
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 38 deletions.
2 changes: 1 addition & 1 deletion assets/style.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 14 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,19 @@
"name": "avalanchesass_mdcss_theme",
"description": "mdcss theme for avalanche",
"keywords": [
"mdcss",
"avalanchesass-package",
"mdcss-theme"
],
"version": "1.0.0",
"author": "Markus Oberlehner",
"homepage": "https://github.com/avalanchesass/avalanchesass_mdcss_theme",
"homepage": "https://github.com/avalanchesass/avalanche_mdcss_theme",
"license": "GPL v2",
"repository": {
"type": "git",
"url": "https://github.com/avalanchesass/avalanchesass_mdcss_theme"
},
"bugs": {
"url": "https://github.com/avalanchesass/avalanchesass_mdcss_theme/issues"
},
"dependencies": {
"avalanchesass_function_breakpointmax": "avalanchesass/avalanche_function_breakpointmax#dev-3.0.0",
"avalanchesass_function_map_get_deep": "avalanchesass/avalanche_function_map_get_deep#dev-3.0.0",
"avalanchesass_base_box_sizing_reset": "avalanchesass/avalanche_base_box_sizing_reset#dev-3.0.0",
"avalanchesass_base_typography": "avalanchesass/avalanche_base_typography#dev-3.0.0",
"avalanchesass_function_breakpointmax": "^3.0.0",
"avalanchesass_function_map_get_deep": "^3.0.0",
"avalanchesass_base_box_sizing_reset": "^3.0.0",
"avalanchesass_base_typography": "^3.0.0",
"avalanchesass_component_hn": "^3.0.0",
"ejs": "^2.4.1",
"object-assign": "^4.0.1"
},
Expand All @@ -36,6 +30,13 @@
"gulp-sass": "^2.1.0",
"normalize-scss": "^4.0.3"
},
"repository": {
"type": "git",
"url": "https://github.com/avalanchesass/avalanche_mdcss_theme"
},
"bugs": {
"url": "https://github.com/avalanchesass/avalanche_mdcss_theme/issues"
},
"engines": {
"iojs": ">=2.0.0",
"node": ">=0.12.0"
Expand Down
23 changes: 0 additions & 23 deletions scss/_variable.scss
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,6 @@ section: variable_typography
<div style="font-size: #{map-get($font-sizes, xxxl)};">map-get($font-sizes, xxxl)</div>
*/

$font-sizes: map-merge($font-sizes, (
h1: map-get($font-sizes, xxxl),
h2: map-get($font-sizes, xxl),
h3: map-get($font-sizes, xl),
h4: map-get($font-sizes, l),
h5: map-get($font-sizes, m),
h6: map-get($font-sizes, m),
));

/*---
title: Fonts
name: variable_typography_fonts
Expand Down Expand Up @@ -183,20 +174,6 @@ $fonts: (
ultra-bold: 900,
),
),
b: (
family: "'Helvetica Neue', sans-serif",
weights: (
thin: 100,
extra-light: 200,
light: 300,
normal: 400,
medium: 500,
semi-bold: 600,
bold: 700,
extra-bold: 800,
ultra-bold: 900,
),
),
);

@each $-font-data in $fonts {
Expand Down
1 change: 1 addition & 0 deletions scss/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
@import 'avalanchesass_base_typography';
@import 'base/*.scss';

@import 'avalanchesass_component_hn';
@import 'component/*.scss';
2 changes: 1 addition & 1 deletion template.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
children.forEach(function (child) { %>
<section<% if (child.name) { %> id="<%= child.name %>"<% } %> class="c-section">
<% if (child.title) { %><%- '<h' + depth + '>' %><%= child.title %><%- '</h' + depth + '>' %><% } %>
<% if (child.title) { %><%- '<h' + depth + ' class="c-h' + depth + '">' %><%= child.title %><%- '</h' + depth + '>' %><% } %>
<div class="c-section__inner">
<%- child.content %>
<% if (child.children) sections(child.children, depth + 1) %>
Expand Down

0 comments on commit 0ec8d6c

Please sign in to comment.