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

Merge pull request #5799 from svbergerem/invitation-input

Browse source 
Unify invite code and contacts page link style
This commit is contained in:
Jonne Haß 2015-03-20 01:52:00 +01:00
commit 496a16d14d
3 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/stylesheets/invitations.scss
View file

@ -1,4 +1,5 @@
#invite_code { #invite_code {
background-color: $white;
cursor: text; cursor: text;
display: block; display: block;
margin-top: 5px; margin-top: 5px;

1
app/assets/stylesheets/sidebar.scss
View file

@ -34,7 +34,6 @@
} }
& > #invite_code { & > #invite_code {
background-color: $white;
box-sizing: border-box; box-sizing: border-box;
font-size: 11px; font-size: 11px;
height: 30px; height: 30px;

2
app/views/contacts/_sidebar.html.haml
View file

@ -4,7 +4,7 @@
%hr %hr
- if AppConfig.settings.community_spotlight.enable? - if AppConfig.settings.community_spotlight.enable?
.text-center.spotlight .text-center.spotlight
= link_to t('contacts.spotlight.community_spotlight'), community_spotlight_path, :class => "element_selector" = link_to t('contacts.spotlight.community_spotlight'), community_spotlight_path, :class => "btn btn-link"
.text-center .text-center
.btn.btn-link{ 'data-toggle' => 'modal', 'data-target' => '#invitationsModal'} .btn.btn-link{ 'data-toggle' => 'modal', 'data-target' => '#invitationsModal'}
= t('invitations.new.invite_someone_to_join') = t('invitations.new.invite_someone_to_join')