Skip to content

Commit

Permalink
Updated the reset
Browse files Browse the repository at this point in the history
  • Loading branch information
Anthony Short committed Apr 30, 2011
1 parent d3383c9 commit 8e6a76f
Show file tree
Hide file tree
Showing 9 changed files with 129 additions and 22 deletions.
1 change: 1 addition & 0 deletions stylesheets/stitch/patterns/_animation.scss
@@ -0,0 +1 @@
@include 'animation/hardware-acceleration';
@@ -0,0 +1,6 @@
/*
Forces the browser to render animation on the element with hardware acceleration
*/
@mixin hardware-acceleration {
-webkit-transform:translateZ(0);
}
2 changes: 1 addition & 1 deletion stylesheets/stitch/patterns/images/_image-replace.scss
@@ -1,7 +1,7 @@
/*
Removes any text from an element and replaces it with an image
*/
.f-ir {
.stitch-ir {
display : block;
text-indent : -9999em;
overflow : hidden;
Expand Down
3 changes: 3 additions & 0 deletions stylesheets/stitch/patterns/layout/_button.scss
@@ -0,0 +1,3 @@
/*
Helper to quickly create a button
*/
12 changes: 12 additions & 0 deletions stylesheets/stitch/patterns/layout/_columns.scss
@@ -0,0 +1,12 @@
@include 'stitch/helpers/css3';

/*
Shorthand for CSS columns
@include text-columns(3,20px);
*/
@mixin text-columns($count:2,$gap:20px,$width:auto,$rule:none) {
@include column-count($count);
@include column-gap($count);
@include column-width($width);
@include column-rule($rule);
}
13 changes: 13 additions & 0 deletions stylesheets/stitch/patterns/layout/_simple-gradient.scss
@@ -0,0 +1,13 @@
@include 'compass/css3';

@mixin vertical-gradient($from,$to) {
@include background(
$to no-repeat linear-gradient(top,$from,$to)
);
}

@mixin horizontal-gradient($from,$to) {
@include background(
$to no-repeat linear-gradient(left,$from,$to)
);
}
15 changes: 15 additions & 0 deletions stylesheets/stitch/patterns/text/_font-stacks.scss
@@ -0,0 +1,15 @@
/*
These provide basic font stacks with fallbacks. You can add your own fonts to the stack
*/

@mixin sans-serif($prepend:false) {
font-family: join($prepend,"Helvetica Neue", Helvetica, Arial, sans-serif);
}

@mixin serif($prepend:false) {
font-family: join($prepend,"Georgia", Times New Roman, Times, sans-serif);
}

@mixin monospace($prepend:false) {
font-family: join($prepend,"Monaco", Courier New, monospace);
}
87 changes: 68 additions & 19 deletions stylesheets/stitch/reset/_desktop.scss
@@ -1,9 +1,5 @@
/* Block Elements
---------------------------------------- */
/*
Reset all COMMON block elements.
If you're using uncommon or invalid elements you will need to reset them yourself
*/
address,
article,
aside,
Expand Down Expand Up @@ -63,6 +59,7 @@ textarea {
display : inline-block;
vertical-align : middle;
white-space : normal;
font : inherit;
}

/* Hand cursor on clickable input elements */
Expand Down Expand Up @@ -117,7 +114,7 @@ input[type="submit"] {

/* Turn off scroll bars in IE unless needed */
textarea {
overflow : auto;
overflow:auto;
}

/* HTML5 elements
Expand All @@ -132,15 +129,10 @@ footer, header, hgroup, menu, nav, section {

/* Text Elements
---------------------------------------- */
/*
Reset all COMMON text elements.
If you're using uncommon or invalid elements you have to reset them yourself
*/
a,
abbr,
b,
body,
br,
cite,
code,
dfn,
Expand Down Expand Up @@ -168,16 +160,70 @@ sup,
textarea,
var
{
font-size : 100%;
font-family : sans-serif;
font-style : normal;
font-weight : normal;
font-variant : normal;
color : #000;
vertical-align : baseline;
text-decoration : none;

}

/*
Set the alignment of text to touch the baseline
*/
body {
vertical-align:baseline;
}

/*
Make all the elements use the same font family by default
*/
body,
pre,
code,
var,
kbd {
font-family:sans-serif;
}

/*
Make all text the same size
*/
body,
small,
h1,
h2,
h3,
h4,
h5,
h6 {
font-size:100%;
font-weight:normal;
line-height:1;
}

/*
Remove default text decoration
*/
del,
abbr,
mark {
text-decoration:none;
}

/*
Remove default font weight
*/
b,
strong {
font-weight:normal;
}

/*
Remove default font style
*/
em {
font-style:normal;
}

/*
Reset quotations
*/
blockquote:before,
blockquote:after,
q:before,
Expand All @@ -201,6 +247,9 @@ li {
override styles when you create buttons and wrap blocks in links
*/
a {
font-weight:normal;
color:inherit;
text-decoration:none;
&:hover,
&:active {
outline: none;
Expand Down Expand Up @@ -240,4 +289,4 @@ img {
img,object,embed,video {
max-width:100%;
display:block;
}
}
12 changes: 10 additions & 2 deletions templates/project/layouts/desktop/_copy.scss
Expand Up @@ -26,11 +26,15 @@
---------------------------------------- */

ul {

li {
list-style-type:disc;
}
}

ol {

li {
list-style-type:decimal;
}
}

li {
Expand All @@ -56,6 +60,10 @@

}

code {

}

/* Headings
---------------------------------------- */

Expand Down

0 comments on commit 8e6a76f

Please sign in to comment.