diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css index 112ae64b..744c8d5b 100644 --- a/app/assets/stylesheets/desktopmain.css +++ b/app/assets/stylesheets/desktopmain.css @@ -736,6 +736,23 @@ a:focus { outline: none; } #paper_add .f_w { width: 336px; } #paper_add label { margin-right: 0; } +/* Journal Journal list */ +#journal_list .g_col { + width: 416px; +} +#journal_list .g_col { + float: left; + height: 456px; + margin-left: 12px; + padding-left: 12px; + border-left: solid 1px #EEE; +} +#journal_list .g_col:first-child { + margin-left: 0; + padding-left: 0; + border: none; +} + /* App */ .app_frame { margin: 48px 96px 48px 156px; diff --git a/app/assets/stylesheets/orbit-bar.css.erb b/app/assets/stylesheets/orbit-bar.css.erb index 38441260..154f1158 100644 --- a/app/assets/stylesheets/orbit-bar.css.erb +++ b/app/assets/stylesheets/orbit-bar.css.erb @@ -143,6 +143,7 @@ display: inline-block; line-height: 22px; padding: 0 10px; + vertical-align: top; } #orbit-bar .nav img.member-img { display: inline-block; diff --git a/app/views/desktop/journal_lists/index.html.erb b/app/views/desktop/journal_lists/index.html.erb index 804787df..bcfa77b3 100644 --- a/app/views/desktop/journal_lists/index.html.erb +++ b/app/views/desktop/journal_lists/index.html.erb @@ -1,11 +1,25 @@ -