Skip to content

Commit

Permalink
シングルビューの表示を改善
Browse files Browse the repository at this point in the history
  • Loading branch information
wawawanet committed Dec 21, 2018
1 parent 17d0f1c commit f2f0bb0
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 9 deletions.
8 changes: 8 additions & 0 deletions app/assets/stylesheets/custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@ p {
font-weight: 600;
}

.add {
font-size: 24px;
}

.split-box {
padding: 40px;
}

.dropdown.nav-avatar {

.dropdown-toggle:after {
Expand Down
6 changes: 2 additions & 4 deletions app/views/schedule/_insert.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
<div class="container">
<div id="schedule-calendar"></div>
<%= put_fullcalendar_events %>
</div>
<div id="schedule-calendar"></div>
<%= put_fullcalendar_events %>
2 changes: 1 addition & 1 deletion app/views/task/_header.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<h1>Tascal</h1>
<!-- <h1>Tascal</h1> -->
<!-- <h2>空き時間ベースで予定を把握できるタスク管理アプリです</h2> -->
<!-- <h2>タスクに割ける時間を計算出来ます!</h2> -->
<!-- <p>残り時間:締切までの時間のうち、予定が入っていない時間</p> -->
Expand Down
6 changes: 2 additions & 4 deletions app/views/task/insert.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,14 @@
<% end %>

<div class="container" id="insert_section">

<ul class="nav nav-tabs" role="tablist">
<li class="active" role="presentation">
<a aria-controls="tab_a" data-toggle="tab" href="#tab_a" role="tab">タスク追加</a>
<a aria-controls="tab_a" data-toggle="tab" href="#tab_a" role="tab" class="add">タスク追加</a>
</li>
<li role="presentation">
<a aria-controls="tab_b" data-toggle="tab" href="#tab_b" role="tab">予定追加</a>
<a aria-controls="tab_b" data-toggle="tab" href="#tab_b" role="tab" class="add">予定追加</a>
</li>
</ul>

<div class="tab-content">
<div class="tab-pane active" id="tab_a" role="tabpanel">
<p>
Expand Down

0 comments on commit f2f0bb0

Please sign in to comment.