Skip to content

Commit

Permalink
Move update notifier modal style to the component (#486)
Browse files Browse the repository at this point in the history
Currently, the modal style style used in this component was declared in
`components/_modal.scss`, however since this srule is very specific to
the update notifier component, its better declared in
`update-notifier/styles`.

Signed-off-by: Juan Cruz Viotti <[email protected]>
  • Loading branch information
jviotti authored Jun 15, 2016
1 parent 52f47d7 commit df24388
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
12 changes: 6 additions & 6 deletions build/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -6221,12 +6221,6 @@ button.btn:focus, button.progress-button:focus {
.modal-open {
padding-right: 0 !important; }

.modal-fat-and-short {
width: 400px;
margin-top: -10px; }
.modal-fat-and-short .modal-content {
height: 245px; }

.modal-footer {
flex-grow: 0;
border: 0; }
Expand Down Expand Up @@ -6307,6 +6301,12 @@ button.btn:focus, button.progress-button:focus {
padding: 30px 35px;
overflow: hidden; }

.modal-update-notifier {
width: 400px;
margin-top: -10px; }
.modal-update-notifier .modal-content {
height: 245px; }

.update-notifier-modal-body__content {
padding-bottom: 15px;
margin-bottom: 25px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ module.exports = function($uibModal, UPDATE_NOTIFIER_SLEEP_TIME, ManifestBindSer
animation: true,
templateUrl: './components/update-notifier/templates/update-notifier-modal.tpl.html',
controller: 'UpdateNotifierController as modal',
size: 'fat-and-short'
size: 'update-notifier'
}).result;
};

Expand Down
12 changes: 12 additions & 0 deletions lib/gui/components/update-notifier/styles/_update-notifier.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,18 @@
overflow: hidden;
}

.modal-update-notifier {
width: 400px;

// Move it a bit to the top for
// aesthetic reasons
margin-top: -10px;

.modal-content {
height: 245px;
}
}

.update-notifier-modal-body__content {
@extend .text-center;

Expand Down
12 changes: 0 additions & 12 deletions lib/gui/scss/components/_modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -93,18 +93,6 @@
padding-right: 0 !important;
}

.modal-fat-and-short {
width: 400px;

// Move it a bit to the top for
// aesthetic reasons
margin-top: -10px;

.modal-content {
height: 245px;
}
}

.modal-footer {
flex-grow: 0;
border: 0;
Expand Down

0 comments on commit df24388

Please sign in to comment.