jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-28 13:46:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move Boostrap style customisations to a boostrap.scss file

Browse Source
This commit is contained in:
Juan Cruz Viotti 2016-03-30 16:04:35 -04:00
parent 9bd0ccd550
commit e3ed0af0f9
3 changed files with 59 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
build/css/main.css
View File

@ -5887,6 +5887,31 @@ button.close {
.hidden-print { .hidden-print {
display: none !important; } } 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.
*/
html {
background-color: #535760; }
.checkbox input[type="checkbox"] {
position: initial;
margin-right: 2px; }
.checkbox input[type="checkbox"]:not(:checked) + * {
color: #ddd; }
/* /*
* Copyright 2016 Resin.io * Copyright 2016 Resin.io
* *
@ -6083,9 +6108,6 @@ button.btn:focus, button.progress-button:focus {
height: 100%; height: 100%;
transition: width 0.3s, opacity 0.3s; } transition: width 0.3s, opacity 0.3s; }
html {
background-color: #535760; }
hero-icon[disabled] .caption { hero-icon[disabled] .caption {
color: #787c7f; } color: #787c7f; }
@ -6155,13 +6177,6 @@ body {
margin: 0 auto 15px; margin: 0 auto 15px;
max-width: 165px; } max-width: 165px; }
.checkbox input[type="checkbox"] {
position: initial;
margin-right: 2px; }
.checkbox input[type="checkbox"]:not(:checked) + * {
color: #ddd; }
.wrapper { .wrapper {
height: 100%; height: 100%;
margin: 20px 60px; } margin: 20px 60px; }

16
lib/scss/main.scss
View File

@ -29,6 +29,7 @@ $link-hover-decoration: none;
@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap"; @import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap";
@import "./modules/bootstrap";
@import "./modules/space"; @import "./modules/space";
@import "./components/badge"; @import "./components/badge";
@import "./components/caption"; @import "./components/caption";
@ -36,11 +37,6 @@ $link-hover-decoration: none;
@import "./components/tick"; @import "./components/tick";
@import "./components/progress-button"; @import "./components/progress-button";
// Prevent white flash when running application
html {
background-color: $body-bg;
}
hero-icon[disabled] .caption { hero-icon[disabled] .caption {
color: $color-disabled; color: $color-disabled;
} }
@ -138,16 +134,6 @@ body {
max-width: $btn-min-width - 5px; max-width: $btn-min-width - 5px;
} }
// Fix slighly checkbox vertical alignment issue
.checkbox input[type="checkbox"] {
position: initial;
margin-right: 2px;
}
.checkbox input[type="checkbox"]:not(:checked) + * {
color: $gray-light;
}
.wrapper { .wrapper {
height: 100%; height: 100%;
margin: 20px 60px; margin: 20px 60px;

33
lib/scss/modules/_bootstrap.scss Normal file
View File

@ -0,0 +1,33 @@
/*
* 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.
*/
// This file is meant to hold Bootstrap modifications
// that don't qualify as separate UI components.
// Prevent white flash when running application
html {
background-color: $body-bg;
}
// Fix slighly checkbox vertical alignment issue
.checkbox input[type="checkbox"] {
position: initial;
margin-right: 2px;
}
.checkbox input[type="checkbox"]:not(:checked) + * {
color: $gray-light;
}