Skip to content
Browse files

Merge pull request #12 from smt/v5.0.1

Upgrade to version 5.0.1
  • Loading branch information...
2 parents f5f8432 + b949600 commit 9a13deda7364ade1dea0300bb08c2de69801f57e @stephenway committed Apr 3, 2013
View
4 README.md
@@ -80,7 +80,6 @@ Imports have been branched out in this extension, additionally you can use these
@import "compass-inuit/base/smallprint";
@import "compass-inuit/base/quotes";
@import "compass-inuit/base/code";
- @import "compass-inuit/base/links";
@import "compass-inuit/base/images";
@import "compass-inuit/base/lists";
@import "compass-inuit/base/tables";
@@ -106,12 +105,11 @@ Imports have been branched out in this extension, additionally you can use these
@import "compass-inuit/objects/arrows";
@import "compass-inuit/objects/sprite";
@import "compass-inuit/objects/icon-text";
- @import "compass-inuit/objects/buttons";
+ @import "compass-inuit/objects/beautons";
@import "compass-inuit/objects/lozenges";
@import "compass-inuit/objects/rules";
@import "compass-inuit/objects/stats";
@import "compass-inuit/objects/greybox";
- @import "compass-inuit/objects/batch";
This makes it super simple to pick and choose what you want for your project.
View
4 compass-inuit.gemspec
@@ -1,7 +1,7 @@
# -*- encoding: utf-8 -*-
Gem::Specification.new do |s|
- s.version = "4.5.5.1"
- s.date = "2013-02-09"
+ s.version = "5.0.1"
+ s.date = "2013-04-03"
s.name = "compass-inuit"
s.authors = ["Stephen Way"]
s.email = ["stephencway@me.com"]
View
1 stylesheets/_compass-inuit.scss
@@ -1,3 +1,4 @@
+@import "compass-inuit/defaults";
@import "compass-inuit/generic";
@import "compass-inuit/base";
@import "compass-inuit/objects";
View
225 stylesheets/compass-inuit/_defaults.scss
@@ -0,0 +1,225 @@
+/*------------------------------------*\
+ $DEFAULTS
+\*------------------------------------*/
+/**
+ * inuit.css’ default variables. Redefine these in your `_vars.scss` file (found
+ * in the inuit.css-web-template) to override them.
+ */
+
+
+
+
+
+/*------------------------------------*\
+ $DEBUG
+\*------------------------------------*/
+/**
+ * Debug mode will visually highlight any potential markup/accessibility quirks
+ * in the browser. Set to `true` or `false`.
+ */
+$debug-mode: false!default;
+
+
+
+
+
+/*------------------------------------*\
+ $BORDER-BOX
+\*------------------------------------*/
+/**
+ * Do you want all elements to adopt `box-sizing:border-box;` as per
+ * paulirish.com/2012/box-sizing-border-box-ftw ?
+ */
+$global-border-box: true!default;
+
+
+
+
+
+/*------------------------------------*\
+ $BASE
+\*------------------------------------*/
+/**
+ * Base stuff
+ */
+$base-font-size: 16px!default;
+$base-line-height: 24px!default;
+
+/**
+ * Base font-family.
+ */
+$base-font-family: sans-serif!default;
+
+/**
+ * Default colour for objects’ borders etc.
+ */
+$base-ui-color: #ccc!default;
+
+
+
+
+
+/*------------------------------------*\
+ $RESPONSIVE
+\*------------------------------------*/
+/**
+ * Responsiveness?
+ */
+$responsive: true!default;
+
+/**
+ * Responsiveness for widescreen/high resolution desktop monitors and beyond?
+ * Note: `$responsive` variable above must be set to true before enabling this.
+ */
+$responsive-extra: false!default;
+
+/**
+ * Responsive push and pull produce a LOT of code, only turn them on if you
+ * definitely need them.
+ */
+$push: false!default;
+/**
+ * Note: `$push` variable above must be set to true before enabling these.
+ */
+$palm-push: false!default;
+$lap-push: false!default;
+$lap-and-up-push: false!default;
+$portable-push: false!default;
+$desk-push: false!default;
+
+$pull: false!default;
+/**
+ * Note: `$pull` variable above must be set to true before enabling these.
+ */
+$palm-pull: false!default;
+$lap-pull: false!default;
+$lap-and-up-pull: false!default;
+$portable-pull: false!default;
+$desk-pull: false!default;
+
+/**
+ * Tell inuit.css when breakpoints start.
+ */
+$lap-start: 481px!default;
+$desk-start: 1024px!default;
+$desk-wide-start: 1200px!default;
+
+
+
+
+
+/*------------------------------------*\
+ $FONT-SIZES
+\*------------------------------------*/
+/**
+ * Font-sizes (in pixels). Refer to relevant sections for their implementations.
+ */
+$giga-size: 96px!default;
+$mega-size: 72px!default;
+$kilo-size: 48px!default;
+
+$h1-size: 36px!default; // .alpha
+$h2-size: 30px!default; // .beta
+$h3-size: 24px!default; // .gamma
+$h4-size: 20px!default; // .delta
+$h5-size: 16px!default; // .epsilon
+$h6-size: 14px!default; // .zeta
+
+$milli-size: 12px!default;
+$micro-size: 10px!default;
+
+
+
+
+
+/*------------------------------------*\
+ $QUOTES
+\*------------------------------------*/
+/**
+ * English quote marks?
+ */
+$english-quotes: true!default;
+
+/**
+ * If you want English quotes then please do not edit these; they’re only here
+ * because Sass needs them.
+ */
+$open-quote: null;
+$close-quote: null;
+
+/**
+ * If you need non-English quotes, please alter the following values accordingly:
+ */
+@if $english-quotes != true{
+ $open-quote: \00AB;
+ $close-quote: \00BB;
+}
+
+
+
+
+
+/*------------------------------------*\
+ $BRAND
+\*------------------------------------*/
+/**
+ * Brand stuff
+ */
+$brand-color: #4a8ec2!default;
+$brand-face: "Helvetica Neue", sans-serif!default;
+
+/**
+ * How big would you like round corners to be by default?
+ */
+$brand-round: 4px!default;
+
+
+
+
+
+/*------------------------------------*\
+ $OBJECTS AND ABSTRACTIONS
+\*------------------------------------*/
+/**
+ * Which objects and abstractions would you like to use?
+ */
+$use-grids: false!default;
+$use-flexbox: false!default;
+$use-columns: false!default;
+$use-nav: false!default;
+$use-options: false!default;
+$use-pagination: false!default;
+$use-breadcrumb: false!default;
+$use-media: false!default;
+$use-marginalia: false!default;
+$use-island: false!default;
+$use-block-list: false!default;
+$use-matrix: false!default;
+$use-split: false!default;
+$use-this-or-this: false!default;
+$use-link-complex: false!default;
+$use-flyout: false!default;
+$use-arrows: false!default;
+$use-sprite: false!default;
+$use-icon-text: false!default;
+$use-beautons: false!default;
+$use-lozenges: false!default;
+$use-rules: false!default;
+$use-stats: false!default;
+$use-greybox: false!default;
+
+
+
+
+
+/*------------------------------------*\
+ $FRAMEWORK
+\*------------------------------------*/
+/**
+ * inuit.css will work these next ones out for use within the framework.
+ *
+ * Assign our `$base-line-height` to a new spacing var for more transparency.
+ */
+$base-spacing-unit: $base-line-height!default;
+$half-spacing-unit: $base-spacing-unit / 2!default;
+$line-height-ratio: $base-line-height / $base-font-size;
View
20 stylesheets/compass-inuit/base/_quotes.scss
@@ -5,8 +5,8 @@
* If English quotes are set in `_vars.scss`, define them here.
*/
@if $english-quotes == true{
- $open-quote: ;
- $close-quote: ;
+ $open-quote: \201C;
+ $close-quote: \201D;
}
@@ -18,23 +18,23 @@
* Inline quotes.
*/
q{
- quotes:"" "" "#{$open-quote}" "#{$close-quote}";
+ quotes:"\2018" "\2019" "#{$open-quote}" "#{$close-quote}";
&:before{
- content:"";
+ content:"\2018";
content:open-quote;
}
&:after{
- content:"";
+ content:"\2019";
content:close-quote;
}
q:before{
- content:"";
+ content:"\201C";
content:open-quote;
}
q:after{
- content:"";
+ content:"\201D";
content:close-quote;
}
}
@@ -56,11 +56,11 @@ blockquote{
}
q:before{
- content:"";
+ content:"\2018";
content:open-quote;
}
q:after{
- content:"";
+ content:"\2019";
content:close-quote;
}
}
@@ -91,6 +91,6 @@ blockquote{
text-indent:0;
&:before{
- content:"";
+ content:"\2014";
}
}
View
2 stylesheets/compass-inuit/generic/_helper.scss
@@ -142,7 +142,7 @@
*
*/
.go:after{
- content:"\00A0»"!important;
+ content:"\00A0" "\00BB"!important;
}
View
18 stylesheets/compass-inuit/generic/_mixins.scss
@@ -28,17 +28,19 @@
}
}
*
- * With thanks to @lar_zzz, @paranoida and @rowanmanning for refining and
- * improving my initial mixin.
+ * With thanks to @lar_zzz, @paranoida and @rowanmanning and ultimately
+ * @thierrylemoulec for refining and improving my initial mixin.
*/
@mixin headings($from: 1, $to: 6){
+ %base-heading {
+ @content
+ }
+
@if $from >= 1 and $to <= 6{
- $heading-selector: (unquote(""));
- @for $i from $from through $to {
- $heading-selector: $heading-selector, unquote("h#{$i}")
- }
- #{$heading-selector}{
- @content
+ @for $i from $from through $to{
+ h#{$i}{
+ @extend %base-heading;
+ }
}
}
}
View
6 stylesheets/compass-inuit/objects/_breadcrumb.scss
@@ -17,7 +17,7 @@
*
*/
.breadcrumb > li + li:before{
- content:"» ";
+ content:"\00BB" "\00A0";
}
@@ -33,7 +33,7 @@
*
*/
.breadcrumb--path > li + li:before{
- content:"/ ";
+ content:"\002F" "\00A0";
}
@@ -49,7 +49,7 @@
*
*/
.breadcrumb > li + li[data-breadcrumb]:before{
- content:attr(data-breadcrumb)" ";
+ content:attr(data-breadcrumb) "\00A0";
}
View
2 stylesheets/compass-inuit/objects/_nav.scss
@@ -143,7 +143,7 @@
> li{
&:after{
- content:", ";
+ content:"\002C" "\00A0";
}
&:last-child:after{
View
4 stylesheets/compass-inuit/objects/_pagination.scss
@@ -41,10 +41,10 @@
margin:-$base-spacing-unit / 2;
}
.pagination__first a:before{
- content:"« ";
+ content:"\00AB" "\00A0";
}
.pagination__last a:after{
- content:" »";
+ content:"\00A0" "\00BB";
}
}//endif
View
2 stylesheets/compass-inuit/objects/_rules.scss
@@ -42,7 +42,7 @@
position:relative;
&:after{
- content:"§";
+ content:"\00A7";
position:absolute;
top: 0;
right: 0;
View
10 stylesheets/compass-inuit/objects/_sprite.scss
@@ -4,7 +4,7 @@
$SPRITE
\*------------------------------------*/
/**
- * Giving an element a class of `.s` will throw it into ‘sprite’ mode and apply
+ * Giving an element a class of `.sprite` will throw it into ‘sprite’ mode and apply
* a background image e.g.:
*
<a class="sprite sprite--question-mark">More info&hellip;</a>
@@ -13,7 +13,7 @@
*
<a href=#><i class="sprite sprite--question-mark"></i> Help and FAQ</a>
*
- * Giving an element a class of `.i` will throw it into ‘icon’ mode and will
+ * Giving an element a class of `.icon` will throw it into ‘icon’ mode and will
* not add a background, but should be used for icon fonts and is populated
* through a `data-icon` attribute and the `:after` pseudo-element, e.g.:
*
@@ -91,8 +91,8 @@
/**
* Icon size modifiers.
*/
-.i--large { font-size:32px; }
-.i--huge { font-size:64px; }
-.i--natural { font-size:inherit; }
+.icon--large { font-size:32px; }
+.icon--huge { font-size:64px; }
+.icon--natural { font-size:inherit; }
}//endif
View
BIN templates/batch/assets/batch/batch.eot
Binary file not shown.
View
360 templates/batch/assets/batch/batch.svg
0 additions, 360 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
BIN templates/batch/assets/batch/batch.ttf
Binary file not shown.
View
BIN templates/batch/assets/batch/batch.woff
Binary file not shown.
View
BIN templates/batch/assets/batch/batch_webfont_reference.pdf
Binary file not shown.
View
21 templates/batch/manifest.rb
@@ -1,21 +0,0 @@
-description "Plugin for the batch web font."
-
-file 'assets/batch/batch.eot'
-file 'assets/batch/batch.svg'
-file 'assets/batch/batch.ttf'
-file 'assets/batch/batch.woff'
-file 'assets/batch/batch_webfont_reference.pdf'
-
-help %Q{
-First, install the plugin to get the font files and pdf symbol reference:
-
- compass install compass-inuit/batch
-
-Then @include "compass-inuit/objects/batch" into your project to enable the batch font.
-
-For more information see the pdf included in assets/batch/batch_webfont_reference.pdf.
-}
-
-welcome_message %Q{
-For more information see the pdf included in assets/batch/batch_webfont_reference.pdf.
-}
View
147 templates/project/_vars.scss
@@ -1,124 +1,71 @@
/*------------------------------------*\
- $VARS
+ VARS.SCSS
\*------------------------------------*/
/**
- * Set up project-specific variables here which are then used throughout your
- * build. These variables are automatically picked up by inuit.css so you should
- * never need to modify any framework code.
+ * Any variables you find set in inuit.css’ `_vars.scss` that you do not wish to
+ * keep, simply redefine here. This means that if inuit.css, for example, sets
+ * your `$base-font-size` at 16px and you wish it to be 14px, simply redeclare
+ * that variable in this file. inuit.css ignores its own variables in favour of
+ * using your own, so you can completely modify how inuit.css works without ever
+ * having to alter the framework itself.
*/
-/**
- * Debug mode will visually highlight any potential markup/accessibility quirks
- * in the browser. Set to `true` or `false`.
- */
-$debug-mode: false!default;
-
-
-/**
- * Do you want all elements to adopt `box-sizing:border-box;` as per
- * paulirish.com/2012/box-sizing-border-box-ftw ?
- */
-$global-border-box: true!default;
-
-
-/**
- * Would you like to use Adam Whitcroft’s Batch icon font, as per:
- * adamwhitcroft.com/batch ?
- */
-$batch: false!default;
-
-/**
- * Base stuff
- */
-$base-font-size: 16px!default;
-$base-line-height: 24px!default;
-
-
-/**
- * How big would you like round corners to be by default?
- */
-$brand-round: 4px!default;
+/*------------------------------------*\
+ $OBJECTS-AND-ABSTRACTIONS
+\*------------------------------------*/
/**
- * Responsiveness?
- */
-$responsive: true!default;
-
-/**
- * Responsiveness for widescreen/high resolution desktop monitors and beyond?
- * Note: $responsive parameter above must be enabled before enabling this.
- */
-$responsive-extra: false!default;
-
-/**
- * Responsive push and pull produce a LOT of code, only turn them on if you
- * definitely need them.
- */
-$responsive-push: false!default;
-$responsive-pull: false!default;
+ * All of inuit.css’ objects and abstractions are initially turned off by
+ * default. This means that you start any project with as little as possible,
+ * and introducing objects and abstractions is as simple as switching the
+ * following variables to `true`.
+ */
+$use-grids: false;
+$use-flexbox: false;
+$use-columns: false;
+$use-nav: false;
+$use-options: false;
+$use-pagination: false;
+$use-breadcrumb: false;
+$use-media: false;
+$use-marginalia: false;
+$use-island: false;
+$use-block-list: false;
+$use-matrix: false;
+$use-split: false;
+$use-this-or-this: false;
+$use-link-complex: false;
+$use-flyout: false;
+$use-arrows: false;
+$use-sprite: false;
+$use-icon-text: false;
+$use-beautons: false;
+$use-lozenges: false;
+$use-rules: false;
+$use-stats: false;
+$use-greybox: false;
-/**
- * Tell inuit.css when breakpoints start.
- */
-$lap-start: 481px!default;
-$desk-start: 1024px!default;
-$desk-wide-start: 1200px!default;
-/**
- * Font-sizes (in pixels). Refer to relevant sections for their implementations.
- */
-$giga-size: 96px!default;
-$mega-size: 72px!default;
-$kilo-size: 48px!default;
-
-$h1-size: 36px!default; // .alpha
-$h2-size: 30px!default; // .beta
-$h3-size: 24px!default; // .gamma
-$h4-size: 20px!default; // .delta
-$h5-size: 16px!default; // .epsilon
-$h6-size: 14px!default; // .zeta
-$milli-size: 12px!default;
-$micro-size: 10px!default;
-
-
-/**
- * English quote marks?
- */
-$english-quotes: true!default;
+/*------------------------------------*\
+ $OVERRIDES
+\*------------------------------------*/
/**
- * If you want English quotes then please do not edit these; they’re only here
- * because Sass needs them.
+ * Place any variables that should override inuit.css’ defaults here.
*/
-$open-quote: null;
-$close-quote: null;
-/**
- * If you need non-English quotes, please alter the following values accordingly:
- */
-@if $english-quotes != true{
- $open-quote: «;
- $close-quote: »;
-}
-/**
- * Brand stuff
- */
-$brand-color: #4a8ec2!default;
-$brand-face: "Helvetica Neue", sans-serif!default;
+/*------------------------------------*\
+ $CUSTOM
+\*------------------------------------*/
/**
- * inuit.css will work these next ones out for you.
- *
- * Assign our `$base-line-height` to a new spacing var for more transparency.
+ * Place any of your own variables that sit on top of inuit.css here.
*/
-$base-spacing-unit: $base-line-height!default;
-$half-spacing-unit: $base-spacing-unit / 2!default;
-$line-height-ratio: $base-line-height / $base-font-size;
View
7 templates/project/style.scss
@@ -19,7 +19,8 @@
// Optionally Import Everything
// @import "compass-inuit";
-// Optionally Import Sections
+// Optionally Import Sections (defaults required)
+@import "compass-inuit/defaults";
// @import "compass-inuit/generic";
// @import "compass-inuit/base";
// @import "compass-inuit/objects";
@@ -46,7 +47,6 @@
@import "compass-inuit/base/smallprint";
@import "compass-inuit/base/quotes";
@import "compass-inuit/base/code";
-@import "compass-inuit/base/links";
@import "compass-inuit/base/images";
@import "compass-inuit/base/lists";
@import "compass-inuit/base/tables";
@@ -72,12 +72,11 @@
@import "compass-inuit/objects/arrows";
@import "compass-inuit/objects/sprite";
@import "compass-inuit/objects/icon-text";
-@import "compass-inuit/objects/buttons";
+@import "compass-inuit/objects/beautons";
@import "compass-inuit/objects/lozenges";
@import "compass-inuit/objects/rules";
@import "compass-inuit/objects/stats";
@import "compass-inuit/objects/greybox";
-@import "compass-inuit/objects/batch";
/**
* She’s all yours, cap’n... Begin importing your stuff here.

0 comments on commit 9a13ded

Please sign in to comment.
Something went wrong with that request. Please try again.