juni/junisaber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove duplicate text font mixin

Browse Source
This commit is contained in:
Kevin Ngo
2018-10-25 08:35:58 -07:00
parent 48c0bb555f
commit 90db3b2850
7 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/assets.html
View File

@@ -40,7 +40,6 @@
<a-mixin id="slice" slice9="color: #050505; transparent: true; opacity: 0.7; src: #sliceImg; left: 50; right: 52; top: 50; bottom: 52; padding: 0.18"></a-mixin>
<a-mixin id="font" text="font: assets/fonts/Teko-Bold.json; shader: msdf; letterSpacing: 1"></a-mixin>
<a-mixin id="textFont" text="font: assets/fonts/Teko-Bold.json; shader: msdf; letterSpacing: 1"></a-mixin>
<a-mixin id="superKeyboardTextInput" mixin="font"></a-mixin>
<a-mixin id="beat" visible="false"></a-mixin>

2
src/components/mine-fragments-loader.js
View File

@@ -7,4 +7,4 @@ AFRAME.registerSystem('mine-fragments-loader', {
this.fragments = objLoader.parse(ev.target.data);
})
}
});
});

4
src/templates/gameMenu.html
View File

@@ -66,9 +66,9 @@
<a-entity id="gameMenuSongInfo">
<a-entity class="gameMenuSongSubName" position="0 0.058 0"
mixin="textFont" text="wrapCount: 40; align: center; color: #FF185B" bind__text="value: menuSelectedChallenge.songSubName"></a-entity>
mixin="font" text="wrapCount: 40; align: center; color: #FF185B" bind__text="value: menuSelectedChallenge.songSubName"></a-entity>
<a-entity class="gameMenuSongName" position="0 -0.031 0"
mixin="textFont" text="align: center; color: #FF185B; wrapCount: 22; baseline: top; lineHeight: 36; width: 0.81"
mixin="font" text="align: center; color: #FF185B; wrapCount: 22; baseline: top; lineHeight: 36; width: 0.81"
bind__text="value: menuSelectedChallenge.songName"></a-entity>
</a-entity>
</a-entity>

6
src/templates/loading.html
View File

@@ -13,16 +13,16 @@
position="0 0.24 0"></a-entity>
<a-entity id="loadingSongInfo">
<a-entity position="0 -0.05 0" mixin="textFont"
<a-entity position="0 -0.05 0" mixin="font"
text="wrapCount: 40; align: center; color: #FF185B"
bind__text="value: menuSelectedChallenge.songSubName"></a-entity>
<a-entity position="0 -0.13 0"
mixin="textFont" text="align: center; color: #FFF; wrapCount: 21; baseline: top; lineHeight: 36; width: 0.81"
mixin="font" text="align: center; color: #FFF; wrapCount: 21; baseline: top; lineHeight: 36; width: 0.81"
bind__text="value: menuSelectedChallenge.songName"></a-entity>
<a-entity
id="loadingText"
mixin="textFont"
mixin="font"
bind__animation__color="enabled: isSongLoading"
bind__text="value: loadingText"
bind__visible="isSongLoading"

22
src/templates/menu.html
View File

