Finish moving to aspects, DB reset required

This commit is contained in:
Raphael 2010-09-13 11:15:08 -07:00
parent 9837340eb2
commit aa0a00d9cb
5 changed files with 32 additions and 27 deletions

View file

@ -22,7 +22,7 @@
%h1{:id => 'aspect_title'} %h1{:id => 'aspect_title'}
Relations Aspects
%ul#aspect_list %ul#aspect_list

View file

@ -64,7 +64,7 @@
- else - else
- if @aspect == :all - if @aspect == :all
%h1 %h1
= link_to "All Relations", root_path = link_to "All Aspects", root_path
- else - else
%h1 %h1
= link_to @aspect.name, @aspect = link_to @aspect.name, @aspect

View file

@ -11,6 +11,7 @@
%ul{ :style => "position:absolute;right:0;bottom:0;"} %ul{ :style => "position:absolute;right:0;bottom:0;"}
%li{:class => ("selected" if @aspect == :all)} %li{:class => ("selected" if @aspect == :all)}
= link_to "All Aspects", root_url = link_to "All Aspects", root_url
%li{ :style => "margin-right:0;" } %li{ :style => "margin-right:0;" }
= link_to "manage", edit_aspect_path(Aspect.first), :class => "edit_aspect_button", :title => "Manage your Aspects" = link_to "manage", edit_aspect_path(Aspect.first), :class => "edit_aspect_button", :title => "Manage your Aspects"

View file

@ -102,21 +102,21 @@ header {
padding-right: 10px; } padding-right: 10px; }
header #session_action a.new_requests { header #session_action a.new_requests {
color: #df0101; } color: #df0101; }
header #group_header { header #aspect_header {
z-index: 5; z-index: 5;
text-shadow: 0 2px 0 white; text-shadow: 0 2px 0 white;
background-color: #eeeeee; background-color: #eeeeee;
border-top: 1px solid #555555; border-top: 1px solid #555555;
height: 85px; } height: 85px; }
header #group_header h1 { header #aspect_header h1 {
margin-bottom: 0; margin-bottom: 0;
margin-top: 15px; } margin-top: 15px; }
header #group_header a { header #aspect_header a {
color: #111111; } color: #111111; }
header #group_header a:hover { header #aspect_header a:hover {
background: none; background: none;
color: #333333; } color: #333333; }
header #group_header .page_title { header #aspect_header .page_title {
text-transform: uppercase; } text-transform: uppercase; }
#show_filters { #show_filters {
@ -455,36 +455,36 @@ h1.big_text {
.image_cycle img { .image_cycle img {
display: none; } display: none; }
#group_nav { #aspect_nav {
position: relative; position: relative;
color: black; color: black;
margin-top: 8px; margin-top: 8px;
margin-bottom: 1px; } margin-bottom: 1px; }
#group_nav #group_manage_button { #aspect_nav #aspect_manage_button {
display: inline; } display: inline; }
#group_nav #group_manage_button a { #aspect_nav #aspect_manage_button a {
color: #999999; } color: #999999; }
#group_nav ul { #aspect_nav ul {
margin: 0; margin: 0;
padding: 0; padding: 0;
list-style: none; } list-style: none; }
#group_nav ul > li { #aspect_nav ul > li {
padding: 0; padding: 0;
display: inline; display: inline;
margin-right: 0.5em; } margin-right: 0.5em; }
#group_nav ul > li a { #aspect_nav ul > li a {
background-color: #444444; background-color: #444444;
border: 1px solid #555555; border: 1px solid #555555;
-webkit-border-radius: 3; -webkit-border-radius: 3;
position: relative; position: relative;
padding: 3px 8px; padding: 3px 8px;
color: #999999; } color: #999999; }
#group_nav ul > li a:hover { #aspect_nav ul > li a:hover {
background: none; } background: none; }
#group_nav ul > li:hover a { #aspect_nav ul > li:hover a {
background-color: #555555; background-color: #555555;
color: #cccccc; } color: #cccccc; }
#group_nav ul > li.selected a { #aspect_nav ul > li.selected a {
padding-top: 5px; padding-top: 5px;
padding-bottom: 3px; padding-bottom: 3px;
line-height: 18px; line-height: 18px;
@ -492,9 +492,9 @@ h1.big_text {
background-color: #eeeeee; background-color: #eeeeee;
border-bottom: 1px solid #eeeeee; border-bottom: 1px solid #eeeeee;
color: black; } color: black; }
#group_nav ul > li.selected a:hover { #aspect_nav ul > li.selected a:hover {
background-color: #efefef; } background-color: #efefef; }
#group_nav ul > li.selected a a { #aspect_nav ul > li.selected a a {
color: black; } color: black; }
#add_photo_loader { #add_photo_loader {
@ -588,15 +588,15 @@ h1.big_text {
background-color: yellow; background-color: yellow;
border: 1px #666666 solid; } border: 1px #666666 solid; }
.group, .aspect,
.requests, .requests,
.remove { .remove {
list-style: none; } list-style: none; }
.group h3, .aspect h3,
.requests h3, .requests h3,
.remove h3 { .remove h3 {
display: inline-block; } display: inline-block; }
.group ul, .aspect ul,
.requests ul, .requests ul,
.remove ul { .remove ul {
min-height: 20px; min-height: 20px;
@ -608,8 +608,8 @@ h1.big_text {
border-radius: 3px; border-radius: 3px;
list-style: none; list-style: none;
padding: 15px; } padding: 15px; }
.group .person, .aspect .person,
.group .requested_person, .aspect .requested_person,
.requests .person, .requests .person,
.requests .requested_person, .requests .requested_person,
.remove .person, .remove .person,
@ -626,8 +626,8 @@ h1.big_text {
height: 75px; height: 75px;
padding: 5px; padding: 5px;
border: 1px solid #999999; } border: 1px solid #999999; }
.group .person img, .aspect .person img,
.group .requested_person img, .aspect .requested_person img,
.requests .person img, .requests .person img,
.requests .requested_person img, .requests .requested_person img,
.remove .person img, .remove .person img,
@ -635,8 +635,8 @@ h1.big_text {
height: 50px; height: 50px;
width: 50px; width: 50px;
display: inline-block; } display: inline-block; }
.group .person .grey, .aspect .person .grey,
.group .requested_person .grey, .aspect .requested_person .grey,
.requests .person .grey, .requests .person .grey,
.requests .requested_person .grey, .requests .requested_person .grey,
.remove .person .grey, .remove .person .grey,

View file

@ -6,9 +6,11 @@
weight: normal; weight: normal;
style: normal; } } style: normal; } }
/* via blueprint */
html { html {
font-size: 100.01%; } font-size: 100.01%; }
/* via blueprint */
body { body {
font-size: 75%; font-size: 75%;
font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
@ -16,12 +18,14 @@ body {
background: white; background: white;
margin-left: 2em; } margin-left: 2em; }
/* via blueprint */
input[type=text], input[type=text],
input[type=password], input[type=password],
textarea, select { textarea, select {
background-color: white; background-color: white;
border: 1px solid #bbbbbb; } border: 1px solid #bbbbbb; }
/* via blueprint */
input[type=text]:focus, input[type=text]:focus,
input[type=password]:focus, input[type=password]:focus,
input.text:focus, input.text:focus,