Skip to content
This repository has been archived by the owner on Jul 9, 2020. It is now read-only.

Commit

Permalink
Change z-grid
Browse files Browse the repository at this point in the history
  • Loading branch information
klen committed Feb 27, 2011
1 parent 1b53308 commit b8f7cac
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 21 deletions.
5 changes: 3 additions & 2 deletions ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
## 2011-02-25 0.3.91
## 2011-02-25 0.3.92
-------------------
* Migrate to python-scss 0.6.2
* Migrate to python-scss 0.6.6
* Migrate jquery 1.5.1
* Upgrade compass
* Change frameworks and zeta-blocks paths
* Update docs
* Change z-grid

## 2011-02-10 0.3.6
-------------------
Expand Down
2 changes: 1 addition & 1 deletion zetalibrary/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python
import os.path

VERSION_INFO = (0, 3, 91)
VERSION_INFO = (0, 3, 92)

__project__ = PROJECT = __name__
__version__ = VERSION = '.'.join(str(i) for i in VERSION_INFO)
Expand Down
10 changes: 5 additions & 5 deletions zetalibrary/tests/zeta/_main.css
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@ h1, h2, h3, h4, h5, h6 {
html {
overflow-y: scroll}

a:hover, a:active {
:hover, :active {
outline: none}

a, a:active, a:visited {
a, :active, :visited {
color: #607890}

a:hover {
:hover {
color: #036}

ul, ol {
Expand Down Expand Up @@ -266,7 +266,7 @@ address {
.z-grid-12 {
width: 940px}

.z-grid_table {
.z-grid_row {
overflow: hidden;
zoom: 1;
margin: 0 auto;
Expand All @@ -279,7 +279,7 @@ address {
zoom: 1;
margin: 0 10px}

.z-grid_row {
.z-grid_row .z-grid_row {
display: inline-block;
margin: 0 -10px;
width: auto}
Expand Down
10 changes: 5 additions & 5 deletions zetalibrary/tests/zeta/_main.css.orig
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@ h1, h2, h3, h4, h5, h6 {
html {
overflow-y: scroll}

a:hover, a:active {
:hover, :active {
outline: none}

a, a:active, a:visited {
a, :active, :visited {
color: #607890}

a:hover {
:hover {
color: #036}

ul, ol {
Expand Down Expand Up @@ -266,7 +266,7 @@ address {
.z-grid-12 {
width: 940px}

.z-grid_table {
.z-grid_row {
overflow: hidden;
zoom: 1;
margin: 0 auto;
Expand All @@ -279,7 +279,7 @@ address {
zoom: 1;
margin: 0 10px}

.z-grid_row {
.z-grid_row .z-grid_row {
display: inline-block;
margin: 0 -10px;
width: auto}
Expand Down
6 changes: 3 additions & 3 deletions zetalibrary/zetalib/zeta/z-base/z-base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ h1, h2, h3, h4, h5, h6 {
html {
overflow-y: scroll; }

a:hover, a:active {
:hover, :active {
outline: none; }

a, a:active, a:visited {
a, :active, :visited {
color: $z-link-color; }

a:hover {
:hover {
color: $z-link-hover-color; }

ul, ol {
Expand Down
11 changes: 6 additions & 5 deletions zetalibrary/zetalib/zeta/z-grid/z-grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,25 @@
$z-grid-columns: 12 !default;
$z-grid-width: 60px !default;
$z-grid-cutter: 20px !default;
$z-grid-center: true !default;

@for $n from 1 to $z-grid-columns {
.z-grid-#{$n} {
width: $z-grid-width * $n + ($z-grid-cutter *( $n - 1 ));
width: $z-grid-width * $n + ($z-grid-cutter * ( $n - 1 ));
}
}

.z-grid_table {
.z-grid_row {
width: $z-grid-columns * ($z-grid-width + $z-grid-cutter);
margin: 0 auto;
margin: 0 if( $z-grid-center, auto, $z-grid-cutter );
@include z-clearfix; }

.z-grid_column {
margin: 0 $z-grid-cutter / 2;
@include z-float-left;
@include z-clearfix; }

.z-grid_row {
margin: 0 0-$z-grid-cutter/2;
.z-grid_row .z-grid_row {
margin: 0 (-$z-grid-cutter/2);
width: auto;
display: inline-block; }

0 comments on commit b8f7cac

Please sign in to comment.