Skip to content

Commit 4b83187

Browse files
JulienGuizotJulienGuizot
committed
update
1 parent 1ab367e commit 4b83187

30 files changed

+572
-168
lines changed

‎Gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ group :assets do
2222
gem 'rails-backbone'
2323
gem 'compass-rails'
2424
gem 'bootstrap-sass'
25+
gem 'autoprefixer-rails'
2526
gem 'bootstrap-datepicker-rails'
2627
gem 'select2-rails'
2728
gem 'underscore-rails'
@@ -43,7 +44,7 @@ group :development, :test do
4344
gem 'rake'
4445
end
4546

46-
gem 'jquery-rails', '=2.1.4'
47+
gem 'jquery-rails', '~>2.1.4'
4748
gem 'simple_form'
4849

4950
# MongoDB adapter and an optimizer for MongoDB

‎Gemfile.lock

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ GEM
4141
asset_sync (0.5.4)
4242
activemodel
4343
fog
44+
autoprefixer-rails (6.3.7)
45+
execjs
4446
bcrypt-ruby (3.0.1)
4547
better_errors (0.9.0)
4648
coderay (>= 1.0.0)
@@ -332,6 +334,7 @@ DEPENDENCIES
332334
acts_as_list_mongoid
333335
airbrake
334336
asset_sync
337+
autoprefixer-rails
335338
better_errors
336339
binding_of_caller
337340
bootstrap-datepicker-rails
@@ -357,7 +360,7 @@ DEPENDENCIES
357360
hirefire-resource
358361
http_accept_language
359362
jammit
360-
jquery-rails (= 2.1.4)
363+
jquery-rails (~> 2.1.4)
361364
koala
362365
memcachier
363366
meta_request
@@ -388,5 +391,8 @@ DEPENDENCIES
388391
underscore-rails
389392
will_paginate_mongoid
390393

394+
RUBY VERSION
395+
ruby 2.2.2p95
396+
391397
BUNDLED WITH
392-
1.10.3
398+
1.12.5

‎app/assets/javascripts/backoffice.js

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,32 @@
77
//= require_tree ./backoffice/propositions
88
//= require_tree ./backoffice/lib
99
//= require_tree ./backoffice
10+
11+
$(window).ready(function(){
12+
13+
pullPictureProfile();
14+
15+
$("#candidacy_candidate_profile_picture").change(function() {
16+
$('#picture-profile').addClass('hide');
17+
$('#picture-changed').removeClass('hide');
18+
});
19+
});
20+
21+
$(window).resize(function(){
22+
23+
pullPictureProfile();
24+
25+
});
26+
27+
function pullPictureProfile() {
28+
var size = $(window).width();
29+
30+
if (size < 992) {
31+
$('.img-col').removeClass('pull-right');
32+
$('#candidacy_candidate_profile_picture, #picture-changed').css("margin-left", "180px");
33+
$('#picture-profile').css("margin-left", '20px');
34+
} else {
35+
$('.img-col').addClass('pull-right');
36+
$('#picture-profile, #candidacy_candidate_profile_picture, #picture-changed').css("margin-left", "0px");
37+
}
38+
}

‎app/assets/javascripts/backoffice/my_profile.js

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
$(document).ready(function() {
2+
3+
var today = new Date();
4+
5+
$( function() {
6+
$( "#candidacy_candidate_profile_birthday" ).datepicker({
7+
dateFormat: "dd/mm/yy",
8+
changeYear: true,
9+
yearRange: "-100:+0"
10+
});
11+
} );
12+
13+
jQuery.extend(jQuery.validator.messages, {
14+
required: "Champs obligatoire.",
15+
url: "Veuillez entrez une URL valide"
16+
});
17+
18+
$("#new_candidacy_candidate_profile").validate({
19+
ignore: [],
20+
messages: {
21+
"candidacy_candidate_profile[password]" : "Champs obligatoire, 6 caractères minimum",
22+
"candidacy_candidate_profile[name]" : "Champs obligatoire",
23+
"candidacy_candidate_profile[email]" : "Entrer une adresse mail valide",
24+
"candidacy_candidate_profile[phone]" : "Entrer un numéro de téléphone valide"
25+
},
26+
submitHandler: function(form) {
27+
mixpanel.track("Submit candidate public profile");
28+
form.submit();
29+
}
30+
});
31+
32+
$("#new_proposition").validate({
33+
ignore: [],
34+
messages: {
35+
"proposition[text]" : "Champs obligatoire, Sélectionner au moins 1 sous-thème",
36+
"proposition[tag_ids][]" : "Champs obligatoire, 300 caractères maximum"
37+
},
38+
submitHandler: function(form) {
39+
mixpanel.track("Submit candidate public profile");
40+
form.submit();
41+
}
42+
});
43+
44+
45+
46+
});

‎app/assets/stylesheets/backoffice.css.sass

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,74 @@
1919
line-height: 5px
2020
margin-bottom: 30px
2121
padding: 20px
22+
23+
.controls label
24+
color: red !important
25+
26+
.controls img
27+
display: none
28+
29+
#text-counter:after
30+
content: ' caractère(s)'
31+
32+
#introduction-counter:after
33+
content: ' caractère(s)'
34+
35+
#biography-counter:after
36+
content: ' caractère(s)'
37+
38+
.crud-btn
39+
width: 120px
40+
margin-bottom: 5px !important
41+
42+
.crud-btn i
43+
float: left
44+
45+
.theme-choose:hover div
46+
background-color: #0088cc
47+
color: white
48+
border-radius: 5px
49+
transition: all 0.1s ease-out
50+
-webkit-transition: all 0.1s ease-out
51+
-ms-transition: all 0.1s ease-out
52+
53+
.theme-choose
54+
font-weight: bold
55+
font-size: 15px
56+
57+
.input-prepend input
58+
height: 32px
59+
60+
.add-on
61+
height: 32px !important
62+
63+
.input-medium
64+
width: 157px !important
65+
66+
67+
.quick-search-div form
68+
margin-top: 30px
69+
70+
.nav-collapse
71+
display: block !important
72+
padding-top: 5px
73+
74+
.url a
75+
margin-left: 15px !important
76+
77+
.control-group input
78+
height: 35px !important
79+
width: 300px !important
80+
81+
.nav-pills li
82+
height: 40px
83+
84+
.carousel-control
85+
margin: auto !important
86+
background: none !important
87+
width: 6% !important
88+
text-align: left !important
89+
90+
.item img
91+
height: 100% !important
92+
width: auto !important

‎app/assets/stylesheets/web/app.css.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ body
77

88
a
99
text-decoration: none
10-
color: #551A8B
10+
color: #ff6b31
1111
&:hover
1212
text-decoration: underline
1313

‎app/assets/stylesheets/web/welcome.css.scss

Lines changed: 45 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,26 @@
99
.clearer {
1010
clear: both; }
1111

12+
a:hover {
13+
text-decoration: none;
14+
color: #e92626;
15+
}
16+
1217
.header {
1318
font-family: "bebas_neuebook", Arial, sans-serif;
1419
text-transform: uppercase;
15-
height: 50px;
20+
max-height: 400px;
1621
background-color: white;
1722
text-align: center;
1823
position: relative; }
1924
.header span {
2025
color: black;
2126
font-size: 15pt;
2227
letter-spacing: 2px;
23-
float: right;
2428
position: absolute;
2529
top: 3px;
26-
right: 10px;
27-
line-height: 50px; }
30+
line-height: 57px;
31+
left: 65px; }
2832
.header .menu {
2933
position: absolute;
3034
top: 10px;
@@ -36,7 +40,8 @@
3640
background: transparent url(image-path('welcome/icon-ham.gif')) 6px 8px no-repeat;
3741
border: 1px solid #99aab5;
3842
text-indent: -3000px;
39-
position: relative; }
43+
position: relative;
44+
top: 12px; }
4045
.header .menu > li:first-child:hover ul {
4146
display: block; }
4247
.header .menu ul {
@@ -50,7 +55,6 @@
5055
font-family: "bebas_neuebold", Arial, sans-serif;
5156
background-color: white;
5257
display: block;
53-
padding: 2vw;
5458
border: 1px solid #99aab5;
5559
border-bottom-width: 0;
5660
text-indent: 0;
@@ -61,6 +65,7 @@
6165
text-align: left;
6266
white-space: nowrap; }
6367
.header .menu ul li a:hover {
68+
text-decoration: none;
6469
background-color: black;
6570
color: white; }
6671
.header .menu ul li:last-child a {
@@ -77,6 +82,11 @@
7782
.content {
7883
color: white;
7984
font-family: "bebas_neuebook", Arial, sans-serif; }
85+
.content div h3 {
86+
font-size: 16pt;
87+
margin-bottom: 2vw;
88+
letter-spacing: 0.1vw;
89+
margin-top: 1vw;}
8090
.content div {
8191
text-align: center;
8292
text-transform: uppercase;
@@ -115,18 +125,18 @@
115125
.newsletter {
116126
background: white;
117127
padding: 1vw;
118-
font-size: 2vw;
128+
font-size: 20pt;
119129
text-align: center;
120130
}
121131
.newsletter label {
122132
font-family: "bebas_neuebold", Arial, sans-serif;
123133
color: #b82132;
124-
margin-right: 2vw;
134+
margin-left: 1vw;
125135
vertical-align: middle;
126136
}
127137
.newsletter label strong {
128138
font-family: "bebas_neuebold", Arial, sans-serif;
129-
margin-right: 2vw;
139+
margin-left: 2vw;
130140
color: #d4452f;
131141
}
132142
.newsletter input[type=email] {
@@ -141,14 +151,17 @@
141151
}
142152
.newsletter input[type=submit] {
143153
border: white;
144-
background: #b82132;
154+
background: #D4452F;
145155
color: white;
146156
padding: .5vw;
147157
font-size: 1vw;
148158
font-family: "bebas_neuebold", Arial, sans-serif;
149159
display: inline-block;
150160
vertical-align: middle;
151161
}
162+
.newsletter input[type=submit]:hover {
163+
background-color: #B82132;
164+
}
152165

153166
.footer {
154167
color: #6d020e;
@@ -161,7 +174,8 @@
161174
padding-top: 2.5vw;
162175
padding-bottom: 15px;
163176
font-size: 2vw;
164-
letter-spacing: 0.3vw; }
177+
line-height: 2.5vw;
178+
letter-spacing: 0.1vw; }
165179
.footer a {
166180
background-color: transparent;
167181
background-position: top left;
@@ -208,4 +222,24 @@
208222
.footer h3 {
209223
font-size: 16pt; } }
210224

225+
.toolbox {
226+
font-family: "bebas_neuebold", Arial, sans-serif;
227+
color: #b82132;
228+
vertical-align: middle;
229+
/* margin-right: 2vw; */
230+
}
231+
.toolbox a {
232+
color: #b82132;
233+
float: left;
234+
margin-left: 40px;
235+
margin-top: 6px;
236+
}
237+
.getintouch {
238+
text-align: right;
239+
}
240+
.contact {
241+
color: rgb(212, 69, 47);
242+
float: right;
243+
margin-top: 4px;
244+
}
211245
/*# sourceMappingURL=styles.css.map */

0 commit comments

Comments
 (0)