Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Responsify views & allow Neat's visual-grid to be used #168

Merged
merged 6 commits into from
Aug 20, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/assets/stylesheets/_settings.sass
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/application.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "normalize";
@import "settings";
@import "bourbon";
@import "settings";
@import "neat";
@import "utils";
@import "base";
Expand Down
6 changes: 4 additions & 2 deletions app/assets/stylesheets/partials/_user.sass
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ body.user
font-size: 1.5em

section.form
width: 640px
padding: 70px
+span-columns(6)
padding: 10px
+media($smartphone-landscape)
padding: 70px
margin: 0 auto
background: $white
box-shadow: 0 0 7px transparentize($black, 0.9)
Expand Down
12 changes: 8 additions & 4 deletions app/assets/stylesheets/partials/activities/_form.sass
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 0 additions & 9 deletions app/assets/stylesheets/partials/activities/_index.sass
Original file line number Diff line number Diff line change
Expand Up @@ -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)