@@ -10,14 +10,14 @@
<!-- All search result text merged and spaced out. -->
<a-entity
id="searchSongNameTexts"
mixin="textFont"
mixin="font"
bind__text="value: search.songNameTexts"
text="baseline: top; align: left; color: #FAFAFA; wrapCount: 28; lineHeight: 112"
position="0.181 0.51 0.001">
</a-entity>
<a-entity
id="searchSongSubNameTexts"
mixin="textFont"
mixin="font"
bind__text="value: search.songSubNameTexts"
text="baseline: top; align: left; color: #999; wrapCount: 42; lineHeight: 166"
position="0.181 0.445 0.001">
@@ -34,7 +34,7 @@
<a-entity
id="searchSongNameTextSelected"
mixin="textFont"
mixin="font"
bind__search-song-name-selected="index: menuSelectedChallenge.index; selectedChallengeId: menuSelectedChallenge.id"
bind__text="value: menuSelectedChallenge.shortSongName"
text="align: left; color: #333; wrapCount: 28"
@@ -161,7 +161,7 @@
animation__mouseentervisible="property: visible; from: false; to: true; startEvents: mouseenter; pauseEvents: mouseleave; dur: 1"
animation__mouseleave="property: components.material.material.opacity; to: 0.0; startEvents: mouseleave; pauseEvents: mouseenter; dur: 150"
animation__mouseleavevisible="property: visible; from: true; to: false; startEvents: mouseleave; pauseEvents: mouseenter; dur: 160"></a-entity>
<a-entity class="difficultyText" mixin="textFont" bind-item__active-text-color="active: menuSelectedChallenge.difficulty === item" active-text-color="color: #333" bind-item__text-uppercase="value: item" text="wrapCount: 28; align: center; color: #FAFAFA" position="0 -0.057 0.001"></a-entity>
<a-entity class="difficultyText" mixin="font" bind-item__active-text-color="active: menuSelectedChallenge.difficulty === item" active-text-color="color: #333" bind-item__text-uppercase="value: item" text="wrapCount: 28; align: center; color: #FAFAFA" position="0 -0.057 0.001"></a-entity>
</a-entity>
</template>
{% endraw %}
@@ -184,31 +184,31 @@
<a-entity
id="menuSelectedChallengeSongAuthor"
position="0 0.058 0"
mixin="textFont"
mixin="font"
text="wrapCount: 40; align: center; color: #FF185B"
bind__text="value: menuSelectedChallenge.songSubName"></a-entity>
<a-entity
id="menuSelectedChallengeSongName"
position="0 -0.031 0"
mixin="textFont"
mixin="font"
text="align: center; color: #FF185B; wrapCount: 22; baseline: top; lineHeight: 36; width: 0.81"
bind__text="value: menuSelectedChallenge.songName"></a-entity>
<a-entity
id="menuSelectedChallengeAuthor"
position="0 -0.257 0"
mixin="textFont"
mixin="font"
text="align: center; color: #FFF; wrapCount: 33; width: 0.78; baseline: bottom"
bind__text="value: menuSelectedChallenge.author"></a-entity>
<a-entity
id="menuSelectedChallengeDownloads"
position="0 -0.325 0"
mixin="textFont"
mixin="font"
text="align: center; color: #FFF; wrapCount: 35"
bind__text="value: menuSelectedChallenge.downloadsText"></a-entity>
<a-entity
id="menuSelectedChallengeSongInfo"
position="0 -0.395 0"
mixin="textFont"
mixin="font"
text="align: center; color: #FFF; wrapCount: 35"
bind__text="value: menuSelectedChallenge.songInfoText"></a-entity>
</a-entity>
@@ -233,7 +233,7 @@
<a-entity
id="searchError"
bind__visible="search.hasError"
mixin="textFont"
mixin="font"
text="align: center; value: Sorry, there was an issue fetching search results. Please try again."
position="0 0 0.01"></a-entity>
</a-entity>
@@ -260,5 +260,5 @@
bind-toggle__raycastable="menuActive && !isSearching"
bind__visible="menuActive && !isSearching"
proxy-event="event: click; to: a-scene; as: keyboardopen">
<a-entity mixin="textFont" text="align: center; color: #AAA; wrapCount: 20; value: SEARCH SONGS" position="0 -0.07 0.01"></a-entity>
<a-entity mixin="font" text="align: center; color: #AAA; wrapCount: 20; value: SEARCH SONGS" position="0 -0.07 0.01"></a-entity>
</a-entity>

2
src/templates/score.html
View File

@@ -1,6 +1,6 @@
<a-mixin
id="scoreText"
mixin="textFont"
mixin="font"
text="color: #88A; letterSpacing: -2; align: center"></a-mixin>
<a-entity

8
src/templates/victory.html
View File

@@ -10,7 +10,7 @@
id="victoryInfoRank"
bind__animation="enabled: isVictory"
animation="property: object3D.rotation.y; from: 0; to: 360; loop: true; easing: linear; dur: 3000"
mixin="textFont"
mixin="font"
bind__victory-rank="rank: score.rank"
text="wrapCount: 1; align: center; color: #AAFFAA; width: 0.5; side: double"></a-entity>
@@ -31,19 +31,19 @@
<a-entity id="victoryInfo" layout="type: box; columns: 1; margin: -0.1" position="0 -0.06 0">
<a-entity
id="victoryInfoScore"
mixin="textFont"
mixin="font"
text="align: center; color: #FAFAFA; wrapCount: 22; baseline: top; lineHeight: 36; width: 0.81"
bind__text="value: score.scoreText"></a-entity>
<a-entity
id="victoryInfoAccuracy"
mixin="textFont"
mixin="font"
text="align: center; color: #FAFAFA; wrapCount: 22; baseline: top; lineHeight: 36; width: 0.81"
bind__text="value: score.accuracyText"></a-entity>
<a-entity
id="victoryInfoMaxCombo"
mixin="textFont"
mixin="font"
text="align: center; color: #FAFAFA; wrapCount: 22; baseline: top; lineHeight: 36; width: 0.81"
bind__text="value: score.maxComboText"></a-entity>
</a-entity>