diff options
| -rw-r--r-- | app/assets/stylesheets/generic/mobile.scss | 33 | ||||
| -rw-r--r-- | app/assets/stylesheets/sections/projects.scss | 14 | ||||
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/_milestones_filter.html.haml | 4 |
4 files changed, 34 insertions, 19 deletions
diff --git a/app/assets/stylesheets/generic/mobile.scss b/app/assets/stylesheets/generic/mobile.scss index c164b07b104..bcd28098502 100644 --- a/app/assets/stylesheets/generic/mobile.scss +++ b/app/assets/stylesheets/generic/mobile.scss @@ -1,4 +1,4 @@ -/** Common mobile (screen XS) styles **/ +/** Common mobile (screen XS, SM) styles **/ @media (max-width: $screen-xs-max) { .container .content { margin-top: 20px; @@ -13,5 +13,36 @@ display: none; } } + + .issues-filters, + .dash-projects-filters { + display: none; + } + + .rss-btn { + display: none !important; + } + + .project-home-panel { + .star-fork-buttons { + padding-top: 10px; + padding-right: 15px; + } + } + + .project-home-links { + display: none; + } } +@media (max-width: $screen-sm-max) { + .issues-filters { + .milestone-filter, .labels-filter { + display: none; + } + } + + .page-title .new-issue-link { + display: none; + } +} diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss index fbfe9ad4c93..93c0c2bc518 100644 --- a/app/assets/stylesheets/sections/projects.scss +++ b/app/assets/stylesheets/sections/projects.scss @@ -296,20 +296,6 @@ ul.nav.nav-projects-tabs { } } -@media (max-width: $screen-xs-max) { - .project-home-panel { - .star-fork-buttons { - padding-top: 10px; - padding-right: 15px; - } - } - - .project-home-links { - display: none; - } -} - - table.table.protected-branches-list tr.no-border { th, td { border: 0; diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index b21a394ebeb..75411c6d86f 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -10,7 +10,7 @@ .pull-right - if can?(current_user, :write_issue, @project) - = link_to new_project_issue_path(@project), class: "btn btn-grouped", title: "New Issue", id: "new_issue_link" do + = link_to new_project_issue_path(@project), class: "btn btn-grouped new-issue-link", title: "New Issue", id: "new_issue_link" do %i.fa.fa-plus New Issue - if can?(current_user, :modify_issue, @issue) diff --git a/app/views/shared/_milestones_filter.html.haml b/app/views/shared/_milestones_filter.html.haml index 8c2fd166922..208f1b77372 100644 --- a/app/views/shared/_milestones_filter.html.haml +++ b/app/views/shared/_milestones_filter.html.haml @@ -1,6 +1,4 @@ -.fixed.sidebar-expand-button.hidden-lg.hidden-md - %i.fa.fa-list.fa-2x -.responsive-side.milestones-filters.append-bottom-10 +.milestones-filters.append-bottom-10 %ul.nav.nav-pills.nav-compact %li{class: ("active" if params[:state].blank? || params[:state] == 'opened')} = link_to milestones_filter_path(state: 'opened') do |