From 3d7519016f9fc3642e1d672d3f80092562e9505a Mon Sep 17 00:00:00 2001 From: Wanfung Joshua Lee Date: Mon, 5 Jan 2015 19:57:09 -0800 Subject: [PATCH 1/3] fix the wacky dashboard intro icon styling [ci skip] --- app/assets/stylesheets/generic/common.scss | 12 +++++++++--- .../dashboard/_zero_authorized_projects.html.haml | 6 +++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss index 24f7a9ad68..da708c96b0 100644 --- a/app/assets/stylesheets/generic/common.scss +++ b/app/assets/stylesheets/generic/common.scss @@ -292,11 +292,17 @@ table { .dashboard-intro-icon { float: left; + text-align: center; font-size: 32px; color: #AAA; - padding: 5px 0; - width: 50px; - min-height: 100px; + width: 60px; +} + +.dashboard-intro-text { + display: inline-block; + margin-left: -60px; + padding-left: 60px; + width: 100%; } .broadcast-message { diff --git a/app/views/dashboard/_zero_authorized_projects.html.haml b/app/views/dashboard/_zero_authorized_projects.html.haml index 5d133cd828..f78ce69ef9 100644 --- a/app/views/dashboard/_zero_authorized_projects.html.haml +++ b/app/views/dashboard/_zero_authorized_projects.html.haml @@ -4,7 +4,7 @@ %div .dashboard-intro-icon %i.fa.fa-bookmark-o - %div + .dashboard-intro-text %p.slead You don't have access to any projects right now. %br @@ -24,7 +24,7 @@ %div .dashboard-intro-icon %i.fa.fa-users - %div + .dashboard-intro-text %p.slead You can create a group for several dependent projects. %br @@ -38,7 +38,7 @@ %div .dashboard-intro-icon %i.fa.fa-globe - %div + .dashboard-intro-text %p.slead There are %strong= @publicish_project_count From 33a510685706549fcf61f78021ce7099ea23e067 Mon Sep 17 00:00:00 2001 From: Wanfung Joshua Lee Date: Mon, 5 Jan 2015 21:36:58 -0800 Subject: [PATCH 2/3] fix event-last-push message's styling on mobile [ci skip] --- app/assets/stylesheets/sections/events.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss index 93ad17f57c..3c3a0d92c6 100644 --- a/app/assets/stylesheets/sections/events.scss +++ b/app/assets/stylesheets/sections/events.scss @@ -145,8 +145,12 @@ * Last push widget */ .event-last-push { + overflow: auto; .event-last-push-text { - @include str-truncated(75%); + @include str-truncated(100%); + float:left; + margin-right: -150px; + padding-right: 150px; line-height: 24px; } } From 252443893ce6e4ca2caaca8eefe75c918c20ffff Mon Sep 17 00:00:00 2001 From: Wanfung Joshua Lee Date: Mon, 5 Jan 2015 21:48:04 -0800 Subject: [PATCH 3/3] removing padding on form-actions when in mobile size [ci skip] --- app/assets/stylesheets/generic/forms.scss | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/generic/forms.scss b/app/assets/stylesheets/generic/forms.scss index 865253d4a7..1a83256995 100644 --- a/app/assets/stylesheets/generic/forms.scss +++ b/app/assets/stylesheets/generic/forms.scss @@ -31,7 +31,12 @@ fieldset legend { margin-bottom: 18px; background-color: whitesmoke; border-top: 1px solid #e5e5e5; - padding-left: 17%; +} + +@media (min-width: $screen-sm-min) { + .form-actions { + padding-left: 17%; + } } label {