Skip to content

Commit

Permalink
updating files to Andy's new stuff and cleaning up the compass files
Browse files Browse the repository at this point in the history
  • Loading branch information
Jina Bolton committed May 1, 2012
1 parent 3c314de commit 7761107
Show file tree
Hide file tree
Showing 146 changed files with 6,008 additions and 5,032 deletions.
4 changes: 2 additions & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/320andup (Git).esproj/
/.esproj/
/.dropbox
/Icon
/Icon
Binary file added .sass-cache/03a1edd726be3fb84a61415e9eb206639df30f76/_shared.scssc
View file
Binary file not shown.
Binary file added .sass-cache/456158f61ae34c7c9f5c62b9af41f0ce642dc602/_ellipsis.scssc
View file
Binary file not shown.
Binary file added .sass-cache/542558ecc268dff7bf1b90af83cbceab28f41eb5/ellipsis.scssc
View file
Binary file not shown.
Binary file added .sass-cache/5a5bea4d1ffaec0c7e6e1e3d522ac991499b6778/_support.scssc
View file
Binary file not shown.
103 changes: 103 additions & 0 deletions 320andup.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
<!-- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="img/h/apple-touch-icon.png"> -->
<!-- For iPad 1-->
<!-- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="img/m/apple-touch-icon.png"> -->
<!-- For the new iPad -->
<!-- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="img/h/apple-touch-icon-144x144-precomposed.png">
<!-- For iPhone 3G, iPod Touch and Android -->
<!-- <link rel="apple-touch-icon-precomposed" href="img/l/apple-touch-icon-precomposed.png"> -->
<!-- For Nokia -->
Expand Down Expand Up @@ -75,6 +77,107 @@ <h2><a href="http://stuffandnonsense.co.uk/projects/320andup/">320 and Up</a></h

<h1 class="h1">&#8216;320 and Up&#8217; styles</h1>

<section>
<h1 class="h2">Colour</h1>

<h2 class="h3">Base colour</h2>
<div class="swatch swatch-base">
<div class="swatch-row swatch-row-one clearfix">
<span></span>
<span></span>
<span></span>
<span></span>
</div>
<div class="swatch-row swatch-row-two clearfix">
<span></span>
<span></span>
<span></span>
<span></span>
</div>
</div>

<h2 class="h3">Alert</h2>
<div class="swatch swatch-alert">
<div class="swatch-row swatch-row-one clearfix">
<span></span>
<span></span>
<span></span>
<span></span>
</div>
<div class="swatch-row swatch-row-two clearfix">
<span></span>
<span></span>
<span></span>
<span></span>
</div>
</div>

<h2 class="h3">Error</h2>
<div class="swatch swatch-error">
<div class="swatch-row swatch-row-one clearfix">
<span></span>
<span></span>
<span></span>
<span></span>
</div>
<div class="swatch-row swatch-row-two clearfix">
<span></span>
<span></span>
<span></span>
<span></span>
</div>
</div>

<h2 class="h3">Info</h2>
<div class="swatch swatch-info">
<div class="swatch-row swatch-row-one clearfix">
<span></span>
<span></span>
<span></span>
<span></span>
</div>
<div class="swatch-row swatch-row-two clearfix">
<span></span>
<span></span>
<span></span>
<span></span>
</div>
</div>

<h2 class="h3">Success</h2>
<div class="swatch swatch-success">
<div class="swatch-row swatch-row-one clearfix">
<span></span>
<span></span>
<span></span>
<span></span>
</div>
<div class="swatch-row swatch-row-two clearfix">
<span></span>
<span></span>
<span></span>
<span></span>
</div>
</div>

<h2 class="h3">Warning</h2>
<div class="swatch swatch-warning">
<div class="swatch-row swatch-row-one clearfix">
<span></span>
<span></span>
<span></span>
<span></span>
</div>
<div class="swatch-row swatch-row-two clearfix">
<span></span>
<span></span>
<span></span>
<span></span>
</div>
</div>

