diff options
| author | Takuya Noguchi <takninnovationresearch@gmail.com> | 2018-11-23 01:40:41 +0900 |
|---|---|---|
| committer | Takuya Noguchi <takninnovationresearch@gmail.com> | 2018-12-12 15:32:55 -0800 |
| commit | 7075c5a1ae7c6b5752d45b59fb1e18267823527f (patch) | |
| tree | de4a28a58de74f446a3e723dd738edfe0bd6fdd0 | |
| parent | df0973eb9438af5a44b0b177881f6217fafb36fa (diff) | |
| download | gitlab-ce-7075c5a1ae7c6b5752d45b59fb1e18267823527f.tar.gz | |
Replace .activity-filter-block with display properties
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| -rw-r--r-- | app/assets/stylesheets/framework/mobile.scss | 4 | ||||
| -rw-r--r-- | app/views/projects/_activity.html.haml | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/mobile.scss b/app/assets/stylesheets/framework/mobile.scss index e587ba80f11..64b3f3b9150 100644 --- a/app/assets/stylesheets/framework/mobile.scss +++ b/app/assets/stylesheets/framework/mobile.scss @@ -52,8 +52,4 @@ padding: 19px 10px; } } - - .activity-filter-block { - display: none; - } } diff --git a/app/views/projects/_activity.html.haml b/app/views/projects/_activity.html.haml index 6bf21570d41..7e7af9f9075 100644 --- a/app/views/projects/_activity.html.haml +++ b/app/views/projects/_activity.html.haml @@ -1,5 +1,5 @@ %div{ class: container_class } - .nav-block.activity-filter-block.activities + .nav-block.d-none.d-sm-block.activities = render 'shared/event_filter' .controls = link_to project_path(@project, rss_url_options), title: s_("ProjectActivityRSS|Subscribe"), class: 'btn rss-btn has-tooltip' do |