diff --git a/app/views/my/page.html.erb b/app/views/my/page.html.erb index 61c836e..c56e03c 100644 --- a/app/views/my/page.html.erb +++ b/app/views/my/page.html.erb @@ -7,15 +7,13 @@

<%=l(:label_my_page)%>

-
-
+
<% @groups.each do |group| %> -
+
<%= render_blocks(@blocks[group], @user) %>
<% end %>
-
<%= context_menu %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index fa59d6a..b46b988 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -442,9 +442,10 @@ div.square { .message .contextual { margin-top: 0; } .splitcontent {overflow: auto; display: flex; flex-wrap: wrap;} -.splitcontentleft, #list-left {flex: 1; margin-right: 5px;} -.splitcontentright, #list-right {flex: 1; margin-left: 5px;} -#list-top {width: 100%;} +.splitcontentleft {flex: 1; margin-right: 5px;} +.splitcontentright {flex: 1; margin-left: 5px;} +.splitcontenttop {flex: 2; flex-basis: 100%;} + form {display: inline;} input, select {vertical-align: middle; margin-top: 1px; margin-bottom: 1px;} input[type="submit"] { -webkit-appearance: button; }