diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss index 37405d3b0..514bcc153 100644 --- a/app/assets/stylesheets/_application.scss +++ b/app/assets/stylesheets/_application.scss @@ -101,3 +101,7 @@ /* gallery */ @import "blueimp-gallery"; @import "gallery"; + +/* settings */ +@import "user_applications"; +@import "bootstrap3-switch"; \ No newline at end of file diff --git a/app/assets/stylesheets/mobile/settings.scss b/app/assets/stylesheets/mobile/settings.scss index 04662edcd..a19241e60 100644 --- a/app/assets/stylesheets/mobile/settings.scss +++ b/app/assets/stylesheets/mobile/settings.scss @@ -40,5 +40,21 @@ } .applications-page { - .application-img { margin: 9px 0; } + .application-img { + display: inline; + float: left; + + img { + width: 70px; + max-height: 70px; + margin: 9px 0; + } + } + + .application-authorizations { + width: calc(100% - 70px); + padding: 0 0 15px 15px; + display: inline-block; + float: right; + } } \ No newline at end of file diff --git a/app/assets/stylesheets/user_applications.scss b/app/assets/stylesheets/user_applications.scss new file mode 100644 index 000000000..32cadd102 --- /dev/null +++ b/app/assets/stylesheets/user_applications.scss @@ -0,0 +1,19 @@ +.applications-page { + .application-img { + display: inline; + float: left; + + img { + width: 70px; + max-height: 70px; + margin: 9px 0; + } + } + + .application-authorizations { + width: calc(100% - 70px); + padding: 0 0 15px 15px; + display: inline-block; + float: right; + } +} diff --git a/app/views/user_applications/_add_remove_applications.haml b/app/views/user_applications/_add_remove_applications.haml index 2a6a1e3f5..4f0c082d0 100644 --- a/app/views/user_applications/_add_remove_applications.haml +++ b/app/views/user_applications/_add_remove_applications.haml @@ -2,25 +2,22 @@ %ul.list-group - @user_apps.user_applications.each do |app| %li.list-group-item - .row - .col-xs-2.application-img - = image_tag app[:image], class: "img-responsive" - .col-xs-10 - - if app[:authorizations].count > 0 - %h4="#{app[:name]} #{t("user_applications.index.access")}" - %ul - - app[:authorizations].each do |authorization| - %li - %b= t("user_applications.scopes.#{authorization}.name") - %p= t("user_applications.scopes.#{authorization}.description") - - else - .well - =t("user_applications.show.no_requirement") - .small-horizontal-spacer - .row - = form_for "application", url: "#{api_openid_connect_authorizations_path}/#{app[:id]}", - html: { method: :delete, class: "form-horizontal col-xs-12"} do |f| - .clearfix= f.submit t("user_applications.revoke_autorization"), class: "btn btn-primary pull-right" + .application-img + = image_tag app[:image], class: "img-responsive" + .application-authorizations + - if app[:authorizations].count > 0 + %h4="#{app[:name]} #{t("user_applications.index.access")}" + %ul + - app[:authorizations].each do |authorization| + %li + %b= t("user_applications.scopes.#{authorization}.name") + %p= t("user_applications.scopes.#{authorization}.description") + - else + .well + =t("user_applications.show.no_requirement") + = form_for "application", url: "#{api_openid_connect_authorizations_path}/#{app[:id]}", + html: { method: :delete, class: "form-horizontal"} do |f| + .clearfix= f.submit t("user_applications.revoke_autorization"), class: "btn btn-primary pull-right" - else .well