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

Merge branch 'select_aspects_dropdown_list' of git://github.com/movilla/diaspora into develop

Browse source
This commit is contained in:
Jonne Haß 2012-09-17 21:36:36 +02:00
commit 42f97db42e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/stylesheets/ui.css.sass
View file

@ -119,7 +119,7 @@ input.button
> li
:font-size 11px !important
:padding 3px 2px
:padding 6px 2px
:left 24px
:position relative
:color #222
@ -195,8 +195,8 @@ input.button
:top 1px solid #444
:bottom 1px solid #444
:padding
:top 2px
:bottom 2px
:top 5px
:bottom 5px
&.divider
:padding

2
app/views/shared/_publisher.html.haml
View file

@ -61,7 +61,7 @@
%li.public.radio{"data-aspect_id" => "public", :class => ("selected" if publisher_public)}
= t('public')
%li.divider.all_aspects.radio{:style => "border-bottom: 1px solid #ddd;", "data-aspect_id" => "all_aspects", :class => ("selected" if (!publisher_public && all_aspects_selected?(selected_aspects)))}
%li.divider.all_aspects.radio{:style => "padding-bottom: 5px; border-bottom: 1px solid #ddd;", "data-aspect_id" => "all_aspects", :class => ("selected" if (!publisher_public && all_aspects_selected?(selected_aspects)))}
= t('all_aspects')
- for aspect in all_aspects