Skip to content
Extraits de code Groupes Projets
Valider aa0a00d9 rédigé par Raphael's avatar Raphael
Parcourir les fichiers

Finish moving to aspects, DB reset required

parent 9837340e
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -22,7 +22,7 @@
%h1{:id => 'aspect_title'}
Relations
Aspects
%ul#aspect_list
......
......@@ -64,7 +64,7 @@
- else
- if @aspect == :all
%h1
= link_to "All Relations", root_path
= link_to "All Aspects", root_path
- else
%h1
= link_to @aspect.name, @aspect
......
......@@ -11,6 +11,7 @@
%ul{ :style => "position:absolute;right:0;bottom:0;"}
%li{:class => ("selected" if @aspect == :all)}
= link_to "All Aspects", root_url
%li{ :style => "margin-right:0;" }
= link_to "manage", edit_aspect_path(Aspect.first), :class => "edit_aspect_button", :title => "Manage your Aspects"
......
......@@ -102,21 +102,21 @@ header {
padding-right: 10px; }
header #session_action a.new_requests {
color: #df0101; }
header #group_header {
header #aspect_header {
z-index: 5;
text-shadow: 0 2px 0 white;
background-color: #eeeeee;
border-top: 1px solid #555555;
height: 85px; }
header #group_header h1 {
header #aspect_header h1 {
margin-bottom: 0;
margin-top: 15px; }
header #group_header a {
header #aspect_header a {
color: #111111; }
header #group_header a:hover {
header #aspect_header a:hover {
background: none;
color: #333333; }
header #group_header .page_title {
header #aspect_header .page_title {
text-transform: uppercase; }
#show_filters {
......@@ -455,36 +455,36 @@ h1.big_text {
.image_cycle img {
display: none; }
#group_nav {
#aspect_nav {
position: relative;
color: black;
margin-top: 8px;
margin-bottom: 1px; }
#group_nav #group_manage_button {
#aspect_nav #aspect_manage_button {
display: inline; }
#group_nav #group_manage_button a {
#aspect_nav #aspect_manage_button a {
color: #999999; }
#group_nav ul {
#aspect_nav ul {
margin: 0;
padding: 0;
list-style: none; }
#group_nav ul > li {
#aspect_nav ul > li {
padding: 0;
display: inline;
margin-right: 0.5em; }
#group_nav ul > li a {
#aspect_nav ul > li a {
background-color: #444444;
border: 1px solid #555555;
-webkit-border-radius: 3;
position: relative;
padding: 3px 8px;
color: #999999; }
#group_nav ul > li a:hover {
#aspect_nav ul > li a:hover {
background: none; }
#group_nav ul > li:hover a {
#aspect_nav ul > li:hover a {
background-color: #555555;
color: #cccccc; }
#group_nav ul > li.selected a {
#aspect_nav ul > li.selected a {
padding-top: 5px;
padding-bottom: 3px;
line-height: 18px;
......@@ -492,9 +492,9 @@ h1.big_text {
background-color: #eeeeee;
border-bottom: 1px solid #eeeeee;
color: black; }
#group_nav ul > li.selected a:hover {
#aspect_nav ul > li.selected a:hover {
background-color: #efefef; }
#group_nav ul > li.selected a a {
#aspect_nav ul > li.selected a a {
color: black; }
#add_photo_loader {
......@@ -588,15 +588,15 @@ h1.big_text {
background-color: yellow;
border: 1px #666666 solid; }
.group,
.aspect,
.requests,
.remove {
list-style: none; }
.group h3,
.aspect h3,
.requests h3,
.remove h3 {
display: inline-block; }
.group ul,
.aspect ul,
.requests ul,
.remove ul {
min-height: 20px;
......@@ -608,8 +608,8 @@ h1.big_text {
border-radius: 3px;
list-style: none;
padding: 15px; }
.group .person,
.group .requested_person,
.aspect .person,
.aspect .requested_person,
.requests .person,
.requests .requested_person,
.remove .person,
......@@ -626,8 +626,8 @@ h1.big_text {
height: 75px;
padding: 5px;
border: 1px solid #999999; }
.group .person img,
.group .requested_person img,
.aspect .person img,
.aspect .requested_person img,
.requests .person img,
.requests .requested_person img,
.remove .person img,
......@@ -635,8 +635,8 @@ h1.big_text {
height: 50px;
width: 50px;
display: inline-block; }
.group .person .grey,
.group .requested_person .grey,
.aspect .person .grey,
.aspect .requested_person .grey,
.requests .person .grey,
.requests .requested_person .grey,
.remove .person .grey,
......
......@@ -6,9 +6,11 @@
weight: normal;
style: normal; } }
/* via blueprint */
html {
font-size: 100.01%; }
/* via blueprint */
body {
font-size: 75%;
font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
......@@ -16,12 +18,14 @@ body {
background: white;
margin-left: 2em; }
/* via blueprint */
input[type=text],
input[type=password],
textarea, select {
background-color: white;
border: 1px solid #bbbbbb; }
/* via blueprint */
input[type=text]:focus,
input[type=password]:focus,
input.text:focus,
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter