hackathon_manager 0.4.4 → 0.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (43) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/hackathon_manager/core.sass +1 -1
  3. data/app/assets/stylesheets/hackathon_manager/forms/_confirmation.sass +2 -4
  4. data/app/assets/stylesheets/hackathon_manager/forms/_forms.sass +161 -120
  5. data/app/assets/stylesheets/hackathon_manager/general/_base.sass +16 -12
  6. data/app/assets/stylesheets/hackathon_manager/general/_button.sass +15 -11
  7. data/app/assets/stylesheets/hackathon_manager/general/_header.sass +67 -0
  8. data/app/assets/stylesheets/hackathon_manager/general/_main.sass +4 -2
  9. data/app/assets/stylesheets/hackathon_manager/general/_mixins.sass +59 -53
  10. data/app/assets/stylesheets/hackathon_manager/mailer.sass +3 -3
  11. data/app/assets/stylesheets/variables.sass +100 -11
  12. data/app/controllers/bus_lists_controller.rb +1 -1
  13. data/app/controllers/questionnaires_controller.rb +1 -1
  14. data/app/controllers/rsvps_controller.rb +1 -1
  15. data/app/controllers/users/registrations_controller.rb +1 -1
  16. data/app/helpers/hackathon_manager_helper.rb +8 -0
  17. data/app/inputs/deletable_attachment_input.rb +1 -1
  18. data/app/models/questionnaire.rb +14 -0
  19. data/app/views/bus_lists/show.html.haml +5 -2
  20. data/app/views/devise/passwords/edit.html.haml +15 -14
  21. data/app/views/devise/passwords/new.html.haml +6 -4
  22. data/app/views/devise/registrations/_form.html.haml +5 -6
  23. data/app/views/devise/registrations/edit.html.haml +18 -20
  24. data/app/views/devise/registrations/new.html.haml +14 -13
  25. data/app/views/devise/sessions/_form.html.haml +5 -5
  26. data/app/views/devise/sessions/new.html.haml +10 -9
  27. data/app/views/layouts/hackathon_manager/_account_nav.html.haml +10 -0
  28. data/app/views/layouts/hackathon_manager/_footer.html.haml +0 -0
  29. data/app/views/layouts/hackathon_manager/_header.html.haml +14 -0
  30. data/app/views/layouts/{_shared_footer.html.haml → hackathon_manager/_shared_footer.html.haml} +1 -1
  31. data/app/views/layouts/{hackathon_manager.html.haml → hackathon_manager/application.html.haml} +7 -3
  32. data/app/views/layouts/manage/application.html.haml +2 -2
  33. data/app/views/manage/questionnaires/_form.html.haml +1 -1
  34. data/app/views/questionnaires/_form.html.haml +42 -45
  35. data/app/views/questionnaires/edit.html.haml +11 -8
  36. data/app/views/questionnaires/new.html.haml +6 -6
  37. data/app/views/questionnaires/show.html.haml +46 -27
  38. data/app/views/rsvps/show.html.haml +40 -33
  39. data/config/initializers/devise.rb +2 -1
  40. data/lib/hackathon_manager/version.rb +1 -1
  41. metadata +8 -6
  42. data/app/assets/stylesheets/hackathon_manager/general/_sidebar.sass +0 -70
  43. data/app/views/layouts/_sidebar.html.haml +0 -25
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f7272827c5c525797e35fa09133a41308bba63b5
4
- data.tar.gz: 0c33f81ac1f42fda230b72c9a3c07f7f0e239556
3
+ metadata.gz: 0a1bc9a24703fd376eea3a20ae7222d6d377486a
4
+ data.tar.gz: 199d5b1177c14ef8790747aa776de42fe2959eca
5
5
  SHA512:
6
- metadata.gz: 3a463af5497ca02839b34d3615b4bbea43ed779abf06bc312cae6717a68b2e376514d92e8dc428dee953a39cc73e19bff93806767bac443875eb847d848f400a
7
- data.tar.gz: 8ab9bc6c30530b539c68423f5343618f723e0a75114a7d2532a271fc1a4f7278f695383df9a44635c5e5aab58d0d559ba604b78768ad7ee9bc5310f4ee0c9bd1
6
+ metadata.gz: 05d64818cdaf8ce472b975e1fd962aa1590831d1f33e0f0577fc2c6abed15e87723fcfb4bca300e1fae3e635d920c7479604e695b6d2e6b137ecbd9aacad9b26
7
+ data.tar.gz: 49adc898bcea2c47466bc320e36b861a31da691d226e5e82205636b514755fb852a5f63263ef07c93f450f8ab93054bf319c76b175deacc490b6ced435d2fa69
@@ -5,7 +5,7 @@
5
5
  @import general/base
6
6
  @import general/button
7
7
  @import general/main
8
- @import general/sidebar
8
+ @import general/header
9
9
  @import general/footer
10
10
  @import general/table
11
11
  @import general/status-colors
@@ -12,7 +12,5 @@
12
12
  a
13
13
  color: #fff
14
14
 
15
- .participant_info
16
- padding-left: 30px
17
- padding-right: 30px
18
- color: #555
15
+ .participant_info
16
+ color: #555
@@ -1,12 +1,20 @@
1
+ $form-spacing-horizontal: 9px
2
+
1
3
  #disclaimer, .alert
2
- background: $black
3
- color: $white_pure
4
- margin: 0 auto 50px auto
5
- padding: 20px 25px
4
+ background: $alert--background
5
+ color: $alert--text
6
+ margin: 5px auto 55px auto
7
+ padding: 18px 35px
6
8
  line-height: 1.4
9
+ border: 1px solid $alert--border
10
+ border-radius: 3px
11
+ box-shadow: 0 6px 35px rgba(0, 0, 0, .1)
12
+
13
+ .section-title
14
+ margin: 12px 0 5px
7
15
 
8
16
  fieldset
9
- margin-top: 25px
17
+ margin: 25px 0 0
10
18
  border: 1px solid #aaa
11
19
  padding: 0.25em 1.5em 0.5em
12
20
  outline: none
@@ -20,115 +28,154 @@ fieldset
20
28
 
21
29
  hr
22
30
  border: none
23
- border-top: 1px solid $primary
24
- margin: 40px 25px 35px
31
+ border-top: 1px solid $input--border-color
32
+ margin: 35px 0 40px
33
+ width: 80px
25
34
 
26
35
  .alert
27
- background: $red
36
+ color: $alert--text--error
37
+ background: $alert--background--error
38
+ border-color: $alert--border--error
28
39
 
29
40
  .form-container, .cancel_btn_wrap
30
41
  margin: 0 auto
31
- max-width: 640px
32
- padding-right: 100px
33
- padding-left: 40px
42
+ max-width: 670px
43
+ padding-left: 5px
44
+ padding-right: 5px
34
45
 
35
46
  // custom styles
36
47
  .form-container.login, .form-container.signup
37
- max-width: 530px
38
- padding: 30px
48
+ max-width: 360px
39
49
  .btn
40
50
  margin-bottom: 30px
51
+
41
52
  .simple_form
42
53
  color: $grey
43
54
  .error
44
- background: $red
45
- //bottom: 1px
46
- color: $white
47
- display: table
55
+ background: $input--error--background
56
+ color: $input--error--text
48
57
  font-size: 0.74rem
49
- left: 100%
50
- margin-left: 5px
51
- padding: 8px
58
+ padding: 6px 9px
59
+ flex: 1 1 100%
60
+ abbr
61
+ text-decoration: none
52
62
  position: absolute
63
+ margin-left: -16px
64
+ color: $input--required-star
65
+ align-self: flex-start
66
+
67
+ .form-inputs
68
+ display: flex
69
+ flex-flow: row wrap
70
+ justify-content: stretch
71
+ margin-left: -1 * $form-spacing-horizontal
72
+ margin-right: -1 * $form-spacing-horizontal
53
73
 
54
- div.input
74
+ .input
75
+ flex: 1 1 600px
55
76
  display: flex
56
- flex-direction: row
57
- flex-wrap: nowrap
77
+ flex-flow: row wrap
78
+ margin-left: $form-spacing-horizontal
79
+ margin-right: $form-spacing-horizontal
58
80
  margin-bottom: 15px
59
81
  position: relative
60
82
  text-align: left
83
+ align-items: flex-start
84
+ align-content: flex-start
85
+
86
+ .input--half
87
+ flex-basis: 220px
61
88
 
62
89
  label
63
- font-weight: $font-reg
64
- margin-right: 10px
65
- min-width: 160px
66
- padding-top: 3px
67
- padding-right: 10px
90
+ display: flex
91
+ align-items: center
92
+ width: 100%
93
+ flex-shrink: 0
94
+ font-weight: $font-light
95
+ padding-top: 5px
96
+ padding-bottom: 8px
68
97
  text-align: left
69
98
 
70
99
  // all form input types
71
- input[type=text], input[type=email], input[type=tel], input[type=date], input[type="url"], input[type=password], textarea, select
72
- color: $grey-dark
100
+ input[type=text], input[type=email], input[type=tel], input[type=date], input[type="url"], input[type=password], input[type=file], input[type=checkbox], textarea, select
101
+ background: $input--background
102
+ color: $input--text
73
103
  font-family: $font-body-family
74
- font-weight: $font-bold
104
+ font-weight: $font-reg
75
105
  font-size: 100%
76
- &:focus
77
- color: $black
78
- color: $primary
79
-
80
- // just inputs
81
- input[type=text], input[type=email], input[type=tel], input[type=date], input[type="url"], input[type=password], textarea
82
- border: 1px solid $white
83
- background: $white
106
+ border: 1px solid $input--border-color
107
+ margin-bottom: 5px
84
108
  outline: none
85
- padding: 4px 8px
86
- @include transition (200ms, all, ease-in-out, 0)
109
+ padding: 9px 14px
87
110
  width: 100%
88
- margin-bottom: 5px
111
+ @include transition(150ms, border-color, ease-out, 0ms)
112
+ @include placeholder-color($input--text--placeholder)
89
113
  &:focus
90
- background: $white_pure
91
- border-color: lighten($black, 10%)
114
+ color: $input--text--focus
115
+ background-color: $input--background--focus
116
+ border-color: $input--border-color--focus
117
+ border-width: 2px
118
+ padding: 8px 13px
92
119
 
93
120
  // just selects
94
121
  select
95
122
  @include appearance (none)
96
- background: asset-url("hackathon_manager/arrow_down.svg"), $white_pure
123
+ background: asset-url("hackathon_manager/arrow_down_hover.svg"), $input--background
97
124
  background-repeat: no-repeat
98
125
  background-position: right
99
126
  background-size: auto 100%
100
- border: 1px solid $white
101
- outline: none
102
- padding: 5px 30px 5px 8px
103
- @include transition (200ms, border, ease-in-out, 0)
104
- width: 100%
105
127
  font-size: 100%
106
- margin-right: 5px
107
128
  border-radius: 0
108
- &:last-child
109
- margin-right: 0
110
129
  &:hover
111
- background: asset-url("hackathon_manager/arrow_down_hover.svg"), $white_pure
112
- background-repeat: no-repeat
113
- background-position: right
114
- background-size: auto 100%
130
+ background-image: asset-url("hackathon_manager/arrow_down.svg")
115
131
  &:focus
116
- border-color: lighten($black, 10%)
117
- background: asset-url("hackathon_manager/arrow_down_hover.svg"), $white_pure
118
- background-repeat: no-repeat
119
- background-position: right
120
- background-size: auto 100%
121
- option
122
- background: $white_pure
123
- padding: 3px auto
132
+ background-image: asset-url("hackathon_manager/arrow_down.svg")
133
+ &.date:nth-child(2)
134
+ flex: 3 0 120px
135
+ margin-right: 2 * $form-spacing-horizontal
124
136
  &.date:nth-child(3)
125
- max-width: 70px
137
+ flex: 1 1 65px
138
+ margin-right: 2 * $form-spacing-horizontal
126
139
  &.date:nth-child(4)
127
- max-width: 90px
140
+ flex: 1 1 85px
128
141
 
129
142
  // checkbox
130
143
  input[type=checkbox]
131
- margin-top: 9px
144
+ @include appearance (none)
145
+ width: 22px
146
+ height: 22px
147
+ padding: 1px
148
+ margin: 0
149
+ &::after
150
+ // Begin FontAwesome's .fa class
151
+ font: normal normal normal 14px/1 FontAwesome
152
+ text-rendering: auto
153
+ -webkit-font-smoothing: antialiased
154
+ -moz-osx-font-smoothing: grayscale
155
+ // end .fa
156
+ content: ""
157
+ color: $primary
158
+ font-size: 25px
159
+ margin-left: 2px
160
+ margin-top: -4px
161
+ display: block
162
+ opacity: 0
163
+ &:hover
164
+ background: #eee
165
+ &::after
166
+ opacity: 0.3
167
+ &:checked
168
+ &::after
169
+ opacity: 1
170
+ &:focus
171
+ padding: 0
172
+
173
+ // radio
174
+ .radio
175
+ min-width: 170px
176
+
177
+ input[type=radio]
178
+ margin-right: 10px
132
179
 
133
180
  //Submit
134
181
  input[type=submit]
@@ -138,19 +185,31 @@ input[type=submit]
138
185
  .cancel_btn_wrap
139
186
  text-align: center
140
187
 
141
- //Resume Upload
188
+ // Resume Upload
142
189
  .participant_resume
143
190
  margin-top: 20px
144
191
 
145
192
  .field_with_errors
146
193
  color: $red !important
147
194
 
195
+ .hint
196
+ color: $input--hint
197
+ font-style: italic
198
+ width: 100%
199
+
200
+ .supporting-text
201
+ color: $input--hint
202
+ line-height: 1.5
203
+ margin-left: $form-spacing-horizontal
204
+ margin-right: $form-spacing-horizontal
205
+ margin-bottom: 3px
206
+
148
207
 
