summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/generic/mobile.scss33
-rw-r--r--app/views/dashboard/_activities.html.haml21
-rw-r--r--app/views/groups/show.html.haml21
-rw-r--r--app/views/projects/show.html.haml24
4 files changed, 67 insertions, 32 deletions
diff --git a/app/assets/stylesheets/generic/mobile.scss b/app/assets/stylesheets/generic/mobile.scss
index 71a1fc4493f..c9bbacd7348 100644
--- a/app/assets/stylesheets/generic/mobile.scss
+++ b/app/assets/stylesheets/generic/mobile.scss
@@ -4,6 +4,11 @@
margin-top: 20px;
}
+ .container-fluid {
+ padding-left: 5px;
+ padding-right: 5px;
+ }
+
.nav.nav-tabs > li > a {
padding: 10px;
font-size: 12px;
@@ -27,6 +32,34 @@
.project-home-links {
display: none;
}
+
+ .project-avatar {
+ display: none;
+ }
+
+ .project-home-panel {
+ padding-left: 0 !important;
+
+ .project-home-row {
+ .project-home-desc {
+ margin-right: 0 !important;
+ float: none !important;
+ }
+
+ .project-repo-buttons {
+ position: static;
+ margin-top: 15px;
+ width: 100%;
+ float: none;
+ text-align: left;
+ }
+ }
+ }
+
+ .navbar-inner .title {
+ margin-left: 6px !important;
+ max-width: 70% !important;
+ }
}
@media (max-width: $screen-sm-max) {
diff --git a/app/views/dashboard/_activities.html.haml b/app/views/dashboard/_activities.html.haml
index b4fe8fecf99..ba49013d834 100644
--- a/app/views/dashboard/_activities.html.haml
+++ b/app/views/dashboard/_activities.html.haml
@@ -1,13 +1,14 @@
-= render "events/event_last_push", event: @last_push
+.hidden-xs
+ = render "events/event_last_push", event: @last_push
-- if current_user
- %ul.nav.nav-pills.event_filter.pull-right
- %li.pull-right
- = link_to dashboard_path(:atom, { private_token: current_user.private_token }), class: 'rss-btn' do
- %i.fa.fa-rss
- Activity Feed
-
-= render 'shared/event_filter'
-%hr
+ - if current_user
+ %ul.nav.nav-pills.event_filter.pull-right
+ %li.pull-right
+ = link_to dashboard_path(:atom, { private_token: current_user.private_token }), class: 'rss-btn' do
+ %i.fa.fa-rss
+ Activity Feed
+
+ = render 'shared/event_filter'
+ %hr
.content_list
= spinner
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 70a18f064be..3db0dfa59b1 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -15,18 +15,19 @@
%hr
.row
%section.activities.col-md-8
- - if current_user
- = render "events/event_last_push", event: @last_push
-
+ .hidden-xs
- if current_user
- %ul.nav.nav-pills.event_filter.pull-right
- %li
- = link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'rss-btn' do
- %i.fa.fa-rss
- Activity Feed
+ = render "events/event_last_push", event: @last_push
+
+ - if current_user
+ %ul.nav.nav-pills.event_filter.pull-right
+ %li
+ = link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'rss-btn' do
+ %i.fa.fa-rss
+ Activity Feed
- = render 'shared/event_filter'
- %hr
+ = render 'shared/event_filter'
+ %hr
.content_list
= spinner
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index f85705ffdd2..1787caa243d 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -7,7 +7,6 @@
= render 'shared/no_password'
= render "home_panel"
-
%ul.nav.nav-tabs
%li.active
= link_to '#tab-activity', 'data-toggle' => 'tab' do
@@ -17,11 +16,11 @@
= link_to '#tab-readme', 'data-toggle' => 'tab' do
Readme
- if @repository.changelog
- %li
+ %li.hidden-xs
= link_to changelog_url(@project) do
Changelog
- if @repository.contribution_guide
- %li
+ %li.hidden-xs
= link_to contribution_guide_url(@project) do
Contribution guide
- if @repository.license
@@ -42,17 +41,18 @@
= link_to '#aside', class: 'show-aside' do
%i.fa.fa-angle-left
%section.col-md-9
- = render "events/event_last_push", event: @last_push
+ .hidden-xs
+ = render "events/event_last_push", event: @last_push
- - if current_user
- %ul.nav.nav-pills.event_filter.pull-right
- %li
- = link_to namespace_project_path(@project.namespace, @project, format: :atom, private_token: current_user.private_token), title: "Feed", class: 'rss-btn' do
- %i.fa.fa-rss
- Activity Feed
+ - if current_user
+ %ul.nav.nav-pills.event_filter.pull-right
+ %li
+ = link_to namespace_project_path(@project.namespace, @project, format: :atom, private_token: current_user.private_token), title: "Feed", class: 'rss-btn' do
+ %i.fa.fa-rss
+ Activity Feed
- = render 'shared/event_filter'
- %hr
+ = render 'shared/event_filter'
+ %hr
.content_list
= spinner
%aside.col-md-3.project-side