1
0
mirror of https://github.com/kremalicious/blog.git synced 2024-11-13 16:45:14 +01:00

remove nib dependency

This commit is contained in:
Matthias Kretschmann 2015-08-09 18:11:26 +02:00
parent e12e800039
commit 6c53f21d6d
13 changed files with 37 additions and 36 deletions

View File

@ -40,7 +40,7 @@ a.btn
font-weight: $headings-font-weight
color: $brand-grey
text-transform: uppercase
box-shadow: 0 1px 3px rgba($brand-grey-light, .2), inset 0 1px 0 rgba(255,255,255,.7)
box-shadow: 0 1px 3px alpha($brand-grey-light, .2), inset 0 1px 0 rgba(255,255,255,.7)
&:hover,
&:focus

View File

@ -20,7 +20,7 @@ kbd
code
color: darken($code-color, 40%)
background-color: rgba($code-bg, 10%)
background-color: alpha($code-bg, 10%)
border-radius: $border-radius-base
white-space: nowrap
word-wrap: normal

View File

@ -34,7 +34,7 @@
font-size: $font-size-small
padding: ($line-height-computed/3)
background: $link-color
background: rgba($link-color, .7)
background: alpha($link-color, .7)
color: #fff
text-shadow: 0 1px 0 #000

View File

@ -7,7 +7,7 @@
.footer
@extend .textcenter
border-top: 1px solid rgba(255,255,255,.7)
box-shadow: inset 0 1px 4px rgba($brand-dark, .2)
box-shadow: inset 0 1px 4px alpha($brand-dark, .2)
.gravatar
margin-bottom: ($line-height-computed/2)

View File

@ -80,7 +80,7 @@ select[size]
-webkit-appearance: none // screw you, iOS default inset box-shadow
// Placeholder
placeholder(color $input-color-placeholder, font-size $font-size-base, line-height $line-height-base)
placeholder($input-color-placeholder)
&:hover
lighten($input-bg, 30%)
@ -89,7 +89,7 @@ select[size]
background-color: $input-bg-focus
border-color: $input-border-focus
outline: 0
placeholder(color lighten($input-color-placeholder, 25%),)
placeholder(lighten($input-color-placeholder, 25%))
// Disabled and read-only inputs
//

View File

@ -9,9 +9,6 @@
@import '../../../node_modules/normalize-css/normalize.css'
@import '../../../node_modules/normalize-opentype.css/normalize-opentype.css'
// Nib Nib
@import 'nib'
// Core variables and mixins
@import 'variables'
@import 'mixins'

View File

