Merge pull request #115 from resin-io/refactor/scss-css

Convert angular.scss and desktop.scss to plain CSS files

build/css/main.css

@@ -5832,54 +5832,6 @@ button.close {
   .hidden-print {
     display: none !important; } }
 
-/*
- * Copyright 2016 Resin.io
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-[ng-click] {
-  cursor: pointer; }
-
-/*
- * Copyright 2016 Resin.io
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-body {
-  -webkit-user-select: none; }
-
-html,
-body {
-  height: 100%;
-  width: 100%; }
-
-html {
-  overflow: hidden; }
-
-body {
-  overflow: auto;
-  -webkit-overflow-scrolling: touch; }
-
 /*
  * Copyright 2016 Resin.io
  *

lib/css/angular.css

@@ -17,4 +17,3 @@
 [ng-click] {
   cursor: pointer;
 }
-

lib/css/desktop.css

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-// Prevent text selection
+/* Prevent text selection */
 body {
   -webkit-user-select: none;
 }
 
-// Prevent WebView bounce effect in OS X
+/* Prevent WebView bounce effect in OS X */
 html,
 body {
   height: 100%;

lib/index.html

@@ -4,6 +4,8 @@
     <title>Resin Etcher</title>
     <link rel="stylesheet" type="text/css" href="../node_modules/flexboxgrid/dist/flexboxgrid.css">
     <link rel="stylesheet" type="text/css" href="../build/css/main.css">
+    <link rel="stylesheet" type="text/css" href="css/desktop.css">
+    <link rel="stylesheet" type="text/css" href="css/angular.css">
 
     <link rel="import" href="components/hero-badge.html">
     <link rel="import" href="components/hero-caption.html">

lib/scss/main.scss

@@ -27,8 +27,6 @@ $badge-disabled: rgb(92, 94, 92);
 $btn-padding: 10px;
 
 @import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap";
-@import "./angular";
-@import "./desktop";
 
 @import "./modules/space";