Skip to content

Commit

Permalink
adding column and columns, singular and plural, to single column
Browse files Browse the repository at this point in the history
  • Loading branch information
dhg committed Jan 26, 2012
1 parent b43be29 commit 78ae309
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
9 changes: 5 additions & 4 deletions stylesheets/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
/* #Buttons
================================================== */

a.button,
.button,
button,
input[type="submit"],
input[type="reset"],
Expand All @@ -155,10 +155,11 @@
text-shadow: 0 1px rgba(255, 255, 255, .75);
cursor: pointer;
margin-bottom: 20px;
line-height: 21px;
line-height: 14px;
padding: 10px;
font-family: "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif; }

a.button:hover,
.button:hover,
button:hover,
input[type="submit"]:hover,
input[type="reset"]:hover,
Expand All @@ -175,7 +176,7 @@
border-top: 1px solid #aaa;
border-left: 1px solid #aaa; }

a.button:active,
.button:active,
button:active,
input[type="submit"]:active,
input[type="reset"]:active,
Expand Down
8 changes: 6 additions & 2 deletions stylesheets/skeleton.css
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
.column.omega, .columns.omega { margin-right: 0; }

/* Base Grid */
.container .one.column { width: 40px; }
.container .one.column,
.container .one.columns { width: 40px; }
.container .two.columns { width: 100px; }
.container .three.columns { width: 160px; }
.container .four.columns { width: 220px; }
Expand Down Expand Up @@ -81,7 +82,8 @@
.column.alpha, .columns.alpha { margin-left: 0; margin-right: 10px; }
.column.omega, .columns.omega { margin-right: 0; margin-left: 10px; }

.container .one.column { width: 28px; }
.container .one.column,
.container .one.columns { width: 28px; }
.container .two.columns { width: 76px; }
.container .three.columns { width: 124px; }
.container .four.columns { width: 172px; }
Expand Down Expand Up @@ -130,6 +132,7 @@
.columns, .column { margin: 0; }

.container .one.column,
.container .one.columns,
.container .two.columns,
.container .three.columns,
.container .four.columns,
Expand Down Expand Up @@ -178,6 +181,7 @@
.columns, .column { margin: 0; }

.container .one.column,
.container .one.columns,
.container .two.columns,
.container .three.columns,
.container .four.columns,
Expand Down

0 comments on commit 78ae309

Please sign in to comment.