Skip to content

Commit f7a8ed1

Browse files
kimchouardkimchouard
committed
Bugfix last of odd number list now float left & org -> orbs in featured
1 parent e7f4148 commit f7a8ed1

File tree

4 files changed

+47
-41
lines changed

4 files changed

+47
-41
lines changed

‎data/featured.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
]
3131
}
3232
],
33-
"org": [
33+
"orgs": [
3434
{
3535
"title": "Adobe Research",
3636
"logo": "img/adobe_research.png",

‎index.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<strong>Adobe</strong> Open Source
2424
</dd>
2525
<div class="menuLinks" ng-class="{more: menuOpen}">
26-
<dd data-magellan-arrival="featured"><a href="#featured" ng-click="menuOpen = false">Featured</a></dd>
26+
<dd data-magellan-arrival="statistics"><a href="#statistics" ng-click="menuOpen = false">Statistics</a></dd>
2727
<dd data-magellan-arrival="projects"><a href="#projects" ng-click="menuOpen = false">Projects</a></dd>
2828
<dd data-magellan-arrival="organisations"><a href="#organisations" ng-click="menuOpen = false">Organisation</a></dd>
2929
</div>
@@ -36,8 +36,8 @@
3636
</div>
3737
</div>
3838

39-
<a name="featured" class="anchor"></a>
40-
<div class="intro" data-magellan-destination="featured">
39+
<a name="statistics" class="anchor" data-magellan-destination="statistics"></a>
40+
<div class="intro">
4141
<div class="row">
4242
<div class="large-4 columns">
4343
<blockquote>Advancing technology through open initiatives</blockquote>
@@ -67,6 +67,7 @@ <h4>Statistics</h4>
6767
-------------------------------------------------------------------------------------- -->
6868

6969
<div class="header_inline" id="featuredProj">
70+
<a name="projects" class="anchor" data-magellan-destination="projects"></a>
7071
<div class="wrapper" ng-repeat="featured in featureds['projects']" ng-class="{actual: $index <= indexFeatured['projects']}">
7172
<div class="row">
7273
<div class="large-5 columns text-header">
@@ -96,9 +97,8 @@ <h4>Statistics</h4>
9697
<!-- ------- Header -------- -->
9798
<div class="row topProject">
9899
<div class="large-12 columns">
99-
<a name="projects" class="anchor"></a>
100100

101-
<h2 class="large-6 small-4 columns" data-magellan-destination="projects">Repos</h2>
101+
<h2 class="large-6 small-4 columns">Repos</h2>
102102
<form class="large-3 small-8 columns custom mainFilters">
103103
<div class="large-10 small-10 columns">
104104
<select id="orderby" class="medium" ng-model="filterOrder">
@@ -164,7 +164,7 @@ <h2 class="large-6 small-4 columns" data-magellan-destination="projects">Repos</
164164
<div ng-show="!loading">
165165
<div class="large-12 columns">
166166
<div class="row">
167-
<div class="large-6 columns" ng-repeat="actProject in projects | projectsFilter:this" ng-class-odd="'clear'">
167+
<div class="large-6 columns listItem" ng-repeat="actProject in projects | projectsFilter:this" ng-class-odd="'clear'">
168168
<project project="actProject" />
169169
</div>
170170

@@ -193,7 +193,7 @@ <h2 class="large-6 small-4 columns" data-magellan-destination="projects">Repos</
193193
-------------------------------------------------------------------------------------- -->
194194

195195
<div class="header_inline" id="featuredOrg">
196-
<div class="wrapper" ng-repeat="featured in featureds['org']" ng-class="{actual: $index <= indexFeatured['org']}">
196+
<div class="wrapper" ng-repeat="featured in featureds['orgs']" ng-class="{actual: $index <= indexFeatured['org']}">
197197
<div class="row">
198198
<div class="large-5 columns">
199199
<img class="logo logoFeatured second" ng-src="{{featured.logo}}" title="{{featured.title}}" />
@@ -229,7 +229,7 @@ <h2 data-magellan-destination="organisations">Organisations</h2>
229229
</div>
230230

231231
<div ng-show="!loading">
232-
<div class="large-6 columns" ng-repeat="actOrg in orgs" ng-class-odd="'clear'">
232+
<div class="large-6 columns listItem" ng-repeat="actOrg in orgs" ng-class-odd="'clear'">
233233
<org org="actOrg"/>
234234
</div>
235235
</div>

‎stylesheets/app.css‎

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7684,6 +7684,10 @@ form.custom .custom.dropdown.open.medium ul {
76847684
z-index: 30;
76857685
}
76867686
/* line 526, sass/app.scss */
7687+
.main .listItem {
7688+
float: left !important;
7689+
}
7690+
/* line 528, sass/app.scss */
76877691
.main .project, .main .org {
76887692
font-size: 14px;
76897693
border-left: 3px #e9e9e9 solid;
@@ -7695,89 +7699,89 @@ form.custom .custom.dropdown.open.medium ul {
76957699
color: black;
76967700
margin: 10px 0;
76977701
}
7698-
/* line 535, sass/app.scss */
7702+
/* line 537, sass/app.scss */
76997703
.main .project:hover, .main .org:hover {
77007704
border-left: 3px red solid;
77017705
}
7702-
/* line 539, sass/app.scss */
7706+
/* line 541, sass/app.scss */
77037707
.main .project h1, .main .org h1 {
77047708
font-size: 17px;
77057709
margin-bottom: 3px;
77067710
}
7707-
/* line 544, sass/app.scss */
7711+
/* line 546, sass/app.scss */
77087712
.main .project p, .main .org p {
77097713
margin-bottom: 5px;
77107714
}
7711-
/* line 546, sass/app.scss */
7715+
/* line 548, sass/app.scss */
77127716
.main .project .details, .main .org .details {
77137717
padding-left: 10px;
77147718
color: #666;
77157719
}
7716-
/* line 552, sass/app.scss */
7720+
/* line 554, sass/app.scss */
77177721
.main .project .star img, .main .org .star img {
77187722
width: 20px;
77197723
}
7720-
/* line 554, sass/app.scss */
7724+
/* line 556, sass/app.scss */
77217725
.main .project .watchCount, .main .org .watchCount {
77227726
padding: 5px 10px;
77237727
float: right;
77247728
color: #666;
77257729
}
7726-
/* line 560, sass/app.scss */
7730+
/* line 562, sass/app.scss */
77277731
.main .project .more, .main .org .more {
77287732
margin-bottom: 25px;
77297733
}
7730-
/* line 563, sass/app.scss */
7734+
/* line 565, sass/app.scss */
77317735
.main .project .more .link, .main .org .more .link {
77327736
text-align: right;
77337737
color: red;
77347738
}
7735-
/* line 567, sass/app.scss */
7739+
/* line 569, sass/app.scss */
77367740
.main .project .more .link:hover, .main .org .more .link:hover {
77377741
color: #e60000;
77387742
}
7739-
/* line 575, sass/app.scss */
7743+
/* line 577, sass/app.scss */
77407744
.main .buttonMore, .main .buttonLess {
77417745
width: 100%;
77427746
height: 100px;
77437747
overflow: hidden;
77447748
}
7745-
/* line 581, sass/app.scss */
7749+
/* line 583, sass/app.scss */
77467750
.main .buttonLess {
77477751
position: fixed;
77487752
bottom: 0px;
77497753
left: 0;
77507754
}
7751-
/* line 587, sass/app.scss */
7755+
/* line 589, sass/app.scss */
77527756
.main .buttonMore {
77537757
bottom: -50px;
77547758
position: absolute;
77557759
}
7756-
/* line 592, sass/app.scss */
7760+
/* line 594, sass/app.scss */
77577761
.main .ng-hide {
77587762
display: none;
77597763
}
7760-
/* line 596, sass/app.scss */
7764+
/* line 598, sass/app.scss */
77617765
.main .clear {
77627766
clear: both;
77637767
}
77647768

77657769
/* For reseting magellan on top :) */
7766-
/* line 602, sass/app.scss */
7770+
/* line 604, sass/app.scss */
77677771
.featured {
77687772
position: absolute;
77697773
top: 0;
77707774
margin-top: -250px;
77717775
display: block;
77727776
}
77737777

7774-
/* line 612, sass/app.scss */
7778+
/* line 614, sass/app.scss */
77757779
.loading {
77767780
width: 100px;
77777781
height: 50px;
77787782
margin: 20px auto;
77797783
}
7780-
/* line 618, sass/app.scss */
7784+
/* line 620, sass/app.scss */
77817785
.loading .bars div {
77827786
height: 40px;
77837787
width: 3px;
@@ -7788,77 +7792,77 @@ form.custom .custom.dropdown.open.medium ul {
77887792
-o-animation: loader 1.3s infinite;
77897793
animation: loader 1.3s infinite;
77907794
}
7791-
/* line 626, sass/app.scss */
7795+
/* line 628, sass/app.scss */
77927796
.loading .bars div:nth-child(1) {
77937797
-webkit-animation-delay: 0.1s;
77947798
-moz-animation-delay: 0.1s;
77957799
-o-animation-delay: 0.1s;
77967800
animation-delay: 0.1s;
77977801
}
7798-
/* line 626, sass/app.scss */
7802+
/* line 628, sass/app.scss */
77997803
.loading .bars div:nth-child(2) {
78007804
-webkit-animation-delay: 0.2s;
78017805
-moz-animation-delay: 0.2s;
78027806
-o-animation-delay: 0.2s;
78037807
animation-delay: 0.2s;
78047808
}
7805-
/* line 626, sass/app.scss */
7809+
/* line 628, sass/app.scss */
78067810
.loading .bars div:nth-child(3) {
78077811
-webkit-animation-delay: 0.3s;
78087812
-moz-animation-delay: 0.3s;
78097813
-o-animation-delay: 0.3s;
78107814
animation-delay: 0.3s;
78117815
}
7812-
/* line 626, sass/app.scss */
7816+
/* line 628, sass/app.scss */
78137817
.loading .bars div:nth-child(4) {
78147818
-webkit-animation-delay: 0.4s;
78157819
-moz-animation-delay: 0.4s;
78167820
-o-animation-delay: 0.4s;
78177821
animation-delay: 0.4s;
78187822
}
7819-
/* line 626, sass/app.scss */
7823+
/* line 628, sass/app.scss */
78207824
.loading .bars div:nth-child(5) {
78217825
-webkit-animation-delay: 0.5s;
78227826
-moz-animation-delay: 0.5s;
78237827
-o-animation-delay: 0.5s;
78247828
animation-delay: 0.5s;
78257829
}
7826-
/* line 626, sass/app.scss */
7830+
/* line 628, sass/app.scss */
78277831
.loading .bars div:nth-child(6) {
78287832
-webkit-animation-delay: 0.6s;
78297833
-moz-animation-delay: 0.6s;
78307834
-o-animation-delay: 0.6s;
78317835
animation-delay: 0.6s;
78327836
}
7833-
/* line 626, sass/app.scss */
7837+
/* line 628, sass/app.scss */
78347838
.loading .bars div:nth-child(7) {
78357839
-webkit-animation-delay: 0.7s;
78367840
-moz-animation-delay: 0.7s;
78377841
-o-animation-delay: 0.7s;
78387842
animation-delay: 0.7s;
78397843
}
7840-
/* line 626, sass/app.scss */
7844+
/* line 628, sass/app.scss */
78417845
.loading .bars div:nth-child(8) {
78427846
-webkit-animation-delay: 0.8s;
78437847
-moz-animation-delay: 0.8s;
78447848
-o-animation-delay: 0.8s;
78457849
animation-delay: 0.8s;
78467850
}
7847-
/* line 626, sass/app.scss */
7851+
/* line 628, sass/app.scss */
78487852
.loading .bars div:nth-child(9) {
78497853
-webkit-animation-delay: 0.9s;
78507854
-moz-animation-delay: 0.9s;
78517855
-o-animation-delay: 0.9s;
78527856
animation-delay: 0.9s;
78537857
}
7854-
/* line 626, sass/app.scss */
7858+
/* line 628, sass/app.scss */
78557859
.loading .bars div:nth-child(10) {
78567860
-webkit-animation-delay: 1s;
78577861
-moz-animation-delay: 1s;
78587862
-o-animation-delay: 1s;
78597863
animation-delay: 1s;
78607864
}
7861-
/* line 633, sass/app.scss */
7865+
/* line 635, sass/app.scss */
78627866
.loading .text {
78637867
color: red;
78647868
text-transform: uppercase;
@@ -7869,7 +7873,7 @@ form.custom .custom.dropdown.open.medium ul {
78697873
}
78707874

78717875
@-moz-keyframes loader {
7872-
/* line 644, sass/app.scss */
7876+
/* line 646, sass/app.scss */
78737877
50% {
78747878
height: 3px;
78757879
margin-top: 37px;
@@ -7878,7 +7882,7 @@ form.custom .custom.dropdown.open.medium ul {
78787882
}
78797883

78807884
@-webkit-keyframes loader {
7881-
/* line 644, sass/app.scss */
7885+
/* line 646, sass/app.scss */
78827886
50% {
78837887
height: 3px;
78847888
margin-top: 37px;
@@ -7887,7 +7891,7 @@ form.custom .custom.dropdown.open.medium ul {
78877891
}
78887892

78897893
@-o-keyframes loader {
7890-
/* line 644, sass/app.scss */
7894+
/* line 646, sass/app.scss */
78917895
50% {
78927896
height: 3px;
78937897
margin-top: 37px;
@@ -7896,7 +7900,7 @@ form.custom .custom.dropdown.open.medium ul {
78967900
}
78977901

78987902
@keyframes loader {
7899-
/* line 644, sass/app.scss */
7903+
/* line 646, sass/app.scss */
79007904
50% {
79017905
height: 3px;
79027906
margin-top: 37px;

‎stylesheets/sass/app.scss‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,8 @@ form.custom .custom.dropdown.open.medium ul {
522522
position: relative;
523523
z-index: 30;
524524
}
525+
526+
.listItem { float: left !important; }
525527

526528
.project, .org {
527529
font-size: 14px;

0 commit comments

Comments
 (0)