diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss index 514bcc153..a5b4f6e62 100644 --- a/app/assets/stylesheets/_application.scss +++ b/app/assets/stylesheets/_application.scss @@ -102,6 +102,5 @@ @import "blueimp-gallery"; @import "gallery"; -/* settings */ -@import "user_applications"; -@import "bootstrap3-switch"; \ No newline at end of file +// settings +@import 'user_applications'; diff --git a/app/assets/stylesheets/user_applications.scss b/app/assets/stylesheets/user_applications.scss index 39c94fc75..87a0005ce 100644 --- a/app/assets/stylesheets/user_applications.scss +++ b/app/assets/stylesheets/user_applications.scss @@ -1,9 +1,9 @@ .application-img { - margin: 9px 0; float: left; - width: 60px; + margin: 9px 0; max-height: 60px; text-align: center; + width: 60px; [class^="entypo-"] { font-size: 60px; @@ -11,6 +11,7 @@ margin: 0; padding: 0; width: 100%; + &::before { position: relative; top: -15px; @@ -19,10 +20,10 @@ } .application-authorizations { - width: calc(100% - 60px); - padding: 0 0 15px 15px; display: inline-block; float: right; + padding: 0 0 15px 15px; + width: calc(100% - 60px); } .application-tos-policy > b { diff --git a/app/presenters/user_application_presenter.rb b/app/presenters/user_application_presenter.rb index ad147626a..0bc2ea9d4 100644 --- a/app/presenters/user_application_presenter.rb +++ b/app/presenters/user_application_presenter.rb @@ -1,14 +1,12 @@ class UserApplicationPresenter + attr_reader :scopes + def initialize(application, scopes, authorization_id=nil) @app = application @scopes = scopes @authorization_id = authorization_id end - def scopes - @scopes - end - def id @authorization_id end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index b97fb6166..6bad87360 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -79,7 +79,7 @@ end def client_assertion_with_nonexistent_client_id_path @client_assertion_with_nonexistent_client_id = File.join(File.dirname(__FILE__), "fixtures", - "client_assertion_with_nonexistent_client_id.txt") + "client_assertion_with_nonexistent_client_id.txt") end # Force fixture rebuild