Commit 270f0f3a by Kyle Fiedler

Added more styles includeing the index page more color changes and header styles

parent b777d2c0
...@@ -8,7 +8,7 @@ $body-line-height: 20px; ...@@ -8,7 +8,7 @@ $body-line-height: 20px;
$light-blue: #f0f7fd; $light-blue: #f0f7fd;
$dark-blue: #50545c; $dark-blue: #50545c;
$bright-blue: #3c8ebf; $bright-blue: #3c8ebf;
$orange: #f96e5b; $orange: #ea5155;
$yellow: #fff8af; $yellow: #fff8af;
$cream: #F6EFD4; $cream: #F6EFD4;
$mit-red: #933; $mit-red: #933;
...@@ -41,11 +41,18 @@ input { ...@@ -41,11 +41,18 @@ input {
} }
button, input[type="submit"], .button { button, input[type="submit"], .button {
<<<<<<< HEAD
background-color: $orange; background-color: $orange;
@include linear-gradient(adjust-hue($orange, 8%), $orange); @include linear-gradient(adjust-hue($orange, 8%), $orange);
border: 1px solid darken($orange, 15%); border: 1px solid darken($orange, 15%);
@include box-shadow(inset 0 0 0 1px adjust-hue($orange, 20%), 0 1px 0 #fff); @include box-shadow(inset 0 0 0 1px adjust-hue($orange, 20%), 0 1px 0 #fff);
text-shadow: 0 1px 0 darken($orange, 10%); text-shadow: 0 1px 0 darken($orange, 10%);
=======
@include box-shadow(inset 0 0 0 1px lighten($bright-blue, 15%));
@include linear-gradient(lighten($bright-blue, 10%), $bright-blue);
border-left: 1px solid lighten($dark-blue, 10%);
text-shadow: 0 -1px 0 darken($bright-blue, 10%);
>>>>>>> Added more styles includeing the index page more color changes and header styles
color: #fff; color: #fff;
font-weight: bold; font-weight: bold;
padding: 6px 20px; padding: 6px 20px;
...@@ -53,7 +60,10 @@ button, input[type="submit"], .button { ...@@ -53,7 +60,10 @@ button, input[type="submit"], .button {
@include border-radius(4px); @include border-radius(4px);
&:hover, &:focus { &:hover, &:focus {
<<<<<<< HEAD
@include box-shadow(inset 0 0 6px 1px adjust-hue($orange, 30%)); @include box-shadow(inset 0 0 6px 1px adjust-hue($orange, 30%));
=======
>>>>>>> Added more styles includeing the index page more color changes and header styles
} }
} }
......
...@@ -58,3 +58,8 @@ ...@@ -58,3 +58,8 @@
@extend .content-type; @extend .content-type;
background-image: url('/static/img/content-types/module.png'); background-image: url('/static/img/content-types/module.png');
} }
.module a:first-child {
@extend .content-type;
background-image: url('/static/img/content-types/module.png');
}
...@@ -20,7 +20,7 @@ body { ...@@ -20,7 +20,7 @@ body {
color: #fff; color: #fff;
display: block; display: block;
float: none; float: none;
padding: 0 25px; padding: 0 20px;
text-shadow: 0 -1px 0 darken($dark-blue, 15%); text-shadow: 0 -1px 0 darken($dark-blue, 15%);
width: 100%; width: 100%;
......
...@@ -32,31 +32,46 @@ section#unit-wrapper { ...@@ -32,31 +32,46 @@ section#unit-wrapper {
@include clearfix; @include clearfix;
color: #666; color: #666;
float: right; float: right;
padding: 6px 20px; padding: 0 20px;
a { a {
@include inline-block; @include inline-block;
padding: 13px 20px;
&.cancel { &.cancel {
margin-right: 20px; margin-right: 20px;
font-style: italic; font-style: italic;
font-size: 12px; font-size: 12px;
padding: 6px 0;
} }
&.save-update { &.save-update {
padding: 6px 20px; border-left: 1px solid lighten($dark-blue, 40%);
@include border-radius(3px); border-right: 1px solid lighten($dark-blue, 40%);
border: 1px solid lighten($dark-blue, 40%); // @include box-shadow(inset 0 0 0 1px lighten($bright-blue, 15%));
@include box-shadow(inset 0 0 0 1px #fff); color: $bright-blue;
color: $dark-blue; @include linear-gradient(lighten($dark-blue, 50%), lighten($bright-blue, 55%));
@include linear-gradient(lighten($dark-blue, 60%), lighten($dark-blue, 55%));
// &:hover, &:focus {
&:hover, &:focus { // color: $yellow;
@include linear-gradient(lighten($dark-blue, 58%), lighten($dark-blue, 53%)); // @include linear-gradient($bright-blue, darken($bright-blue, 10%));
@include box-shadow(inset 0 0 6px 1px #fff); // @include box-shadow(inset 0 0 3px 1px lighten($bright-blue, 10%));
} // }
} }
// &.save-update {
// border-left: 1px solid lighten($dark-blue, 10%);
// border-right: 1px solid lighten($dark-blue, 10%);
// @include box-shadow(inset 0 0 0 1px lighten($bright-blue, 15%));
// color: #fff;
// @include linear-gradient(lighten($bright-blue, 10%), $bright-blue);
// text-shadow: 0 -1px 0 darken($bright-blue, 10%);
// &:hover, &:focus {
// color: $yellow;
// @include linear-gradient($bright-blue, darken($bright-blue, 10%));
// @include box-shadow(inset 0 0 3px 1px lighten($bright-blue, 10%));
// }
// }
>>>>>>> Added more styles includeing the index page more color changes and header styles
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment