From f1723039a00b2eb1c842810a986e99d7908abee8 Mon Sep 17 00:00:00 2001 From: Daniel Carral Date: Wed, 19 Aug 2015 01:11:11 +0200 Subject: [PATCH 1/6] Import bourbon before settings, thus allowing visual-grid's usage --- app/assets/stylesheets/application.css.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 2620960f..ddc8733f 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -1,6 +1,6 @@ @import "normalize"; -@import "settings"; @import "bourbon"; +@import "settings"; @import "neat"; @import "utils"; @import "base"; From be52a7de2c44d77ecfe7f400912fbaba1105a3b9 Mon Sep 17 00:00:00 2001 From: Daniel Carral Date: Wed, 19 Aug 2015 01:12:06 +0200 Subject: [PATCH 2/6] More appealing Bourbon's visual-grid (dev. mode) --- app/assets/stylesheets/_settings.sass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/assets/stylesheets/_settings.sass b/app/assets/stylesheets/_settings.sass index 311708e2..9870485b 100644 --- a/app/assets/stylesheets/_settings.sass +++ b/app/assets/stylesheets/_settings.sass @@ -2,6 +2,9 @@ // DEV $visual-grid: false +$visual-grid-opacity: 0.2 +$visual-grid-index: front +$visual-grid-color: blue // grid set-up $column: 225px From 0036a2953d90ad4dde934033a3a166bf468e8b8e Mon Sep 17 00:00:00 2001 From: Daniel Carral Date: Wed, 19 Aug 2015 01:12:50 +0200 Subject: [PATCH 3/6] Delete unneeded media queries in activities listing --- app/assets/stylesheets/partials/activities/_index.sass | 9 --------- 1 file changed, 9 deletions(-) diff --git a/app/assets/stylesheets/partials/activities/_index.sass b/app/assets/stylesheets/partials/activities/_index.sass index f1e8c0bb..d7197e9a 100644 --- a/app/assets/stylesheets/partials/activities/_index.sass +++ b/app/assets/stylesheets/partials/activities/_index.sass @@ -216,15 +216,6 @@ a#new-activity +transition(all 0.15s ease-out 0.15s) - +media($smartphone-portrait) - li - +span-columns(2) - - +media($tablet-lite) li +span-columns(2) - - +media($tablet-portrait-plus) - li - +span-columns(2) From 7915367ff10ab0fd51c5cef514a49aa08a5dc8e1 Mon Sep 17 00:00:00 2001 From: Daniel Carral Date: Wed, 19 Aug 2015 01:40:05 +0200 Subject: [PATCH 4/6] Tweak responsive design in activities' form by forcing location input to take the whole grid's with in smaller devices --- .../stylesheets/partials/activities/_form.sass | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/partials/activities/_form.sass b/app/assets/stylesheets/partials/activities/_form.sass index 3eed2741..0c9bd822 100644 --- a/app/assets/stylesheets/partials/activities/_form.sass +++ b/app/assets/stylesheets/partials/activities/_form.sass @@ -54,15 +54,19 @@ form#new-activity label &.location display: inline-block - width: 80% + +span-columns(6) + +media($tablet-lite) + +span-columns(3) &.limit-of-participants display: inline-block text-align: right - width: 20% + +span-columns(6) - input - width: 85% + +media($tablet-lite) + +span-columns(1) + input + width: 85% &.image-url .preview From 72a4c31411a5137fa47d0a63061b1cc436cde379 Mon Sep 17 00:00:00 2001 From: Daniel Carral Date: Wed, 19 Aug 2015 01:56:12 +0200 Subject: [PATCH 5/6] Avoid using fixed with in user forms, thus improving appearance in smaller devices --- app/assets/stylesheets/partials/_user.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/partials/_user.sass b/app/assets/stylesheets/partials/_user.sass index 156dc714..61e80b89 100644 --- a/app/assets/stylesheets/partials/_user.sass +++ b/app/assets/stylesheets/partials/_user.sass @@ -32,7 +32,7 @@ body.user font-size: 1.5em section.form - width: 640px + +span-columns(6) padding: 70px margin: 0 auto background: $white From 5a4d13f30ba9a139d998ec95952546d767d70ee3 Mon Sep 17 00:00:00 2001 From: Daniel Carral Date: Wed, 19 Aug 2015 01:58:24 +0200 Subject: [PATCH 6/6] Tweak user forms' margin, improving their appearance in smaller devices --- app/assets/stylesheets/partials/_user.sass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/partials/_user.sass b/app/assets/stylesheets/partials/_user.sass index 61e80b89..d21581a8 100644 --- a/app/assets/stylesheets/partials/_user.sass +++ b/app/assets/stylesheets/partials/_user.sass @@ -33,7 +33,9 @@ body.user section.form +span-columns(6) - padding: 70px + padding: 10px + +media($smartphone-landscape) + padding: 70px margin: 0 auto background: $white box-shadow: 0 0 7px transparentize($black, 0.9)