bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

AutoCommit Don Sep 3 10:03:06 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-09-03 10:03:06 +02:00
parent 889d7ac3d0
commit e7c21ad95b
4 changed files with 56 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/themes/blue2/application.css.scss
View File

@@ -130,7 +130,7 @@ $box-background: white;
@import 'linkboxes'; @import 'linkboxes';
@import 'extra'; @import 'extra';
body { body {
background: #FFF; //#EFEFEF; background: #FCFCFC; //#EFEFEF;
background-size:100%; background-size:100%;
} }

56
app/assets/stylesheets/themes/blue2/linkboxes.css.scss
View File

@@ -58,7 +58,10 @@ a.color-3-dark:hover { color:$color_schema_3; }
a.color-4-dark:hover { color:$color_schema_4; } a.color-4-dark:hover { color:$color_schema_4; }
a.color-5-dark:hover { color:$color_schema_5; } a.color-5-dark:hover { color:$color_schema_5; }
a.linkbox li { } a.linkbox li { }
ul.linklist { ul.linklist {
max-width:100%; max-width:100%;
padding:0; padding:0;
@@ -66,15 +69,62 @@ ul.linklist {
} }
ul.linklist li { ul.linklist li {
list-style:none; list-style:none;
margin-bottom:2px;
} }
ul.linklist li a i{ ul.linklist li a i{
vertical-align:middle; vertical-align:middle;
margin-right:6px; margin-right:6px;
font-size:2em;} font-size:2em;}
span.linklist a {
ul.linklist > li a.linkbox {
border-radius: 0;
border: none;
border-color:white;
padding-top: 7px;
margin-bottom:1px;
margin-top:1px;
}
ul.linklist > li a.linkbox:hover {
border-bottom: $box-border;
border-top: $box-border;
box-shadow: none;
background: #FCFCFC;
margin: 0;
margin-bottom:0px;
}
ul.linklist > li:first-child a.linkbox { margin-top:1px;}
ul.linklist > li:last-child a.linkbox { margin-bottom:1px;
}
ul.linklist > li:first-child a.linkbox {
border-top-left-radius:$box-border-radius;
border-top-right-radius:$box-border-radius;
border-top:none;
}
ul.linklist > li:last-child a.linkbox {
border-bottom-left-radius:$box-border-radius;
border-bottom-right-radius:$box-border-radius;
border-bottom:none;
}
ul.linklist {
border-radius: $box-border-radius;
border: $box-border;
}
span.linklist li a {
padding:5px; padding:5px;
border-radius:$box-border-radius;
border: $box-border; border: $box-border;
background: $box-background; background: $box-background;
display:block; display:block;

2
spec/views/fetprofiles/index.html.erb_spec.rb
View File

@@ -26,6 +26,6 @@ describe "fetprofiles/index" , :type=>:view do
expect(rendered).to match(/#{@fetprofile4.vorname}/) expect(rendered).to match(/#{@fetprofile4.vorname}/)
expect(rendered).to match(/#{@fetprofile4.nachname}/) expect(rendered).to match(/#{@fetprofile4.nachname}/)
# expect(rendered).to have_tag("fetprofile_#{@fetprofile1.id}") # expect(rendered).to have_tag("fetprofile_#{@fetprofile1.id}")
end end
end end

2
spec/views/fetprofiles/show.html.erb_spec.rb
View File

@@ -60,7 +60,7 @@ end
it "renders public attributes" do it "renders public attributes" do
render render
expect(rendered).to match(/#{@fetprofile.vorname}/) expect(rendered).to match(/#{@fetprofile.vorname}/)
expect(rendered).to match(/#{@fetprofile.nachname}/) expect(rendered).to match(/#{@fetprofile.nachname}/)
expect(rendered).to match(/#{@fetprofile.desc}/) expect(rendered).to match(/#{@fetprofile.desc}/)
expect(rendered).to match(/#{@fetprofile.fetmail}/) expect(rendered).to match(/#{@fetprofile.fetmail}/)