nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix pronto remarks

Browse source
This commit is contained in:
augier 2015-11-08 17:40:12 +01:00 committed by theworldbright
parent c6bec2f2dc
commit 73c1f0bc70
4 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/stylesheets/_application.scss
View file

@ -102,6 +102,5 @@
@import "blueimp-gallery"; @import "blueimp-gallery";
@import "gallery"; @import "gallery";
/* settings */ // settings
@import "user_applications"; @import 'user_applications';
@import "bootstrap3-switch";

9
app/assets/stylesheets/user_applications.scss
View file

@ -1,9 +1,9 @@
.application-img { .application-img {
margin: 9px 0;
float: left; float: left;
width: 60px; margin: 9px 0;
max-height: 60px; max-height: 60px;
text-align: center; text-align: center;
width: 60px;
[class^="entypo-"] { [class^="entypo-"] {
font-size: 60px; font-size: 60px;
@ -11,6 +11,7 @@
margin: 0; margin: 0;
padding: 0; padding: 0;
width: 100%; width: 100%;
&::before { &::before {
position: relative; position: relative;
top: -15px; top: -15px;
@ -19,10 +20,10 @@
} }
.application-authorizations { .application-authorizations {
width: calc(100% - 60px);
padding: 0 0 15px 15px;
display: inline-block; display: inline-block;
float: right; float: right;
padding: 0 0 15px 15px;
width: calc(100% - 60px);
} }
.application-tos-policy > b { .application-tos-policy > b {

6
app/presenters/user_application_presenter.rb
View file

@ -1,14 +1,12 @@
class UserApplicationPresenter class UserApplicationPresenter
attr_reader :scopes
def initialize(application, scopes, authorization_id=nil) def initialize(application, scopes, authorization_id=nil)
@app = application @app = application
@scopes = scopes @scopes = scopes
@authorization_id = authorization_id @authorization_id = authorization_id
end end
def scopes
@scopes
end
def id def id
@authorization_id @authorization_id
end end

2
spec/spec_helper.rb
View file

@ -79,7 +79,7 @@ end
def client_assertion_with_nonexistent_client_id_path 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 = File.join(File.dirname(__FILE__), "fixtures",
"client_assertion_with_nonexistent_client_id.txt") "client_assertion_with_nonexistent_client_id.txt")
end end
# Force fixture rebuild # Force fixture rebuild