@ -238,3 +238,16 @@ input-size(input-height, padding-vertical, padding-horizontal, font-size, line-h
textarea&,
select[multiple]&
height: auto
// Placeholder text
/////////////////////////////////////
placeholder($color = $input-color-placeholder)
&::-moz-placeholder // Firefox
color $color
opacity 1 // Override Firefox's unusual default opacity; See https//github.com/twbs/bootstrap/pull/11526
&:-ms-input-placeholder // Internet Explorer 10+
color $color
&::-webkit-input-placeholder // Safari and Chrome
color $color

View File

@ -4,7 +4,6 @@
// kbdfun
//
@import 'nib'
@import 'variables'
kbd

View File

@ -10,7 +10,7 @@
html
font-size: 62.5%
-webkit-tap-highlight-color: rgba($link-color, .2)
-webkit-tap-highlight-color: alpha($link-color, .2)
body
background: $body-bg
@ -42,7 +42,7 @@ textarea
background-color: $page-bg
border-top: 1px solid rgba(255,255,255,.7)
border-bottom: 1px solid rgba(255,255,255,.7)
box-shadow: 0 1px 4px rgba($brand-dark, .1), 0 -1px 4px rgba($brand-dark, .2)
box-shadow: 0 1px 4px alpha($brand-dark, .1), 0 -1px 4px alpha($brand-dark, .2)
@media only screen and (min-width: 40.625em) and (min-height: 650px)
body

View File

@ -8,9 +8,7 @@
// Settings
/////////////////////////////////////
vendors = official webkit // Stylus' @keyframes settings
vendor-prefixes = webkit moz official // Nib vendor prefixes
support-for-ie = false // Nib IE 8 support
vendors = official // Stylus' @keyframes settings
// Asset Paths

View File

@ -1,11 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid" width="72" height="46" viewBox="0 0 72 46">
<defs>
<style>
.cls-1 {
fill: #015565;
fill-rule: evenodd;
}
</style>
</defs>
<path d="M72.000,25.418 L72.000,26.637 L62.213,26.637 L62.213,30.287 L71.951,30.287 L71.951,31.468 L62.213,31.468 L62.213,35.118 L70.432,35.118 L70.432,36.338 L62.213,36.338 L62.213,39.949 L67.134,39.949 L67.134,41.169 L62.213,41.169 L62.213,44.845 L61.076,44.845 L61.076,46.000 L51.915,46.000 L51.915,45.979 L14.404,45.979 C6.451,45.979 -0.004,39.460 -0.004,31.542 C-0.004,25.616 3.609,20.535 8.759,18.351 C8.708,17.970 8.641,17.595 8.641,17.203 C8.641,12.450 12.510,8.599 17.286,8.599 C20.154,8.599 22.673,10.000 24.246,12.137 C26.900,5.051 33.742,-0.004 41.782,-0.004 C47.709,-0.004 52.977,2.744 56.407,7.018 C55.332,7.015 54.659,7.039 54.659,7.039 L52.465,7.107 L52.465,7.304 L56.134,7.304 L56.134,7.039 L57.358,7.039 L57.358,7.304 L61.027,7.304 L61.027,8.599 L57.358,8.599 L57.358,10.924 L61.027,10.924 L61.027,8.648 L62.213,8.648 L62.213,10.924 L63.445,10.924 L63.445,12.143 L62.213,12.143 L62.213,15.755 L65.779,15.755 L65.779,16.937 L62.213,16.937 L62.213,20.586 L70.432,20.586 L70.432,21.806 L62.213,21.806 L62.213,25.418 L72.000,25.418 ZM48.388,17.959 L48.290,19.421 L46.723,19.421 L46.723,20.586 L51.240,20.586 L51.240,16.937 L50.132,16.937 L50.152,17.861 L48.388,17.959 ZM51.240,15.755 L51.240,12.143 L50.031,12.143 L50.107,15.755 L51.240,15.755 ZM50.005,10.924 L51.240,10.924 L51.240,8.599 L49.956,8.599 L50.005,10.924 ZM50.071,35.118 L51.240,35.118 L51.240,31.468 L49.893,31.468 C49.925,32.186 49.975,33.267 50.054,34.923 C50.057,34.989 50.067,35.053 50.071,35.118 ZM49.845,30.287 C49.839,30.075 49.849,30.202 49.854,30.287 L51.240,30.287 L51.240,26.637 L48.404,26.637 L48.582,30.287 L49.845,30.287 ZM51.240,36.338 L50.202,36.338 C50.404,37.692 50.780,38.969 51.240,40.125 L51.240,36.338 ZM48.290,24.296 L48.345,25.418 L51.240,25.418 L51.240,21.806 L46.723,21.806 L46.723,24.003 L48.290,24.296 ZM56.134,8.599 L52.465,8.599 L52.465,10.924 L56.134,10.924 L56.134,8.599 ZM56.134,12.143 L52.465,12.143 L52.465,15.755 L56.134,15.755 L56.134,12.143 ZM56.134,16.937 L52.465,16.937 L52.465,20.586 L56.134,20.586 L56.134,16.937 ZM56.134,21.806 L52.465,21.806 L52.465,25.418 L56.134,25.418 L56.134,21.806 ZM56.134,26.637 L52.465,26.637 L52.465,30.287 L56.134,30.287 L56.134,26.637 ZM56.134,31.468 L52.465,31.468 L52.465,35.118 L56.134,35.118 L56.134,31.468 ZM56.134,36.338 L52.465,36.338 L52.465,39.949 L56.134,39.949 L56.134,36.338 ZM56.134,41.169 L52.465,41.169 L52.465,42.686 C52.933,43.523 53.397,44.235 53.785,44.781 L56.134,44.781 L56.134,41.169 ZM61.027,12.143 L57.358,12.143 L57.358,15.755 L61.027,15.755 L61.027,12.143 ZM61.027,16.937 L57.358,16.937 L57.358,20.586 L61.027,20.586 L61.027,16.937 ZM61.027,21.806 L57.358,21.806 L57.358,25.418 L61.027,25.418 L61.027,21.806 ZM61.027,26.637 L57.358,26.637 L57.358,30.287 L61.027,30.287 L61.027,26.637 ZM61.027,31.468 L57.358,31.468 L57.358,35.118 L61.027,35.118 L61.027,31.468 ZM61.027,36.338 L57.358,36.338 L57.358,39.949 L61.027,39.949 L61.027,36.338 ZM61.027,41.169 L57.358,41.169 L57.358,44.781 L61.027,44.781 L61.027,41.169 Z" class="cls-1"/>
</svg>

Before

Width:  |  Height:  |  Size: 3.2 KiB

View File

@ -4,7 +4,7 @@ var $ = require('gulp-load-plugins')();
// manually require modules that won"t get picked up by gulp-load-plugins
var gulp = require('gulp'),
del = require('del'),
nib = require('nib'),
chalk = require('chalk'),
merge = require('merge-stream'),
pkg = require('./package.json');
@ -12,6 +12,12 @@ var gulp = require('gulp'),
// https://github.com/gulpjs/gulp/issues/355
var runSequence = require('run-sequence');
// handle errors
var onError = function(error) {
console.log(chalk.red('You fucked up:', error.message, 'on line' , error.lineNumber));
}
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
// Terminal Banner
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -128,12 +134,12 @@ gulp.task('css', function() {
src + '/_assets/styl/poststyle-2300.styl'
])
.pipe($.stylus({
use: [nib()],
'include css': true
}))
})).on('error', onError)
.pipe(gulp.dest(dist + '/assets/css/'))
.pipe($.autoprefixer({
browsers: 'last 2 versions'
}))
})).on('error', onError)
.pipe($.combineMq({ beautify: false }))
// .pipe($.uncss({
// html: [dist + '/**/*.html'],
@ -156,7 +162,7 @@ gulp.task('js-libraries', function() {
var picturefill = gulp.src('node_modules/picturefill/dist/picturefill.js');
return merge(picturefill)
.pipe($.uglify())
.pipe($.uglify()).on('error', onError)
.pipe($.rename({
suffix: '.min'
}))
@ -175,7 +181,7 @@ gulp.task('js-project', function() {
'bower_components/time-elements/time-elements.js',
src + '/_assets/js/*.js'
])
.pipe($.uglify())
.pipe($.uglify()).on('error', onError)
.pipe($.concat('kremalicious3.min.js'))
.pipe($.header(banner, {
pkg: pkg
@ -192,7 +198,7 @@ gulp.task('js', ['js-libraries', 'js-project']);
// Icons
//
gulp.task('icons', function() {
var iconset = icons.entypo
var iconset = icons.entypo;
// Iterate through the icon set array
icons.entypo.icons.forEach(function(icon, i, icons) {
@ -357,8 +363,7 @@ gulp.task('watch', function() {
gulp.task('jekyll-build', function(cb) {
runSequence(
'jekyll',
['css', 'js', 'images', 'fonts', 'media'],
'icons',
['css', 'js', 'images', 'fonts', 'media', 'icons'],
cb
);
});

View File

@ -23,6 +23,7 @@
"webcomponents.js": ">=0.7.1"
},
"devDependencies": {
"chalk": ">=1.0.0",
"del": ">=1.2.0",
"gulp": ">=3.8.0",
"gulp-autoprefixer": ">=2.3.0",
@ -46,7 +47,6 @@
"gulp-uglify": ">=1.2.0",
"gulp-uncss": ">=1.0.1",
"merge-stream": ">=0.1.7",
"nib": ">=1.0.3",
"run-sequence": ">=1.1.0",
"stylus": ">=0.45.0",
"vinyl": "^0.4.6"