Tweaks styling; fixes minor bug

paullewis · paullewis · commit b56e751e2c09 · 2016-06-02T16:05:26.000+01:00
diff --git a/router/static/sc-router.js b/router/static/sc-router.js
@@ -47,6 +47,9 @@ class SCRouter extends HTMLElement {
     if (this._currentView) {
       // ...and it's the one we already have, just update it.
       if (this._currentView === this._newView) {
+        // No transitions, so remove the boolean gate.
+        this._isTransitioningBetweenViews = false;
+
         return this._currentView.update(data);
       }
 
diff --git a/router/static/superstyles.css b/router/static/superstyles.css
@@ -38,6 +38,12 @@ sc-view {
   transform: scale(0.95);
   transition: transform 0.3s cubic-bezier(0,0,0.3,1),
     opacity 0.3s cubic-bezier(0,0,0.3,1);
+  font-size: 20vh;
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  color: white;
 }
 
 sc-view.visible {
@@ -47,20 +53,19 @@ sc-view.visible {
 }
 
 .view-home {
-  background: red;
+  background: rgb(128,00,64);
 }
 
 .view-contact {
-  background: blue;
+  background: rgb(00,128,64);
 }
 
 .view-about {
-  background: black;
-  color: white;
+  background: rgb(00,64,128);
 }
 
 .view-misc {
-  background: green;
+  background: rgb(128,64,0);
 }
 
 nav {

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,9 @@ class SCRouter extends HTMLElement {`
`47`	`47`	`if (this._currentView) {`
`48`	`48`	`// ...and it's the one we already have, just update it.`
`49`	`49`	`if (this._currentView === this._newView) {`
	`50`	`+ // No transitions, so remove the boolean gate.`
	`51`	`+ this._isTransitioningBetweenViews = false;`
	`52`	`+`
`50`	`53`	`return this._currentView.update(data);`
`51`	`54`	`}`
`52`	`55`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,12 @@ sc-view {`
`38`	`38`	`transform: scale(0.95);`
`39`	`39`	`transition: transform 0.3s cubic-bezier(0,0,0.3,1),`
`40`	`40`	`opacity 0.3s cubic-bezier(0,0,0.3,1);`
	`41`	`+ font-size: 20vh;`
	`42`	`+ display: flex;`
	`43`	`+ flex-direction: row;`
	`44`	`+ justify-content: center;`
	`45`	`+ align-items: center;`
	`46`	`+ color: white;`
`41`	`47`	`}`
`42`	`48`
`43`	`49`	`sc-view.visible {`
`@@ -47,20 +53,19 @@ sc-view.visible {`
`47`	`53`	`}`
`48`	`54`
`49`	`55`	`.view-home {`
`50`		`- background: red;`
	`56`	`+ background: rgb(128,00,64);`
`51`	`57`	`}`
`52`	`58`
`53`	`59`	`.view-contact {`
`54`		`- background: blue;`
	`60`	`+ background: rgb(00,128,64);`
`55`	`61`	`}`
`56`	`62`
`57`	`63`	`.view-about {`
`58`		`- background: black;`
`59`		`- color: white;`
	`64`	`+ background: rgb(00,64,128);`
`60`	`65`	`}`
`61`	`66`
`62`	`67`	`.view-misc {`
`63`		`- background: green;`
	`68`	`+ background: rgb(128,64,0);`
`64`	`69`	`}`
`65`	`70`
`66`	`71`	`nav {`