Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: Condimen/condimen
base: 00dde2fd75
...
head fork: Condimen/condimen
compare: f123c2b0bb
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
Commits on Aug 30, 2012
@Condimen DS_Store finally deleted! & header fixed b13fdf7
@Condimen Don't-know-why commit
What the hell are you doing Github app?
f123c2b
View
BIN  .DS_Store
Binary file not shown
View
3  .gitignore
@@ -1 +1,2 @@
-.DS_Store
+DS_Store
+.DS_Store
View
8 styles.css
@@ -37,7 +37,7 @@ header {
header .title {
width: 120%;
height: 10em;
- position: absolute;
+ position: relative;
z-index: 2;
background: lightblue;
padding-left: 4%;
@@ -84,8 +84,8 @@ header .title nav a {
header .info {
width: 100%;
height: 20em;
- position: absolute;
- top: -12.5em;
+ position: relative;
+ top: -22.5em;
z-index: 1;
background: pink;
-webkit-transform-origin: 100% 100%;
@@ -119,7 +119,7 @@ header .info p img {
}
/* line 104, /Volumes/750/Design & developement/Web/condimen/styles.scss */
header .info:hover {
- top: 0;
+ top: -10em;
-webkit-transform: rotate(0deg);
-moz-transform: rotate(0deg);
-ms-transform: rotate(0deg);
View
8 styles.scss
@@ -9,7 +9,7 @@ $title-height: 10em;
$info-angle: 7deg;
$info-height: $title-height + 10em;
-$info-top: -$info-height + (3*$title-height/4);
+$info-top: -$info-height - ($title-height/4);
$title-bg-color: lightblue;
$info-bg-color: pink;
@@ -51,7 +51,7 @@ header {
.title {
width: 120%;
height: $title-height;
- position: absolute;
+ position: relative;
z-index: 2;
background: $title-bg-color;
padding-left: 4%;
@@ -80,7 +80,7 @@ header {
.info {
width: 100%;
height: $info-height;
- position: absolute;
+ position: relative;
top: $info-top;
z-index:1;
background: $info-bg-color;
@@ -102,7 +102,7 @@ header {
}
}
.info:hover {
- top: 0;
+ top: -$title-height;
@include rotate(0deg);
}
}

No commit comments for this range

Something went wrong with that request. Please try again.