Browse Source

petites modifs CSS

Sevajol Bastien 11 years ago
parent
commit
0093f6ed50

+ 79 - 5
src/Muzich/CoreBundle/Resources/public/css/main.css View File

37
   background-image: url("/img/header_background.png");
37
   background-image: url("/img/header_background.png");
38
   background-repeat: repeat-x;
38
   background-repeat: repeat-x;
39
   border-bottom: 3px solid #e51936;
39
   border-bottom: 3px solid #e51936;
40
+  
41
+  margin-bottom: 25px;
40
 }
42
 }
41
 
43
 
42
 div#header div#hgroup
44
 div#header div#hgroup
258
 
260
 
259
 .top-fixed {
261
 .top-fixed {
260
     position: fixed;
262
     position: fixed;
261
-    top: 0;
263
+    top: 25px;
262
 }
264
 }
263
 
265
 
264
 .bottom-fixed {
266
 .bottom-fixed {
265
     position:fixed;
267
     position:fixed;
266
-    bottom: 0;
268
+    bottom: 25px;
267
 }
269
 }
268
 
270
 
269
 #mainbox
271
 #mainbox
270
 {
272
 {
271
-  margin-top: 25px;
273
+  margin-top: 0px;
272
   /*padding: 10px;*/
274
   /*padding: 10px;*/
273
   padding-bottom: 23px;
275
   padding-bottom: 23px;
274
 }
276
 }
275
 
277
 
276
 #mainbox.mainbox_margintop
278
 #mainbox.mainbox_margintop
277
 {
279
 {
278
-  margin-top: 80px;
280
+  margin-top: 60px;
279
 }
281
 }
280
 
282
 
281
 #mainbox.mainbox_nopadding
283
 #mainbox.mainbox_nopadding
590
 
592
 
591
 div#user_statusbox
593
 div#user_statusbox
592
 {
594
 {
593
-  margin-top: 25px;
595
+  margin-top: 0px;
594
 }
596
 }
595
 
597
 
596
 div.user_score
598
 div.user_score
2408
 }
2410
 }
2409
 
2411
 
2410
 
2412
 
2413
+
2414
+@-webkit-keyframes sidesticktop
2415
+{
2416
+  0%{top: auto;}
2417
+  50%{top: 0px;}
2418
+  100%{top: 25px}
2419
+}
2420
+
2421
+@-moz-keyframes sidesticktop
2422
+{
2423
+  0%{top: auto;}
2424
+  50%{top: 0px;}
2425
+  100%{top: 25px}
2426
+}
2427
+
2428
+@-ms-keyframes sidesticktop
2429
+{
2430
+  0%{top: auto;}
2431
+  50%{top: 0px;}
2432
+  100%{top: 25px}
2433
+}
2434
+
2435
+@-o-keyframes sidesticktop
2436
+{
2437
+  0%{top: auto;}
2438
+  50%{top: 0px;}
2439
+  100%{top: 25px}
2440
+}
2441
+
2442
+@keyframes sidesticktop
2443
+{
2444
+  0%{top: auto;}
2445
+  50%{top: 0px;}
2446
+  100%{top: 25px}
2447
+}
2448
+
2449
+@-webkit-keyframes sidestickbottom
2450
+{
2451
+  0%{bottom: auto;}
2452
+  50%{bottom: 0px;}
2453
+  100%{bottom: 25px}
2454
+}
2455
+
2456
+@-moz-keyframes sidestickbottom
2457
+{
2458
+  0%{bottom: auto;}
2459
+  50%{bottom: 0px;}
2460
+  100%{bottom: 25px}
2461
+}
2462
+
2463
+@-ms-keyframes sidestickbottom
2464
+{
2465
+  0%{bottom: auto;}
2466
+  50%{bottom: 0px;}
2467
+  100%{bottom: 25px}
2468
+}
2469
+
2470
+@-o-keyframes sidestickbottom
2471
+{
2472
+  0%{bottom: auto;}
2473
+  50%{bottom: 0px;}
2474
+  100%{bottom: 25px}
2475
+}
2476
+
2477
+@keyframes sidestickbottom
2478
+{
2479
+  0%{bottom: auto;}
2480
+  50%{bottom: 0px;}
2481
+  100%{bottom: 25px}
2482
+}
2483
+
2484
+
2411
 .flashing
2485
 .flashing
2412
 {
2486
 {
2413
   font-weight: bold;
2487
   font-weight: bold;

+ 3 - 1
src/Muzich/CoreBundle/Resources/public/js/muzich.js View File

3276
   if ($('#sidebar .sidebar').height() < $('#content .content').height() &&
3276
   if ($('#sidebar .sidebar').height() < $('#content .content').height() &&
3277
     $('#sidebar .sidebar').height() > $(window).height())
3277
     $('#sidebar .sidebar').height() > $(window).height())
3278
   {
3278
   {
3279
+    console.log('sticky sidebar');
3279
     $('#content').stickySidebar();
3280
     $('#content').stickySidebar();
3280
   }
3281
   }
3281
   else
3282
   else
3282
   {
3283
   {
3284
+    console.log('sticky tout court');
3283
     $('#sidebar .sidebar').css('padding-bottom', '155px');
3285
     $('#sidebar .sidebar').css('padding-bottom', '155px');
3284
-    $("#sidebar .sidebar").sticky({topSpacing:0});
3286
+    $("#sidebar .sidebar").sticky({topSpacing:25});
3285
   }
3287
   }
3286
   
3288
   
3287
   
3289
   

+ 0 - 2
src/Muzich/CoreBundle/Resources/views/Layout/side.html.twig View File

25
   
25
   
26
   {% if display_help %}
26
   {% if display_help %}
27
     
27
     
28
-    <div class="side_margin_top"></div>
29
-    
30
     <div class="center">
28
     <div class="center">
31
       <a id="know_more" class="helpbox button" href="{{ path('helpbox_bootstrap', {'ressource_id':'know_more'}) }}" title="{{ 'help.know_more'|trans({}, 'navigationui') }}">
29
       <a id="know_more" class="helpbox button" href="{{ path('helpbox_bootstrap', {'ressource_id':'know_more'}) }}" title="{{ 'help.know_more'|trans({}, 'navigationui') }}">
32
         {{ 'help.know_more'|trans({}, 'navigationui') }}
30
         {{ 'help.know_more'|trans({}, 'navigationui') }}