Browse files

Merge pull request #7 from gwagener/sass

Some tidying up of the stylesheets without any front end changes
  • Loading branch information...
2 parents 761376f + de396c9 commit cc7a50c95f193cd0a17b6844716b87569a9556ca @parndt committed Apr 11, 2012
Showing with 169 additions and 173 deletions.
  1. +169 −0 app/assets/stylesheets/theme.css.scss
  2. +0 −173 app/assets/stylesheets/theme.scss
View
169 app/assets/stylesheets/theme.css.scss
@@ -0,0 +1,169 @@
+body {
+ background: #f2f2f2;
+ padding-bottom: 10em;
+}
+
+body, input, textarea, select, td {
+ font: 14px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
+}
+
+p, h1, h2, h3, h4, h5, h6 {
+ margin: 0;
+ padding: 0;
+ font-size: 100%;
+}
+
+p {
+ margin-bottom: 0.75em;
+}
+
+h1, h2, h3, h4, h5, h6 {
+ font-family: 'Francois One', sans-serif;
+ line-height: 1;
+}
+
+h1 {
+ font-size: 2em;
+ margin: 1em 0 0.5em;
+ text-transform: uppercase;
+ color: #ff5800;
+}
+
+h2 {
+ font-size: 1.5em;
+ margin-bottom: 0.333333em;
+}
+
+header {
+ position: fixed;
+ z-index: 1;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ height: 10em;
+ background: rgba(0, 0, 0, 0.9);
+ color: #f2f2f2;
+
+ h1 {
+ float: right;
+ margin: 0.125em 0 0.125em 0;
+ text-transform: uppercase;
+ font-size: 8em;
+ line-height: 1em;
+ width: 65%;
+ white-space: nowrap;
+
+ a {
+ color: #ff5800;
+ text-decoration: none;
+ }
+ }
+
+ nav {
+ float: right;
+ border-right: 1px solid white;
+ margin: 1em;
+ padding: 0.5em 1em;
+
+ ul {
+ margin: 0;
+ padding: 0;
+
+ li {
+ display: block;
+ list-style-type: none;
+ text-align: right;
+ font-size: 1.25em;
+ line-height: 1.375em;
+ vertical-align: middle;
+
+ a {
+ color: white;
+ text-decoration: none;
+ font-family: 'Francois One', sans-serif;
+ text-transform: uppercase;
+ }
+ }
+ }
+ }
+}
+
+#page, footer {
+ position: relative;
+ margin-left: 35%;
+ text-shadow: 0 1px 0 white;
+}
+
+#side_body {
+ position: absolute;
+ left: -13em;
+ top: 3em;
+ width: 10em;
+ padding: 0 1em;
+ text-align: right;
+ color: #999;
+}
+
+footer {
+ margin-top: 3em;
+ border-top: 1px solid #ccc;
+ padding-top: 0.75em;
+ color: #999;
+}
+
+.inquiries form {
+ margin: 0 1em 1.5em -1em;
+ padding: 1em;
+ background: #eee;
+ box-shadow: inset 0 0 4px rgba(0, 0, 0, 0.2), 0 1px 0 white;
+ border-radius: 0.5em;
+
+ .field {
+ margin: 0 0 0.5em;
+
+ label {
+ clear: left;
+ float: left;
+ width: 15%;
+ text-transform: uppercase;
+ color: #666;
+ line-height: 2em;
+ vertical-align: middle;
+ }
+
+ input, textarea {
+ width: 70%;
+ line-height: 1.5;
+ }
+ }
+
+ .actions {
+ margin-left: 15%;
+
+ input {
+ background: #ff5800;
+ border: 1px solid #ff5800;
+ border-radius: 4px;
+ box-shadow: inset 0 1px 10px 1px rgba(255, 255, 255, 0.4), 0 0.25em 0px #7f2c00, 0 0.25em 0.5em rgba(0, 0, 0, 0.5);
+ color: #fff;
+ font-size: 1.5em;
+ font-weight: bold;
+ line-height: 1;
+ margin-bottom: 1em;
+ padding: 8px 1em 10px;
+ text-align: center;
+ text-shadow: 0px -1px 1px #1e2d4d;
+ -webkit-background-clip: padding-box;
+
+ &:hover {
+ box-shadow: inset 0 1px 20px 1px rgba(255, 255, 255, 0.5), 0 0.25em 0px #7f2c00, 0 0.25em 0.5em rgba(0, 0, 0, 0.5);
+ cursor: pointer;
+ }
+
+ &:active {
+ box-shadow: inset 0 1px 20px 1px rgba(255, 255, 255, 0.5), 0 0.05em 0px #7f2c00, 0 0.05em 0.05em rgba(0, 0, 0, 0.5);
+ margin-top: 0.2em;
+ }
+ }
+ }
+}
View
173 app/assets/stylesheets/theme.scss
@@ -1,173 +0,0 @@
-body {
- background: #f2f2f2;
- padding-bottom: 10em;
-}
-
-body, input, textarea, select, td {
- font: 14px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
-}
-
-p,h1,h2,h3,h4,h5,h6 {
- margin: 0;
- padding: 0;
- font-size: 100%;
-}
-
-p {
- margin: 0 0 0.75em;
-}
-
-h1, h2, h3, h4, h5, h6 {
- font-family: 'Francois One', sans-serif;
- line-height: 1;
-}
-
-h1 {
- font-size: 2em;
- margin: 1em 0 0.5em;
- text-transform: uppercase;
- color: #ff5800;
-}
-
-h2 {
- font-size: 1.5em;
- margin-bottom: 0.333333em;
-}
-
-header {
- position: fixed;
- z-index: 1;
- left: 0;
- right: 0;
- bottom: 0;
- height: 10em;
- background: rgba(0, 0, 0, 0.9);
- color: #f2f2f2;
-}
-
-header h1 {
- float: right;
- margin: 0.125em 0 0.125em 0;
- text-transform: uppercase;
- font-size: 8em;
- line-height: 1em;
- width: 65%;
- white-space: nowrap;
-}
-
-header h1 a {
- color: #ff5800;
- text-decoration: none;
-}
-
-header nav {
- float: right;
- border-right: 1px solid white;
- margin: 1em;
- padding: 0.5em 1em;
-}
-
-header nav ul {
- margin: 0;
- padding: 0;
-}
-
-header nav ul li {
- display: block;
- list-style-type: none;
- text-align: right;
- font-size: 1.25em;
- line-height: 1.375em;
- vertical-align: middle;
-}
-
-header nav ul li a {
- color: white;
- text-decoration: none;
- font-family: 'Francois One', sans-serif;
- text-transform: uppercase;
-}
-
-#page, footer {
- position: relative;
- margin-left: 35%;
- text-shadow: 0 1px 0 white;
-}
-
-#side_body {
- position: absolute;
- left: -13em;
- top: 3em;
- width: 10em;
- padding: 0 1em;
- text-align: right;
- color: #999;
-}
-
-#side_body .inner {
-}
-
-footer {
- margin-top: 3em;
- border-top: 1px solid #ccc;
- padding-top: 0.75em;
- color: #999;
-}
-
-.inquiries form {
- margin: 0 1em 1.5em -1em;
- padding: 1em;
- background: #eee;
- box-shadow: inset 0 0 4px rgba(0, 0, 0, 0.2), 0 1px 0 white;
- border-radius: 0.5em;
-}
-
-.inquiries form .field {
- margin: 0 0 0.5em;
-}
-
-.inquiries form .field label {
- clear: left;
- float: left;
- width: 15%;
- text-transform: uppercase;
- color: #666;
- line-height: 2em;
- vertical-align: middle;
-}
-
-.inquiries form .field input,
-.inquiries form .field textarea {
- width: 70%;
- line-height: 1.5;
-}
-
-.inquiries form .actions {
- margin-left: 15%;
-}
-
-.inquiries form .actions input {
- background: #ff5800;
- border: 1px solid #ff5800;
- border-radius: 4px;
- box-shadow: inset 0 1px 10px 1px rgba(255, 255, 255, 0.4), 0 0.25em 0px #7f2c00, 0 0.25em 0.5em rgba(0, 0, 0, 0.5);
- color: #fff;
- font-size: 1.5em;
- font-weight: bold;
- line-height: 1;
- margin-bottom: 1em;
- padding: 8px 1em 10px;
- text-align: center;
- text-shadow: 0px -1px 1px #1e2d4d;
- -webkit-background-clip: padding-box;
-}
-
-.inquiries form .actions input:hover {
- box-shadow: inset 0 1px 20px 1px rgba(255, 255, 255, 0.5), 0 0.25em 0px #7f2c00, 0 0.25em 0.5em rgba(0, 0, 0, 0.5);
- cursor: pointer;
-}
-
-.inquiries form .actions input:active {
- box-shadow: inset 0 1px 20px 1px rgba(255, 255, 255, 0.5), 0 0.05em 0px #7f2c00, 0 0.05em 0.05em rgba(0, 0, 0, 0.5);
- margin-top: 0.2em;
-}

0 comments on commit cc7a50c

Please sign in to comment.