From e7c21ad95b2eac21827e9db3e654621f0dad4588 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Thu, 3 Sep 2015 10:03:06 +0200 Subject: [PATCH] AutoCommit Don Sep 3 10:03:06 CEST 2015 --- .../themes/blue2/application.css.scss | 2 +- .../themes/blue2/linkboxes.css.scss | 56 ++++++++++++++++++- spec/views/fetprofiles/index.html.erb_spec.rb | 2 +- spec/views/fetprofiles/show.html.erb_spec.rb | 2 +- 4 files changed, 56 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/themes/blue2/application.css.scss b/app/assets/stylesheets/themes/blue2/application.css.scss index dfecb6a..4e48983 100755 --- a/app/assets/stylesheets/themes/blue2/application.css.scss +++ b/app/assets/stylesheets/themes/blue2/application.css.scss @@ -130,7 +130,7 @@ $box-background: white; @import 'linkboxes'; @import 'extra'; body { -background: #FFF; //#EFEFEF; +background: #FCFCFC; //#EFEFEF; background-size:100%; } diff --git a/app/assets/stylesheets/themes/blue2/linkboxes.css.scss b/app/assets/stylesheets/themes/blue2/linkboxes.css.scss index 789e94f..1ebf7ec 100644 --- a/app/assets/stylesheets/themes/blue2/linkboxes.css.scss +++ b/app/assets/stylesheets/themes/blue2/linkboxes.css.scss @@ -58,7 +58,10 @@ a.color-3-dark:hover { color:$color_schema_3; } a.color-4-dark:hover { color:$color_schema_4; } a.color-5-dark:hover { color:$color_schema_5; } + a.linkbox li { } + + ul.linklist { max-width:100%; padding:0; @@ -66,15 +69,62 @@ ul.linklist { } ul.linklist li { list-style:none; - margin-bottom:2px; + } ul.linklist li a i{ vertical-align:middle; margin-right:6px; 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; - border-radius:$box-border-radius; border: $box-border; background: $box-background; display:block; diff --git a/spec/views/fetprofiles/index.html.erb_spec.rb b/spec/views/fetprofiles/index.html.erb_spec.rb index d28b658..acfffba 100644 --- a/spec/views/fetprofiles/index.html.erb_spec.rb +++ b/spec/views/fetprofiles/index.html.erb_spec.rb @@ -26,6 +26,6 @@ describe "fetprofiles/index" , :type=>:view do expect(rendered).to match(/#{@fetprofile4.vorname}/) expect(rendered).to match(/#{@fetprofile4.nachname}/) # expect(rendered).to have_tag("fetprofile_#{@fetprofile1.id}") - + end end diff --git a/spec/views/fetprofiles/show.html.erb_spec.rb b/spec/views/fetprofiles/show.html.erb_spec.rb index fac5430..bca5af1 100644 --- a/spec/views/fetprofiles/show.html.erb_spec.rb +++ b/spec/views/fetprofiles/show.html.erb_spec.rb @@ -60,7 +60,7 @@ end it "renders public attributes" do render 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.fetmail}/)