149
208
  // jquery ui override
150
209
  .ui-autocomplete
151
- background: $white_pure
152
- border: 1px solid lighten($black, 10%)
153
- color: $primary
210
+ background: $input--background--focus
211
+ border: 1px solid $input--border-color--focus
212
+ color: $input--text--focus
154
213
  list-style: none
155
214
  padding: 0
156
215
  .ui-menu-item a
@@ -160,56 +219,9 @@ input[type=submit]
160
219
  background: $primary
161
220
  color: $white
162
221
 
163
- @media screen and (max-width: 950px)
164
- .simple_form .error
165
- position: initial
166
-
167
222
  @media screen and (max-width: 680px)
168
223
  #disclaimer, .alert
169
- max-width: none
170
- margin: 0 25px 25px 25px
171
- ul
172
- margin: 0
173
- padding: 0
174
-
175
- .form-container
176
- padding: 0 5px
177
-
178
- div.input
179
- display: block
180
-
181
- select
182
- margin-right: 0
183
- margin-bottom: 5px
184
- &.date:nth-child(3)
185
- max-width: none
186
- &.date:nth-child(4)
187
- max-width: none
188
-
189
- label
190
- display: block
191
- font-size: 1.115rem
192
- margin-bottom: 5px
193
- margin-top: 15px
194
- text-align: left
195
-
196
- input[type=text], input[type=email], input[type=date], input[type="url"], input[type=password], textarea, select, option
197
- font-size: 1.115rem
198
- padding: 12px 15px
199
- width: 100%
200
-
201
- .participant_resume
202
- .hint
203
- display: block
204
- margin-top: 5px
205
- margin-left: 2px
206
-
207
- .simple_form .error
208
- display: block
209
- left: 0
210
- margin: 0
211
- padding-left: 8px
212
- position: relative
224
+ margin-bottom: 30px
213
225
 
214
226
  // form wizard
215
227
  .wizard-stage
@@ -240,3 +252,32 @@ input[type=submit]
240
252
  width: 150%
241
253
  height: 75%
242
254
  background: inherit
255
+
256
+ .formatted_boolean
257
+ flex-flow: row wrap
258
+ align-items: center
259
+ label
260
+ flex: 1
261
+ max-width: 310px
262
+ padding-right: 10px
263
+ @media (max-width: 680px)
264
+ label
265
+ width: 220px
266
+
267
+ .deletable_attachment
268
+ justify-content: space-between
269
+ input[type=file]
270
+ flex: 1
271
+ min-width: 200px
272
+ max-width: 450px
273
+
274
+ .deletable_attachment_input
275
+ margin: 0
276
+ flex: 1
277
+ max-width: fit-content
278
+ label
279
+ justify-content: flex-end
280
+ @media (max-width: 500px)
281
+ justify-content: flex-start
282
+ input[type=checkbox]
283
+ margin-right: 10px
@@ -6,7 +6,7 @@ body, html
6
6
  min-height: 250px
7
7
 
8
8
  body
9
- background: $white-grey
9
+ background: $white_pure
10
10
  color: $grey-med
11
11
  font-family: $font-body-family
12
12
  font-size: 16px
@@ -20,7 +20,7 @@ h1, h2, h3
20
20
  margin-top: 0
21
21
  h1
22
22
  font-size: 2.250rem
23
- font-weight: $font-reg
23
+ font-weight: $font-light
24
24
  h2
25
25
  font-size: 2rem
26
26
  font-weight: $font-bold
@@ -36,30 +36,34 @@ img
36
36
  width: 100%
37
37
 
38
38
  a
39
- color: $secondary
39
+ color: $link--text
40
40
  text-decoration: none
41
+ @include transition(100ms, color, ease-out, 0ms)
41
42
  &:hover
42
- color: lighten($secondary, 10%)
43
-
44
- p > a
45
- font-weight: 300
46
- text-decoration: underline
43
+ color: $link--text--hover
47
44
 
48
45
  a.underline
49
46
  text-decoration: underline
50
47
 
51
48
  .section
52
49
  min-height: 100%
53
- padding-top: 80px
50
+ padding-top: 55px
54
51
  padding-bottom: 80px
55
52
  position: relative
56
53
 
57
54
  .section-title
58
- color: $primary
59
- font-size: 2.200rem
60
- text-align: center
55
+ color: $section-title--text
56
+ font-size: 2.1rem
57
+ text-align: left
61
58
  &.white
62
59
  color: $white
60
+ .emphasized
61
+ color: $section-title--text--emphasized
62
+
63
+ .section-title--actions
64
+ display: flex
65
+ justify-content: space-between
66
+ align-items: center
63
67
 
64
68
  .container
65
69
  margin: 0 auto