Commit 560e717f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

parents 0adc2689 165199cb
...@@ -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 {
......
...@@ -31,7 +31,12 @@ fieldset legend { ...@@ -31,7 +31,12 @@ fieldset legend {
margin-bottom: 18px; margin-bottom: 18px;
background-color: whitesmoke; background-color: whitesmoke;
border-top: 1px solid #e5e5e5; border-top: 1px solid #e5e5e5;
}
@media (min-width: $screen-sm-min) {
.form-actions {
padding-left: 17%; padding-left: 17%;
}
} }
label { label {
......
...@@ -145,8 +145,12 @@ ...@@ -145,8 +145,12 @@
* Last push widget * Last push widget
*/ */
.event-last-push { .event-last-push {
overflow: auto;
.event-last-push-text { .event-last-push-text {
@include str-truncated(75%); @include str-truncated(100%);
float:left;
margin-right: -150px;
padding-right: 150px;
line-height: 24px; line-height: 24px;
} }
} }
......
...@@ -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