summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-11-19 18:11:16 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-11-19 18:11:16 +0200
commit580cedd76cb1b2a9101fcb722dfec455ad00c8c6 (patch)
tree2563ddac19a1d7cb2b56de6186edd15f4c096852
parente65866d4ff337f66e3526a3eb7ac5ea9ae0c3d8f (diff)
downloadgitlab-ce-580cedd76cb1b2a9101fcb722dfec455ad00c8c6.tar.gz
Fix header and project home ui for mobile
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/assets/stylesheets/sections/header.scss1
-rw-r--r--app/assets/stylesheets/sections/nav.scss2
-rw-r--r--app/assets/stylesheets/sections/projects.scss13
-rw-r--r--app/views/projects/_home_panel.html.haml2
4 files changed, 16 insertions, 2 deletions
diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss
index e0e0d60c387..9ad1a1db2cd 100644
--- a/app/assets/stylesheets/sections/header.scss
+++ b/app/assets/stylesheets/sections/header.scss
@@ -59,6 +59,7 @@ header {
}
.navbar-collapse {
+ margin-top: 47px;
padding-right: 0;
padding-left: 0;
}
diff --git a/app/assets/stylesheets/sections/nav.scss b/app/assets/stylesheets/sections/nav.scss
index 31c0a0835db..ccd672c5f67 100644
--- a/app/assets/stylesheets/sections/nav.scss
+++ b/app/assets/stylesheets/sections/nav.scss
@@ -63,7 +63,6 @@
@media (max-width: $screen-xs-max) {
font-size: 18px;
margin: 0;
-
max-height: none;
&, .container {
@@ -86,6 +85,7 @@
color: #fff;
font-weight: normal;
text-shadow: none;
+ border: none;
&:after { display: none; }
}
diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss
index 76a7507d699..7b894cf00bb 100644
--- a/app/assets/stylesheets/sections/projects.scss
+++ b/app/assets/stylesheets/sections/projects.scss
@@ -295,3 +295,16 @@ 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;
+ }
+}
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index 8b9260d661c..30d063c7a36 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -31,7 +31,7 @@
- else
= link_to_toggle_star('You must sign in to star a project.', false, false)
- .project-home-row
+ .project-home-row.hidden-xs
- if current_user && !empty_repo
.project-home-dropdown
= render "dropdown"