Skip to content
This repository has been archived by the owner on Sep 10, 2021. It is now read-only.

Commit

Permalink
Fix various scss-lint errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Jamie Snape committed Oct 12, 2015
1 parent 25c4c00 commit 5d7844a
Show file tree
Hide file tree
Showing 109 changed files with 978 additions and 441 deletions.
1 change: 1 addition & 0 deletions .scss-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ scss_files: '**/public/scss/*.scss'
exclude:
- '**/public/**/*.css'
- 'core/public/scss/mixins/**'
- 'library/SwaggerUI/**'
- 'vendor/**'

linters:
Expand Down
3 changes: 2 additions & 1 deletion core/public/scss/admin/admin.dashboard.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */
// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0.

.databaseIntegrityWrapper {
border-top: 1px solid #D7D7D7;
margin-top: 5px;
padding-top: 10px;

ul {
list-style-type: none;
margin-left: 0;
Expand Down
12 changes: 9 additions & 3 deletions core/public/scss/admin/admin.index.scss
Original file line number Diff line number Diff line change
@@ -1,28 +1,33 @@
/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */
// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0.

div {
&.viewSideBar input.globalButton {
margin-left: 0 !important;
}

&.viewWrapper {
padding-right: 40px !important;
}

&.assetstoreElement {
border-bottom: 1px solid #D0D0D0;
margin-bottom: 10px;
padding-bottom: 8px;
}

&.assetstoreNameContainer {
font-size: 14px;
font-weight: bold;
margin-bottom: 4px;
}

&.assetstoreActions {
margin-top: 5px;
}
}

.errorText, .freeSpaceWarning {
.errorText,
.freeSpaceWarning {
color: #F00;
}

Expand All @@ -32,7 +37,8 @@ tr.moduleElementError td {
}

a {
&.moduleVisibleCategoryLink, &.moduleHiddenCategoryLink {
&.moduleVisibleCategoryLink,
&.moduleHiddenCategoryLink {
font-size: 13px !important;
font-weight: bold !important;
}
Expand Down
7 changes: 5 additions & 2 deletions core/public/scss/admin/admin.migrate.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */
// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0.

h2 {
margin-left: 10px;
Expand All @@ -8,6 +8,7 @@ form.migrateForm dl {
border: 0;
margin-top: 25px;
width: 800px;

dt {
border-bottom: 1px solid #EEE;
float: left;
Expand All @@ -18,6 +19,7 @@ form.migrateForm dl {
text-align: right;
width: 200px;
}

dd {
border-bottom: 1px solid #EEE;
display: inline;
Expand All @@ -32,7 +34,8 @@ form.migrateForm dl {
}
}

#submit-label, #submit-element {
#submit-label,
#submit-element {
border-bottom: 0;
}

Expand Down
2 changes: 1 addition & 1 deletion core/public/scss/admin/admin.upgrade.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */
// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0.

div.viewSideBar input.globalButton {
margin-left: 0 !important;
Expand Down
8 changes: 6 additions & 2 deletions core/public/scss/assetstore/assetstore.add.scss
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */
// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0.

form.assetstoreForm {
font-size: 12px;

dl {
margin-top: 0;
width: 250px;

dt {
clear: both;
font-weight: bold;
margin-top: 5px;
text-align: left;
}

dd {
border-bottom: 1px solid #EEE;
margin-left: 0;
Expand All @@ -27,6 +30,7 @@ form.assetstoreForm {
display: none;
}

dd.submit-element, #addassetstore-label {
dd.submit-element,
#addassetstore-label {
border-bottom: 0;
}
4 changes: 2 additions & 2 deletions core/public/scss/assetstore/assetstore.movedialog.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */
// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0.

div.bottomButtons {
margin-top: 15px;
float: right;
margin-top: 15px;
}

#moveBitstreamsProgressBar {
Expand Down
13 changes: 10 additions & 3 deletions core/public/scss/browse/browse.index.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */
// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0.

div {
&.viewAction, &.viewInfo, &.ajaxInfoElement {
&.viewAction,
&.viewInfo,
&.ajaxInfoElement {
display: none;
}

&.feedThumbnail img {
display: none;
height: 31px;
Expand All @@ -21,20 +24,24 @@ div {
&.feedThumbnail a {
border: 0;
}

&.itemList span {
padding-left: 15px;
}

&.itemBlock {
border-bottom: 1px dotted #808080;
padding-bottom: 5px;
padding-top: 5px;

&:hover {
background-color: #F6F9FE;
cursor: pointer;
}
}

&.itemStats {
border: none;
border: 0;
color: #777;
float: right;
font-size: 10px;
Expand Down
7 changes: 5 additions & 2 deletions core/public/scss/browse/browse.movecopy.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */
// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0.

table#moveCopyTable {
display: none;
width: 420px !important;

th.thData {
border-right: none !important;
width: auto !important;
}
display: none;
}

#moveCopyTable .browserPrivacyInformation {
Expand All @@ -22,10 +23,12 @@ div {
float: right;
margin-top: 10px;
}

&.copySymlinkSelect {
margin-bottom: 8px;
padding-top: 6px;
}

&.destinationDisplay {
margin-bottom: 8px;
}
Expand Down
12 changes: 6 additions & 6 deletions core/public/scss/browse/browse.selectfolder.scss
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */
// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0.

table#moveTable {
display: none;
width: 420px !important;

th.thData {
border-right: none !important;
width: auto !important;
}
display: none;
}

#moveTable .browserPrivacyInformation {
right: 10px;
}

#createFolderButton {
border: none;
border: 0;
display: none;
float: none !important;
width: 200px;
}

#createFolderContent {
border-radius: 6px;
border: 1px #CCD7E0 dotted !important;
border: 1px #354856 solid;
border-radius: 6px;
box-shadow: 0 0 2px #666;
display: none;
margin-bottom: 2px;
margin-top: 5px;
padding: 0 5px 6px 5px;
padding: 0 5px 6px;
width: 300px;
}

Expand Down
14 changes: 8 additions & 6 deletions core/public/scss/browse/browse.selectitem.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */
// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0.

table#moveTable {
display: none;
width: 420px !important;

th.thData {
border-right: none !important;
width: auto !important;
}
display: none;
}

.treeTable .browserPrivacyInformation {
Expand All @@ -17,25 +18,26 @@ div {
&.selectedItemContainer {
margin-bottom: 5px;
}

&.bottomButtons {
float: right;
margin-top: 10px;
}
}

input#live_search_item {
background: #FFF url(../../images/icons/search.png) no-repeat scroll 2px 1px;
border-radius: 4px;
background: #FFF url('../../images/icons/search.png') no-repeat scroll 2px 1px;
border: 1px solid #FFF;
border-radius: 4px;
box-shadow: 0 0 3px #666;
font-size: 12px;
opacity: 0.9;
opacity: .9;
padding: 2px 10px 2px 22px;
width: 260px;
}

#searchloadingSelectItem {
background: url("../../images/icons/loading-small.gif") bottom center no-repeat;
background: url('../../images/icons/loading-small.gif') bottom center no-repeat;
color: #FFF;
display: inline-block;
height: 16px;
Expand Down
3 changes: 2 additions & 1 deletion core/public/scss/common/common.browser.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */
// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0.

span.infoTitle {
font-weight: bold;
Expand All @@ -9,6 +9,7 @@ input {
&.deleteSelectedYes {
margin-left: 0 !important;
}

&.deleteSelectedNo {
margin-left: 15px !important;
}
Expand Down
6 changes: 4 additions & 2 deletions core/public/scss/common/common.feed.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */
// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0.

div.feedContainer div {
&.feedElement {
border-bottom: 1px dotted #E4E4E4;
min-height: 30px;
position: relative;
}

&.feedUserImage {
float: left;
}

&.feedDate {
bottom: 0;
color: #808080;
Expand Down Expand Up @@ -37,7 +39,7 @@ div.feedDelete {

img.newFeedElement {
float: right;
position: relative;
left: -13px;
position: relative;
top: 2px;
}
Loading

0 comments on commit 5d7844a

Please sign in to comment.