</section>

<section>

<h1 class="h2">Typography</h1>
Expand Down
108 changes: 106 additions & 2 deletions css/320andup.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ dt {
width: 20.25%;
text-align: right;
}
.dl-horizontal .dl-horizontal dd {
.dl-horizontal dd {
margin-left: 22.78%;
}
abbr[title] {
Expand Down Expand Up @@ -358,6 +358,110 @@ a:hover,
a:active {
outline: 0;
}
::-moz-selection {
background-color: #d6dbe1;
color: #2d353e;
text-shadow: none;
}
::selection {
background-color: #d6dbe1;
color: #2d353e;
text-shadow: none;
}
.swatch {
margin: 0 0 1.5em 0;
padding: 0;
}
.swatch-row {
display: block;
margin: 0;
padding: 0;
width: 200px;
}
.swatch-row-one {
background-color: #000000;
}
.swatch-row-two {
background-color: #ffffff;
}
.swatch-row span {
display: block;
float: left;
width: 50px;
height: 50px;
}
.swatch-base span:nth-child(1) {
background-color: rgba(45, 53, 62, 0.9);
}
.swatch-base span:nth-child(2) {
background-color: rgba(45, 53, 62, 0.8);
}
.swatch-base span:nth-child(3) {
background-color: rgba(45, 53, 62, 0.7);
}
.swatch-base span:nth-child(4) {
background-color: rgba(45, 53, 62, 0.6);
}
.swatch-alert span:nth-child(1) {
background-color: rgba(252, 248, 227, 0.9);
}
.swatch-alert span:nth-child(2) {
background-color: rgba(252, 248, 227, 0.8);
}
.swatch-alert span:nth-child(3) {
background-color: rgba(252, 248, 227, 0.7);
}
.swatch-alert span:nth-child(4) {
background-color: rgba(252, 248, 227, 0.6);
}
.swatch-error span:nth-child(1) {
background-color: rgba(218, 78, 73, 0.9);
}
.swatch-error span:nth-child(2) {
background-color: rgba(218, 78, 73, 0.8);
}
.swatch-error span:nth-child(3) {
background-color: rgba(218, 78, 73, 0.7);
}
.swatch-error span:nth-child(4) {
background-color: rgba(218, 78, 73, 0.6);
}
.swatch-info span:nth-child(1) {
background-color: rgba(217, 237, 247, 0.9);
}
.swatch-info span:nth-child(2) {
background-color: rgba(217, 237, 247, 0.8);
}
.swatch-info span:nth-child(3) {
background-color: rgba(217, 237, 247, 0.7);
}
.swatch-info span:nth-child(4) {
background-color: rgba(217, 237, 247, 0.6);
}
.swatch-success span:nth-child(1) {
background-color: rgba(92, 183, 92, 0.9);
}
.swatch-success span:nth-child(2) {
background-color: rgba(92, 183, 92, 0.8);
}
.swatch-success span:nth-child(3) {
background-color: rgba(92, 183, 92, 0.7);
}
.swatch-success span:nth-child(4) {
background-color: rgba(92, 183, 92, 0.6);
}
.swatch-warning span:nth-child(1) {
background-color: rgba(250, 167, 51, 0.9);
}
.swatch-warning span:nth-child(2) {
background-color: rgba(250, 167, 51, 0.8);
}
.swatch-warning span:nth-child(3) {
background-color: rgba(250, 167, 51, 0.7);
}
.swatch-warning span:nth-child(4) {
background-color: rgba(250, 167, 51, 0.6);
}
/* Texture =================================================== */
.alert {
margin-bottom: 1.5em;
Expand Down Expand Up @@ -1096,7 +1200,7 @@ svg:not(:root) {
figure {
margin-bottom: 1.5em;
}
figure figure img {
figure img {
margin-bottom: 0.375em;
}
figure figcaption {
Expand Down
Loading

0 comments on commit 7761107

Please sign in to comment.