Merge branch 'mobile-ui-improvements' into 'master'
Improve mobile UI for dashboard and project pages Some love for mobile UI 😃 ## Before - - - ![Screenshot_2015-04-24-17-42-59](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/827f9cefa477fc7f0d1b2d56e479a35c/Screenshot_2015-04-24-17-42-59.png) ![Screenshot_2015-04-24-17-27-01](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/698eb90033d40ea7de9f599364a34d0e/Screenshot_2015-04-24-17-27-01.png) ## After - - - ![Screenshot_2015-04-24-17-16-08](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/7e3ad8bc18800f63a7be20ea31ccfd3b/Screenshot_2015-04-24-17-16-08.png) ![Screenshot_2015-04-24-17-39-18](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/cde3379836530d95e94922ba5c200cef/Screenshot_2015-04-24-17-39-18.png) Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !573
This commit is contained in:
commit
34e14b1ca7
|
@ -21,6 +21,7 @@ v 7.11.0 (unreleased)
|
||||||
- Improve UI for sidebar. Increase separation between navigation and content
|
- Improve UI for sidebar. Increase separation between navigation and content
|
||||||
- Improve new project command options (Ben Bodenmiller)
|
- Improve new project command options (Ben Bodenmiller)
|
||||||
- Prevent sending empty messages to HipChat (Chulki Lee)
|
- Prevent sending empty messages to HipChat (Chulki Lee)
|
||||||
|
- Improve UI for mobile phones on dashboard and project pages
|
||||||
|
|
||||||
v 7.10.0 (unreleased)
|
v 7.10.0 (unreleased)
|
||||||
- Ignore submodules that are defined in .gitmodules but are checked in as directories.
|
- Ignore submodules that are defined in .gitmodules but are checked in as directories.
|
||||||
|
|
|
@ -4,6 +4,11 @@
|
||||||
margin-top: 20px;
|
margin-top: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.container-fluid {
|
||||||
|
padding-left: 5px;
|
||||||
|
padding-right: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
.nav.nav-tabs > li > a {
|
.nav.nav-tabs > li > a {
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
|
@ -27,6 +32,34 @@
|
||||||
.project-home-links {
|
.project-home-links {
|
||||||
display: none;
|
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) {
|
@media (max-width: $screen-sm-max) {
|
||||||
|
|
|
@ -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
|
- if current_user
|
||||||
%ul.nav.nav-pills.event_filter.pull-right
|
%ul.nav.nav-pills.event_filter.pull-right
|
||||||
%li.pull-right
|
%li.pull-right
|
||||||
= link_to dashboard_path(:atom, { private_token: current_user.private_token }), class: 'rss-btn' do
|
= link_to dashboard_path(:atom, { private_token: current_user.private_token }), class: 'rss-btn' do
|
||||||
%i.fa.fa-rss
|
%i.fa.fa-rss
|
||||||
Activity Feed
|
Activity Feed
|
||||||
|
|
||||||
= render 'shared/event_filter'
|
= render 'shared/event_filter'
|
||||||
%hr
|
%hr
|
||||||
.content_list
|
.content_list
|
||||||
= spinner
|
= spinner
|
||||||
|
|
|
@ -15,18 +15,19 @@
|
||||||
%hr
|
%hr
|
||||||
.row
|
.row
|
||||||
%section.activities.col-md-8
|
%section.activities.col-md-8
|
||||||
- if current_user
|
.hidden-xs
|
||||||
= render "events/event_last_push", event: @last_push
|
|
||||||
|
|
||||||
- if current_user
|
- if current_user
|
||||||
%ul.nav.nav-pills.event_filter.pull-right
|
= render "events/event_last_push", event: @last_push
|
||||||
%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'
|
- if current_user
|
||||||
%hr
|
%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
|
||||||
|
|
||||||
.content_list
|
.content_list
|
||||||
= spinner
|
= spinner
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
= render 'shared/no_password'
|
= render 'shared/no_password'
|
||||||
|
|
||||||
= render "home_panel"
|
= render "home_panel"
|
||||||
|
|
||||||
%ul.nav.nav-tabs
|
%ul.nav.nav-tabs
|
||||||
%li.active
|
%li.active
|
||||||
= link_to '#tab-activity', 'data-toggle' => 'tab' do
|
= link_to '#tab-activity', 'data-toggle' => 'tab' do
|
||||||
|
@ -17,11 +16,11 @@
|
||||||
= link_to '#tab-readme', 'data-toggle' => 'tab' do
|
= link_to '#tab-readme', 'data-toggle' => 'tab' do
|
||||||
Readme
|
Readme
|
||||||
- if @repository.changelog
|
- if @repository.changelog
|
||||||
%li
|
%li.hidden-xs
|
||||||
= link_to changelog_url(@project) do
|
= link_to changelog_url(@project) do
|
||||||
Changelog
|
Changelog
|
||||||
- if @repository.contribution_guide
|
- if @repository.contribution_guide
|
||||||
%li
|
%li.hidden-xs
|
||||||
= link_to contribution_guide_url(@project) do
|
= link_to contribution_guide_url(@project) do
|
||||||
Contribution guide
|
Contribution guide
|
||||||
- if @repository.license
|
- if @repository.license
|
||||||
|
@ -42,17 +41,18 @@
|
||||||
= link_to '#aside', class: 'show-aside' do
|
= link_to '#aside', class: 'show-aside' do
|
||||||
%i.fa.fa-angle-left
|
%i.fa.fa-angle-left
|
||||||
%section.col-md-9
|
%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
|
- if current_user
|
||||||
%ul.nav.nav-pills.event_filter.pull-right
|
%ul.nav.nav-pills.event_filter.pull-right
|
||||||
%li
|
%li
|
||||||
= link_to namespace_project_path(@project.namespace, @project, format: :atom, private_token: current_user.private_token), title: "Feed", class: 'rss-btn' do
|
= 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
|
%i.fa.fa-rss
|
||||||
Activity Feed
|
Activity Feed
|
||||||
|
|
||||||
= render 'shared/event_filter'
|
= render 'shared/event_filter'
|
||||||
%hr
|
%hr
|
||||||
.content_list
|
.content_list
|
||||||
= spinner
|
= spinner
|
||||||
%aside.col-md-3.project-side
|
%aside.col-md-3.project-side
|
||||||
|
|
Loading…
Reference in New Issue