From 573d237569ae351a6fad25697699e9d7fd18aafe Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Fri, 22 Jan 2016 10:40:05 -0400 Subject: [PATCH] Convert angular.scss and desktop.scss to plain CSS files These are files that contain static rules that are not likely change nor require the advanced functionality that SASS requires. This is the first step towards an attempt to get rid of preprocessor and use native supported web technologies. --- build/css/main.css | 48 --------------------- lib/{scss/_angular.scss => css/angular.css} | 1 - lib/{scss/_desktop.scss => css/desktop.css} | 4 +- lib/index.html | 2 + lib/scss/main.scss | 2 - 5 files changed, 4 insertions(+), 53 deletions(-) rename lib/{scss/_angular.scss => css/angular.css} (99%) rename lib/{scss/_desktop.scss => css/desktop.css} (91%) diff --git a/build/css/main.css b/build/css/main.css index ec8c3cab..fe78759c 100644 --- a/build/css/main.css +++ b/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 * diff --git a/lib/scss/_angular.scss b/lib/css/angular.css similarity index 99% rename from lib/scss/_angular.scss rename to lib/css/angular.css index 60666cee..bf957502 100644 --- a/lib/scss/_angular.scss +++ b/lib/css/angular.css @@ -17,4 +17,3 @@ [ng-click] { cursor: pointer; } - diff --git a/lib/scss/_desktop.scss b/lib/css/desktop.css similarity index 91% rename from lib/scss/_desktop.scss rename to lib/css/desktop.css index c071da95..5481873a 100644 --- a/lib/scss/_desktop.scss +++ b/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%; diff --git a/lib/index.html b/lib/index.html index 7ac0a60a..bc37b816 100644 --- a/lib/index.html +++ b/lib/index.html @@ -4,6 +4,8 @@ Resin Etcher + + diff --git a/lib/scss/main.scss b/lib/scss/main.scss index 74ec48f0..a60bed51 100644 --- a/lib/scss/main.scss +++ b/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";