Permalink
Browse files

working on the port over to sass, ignoring cache

  • Loading branch information...
leemartin committed Aug 31, 2010
1 parent 6f761a8 commit 04e89ba381e00f0410573c0e07cbd2fb7e3498f1
Showing with 113 additions and 99 deletions.
  1. +2 −1 .gitignore
  2. +105 −93 public/stylesheets/application.css
  3. +6 −5 public/stylesheets/application.scss
View
@@ -1,4 +1,5 @@
.DS_Store
log/*.log
tmp/**/*
-db/*.sqlite3
+db/*.sqlite3
+public/stylesheets/.sass-cache/**/*
@@ -1,135 +1,147 @@
-*{ margin: 0; padding: 0; }
+* {
+ margin: 0;
+ padding: 0; }
-body{
- background: white url(/images/bg.jpg) repeat-x;
- background-size: 100% 100%;
- color: #333;
- font: 14px 'Helvetica Neue', Helvetica, sans-serif;
- text-align: center;
-}
+body {
+ background: white url(/images/bg.jpg) repeat-x;
+ background-size: 100% 100%;
+ color: #333;
+ font: 14px 'Helvetica Neue', Helvetica, sans-serif;
+ text-align: center; }
-a{ color: #06C; }
+a {
+ color: #06C; }
+ a:hover {
+ color: #F50; }
-a:hover{ color: #F50; }
+p, h1, object {
+ margin: 10px 0; }
-p, h1, object{ margin: 10px 0; }
+h1, h2 {
+ color: #06C;
+ font-weight: normal; }
-h1, h2{ color: #06C; font-weight: normal; }
+h2 {
+ margin: 0 0 10px 0; }
-h2{ margin: 0 0 10px 0; }
+object {
+ -webkit-box-shadow: 0 0 20px grey; }
-object{ -webkit-box-shadow: 0 0 20px grey; }
-
-#logo{ margin: 30px 0 20px 0; }
+#logo {
+ margin: 30px 0 20px 0; }
/* Button & Glow Effect */
-
-.button{
- background: #E3E3E3 -webkit-gradient(linear, 0 0, 0 100%, from(white), to(#E3E3E3));
- -moz-border-radius: 100px; -webkit-border-radius: 100px;
- border: 1px solid #CCC;
- color: #000;
- cursor: pointer;
- display: inline-block;
- font-size: 18px;
- margin: 5px 0;
- padding: 7px 15px 8px 15px;
- position: relative;
- text-decoration: none;
-}
-
-.button:hover{
- color: #06C;
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#E3E3E3), to(white));
-}
-
-.glow{
- -webkit-animation-name: Pulse;
- -webkit-animation-duration: 2s;
- -webkit-animation-iteration-count: infinite;
- -webkit-animation-direction: alternate;
- -webkit-animation-timing-function: ease-in-out;
-}
+.button {
+ background: #e3e3e3 -webkit-gradient(linear, 0 0, 0 100%, from(white), to(#e3e3e3));
+ -moz-border-radius: 100px;
+ -webkit-border-radius: 100px;
+ border: 1px solid #CCC;
+ color: #000;
+ cursor: pointer;
+ display: inline-block;
+ font-size: 18px;
+ margin: 5px 0;
+ padding: 7px 15px 8px 15px;
+ position: relative;
+ text-decoration: none; }
+
+.button:hover {
+ color: #06C;
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e3e3e3), to(white)); }
+
+.glow {
+ -webkit-animation-name: Pulse;
+ -webkit-animation-duration: 2s;
+ -webkit-animation-iteration-count: infinite;
+ -webkit-animation-direction: alternate;
+ -webkit-animation-timing-function: ease-in-out; }
@-webkit-keyframes Pulse {
- from { -webkit-box-shadow: 0 0 15px white; }
- 50% { -webkit-box-shadow: 0 0 15px grey; }
- to { -webkit-box-shadow: 0 0 15px white; }
-}
+ from {
+ -webkit-box-shadow: 0 0 15px white; }
-/* Users Table */
+ 50% {
+ -webkit-box-shadow: 0 0 15px grey; }
-table#users{
- border-collapse: collapse;
- width: 100%;
-}
+ to {
+ -webkit-box-shadow: 0 0 15px white; } }
-table#users th, table#users td{
- border: 1px solid #CCC;
- padding: 10px;
-}
+/* Users Table */
+table#users {
+ border-collapse: collapse;
+ width: 100%; }
-/* Popup */
+table#users th, table#users td {
+ border: 1px solid #CCC;
+ padding: 10px; }
+/* Popup */
#facebox {
- background: #fff;
- -moz-border-radius: 10px; -webkit-border-radius: 10px;
- -webkit-box-shadow: #333 0 0 30px 0px;
+ background: #fff;
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+ -webkit-box-shadow: #333 0 0 30px 0px;
position: absolute;
top: 0;
left: 0;
z-index: 100;
text-align: left;
- width: 500px;
-}
+ width: 500px; }
-#facebox .popup { position: relative; }
+#facebox .popup {
+ position: relative; }
-#facebox .body { padding: 15px 20px 20px 20px; }
+#facebox .body {
+ padding: 15px 20px 20px 20px; }
-textarea{
- font-size: 14px;
- height: 80px;
- resize: none;
- padding: 5px 10px;
- width: 438px;
-}
+textarea {
+ font-size: 14px;
+ height: 80px;
+ resize: none;
+ padding: 5px 10px;
+ width: 438px; }
-textarea:focus{ outline: 5px auto #E3E3E3; }
+textarea:focus {
+ outline: 5px auto #E3E3E3; }
-#user_email{
- font-size: 14px;
- padding: 5px;
- width: 448px;
-}
+#user_email {
+ font-size: 14px;
+ padding: 5px;
+ width: 448px; }
-#user_email:focus{ outline: 5px auto #E3E3E3; }
+#user_email:focus {
+ outline: 5px auto #E3E3E3; }
-.update{
- font-size: 12px;
- margin: 0;
- padding: 5px 10px;
-}
+.update {
+ font-size: 12px;
+ margin: 0;
+ padding: 5px 10px; }
#facebox_overlay {
position: fixed;
top: 0px;
left: 0px;
height: 100%;
- width: 100%;
-}
+ width: 100%; }
-.facebox_hide { z-index: -100; }
+.facebox_hide {
+ z-index: -100; }
-.facebox_overlayBG { background-color: #000; z-index: 99; }
+.facebox_overlayBG {
+ background-color: #000;
+ z-index: 99; }
-* html #facebox_overlay { /* ie6 hack */
+* html #facebox_overlay {
+ /* ie6 hack */
position: absolute;
- height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
-}
+ height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); }
/* MISC */
+.fl {
+ float: left; }
+
+.fr {
+ float: right; }
-.fl{ float: left; }
-.fr{ float: right; }
-.clear{ clear: both; }
+.clear {
+ clear: both; }
@@ -8,9 +8,10 @@ body{
text-align: center;
}
-a{ color: #06C; }
-
-a:hover{ color: #F50; }
+a{
+ color: #06C;
+ &:hover{ color: #F50; }
+}
p, h1, object{ margin: 10px 0; }
@@ -25,7 +26,7 @@ object{ -webkit-box-shadow: 0 0 20px grey; }
/* Button & Glow Effect */
.button{
- background: #E3E3E3 -webkit-gradient(linear, 0 0, 0 100%, from(white), to(#E3E3E3));
+ background: #E3E3E3 -webkit-gradient(linear, 0 0, 0 100%, from(#FFFFFF), to(#E3E3E3));
-moz-border-radius: 100px; -webkit-border-radius: 100px;
border: 1px solid #CCC;
color: #000;
@@ -40,7 +41,7 @@ object{ -webkit-box-shadow: 0 0 20px grey; }
.button:hover{
color: #06C;
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#E3E3E3), to(white));
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#E3E3E3), to(#FFFFFF));
}
.glow{

0 comments on commit 04e89ba

Please sign in to comment.