summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-12-24 15:05:28 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-12-24 15:05:28 +0000
commit1a23af485cd755738f4051e04132b1eb93fc3fab (patch)
tree34f03434fe1bcc55ad1f5cd0a1b81d678a3e7d4b
parent0869d84c0709fa745a375be700c5cc8a4cba7fe1 (diff)
parent40a3845fab760a0600e06a2dc2fab4b942b5ffa3 (diff)
downloadgitlab-ce-1a23af485cd755738f4051e04132b1eb93fc3fab.tar.gz
Merge branch 'fix-explore-ui' into 'master'
Fix explore projects page UI # Before ![Screenshot_2015-12-24_14.13.03](/uploads/fdae7648acc8b8076709e4bfc867a5f8/Screenshot_2015-12-24_14.13.03.png) # After ![Screenshot_2015-12-24_14.11.29](/uploads/b1ecd3bebfadab9d2ceabaae27046271/Screenshot_2015-12-24_14.11.29.png) cc @jschatz1 @skyruler Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2202
-rw-r--r--app/views/explore/projects/index.html.haml2
-rw-r--r--app/views/explore/projects/starred.html.haml2
-rw-r--r--app/views/explore/projects/trending.html.haml2
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/explore/projects/index.html.haml b/app/views/explore/projects/index.html.haml
index 76bdd68fd76..b9a958fbe7b 100644
--- a/app/views/explore/projects/index.html.haml
+++ b/app/views/explore/projects/index.html.haml
@@ -6,7 +6,7 @@
- else
= render 'explore/head'
-.gray-content-block.clearfix
+.gray-content-block.clearfix.second-block
= render 'filter'
= render 'projects', projects: @projects
= paginate @projects, theme: "gitlab"
diff --git a/app/views/explore/projects/starred.html.haml b/app/views/explore/projects/starred.html.haml
index e30c3633223..95d46e331f8 100644
--- a/app/views/explore/projects/starred.html.haml
+++ b/app/views/explore/projects/starred.html.haml
@@ -7,7 +7,7 @@
= render 'explore/head'
.explore-trending-block
- .gray-content-block
+ .gray-content-block.second-block
.pull-right
= render 'explore/projects/dropdown'
.oneline
diff --git a/app/views/explore/projects/trending.html.haml b/app/views/explore/projects/trending.html.haml
index 1412b19acde..fa0b718e48b 100644
--- a/app/views/explore/projects/trending.html.haml
+++ b/app/views/explore/projects/trending.html.haml
@@ -7,7 +7,7 @@
= render 'explore/head'
.explore-trending-block
- .gray-content-block
+ .gray-content-block.second-block
.pull-right
= render 'explore/projects/dropdown'
.oneline