jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-04-24 07:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(GUI): unify modal body styles (#1073)

Browse Source 
- Remove unnecessary `.modal-text` wrapper
- Move drive selector specific styles to `_drive-selector.scss`

Signed-off-by: Juan Cruz Viotti <jviotti@openmailbox.org>
This commit is contained in:
Juan Cruz Viotti 2017-02-07 16:14:15 -04:00 committed by GitHub
parent 70c7ddc52a
commit 05fdd5cc29
6 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/gui/components/drive-selector/styles/_drive-selector.scss
View File

@ -19,6 +19,11 @@
height: 320px;
}
.modal-drive-selector-modal .modal-body {
padding-top: 0;
padding-bottom: 0;
}
.modal-drive-selector-modal .list-group-item[disabled] {
cursor: not-allowed;
}
@ -33,5 +38,45 @@
.list-group-item-text {
word-break: break-all;
}
.list-group {
margin-bottom: 0;
}
.list-group-item {
display: flex;
align-items: center;
border-left: 0;
border-right: 0;
border-radius: 0;
border-color: darken($palette-theme-light-background, 7%);
padding: 12px 0;
> .tick {
font-size: 11px;
}
:first-child {
flex-grow: 1;
}
&:first-child {
border-top: 0;
}
&[disabled] .list-group-item-heading {
color: $palette-theme-light-soft-foreground;
}
}
.list-group-item-heading {
font-size: 13px;
}
.list-group-item-text {
line-height: 1;
font-size: 11px;
color: $palette-theme-light-soft-foreground;
}
}

46
lib/gui/components/modal/styles/_modal.scss
View File

@ -39,7 +39,7 @@
.modal-body {
flex-grow: 1;
color: $palette-theme-light-foreground;
padding: 0;
padding: 20px;
max-height: 250px;
overflow: auto;
@ -47,50 +47,6 @@
color: $palette-theme-primary-background;
}
.list-group {
padding: 0 20px;
}
.list-group-item {
display: flex;
align-items: center;
border-left: 0;
border-right: 0;
border-radius: 0;
border-color: darken($palette-theme-light-background, 7%);
padding: 12px 0;
> .tick {
font-size: 11px;
}
:first-child {
flex-grow: 1;
}
&:first-child {
border-top: 0;
}
&[disabled] .list-group-item-heading {
color: $palette-theme-light-soft-foreground;
}
}
.list-group-item-heading {
font-size: 13px;
}
.list-group-item-text {
line-height: 1;
font-size: 11px;
color: $palette-theme-light-soft-foreground;
}
}
.modal-text {
padding: 20px;
> p {
white-space: pre-line;
}

4
lib/gui/components/tooltip-modal/templates/tooltip-modal.tpl.html
View File

@ -3,6 +3,4 @@
<button class="close" ng-click="modal.closeModal()">&times;</button>
</div>
<div class="modal-body">
<div class="modal-text">{{ ::modal.data.message }}</div>
</div>
<div class="modal-body">{{ ::modal.data.message }}</div>

4
lib/gui/components/update-notifier/templates/update-notifier-modal.tpl.html
View File

@ -4,9 +4,7 @@
</div>
<div class="modal-body">
<div class="modal-text">
<p>Etcher {{ ::modal.options.version }} is available for download</p>
</div>
<p>Etcher {{ ::modal.options.version }} is available for download</p>
</div>
<div class="modal-footer">

4
lib/gui/components/warning-modal/templates/warning-modal.tpl.html
View File

@ -7,9 +7,7 @@
</div>
<div class="modal-body">
<div class="modal-text">
<p>{{ ::modal.options.description }}</p>
</div>
<p>{{ ::modal.options.description }}</p>
</div>
<div class="modal-footer">

65
lib/gui/css/main.css
View File

@ -6236,41 +6236,14 @@ body {
.modal-body {
flex-grow: 1;
color: #666;
padding: 0;
padding: 20px;
max-height: 250px;
overflow: auto; }
.modal-body a {
color: #5793db; }
.modal-body .list-group {
padding: 0 20px; }
.modal-body .list-group-item {
display: flex;
align-items: center;
border-left: 0;
border-right: 0;
border-radius: 0;
border-color: #ededed;
padding: 12px 0; }
.modal-body .list-group-item > .tick {
font-size: 11px; }
.modal-body .list-group-item :first-child {
flex-grow: 1; }
.modal-body .list-group-item:first-child {
border-top: 0; }
.modal-body .list-group-item[disabled] .list-group-item-heading {
color: #b3b3b3; }
.modal-body .list-group-item-heading {
font-size: 13px; }
.modal-body .list-group-item-text {
line-height: 1;
font-size: 11px;
color: #b3b3b3; }
.modal-text {
padding: 20px; }
.modal-text > p {
.modal-body > p {
white-space: pre-line; }
.modal-text > p:last-child {
.modal-body > p:last-child {
margin-bottom: 0; }
.modal-menu {
@ -6415,6 +6388,10 @@ body {
width: 300px;
height: 320px; }
.modal-drive-selector-modal .modal-body {
padding-top: 0;
padding-bottom: 0; }
.modal-drive-selector-modal .list-group-item[disabled] {
cursor: not-allowed; }
@ -6425,6 +6402,34 @@ body {
.component-drive-selector-body .list-group-item-text {
word-break: break-all; }
.modal-drive-selector-modal .list-group {
margin-bottom: 0; }
.modal-drive-selector-modal .list-group-item {
display: flex;
align-items: center;
border-left: 0;
border-right: 0;
border-radius: 0;
border-color: #ededed;
padding: 12px 0; }
.modal-drive-selector-modal .list-group-item > .tick {
font-size: 11px; }
.modal-drive-selector-modal .list-group-item :first-child {
flex-grow: 1; }
.modal-drive-selector-modal .list-group-item:first-child {
border-top: 0; }
.modal-drive-selector-modal .list-group-item[disabled] .list-group-item-heading {
color: #b3b3b3; }
.modal-drive-selector-modal .list-group-item-heading {
font-size: 13px; }
.modal-drive-selector-modal .list-group-item-text {
line-height: 1;
font-size: 11px;
color: #b3b3b3; }
/*
* Copyright 2016 resin.io
*