Commit baf94a26 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'dashboard-icon-styling' into 'master'

Dashboard icon styling fix

When viewing a fresh install of GitLab on a mobile device, the styling for the dashboard item icon is broken in such a way that if the description div is more than 100px high, its contents wrap beneath the icon as shown below.

![Screen Shot 2015-01-05 at 7.11.37 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/9ac2feca33/Screen_Shot_2015-01-05_at_7.11.37_PM.png)

I modified the css for the icon and added a new class to the description div and now it behaves as expected as shown below.

![Screen Shot 2015-01-05 at 6.56.33 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/25cf3212d2/Screen_Shot_2015-01-05_at_6.56.33_PM.png)

As this is a purely html/css change, I don't believe it will break any tests. The only occurrence of .dashboard-intro-icon is in ./app/views/dashboard/_zero_authorized_projects.html.haml

See merge request !278
parents c4700725 3d751901
...@@ -292,11 +292,17 @@ table { ...@@ -292,11 +292,17 @@ table {
.dashboard-intro-icon { .dashboard-intro-icon {
float: left; float: left;
text-align: center;
font-size: 32px; font-size: 32px;
color: #AAA; color: #AAA;
padding: 5px 0; width: 60px;
width: 50px; }
min-height: 100px;
.dashboard-intro-text {
display: inline-block;
margin-left: -60px;
padding-left: 60px;
width: 100%;
} }
.broadcast-message { .broadcast-message {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
%div %div
.dashboard-intro-icon .dashboard-intro-icon
%i.fa.fa-bookmark-o %i.fa.fa-bookmark-o
%div .dashboard-intro-text
%p.slead %p.slead
You don't have access to any projects right now. You don't have access to any projects right now.
%br %br
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
%div %div
.dashboard-intro-icon .dashboard-intro-icon
%i.fa.fa-users %i.fa.fa-users
%div .dashboard-intro-text
%p.slead %p.slead
You can create a group for several dependent projects. You can create a group for several dependent projects.
%br %br
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
%div %div
.dashboard-intro-icon .dashboard-intro-icon
%i.fa.fa-globe %i.fa.fa-globe
%div .dashboard-intro-text
%p.slead %p.slead
There are There are
%strong= @publicish_project_count %strong= @publicish_project_count
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment