diff --git a/app/assets/images/bitcoin.png b/app/assets/images/bitcoin.png new file mode 100644 index 0000000..7d36f17 Binary files /dev/null and b/app/assets/images/bitcoin.png differ diff --git a/app/assets/images/check-empty.svg b/app/assets/images/check-empty.svg new file mode 100644 index 0000000..efd0bd6 --- /dev/null +++ b/app/assets/images/check-empty.svg @@ -0,0 +1,112 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/app/assets/images/check-full.svg b/app/assets/images/check-full.svg new file mode 100644 index 0000000..d9fd406 --- /dev/null +++ b/app/assets/images/check-full.svg @@ -0,0 +1,116 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/app/assets/images/check-grey.svg b/app/assets/images/check-grey.svg new file mode 100644 index 0000000..11d1492 --- /dev/null +++ b/app/assets/images/check-grey.svg @@ -0,0 +1,125 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/app/assets/images/cross-orange.svg b/app/assets/images/cross-orange.svg new file mode 100644 index 0000000..0be0f2d --- /dev/null +++ b/app/assets/images/cross-orange.svg @@ -0,0 +1,166 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/cross-red.svg b/app/assets/images/cross-red.svg new file mode 100644 index 0000000..700a2b8 --- /dev/null +++ b/app/assets/images/cross-red.svg @@ -0,0 +1,37 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/donate.svg b/app/assets/images/donate.svg new file mode 100644 index 0000000..007d686 --- /dev/null +++ b/app/assets/images/donate.svg @@ -0,0 +1,2 @@ +Donate \ No newline at end of file diff --git a/app/assets/images/donorbox.png b/app/assets/images/donorbox.png new file mode 100644 index 0000000..37de88c Binary files /dev/null and b/app/assets/images/donorbox.png differ diff --git a/app/assets/images/paypal.svg b/app/assets/images/paypal.svg new file mode 100644 index 0000000..2ff7110 --- /dev/null +++ b/app/assets/images/paypal.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/javascripts/application.coffee b/app/assets/javascripts/application.coffee index da733f0..7e6592f 100644 --- a/app/assets/javascripts/application.coffee +++ b/app/assets/javascripts/application.coffee @@ -1,2 +1,3 @@ +##= require jquery ##= require bootstrap/dropdown ##= require_tree . diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss.erb similarity index 64% rename from app/assets/stylesheets/application.scss rename to app/assets/stylesheets/application.scss.erb index 13d6e92..f677682 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss.erb @@ -35,11 +35,17 @@ body { background-color: #000; } -table.center td { - text-align: center; +.label-critical, .progress-bar-critical { + background-color: #000; +} + +table.center { + td, th { + text-align: center; - &.left { - text-align: left; + &.left { + text-align: left; + } } } @@ -51,10 +57,13 @@ td.primary { background-color: $state-info-bg; } +<% unless Rails.env == 'production' %> .translation_missing { border: 1px solid red; } +<% end %> + .progress-bar-default { background-color: $label-default-bg; } @@ -79,45 +88,70 @@ $color-great: #5cb85c; .label-state-critical { background-color: $color-critical; } + .label-state-error { background-color: $color-error; } + .label-state-warning { background-color: $color-warning; color: $text-color; } + .label-state-good { background-color: $color-good; color: $text-color; } + .label-state-best { background-color: $color-best; } + .label-state-great { background-color: $color-great; } .label-state-default { - //background-color: #008000; background-color: $label-default-bg; } + .label-state-success { background-color: $label-success-bg; } -.alert-critical, .alert-error { - background-color: $alert-danger-bg; - color: $alert-danger-text; - border-color: $alert-danger-border +$lighten-alert: 35%; +.alert-critical { + background-color: lighten($color-critical, $lighten-alert); + color: $color-critical; + border-color: $color-critical; +} + +.alert-error { + background-color: lighten($color-error, $lighten-alert); + color: $color-error; + border-color: $color-error; } + .alert-warning { - background-color: $alert-warning-bg; - color: $alert-warning-text; - border-color: $alert-warning-border + background-color: lighten($color-warning, $lighten-alert); + color: $color-warning; + border-color: $color-warning; } -.alert-good, .alert-great, .alert-best { - background-color: $alert-success-bg; - color: $alert-success-text; - border-color: $alert-success-border + +.alert-good { + background-color: lighten($color-good, $lighten-alert); + color: $color-good; + border-color: $color-good; +} + +.alert-best { + background-color: lighten($color-best, $lighten-alert); + color: $color-best; + border-color: $color-best; } +.alert-great { + background-color: lighten($color-great, $lighten-alert); + color: $color-great; + border-color: $color-great; +} diff --git a/app/assets/stylesheets/site.scss b/app/assets/stylesheets/site.scss deleted file mode 100644 index e69de29..0000000 diff --git a/app/assets/stylesheets/site.scss.erb b/app/assets/stylesheets/site.scss.erb new file mode 100644 index 0000000..75ec9a0 --- /dev/null +++ b/app/assets/stylesheets/site.scss.erb @@ -0,0 +1,32 @@ +#about, #help { + margin-bottom: 20px; + p { + font-size: 1.25em; + } +} + +#donorbox { + background: #2d81c5 url(<%= image_path 'donorbox.png' %>) no-repeat 18px center; + color: #fff; + text-decoration: none; + font-family: Verdana, sans-serif; + display: inline-block; + font-size: 16px; + padding: 13px 17px 13px 56px; + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; + box-shadow: 0 1px 0 0 #1f5a89; + text-shadow: 0 1px rgba(0, 0, 0, 0.3); +} + +#liberapay, #donorbox, #paypal { + img { + height: 50px; + max-width: 140px; + } +} + +table.scoring img { + width: 30px; +} diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index b5abf2a..b65aef6 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -34,4 +34,12 @@ class SiteController < ApplicationController @suite = params[:id] || params.require(:suite) @ciphers = CryptCheck::Tls::Cipher.list @suite end + + def help + + end + + def about + + end end diff --git a/app/helpers/check_helper.rb b/app/helpers/check_helper.rb index 35cb1e5..ae6400b 100644 --- a/app/helpers/check_helper.rb +++ b/app/helpers/check_helper.rb @@ -54,7 +54,8 @@ module CheckHelper end def rank_label(rank) - label rank, rank_color(rank) + l = %i(V T).include? rank + label rank, rank_color(rank), !l end def protocol_label(protocol) diff --git a/app/views/application/_headers.erb b/app/views/application/_headers.erb index c90e9e5..2317a38 100644 --- a/app/views/application/_headers.erb +++ b/app/views/application/_headers.erb @@ -14,6 +14,8 @@