Skip to content

Commit 5d3594c

Browse files
kimchouardkimchouard
committed
Bugfix magellan & Remove transition menu
1 parent c9a0255 commit 5d3594c

File tree

3 files changed

+51
-56
lines changed

3 files changed

+51
-56
lines changed

‎index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<!-- ------- Header -------- -->
7575
<div class="row topProject">
7676
<div class="large-12 columns">
77-
<a name="projects"></a>
77+
<a name="projects" class="anchor"></a>
7878

7979
<h2 class="large-6 small-4 columns" data-magellan-destination="projects">Projects</h2>
8080
<form class="large-3 small-8 columns custom mainFilters">
@@ -236,7 +236,7 @@ <h1>{{project.name}}</h1>
236236
Organisations
237237
-------------------------------------------------------------------------------------- -->
238238

239-
<a name="organisations"></a>
239+
<a name="organisations" class="anchor"></a>
240240
<h2 data-magellan-destination="organisations">Organisations</h2>
241241

242242
<!-- Grid Example -->

‎stylesheets/app.css‎

Lines changed: 45 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -7455,10 +7455,6 @@ a.th {
74557455
.menu .sub-nav dd:not(.title) a {
74567456
color: black;
74577457
font-size: 15px;
7458-
-webkit-transition: all 0.1s;
7459-
-moz-transition: all 0.1s;
7460-
-o-transition: all 0.1s;
7461-
transition: all 0.1s;
74627458
}
74637459
/* line 298, sass/app.scss */
74647460
.menu .sub-nav dd:not(.title).active a, .menu .sub-nav dd:not(.title):hover a {
@@ -7489,15 +7485,15 @@ a.th {
74897485
width: 45px;
74907486
}
74917487

7492-
/* line 321, sass/app.scss */
7488+
/* line 319, sass/app.scss */
74937489
.menu-icon {
74947490
display: block;
74957491
float: left;
74967492
width: 16px;
74977493
height: 30px;
74987494
margin-right: 10px;
74997495
}
7500-
/* line 328, sass/app.scss */
7496+
/* line 326, sass/app.scss */
75017497
.menu-icon span {
75027498
display: block;
75037499
width: 100%;
@@ -7507,72 +7503,73 @@ a.th {
75077503
box-shadow: 0 10px 0 1px red, 0 16px 0 1px red, 0 22px 0 1px red;
75087504
}
75097505

7510-
/* line 336, sass/app.scss */
7506+
/* line 334, sass/app.scss */
75117507
.title {
75127508
font-family: "tekton-pro";
75137509
font-size: 24px;
75147510
font-weight: 700 !important;
75157511
margin: 3px 30px 3px 20px;
75167512
}
7517-
/* line 342, sass/app.scss */
7513+
/* line 340, sass/app.scss */
75187514
.title strong {
75197515
color: red;
75207516
}
75217517

7522-
/* line 351, sass/app.scss */
7518+
/* line 349, sass/app.scss */
75237519
.main {
75247520
background: #fff;
75257521
position: relative;
75267522
margin-top: 0;
75277523
padding: 30px 0;
75287524
}
7529-
/* line 355, sass/app.scss */
7525+
/* line 353, sass/app.scss */
75307526
.main.top {
75317527
margin-top: 350px;
75327528
}
7533-
/* line 358, sass/app.scss */
7529+
/* line 356, sass/app.scss */
75347530
.main h2 {
75357531
font-weight: normal;
75367532
}
7537-
/* line 363, sass/app.scss */
7533+
/* line 361, sass/app.scss */
75387534
.main .topProject h2, .main .topProject form {
75397535
margin-bottom: 0;
75407536
}
7541-
/* line 368, sass/app.scss */
7542-
.main .projects, .main .organisations {
7543-
position: relative;
7544-
bottom: -50px;
7537+
/* line 366, sass/app.scss */
7538+
.main .anchor {
7539+
display: block;
7540+
float: left;
7541+
margin-top: -50px;
75457542
}
7546-
/* line 377, sass/app.scss */
7543+
/* line 375, sass/app.scss */
75477544
.main .mainFilters {
75487545
margin-top: 15px;
75497546
}
7550-
/* line 380, sass/app.scss */
7547+
/* line 378, sass/app.scss */
75517548
.main .mainFilters .button {
75527549
padding: 6px 3px 4px;
75537550
}
7554-
/* line 382, sass/app.scss */
7551+
/* line 380, sass/app.scss */
75557552
.main .mainFilters .button svg {
75567553
width: 19px;
75577554
height: 19px;
75587555
}
7559-
/* line 385, sass/app.scss */
7556+
/* line 383, sass/app.scss */
75607557
.main .mainFilters .button svg path {
75617558
fill: #fff;
75627559
}
7563-
/* line 390, sass/app.scss */
7560+
/* line 388, sass/app.scss */
75647561
.main .filters {
75657562
margin-bottom: 10px;
75667563
background: #e9e9e9;
75677564
width: 100%;
75687565
overflow: hidden;
75697566
}
7570-
/* line 391, sass/app.scss */
7567+
/* line 389, sass/app.scss */
75717568
.main .filters.flat {
75727569
height: 0px;
75737570
margin-bottom: 0px;
75747571
}
7575-
/* line 402, sass/app.scss */
7572+
/* line 400, sass/app.scss */
75767573
.main .filters .star .fitlerStar {
75777574
width: 21px;
75787575
height: 21px;
@@ -7581,39 +7578,39 @@ a.th {
75817578
background-size: 21px 21px;
75827579
float: left;
75837580
}
7584-
/* line 409, sass/app.scss */
7581+
/* line 407, sass/app.scss */
75857582
.main .filters .star .fitlerStar:hover, .main .filters .star .fitlerStar.on {
75867583
background-image: url("../img/star_on.svg");
75877584
}
7588-
/* line 413, sass/app.scss */
7585+
/* line 411, sass/app.scss */
75897586
.main .filters .activeFilter {
75907587
margin: -10px 0.9375em 15px;
75917588
}
7592-
/* line 416, sass/app.scss */
7589+
/* line 414, sass/app.scss */
75937590
.main .filters .activeFilter .filterLang {
75947591
margin-right: 10px;
75957592
display: inline-block;
75967593
}
7597-
/* line 420, sass/app.scss */
7594+
/* line 418, sass/app.scss */
75987595
.main .filters .activeFilter .filterLang .button {
75997596
margin-bottom: 0px;
76007597
}
7601-
/* line 427, sass/app.scss */
7598+
/* line 425, sass/app.scss */
76027599
.main .autocomplete {
76037600
width: 100%;
76047601
position: absolute;
76057602
top: 146px;
76067603
z-index: 999;
76077604
}
7608-
/* line 435, sass/app.scss */
7605+
/* line 433, sass/app.scss */
76097606
.main .autocomplete .wrapperLang .items {
76107607
padding-left: 17px;
76117608
}
7612-
/* line 436, sass/app.scss */
7609+
/* line 434, sass/app.scss */
76137610
.main .autocomplete .wrapperLang .items:first-child {
76147611
padding-left: 6px;
76157612
}
7616-
/* line 439, sass/app.scss */
7613+
/* line 437, sass/app.scss */
76177614
.main .autocomplete .wrapperLang .items .item {
76187615
padding: 10px 20px;
76197616
display: block;
@@ -7623,16 +7620,16 @@ a.th {
76237620
color: #333;
76247621
background: white;
76257622
}
7626-
/* line 451, sass/app.scss */
7623+
/* line 449, sass/app.scss */
76277624
.main .autocomplete .wrapperLang .items .item:hover {
76287625
color: red;
76297626
}
7630-
/* line 463, sass/app.scss */
7627+
/* line 461, sass/app.scss */
76317628
.main .wrapProjects {
76327629
padding-bottom: 50px;
76337630
position: relative;
76347631
}
7635-
/* line 468, sass/app.scss */
7632+
/* line 466, sass/app.scss */
76367633
.main .project, .main .org {
76377634
font-size: 14px;
76387635
border-left: 3px #e9e9e9 solid;
@@ -7644,71 +7641,71 @@ a.th {
76447641
color: black;
76457642
margin: 10px 0;
76467643
}
7647-
/* line 477, sass/app.scss */
7644+
/* line 475, sass/app.scss */
76487645
.main .project:hover, .main .org:hover {
76497646
border-left: 3px red solid;
76507647
}
7651-
/* line 481, sass/app.scss */
7648+
/* line 479, sass/app.scss */
76527649
.main .project h1, .main .org h1 {
76537650
font-size: 17px;
76547651
margin-bottom: 3px;
76557652
}
7656-
/* line 486, sass/app.scss */
7653+
/* line 484, sass/app.scss */
76577654
.main .project p, .main .org p {
76587655
margin-bottom: 5px;
76597656
}
7660-
/* line 488, sass/app.scss */
7657+
/* line 486, sass/app.scss */
76617658
.main .project .details, .main .org .details {
76627659
padding-left: 10px;
76637660
color: #666;
76647661
}
7665-
/* line 494, sass/app.scss */
7662+
/* line 492, sass/app.scss */
76667663
.main .project .star img, .main .org .star img {
76677664
width: 20px;
76687665
}
7669-
/* line 496, sass/app.scss */
7666+
/* line 494, sass/app.scss */
76707667
.main .project .watchCount, .main .org .watchCount {
76717668
padding: 5px 10px;
76727669
float: right;
76737670
color: #666;
76747671
}
7675-
/* line 502, sass/app.scss */
7672+
/* line 500, sass/app.scss */
76767673
.main .project .more, .main .org .more {
76777674
margin-bottom: 25px;
76787675
}
7679-
/* line 505, sass/app.scss */
7676+
/* line 503, sass/app.scss */
76807677
.main .project .more .link, .main .org .more .link {
76817678
text-align: right;
76827679
color: red;
76837680
}
7684-
/* line 509, sass/app.scss */
7681+
/* line 507, sass/app.scss */
76857682
.main .project .more .link:hover, .main .org .more .link:hover {
76867683
color: #e60000;
76877684
}
7688-
/* line 517, sass/app.scss */
7685+
/* line 515, sass/app.scss */
76897686
.main .buttonMore, .main .buttonLess {
76907687
width: 100%;
76917688
height: 100px;
76927689
overflow: hidden;
76937690
}
7694-
/* line 523, sass/app.scss */
7691+
/* line 521, sass/app.scss */
76957692
.main .buttonMore {
76967693
position: fixed;
76977694
bottom: 0px;
76987695
left: 0;
76997696
}
7700-
/* line 529, sass/app.scss */
7697+
/* line 527, sass/app.scss */
77017698
.main .buttonLess {
77027699
bottom: -50px;
77037700
position: absolute;
77047701
}
7705-
/* line 534, sass/app.scss */
7702+
/* line 532, sass/app.scss */
77067703
.main .clear {
77077704
clear: both;
77087705
}
77097706

77107707
/* For reseting magellan on top :) */
7711-
/* line 541, sass/app.scss */
7708+
/* line 539, sass/app.scss */
77127709
.featured {
77137710
position: absolute;
77147711
top: 0;

‎stylesheets/sass/app.scss‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ $header-font-family: 'Open Sans', Cambria, 'Times New Roman', Times, sans-serif
292292
a {
293293
color: black;
294294
font-size: 15px;
295-
@include transition(all 0.1s);
295+
// @include transition(all 0.1s);
296296
}
297297

298298
&.active a, &:hover a {
@@ -316,8 +316,6 @@ $header-font-family: 'Open Sans', Cambria, 'Times New Roman', Times, sans-serif
316316
}
317317
}
318318

319-
//[data-magellan-expedition] { background: white !important; }
320-
321319
.menu-icon {
322320
display: block;
323321
float: left;
@@ -365,9 +363,9 @@ $header-font-family: 'Open Sans', Cambria, 'Times New Roman', Times, sans-serif
365363
}
366364
}
367365

368-
.projects, .organisations {
369-
position: relative;
370-
bottom: -$menu-height+px;
366+
.anchor {
367+
display: block; float: left;
368+
margin-top: -$menu-height+px;
371369
}
372370

373371
//---------------------------------------------------------------------------------

0 commit comments

Comments
 (0)