[bugfix] fix snow animation looping

Basster · Dec 19, 2016 · 13ced4b · 13ced4b
1 parent 92c2776
commit 13ced4b
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 28 deletions.
diff --git a/assets/[email protected] b/assets/[email protected]
diff --git a/assets/s1.png b/assets/s1.png
diff --git a/assets/s2.png b/assets/s2.png
diff --git a/assets/s3.png b/assets/s3.png
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "icon": "assets/app.png",
   "description": "A simple but smart menubar weather app",
   "main": "src/app.js",
-  "electronVersion": "1.4.7",
+  "electronVersion": "1.4.12",
   "keywords": [
     "electron",
     "temperature",
@@ -45,11 +45,11 @@
     "electron-packager": "^8.0.0",
     "electron-prebuilt": "^1.4.1",
     "electron-installer-dmg": "0.1.2",
-    "electron-builder": "8.3.0",
+    "electron-builder": "10.8.1",
     "standard": "^8.3.0"
   },
   "dependencies": {
-    "electron": "1.4.10",
+    "electron": "1.4.12",
     "menubar": "^5.1.0",
     "auto-launch": "^5.0.1",
     "applescript": "^1.0.0",
@@ -59,7 +59,7 @@
     "chart.js": "^2.2.1",
     "countup.js": "^1.7.1",
     "semver": "^5.1.0",
-    "superagent": "^3.1.0",
+    "superagent": "^3.3.1",
     "moment": "^2.17.1"
   }
 }
diff --git a/src/app.js b/src/app.js
@@ -34,7 +34,7 @@ app.on('will-quit', function () {
 const mb = menubar({
   index: path.join('file://', __dirname, '/main/index.html'),
   icon: path.join(__dirname, '/../assets/IconTemplate.png'),
-  width: 580,
+  width: 280,
   height: 480,
   resizable: false,
   showDockIcon: false,
@@ -119,6 +119,8 @@ mb.on('show', function show () {
 
 const appPath = app.getPath('exe').split('.app/Content')[0] + '.app';
 
+console.log(appPath)
+
 const appLauncher = new AutoLaunch({
   name: 'temps',
   path: appPath,

diff --git a/src/components/weather.js b/src/components/weather.js
@@ -398,3 +398,4 @@ exports.getGeolocation = getGeolocation
 exports.getNumAnimTemp = getNumAnimTemp
 exports.setNumAnimTemp = setNumAnimTemp
 exports.getIcon = getIcon
+exports.showSnow = showSnow
diff --git a/src/main/index.html b/src/main/index.html
@@ -101,20 +101,18 @@ <h1>
                 </div>
                 <div class="form-item small">
                     <label class="clear">
-                        <div class="pull-left">Show weather in menubar</div>
+                        <div class="pull-left">Show weather in menubar
+                            <div class="menubar-icon">(
+                                <select>
+                                    <option value="auto">auto</option>
+                                    <option value="white">white</option>
+                                    <option value="black">black</option>
+                                </select>)
+                            </div>
+                        </div>
                         <div class="pull-right"><input type="checkbox" name="mb-info" value="true"><span class="fit"></span></div>
                     </label>
                 </div>
-                <div class="form-item small">
-                    <div class="label pull-left">Menubar icon</div>
-                    <div class="pull-right fit menubar-icon">
-                        <select>
-                            <option value="auto">auto</option>
-                            <option value="white">white</option>
-                            <option value="black">black</option>
-                        </select>
-                    </div>
-                </div>
                 <div class="form-item small">
                     <label class="clear">
                         <div class="pull-left">Start at login</div>

diff --git a/src/main/style.css b/src/main/style.css
@@ -547,19 +547,17 @@ input[type="checkbox"][name="favorite-city"]:checked + span {
 }
 
 .menubar-icon {
-    padding: 0;
+    padding: 5px 0 0 10px;
     margin: 0;
-    border: 1px solid #999999;
+    display: inline;
     width: 60px;
     overflow: hidden;
-    background-color: #fff;
-    background: #fff url(../../assets/dropdown@2x.png) center right no-repeat;
 }
 
 .menubar-icon select {
-    padding: 5px 8px;
-    width: 130%;
+    padding: 0;
     border: none;
+    color: #000;
     box-shadow: none;
     background-color: transparent;
     background-image: none;
@@ -698,7 +696,7 @@ body {
 .snow{
     background: none;
     font-family: Androgyne;
-    background-image: url('http://www.wearewebstars.dk/codepen/img/s1.png'), url('http://www.wearewebstars.dk/codepen/img//s2.png'), url('http://www.wearewebstars.dk/codepen/img//s3.png');
+    background-image: url(../../assets/s1.png), url(../../assets/s2.png), url(../../assets/s3.png);
     height: 300px;
     left: 0;
     position: absolute;
@@ -712,19 +710,19 @@ body {
 }
 @keyframes snow {
     0% {background-position: 0px 0px, 0px 0px, 0px 0px;}
-    100% {background-position: 500px 500px, 100px 200px, -100px 150px;}
+    100% {background-position: 0px 1000px, 0px 400px, 0px 300px;}
 }
 @-moz-keyframes snow {
     0% {background-position: 0px 0px, 0px 0px, 0px 0px;}
-    100% {background-position: 500px 500px, 100px 200px, -100px 150px;}
+    100% {background-position: 0px 1000px, 0px 400px, 0px 300px;}
 }
 @-webkit-keyframes snow {
     0% {background-position: 0px 0px, 0px 0px, 0px 0px;}
-    100% {background-position: 500px 500px, 100px 200px, -100px 150px;}
+    100% {background-position: 0px 1000px, 0px 400px, 0px 300px;}
 }
 @-ms-keyframes snow {
     0% {background-position: 0px 0px, 0px 0px, 0px 0px;}
-    100% {background-position: 500px 500px, 100px 200px, -100px 150px;}
+    100% {background-position: 0px 1000px, 0px 400px, 0px 300px;}
 }
 
 #chartjs-tooltip {

diff --git a/src/utilities/utils.js b/src/utilities/utils.js
@@ -38,7 +38,7 @@ const toggleSettings = function () {
     jQuery('#settings .content').fadeOut()
     jQuery('#nav-icon').removeClass('open')
   } else {
-    jQuery('#main').height('100px')
+    jQuery('#main').height('120px')
     jQuery('#main .content').fadeOut()
     jQuery('#main .actual-icon').fadeOut()
     jQuery('#details').fadeOut()