From 6d8224517d075e39852946c80f0824388a56e41f Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Tue, 17 Mar 2015 22:35:08 -0500 Subject: [PATCH] sassy --- gulpfile.js | 20 +- package.json | 1 + src/components/button/_button.scss | 5 + .../tabbar/{tabbar.scss => _tabbar.scss} | 0 src/core-styles/_globals.scss | 0 src/core-styles/_includes.scss | 3 + src/core-styles/_mixins.scss | 0 src/core-styles/_normalize.scss | 277 ++++++++++++++++++ src/core-styles/_scaffolding.scss | 4 + src/core-styles/_typography.scss | 57 ++++ src/core-styles/ionic.scss | 20 ++ 11 files changed, 385 insertions(+), 2 deletions(-) create mode 100644 src/components/button/_button.scss rename src/components/tabbar/{tabbar.scss => _tabbar.scss} (100%) create mode 100644 src/core-styles/_globals.scss create mode 100644 src/core-styles/_includes.scss create mode 100644 src/core-styles/_mixins.scss create mode 100644 src/core-styles/_normalize.scss create mode 100644 src/core-styles/_scaffolding.scss create mode 100644 src/core-styles/_typography.scss create mode 100644 src/core-styles/ionic.scss diff --git a/gulpfile.js b/gulpfile.js index f357b002b5..180e70e3c1 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -10,6 +10,7 @@ var plumber = require('gulp-plumber'); var rename = require('gulp-rename'); var traceur = require('gulp-traceur'); var lazypipe = require('lazypipe'); +var sass = require('gulp-sass'); var config = { dist: 'dist', @@ -46,6 +47,21 @@ gulp.task('watch', ['default'], function () { console.log('Serving `dist` on http://localhost:' + port); }); +gulp.task('sass-watch', ['sass'], function () { + gulp.watch('src/**/*.scss', ['sass']); +}); + +gulp.task('sass', function(done) { + gulp.src('src/core-styles/ionic.scss') + .pipe(sass({ + onError: function(err) { + console.log(err); + } + })) + .pipe(gulp.dest('dist/css')) + .on('end', done); +}); + gulp.task('clean', function(done) { del([config.dist], done); }); @@ -102,12 +118,12 @@ gulp.task('angular2', function () { 'node_modules/angular2/es6/prod/*.es6', 'node_modules/angular2/es6/prod/src/**/*.es6' ], { - base: 'node_modules/angular2/es6/prod' + base: 'node_modules/angular2/es6/prod' }) .pipe(rename(function(path){ path.dirname = 'angular2/' + path.dirname; //this is not ideal... but not sure how to change angular's file structure path.extname = ''; //hack, see: https://github.com/sindresorhus/gulp-traceur/issues/54 - })) + })) .pipe(traceur({ modules: 'instantiate', moduleName: true})) .pipe(concat('angular2.js')) .pipe(gulp.dest('dist/lib')); diff --git a/package.json b/package.json index 96ab2e6f1c..03b9f64baa 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "gulp-if": "^1.2.5", "gulp-plumber": "^1.0.0", "gulp-rename": "~1.2.0", + "gulp-sass": "^1.3.3", "gulp-traceur": "0.16.*", "lazypipe": "^0.2.2", "open": "0.0.5", diff --git a/src/components/button/_button.scss b/src/components/button/_button.scss new file mode 100644 index 0000000000..bf0d07faca --- /dev/null +++ b/src/components/button/_button.scss @@ -0,0 +1,5 @@ + +.button { + background: gray; + font-weight: bold; +} diff --git a/src/components/tabbar/tabbar.scss b/src/components/tabbar/_tabbar.scss similarity index 100% rename from src/components/tabbar/tabbar.scss rename to src/components/tabbar/_tabbar.scss diff --git a/src/core-styles/_globals.scss b/src/core-styles/_globals.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/core-styles/_includes.scss b/src/core-styles/_includes.scss new file mode 100644 index 0000000000..69bb291f96 --- /dev/null +++ b/src/core-styles/_includes.scss @@ -0,0 +1,3 @@ + +$include-button: true !default; +$include-tabbar: true !default; diff --git a/src/core-styles/_mixins.scss b/src/core-styles/_mixins.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/core-styles/_normalize.scss b/src/core-styles/_normalize.scss new file mode 100644 index 0000000000..bc7be55cba --- /dev/null +++ b/src/core-styles/_normalize.scss @@ -0,0 +1,277 @@ +/*! normalize.css v3.0.2 | MIT License | github.com/necolas/normalize.css */ + +// 1. Apply border-box so it can be inherited +// 2. Prevent iOS text size adjust after orientation change, without disabling +// user zoom. +html { + box-sizing: border-box; + -ms-text-size-adjust: 100%; // 2 + -webkit-text-size-adjust: 100%; // 2 +} +*, +*:before, +*:after { + box-sizing: inherit; +} + + +// HTML5 display definitions +// ========================================================================== + +// 1. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. +audio, +canvas, +progress, +video { + vertical-align: baseline; // 1 +} + +// Prevent modern browsers from displaying `audio` without controls. +// Remove excess height in iOS 5 devices. +audio:not([controls]) { + display: none; + height: 0; +} + +// Address `[hidden]` styling not present in IE 8/9/10. +// Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. +[hidden], +template { + display: none; +} + + +// Links +// ========================================================================== + +// Remove the gray background color from active links in IE 10. +a { + background-color: transparent; +} + +// Improve readability when focused and also mouse hovered in all browsers. +a:active, +a:hover { + outline: 0; +} + + +// Text-level semantics +// ========================================================================== + +// Address styling not present in IE 8/9/10/11, Safari, and Chrome. +abbr[title] { + border-bottom: 1px dotted; +} + +// Address style set to `bolder` in Firefox 4+, Safari, and Chrome. +b, +strong { + font-weight: bold; +} + +// Address styling not present in Safari and Chrome. +dfn { + font-style: italic; +} + +// Address variable `h1` font-size and margin within `section` and `article` +// contexts in Firefox 4+, Safari, and Chrome. +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +// Address inconsistent and variable font size in all browsers. +small { + font-size: 80%; +} + +// Prevent `sub` and `sup` affecting `line-height` in all browsers. +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} + + +// Embedded content +// ========================================================================== + +// Remove border when inside `a` element in IE 8/9/10. +img { + border: 0; +} + +// Correct overflow not hidden in IE 9/10/11. +svg:not(:root) { + overflow: hidden; +} + + +// Grouping content +// ========================================================================== + +// Address margin not present in IE 8/9 and Safari. +figure { + margin: 1em 40px; +} + +// Address differences between Firefox and other browsers. +hr { + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; +} + +// Contain overflow in all browsers. +pre { + overflow: auto; +} + +// Address odd `em`-unit font size rendering in all browsers. +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; +} + + +// Forms +// ========================================================================== + +// Known limitation: by default, Chrome and Safari on OS X allow very limited +// styling of `select`, unless a `border` property is set. + +// 1. Correct color not being inherited. +// Known issue: affects color of disabled elements. +// 2. Correct font properties not being inherited. +// 3. Address margins set differently in Firefox 4+, Safari, and Chrome. +// + +button, +input, +optgroup, +select, +textarea { + color: inherit; // 1 + font: inherit; // 2 + margin: 0; // 3 +} + +// Address `overflow` set to `hidden` in IE 8/9/10/11. +button { + overflow: visible; +} + +// Address inconsistent `text-transform` inheritance for `button` and `select`. +// All other form control elements do not inherit `text-transform` values. +// Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. +// Correct `select` style inheritance in Firefox. +button, +select { + text-transform: none; +} + +// 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` +// and `video` controls. +// 2. Correct inability to style clickable `input` types in iOS. +// 3. Improve usability and consistency of cursor style between image-type +// `input` and others. +button, +html input[type="button"], // 1 +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; // 2 + cursor: pointer; // 3 +} + +// Re-set default cursor for disabled elements. +button[disabled], +html input[disabled] { + cursor: default; +} + +// +// Remove inner padding and border in Firefox 4+. +// + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +// Address Firefox 4+ setting `line-height` on `input` using `!important` in +// the UA stylesheet. +input { + line-height: normal; +} + +//t you don't attempt to style these elements. +// Firefox's implementation doesn't respect box-sizing, padding, or width. +// 1. Address box sizing set to `content-box` in IE 8/9/10. +// 2. Remove excess padding in IE 8/9/10. +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; // 1 + padding: 0; // 2 +} + +// Fix the cursor style for Chrome's increment/decrement buttons. For certain +// `font-size` values of the `input`, it causes the cursor style of the +// decrement button to change from `default` to `text`. +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +// 1. Address `appearance` set to `searchfield` in Safari and Chrome. +// 2. Address `box-sizing` set to `border-box` in Safari and Chrome +// (include `-moz` to future-proof). +input[type="search"] { + -webkit-appearance: textfield; // 1 + -moz-box-sizing: content-box; + -webkit-box-sizing: content-box; // 2 + box-sizing: content-box; +} + +// Remove inner padding and search cancel button in Safari and Chrome on OS X. +// Safari (but not Chrome) clips the cancel button when the search input has +// padding (and `textfield` appearance). +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +// Remove default vertical scrollbar in IE 8/9/10/11. +textarea { + overflow: auto; +} + + +// Tables +// ==========================================================================// + +// Remove most spacing between table cells. +table { + border-collapse: collapse; + border-spacing: 0; +} + +td, +th { + padding: 0; +} diff --git a/src/core-styles/_scaffolding.scss b/src/core-styles/_scaffolding.scss new file mode 100644 index 0000000000..c9ce8e351b --- /dev/null +++ b/src/core-styles/_scaffolding.scss @@ -0,0 +1,4 @@ + +[ionic-app] { + +} diff --git a/src/core-styles/_typography.scss b/src/core-styles/_typography.scss new file mode 100644 index 0000000000..55fd280d63 --- /dev/null +++ b/src/core-styles/_typography.scss @@ -0,0 +1,57 @@ + +// Typography +// -------------------------------------------------- + +$font-family-sans-serif: "Helvetica Neue", "Roboto", sans-serif !default; +$font-family-light-sans-serif: "HelveticaNeue-Light", "Roboto-Light", sans-serif-light !default; +$font-family-serif: serif !default; +$font-family-monospace: monospace !default; + +$font-family-base: $font-family-sans-serif !default; +$font-size-base: 14px !default; +$font-size-large: 18px !default; +$font-size-small: 11px !default; + +$line-height-base: 1.428571429 !default; // 20/14 +$line-height-computed: floor($font-size-base * $line-height-base) !default; // ~20px + + + +// Headings +// ------------------------- + +$headings-font-family: $font-family-base !default; +$headings-font-weight: 500 !default; +$headings-line-height: 1.2 !default; + +h1, h2, h3, h4, h5, h6, +.h1, .h2, .h3, .h4, .h5, .h6 { + font-weight: $headings-font-weight; + font-family: $headings-font-family; + line-height: $headings-line-height; +} + +h1, .h1, +h2, .h2, +h3, .h3 { + margin-top: $line-height-computed; + margin-bottom: ($line-height-computed / 2); + + &:first-child { + margin-top: 0; + } +} + +h4, .h4, +h5, .h5, +h6, .h6 { + margin-top: ($line-height-computed / 2); + margin-bottom: ($line-height-computed / 2); +} + +h1, .h1 { font-size: floor($font-size-base * 2.60); } // ~36px +h2, .h2 { font-size: floor($font-size-base * 2.15); } // ~30px +h3, .h3 { font-size: ceil($font-size-base * 1.70); } // ~24px +h4, .h4 { font-size: ceil($font-size-base * 1.25); } // ~18px +h5, .h5 { font-size: $font-size-base; } +h6, .h6 { font-size: ceil($font-size-base * 0.85); } // ~12px diff --git a/src/core-styles/ionic.scss b/src/core-styles/ionic.scss new file mode 100644 index 0000000000..2fe88c1da1 --- /dev/null +++ b/src/core-styles/ionic.scss @@ -0,0 +1,20 @@ +@charset "UTF-8"; + + +// Globals +@import + "mixins", + "globals", + "includes"; + + +// Core +@import + "normalize", + "scaffolding", + "typography"; + + +// Components (Conditional Includes) +@if $include-button { @import "../components/button/button" } +@if $include-tabbar { @import "../components/tabbar/tabbar" }