From 5d7844ab12a7b6c3729fcb304a74046b164e5e30 Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Wed, 7 Oct 2015 17:56:47 -0400 Subject: [PATCH] Fix various scss-lint errors --- .scss-lint.yml | 1 + core/public/scss/admin/admin.dashboard.scss | 3 +- core/public/scss/admin/admin.index.scss | 12 +- core/public/scss/admin/admin.migrate.scss | 7 +- core/public/scss/admin/admin.upgrade.scss | 2 +- .../scss/assetstore/assetstore.add.scss | 8 +- .../assetstore/assetstore.movedialog.scss | 4 +- core/public/scss/browse/browse.index.scss | 13 +- core/public/scss/browse/browse.movecopy.scss | 7 +- .../scss/browse/browse.selectfolder.scss | 12 +- .../public/scss/browse/browse.selectitem.scss | 14 +- core/public/scss/common/common.browser.scss | 3 +- core/public/scss/common/common.feed.scss | 6 +- .../scss/common/common.genericPage.scss | 21 ++- core/public/scss/common/common.listfiles.scss | 4 +- .../scss/community/community.create.scss | 8 +- .../scss/community/community.index.scss | 5 +- .../scss/community/community.invitation.scss | 3 +- .../scss/community/community.manage.scss | 10 +- .../community/community.promotedialog.scss | 2 +- .../scss/community/community.selectgroup.scss | 2 +- .../public/scss/community/community.view.scss | 6 +- core/public/scss/error/error.error.scss | 3 +- core/public/scss/feed/feed.index.scss | 3 +- .../scss/folder/folder.createfolder.scss | 6 +- core/public/scss/folder/folder.edit.scss | 6 +- core/public/scss/folder/folder.view.scss | 4 +- core/public/scss/import/import.index.scss | 7 +- core/public/scss/install/install.scss | 2 +- core/public/scss/install/install.step2.scss | 3 +- core/public/scss/item/item.edit.scss | 8 +- core/public/scss/item/item.editbitstream.scss | 7 +- core/public/scss/item/item.editmetadata.scss | 6 +- core/public/scss/item/item.view.scss | 43 ++++-- core/public/scss/layout/form.scss | 56 ++++--- core/public/scss/layout/jquery.treeTable.scss | 114 +++++++++----- core/public/scss/layout/loginForm.scss | 27 +++- core/public/scss/layout/midas.empty.scss | 46 ++++-- core/public/scss/layout/midas.layout.scss | 141 +++++++++++++----- core/public/scss/layout/view.scss | 59 ++++++-- core/public/scss/licenses/licenses.index.scss | 2 +- core/public/scss/rest/rest.index.scss | 9 +- core/public/scss/search/search.index.scss | 8 +- core/public/scss/share/share.dialog.scss | 14 +- core/public/scss/share/share.links.scss | 16 +- core/public/scss/upload/upload.revision.scss | 12 +- .../scss/upload/upload.simpleupload.scss | 12 +- core/public/scss/user/user.deletedialog.scss | 3 +- core/public/scss/user/user.emailregister.scss | 3 +- core/public/scss/user/user.index.scss | 32 ++-- core/public/scss/user/user.manage.scss | 9 +- core/public/scss/user/user.register.scss | 26 +++- core/public/scss/user/user.settings.scss | 20 ++- core/public/scss/user/user.userpage.scss | 2 +- .../api/public/scss/index/index.index.scss | 2 +- .../public/scss/extract/extract.dialog.scss | 2 +- .../cleanup/public/scss/item/index.index.scss | 3 +- .../public/scss/item/item.comments.scss | 23 ++- .../community/community.agreementdialog.scss | 9 +- .../community/community.agreementtab.scss | 6 +- .../public/scss/upload/upload.index.scss | 2 +- .../public/scss/admin/admin.index.scss | 8 +- .../public/scss/download/download.index.scss | 4 +- .../public/scss/upload/upload.index.scss | 2 +- .../public/scss/upload/upload.revision.scss | 2 +- .../public/scss/item/keyfiles.item.view.scss | 2 +- .../mfa/public/scss/config/config.index.scss | 2 +- .../public/scss/config/config.usertab.scss | 2 +- .../mfa/public/scss/login/login.dialog.scss | 4 +- .../scss/authorize/authorize.index.scss | 23 ++- .../public/scss/client/client.index.scss | 13 +- .../packages.application.latest.scss | 10 +- .../packages.application.view.scss | 14 +- .../public/scss/package/package.manage.scss | 6 +- .../scss/view/packages.view.project.scss | 9 +- .../pvw/public/scss/admin/admin.status.scss | 5 +- .../public/scss/paraview/paraview.common.scss | 2 +- .../public/scss/paraview/paraview.slice.scss | 13 +- .../scss/paraview/paraview.surface.scss | 2 +- .../public/scss/paraview/paraview.volume.scss | 45 ++++-- .../public/scss/item/item.ratings.scss | 10 +- .../scss/executable/executable.define.scss | 10 +- .../public/scss/index/index.selectaction.scss | 5 +- .../public/scss/job/job.init.scss | 18 ++- .../public/scss/job/job.manage.scss | 2 +- .../public/scss/job/job.view.scss | 15 +- .../public/scss/layout/remoteprocessing.scss | 3 +- .../public/scss/folder/folder.index.scss | 2 +- .../solr/public/scss/admin/admin.index.scss | 4 +- .../public/scss/advanced/advanced.index.scss | 7 +- .../public/scss/index/index.index.scss | 3 +- .../public/scss/item/item.index.scss | 12 +- .../public/scss/admin/admin.index.scss | 2 +- .../scss/item/thumbnailcreator.item.view.scss | 3 +- .../public/scss/producer/producer.edit.scss | 2 +- .../public/scss/producer/producer.list.scss | 9 +- .../public/scss/producer/producer.view.scss | 16 +- .../public/scss/scalar/scalar.details.scss | 8 +- .../tracker/public/scss/trend/trend.edit.scss | 8 +- .../public/scss/trend/trend.notify.scss | 3 +- .../tracker/public/scss/trend/trend.view.scss | 31 ++-- .../public/scss/validation.index.scss | 14 +- .../public/scss/media/media.index.scss | 2 +- .../public/scss/paraview/paraview.dual.scss | 53 +++++-- .../public/scss/paraview/paraview.slice.scss | 13 +- .../scss/paraview/paraview.surface.scss | 2 +- .../public/scss/paraview/paraview.volume.scss | 45 ++++-- .../public/scss/webgl/webgl.index.scss | 38 +++-- .../public/scss/thing/thing.get.scss | 2 +- 109 files changed, 978 insertions(+), 441 deletions(-) diff --git a/.scss-lint.yml b/.scss-lint.yml index 21a41f360..1933224e5 100644 --- a/.scss-lint.yml +++ b/.scss-lint.yml @@ -23,6 +23,7 @@ scss_files: '**/public/scss/*.scss' exclude: - '**/public/**/*.css' - 'core/public/scss/mixins/**' + - 'library/SwaggerUI/**' - 'vendor/**' linters: diff --git a/core/public/scss/admin/admin.dashboard.scss b/core/public/scss/admin/admin.dashboard.scss index ab506d292..3bb81ec44 100644 --- a/core/public/scss/admin/admin.dashboard.scss +++ b/core/public/scss/admin/admin.dashboard.scss @@ -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; diff --git a/core/public/scss/admin/admin.index.scss b/core/public/scss/admin/admin.index.scss index dc4d6a24c..0bceaa4e4 100644 --- a/core/public/scss/admin/admin.index.scss +++ b/core/public/scss/admin/admin.index.scss @@ -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; } @@ -32,7 +37,8 @@ tr.moduleElementError td { } a { - &.moduleVisibleCategoryLink, &.moduleHiddenCategoryLink { + &.moduleVisibleCategoryLink, + &.moduleHiddenCategoryLink { font-size: 13px !important; font-weight: bold !important; } diff --git a/core/public/scss/admin/admin.migrate.scss b/core/public/scss/admin/admin.migrate.scss index f26a9804a..2494e45da 100644 --- a/core/public/scss/admin/admin.migrate.scss +++ b/core/public/scss/admin/admin.migrate.scss @@ -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; @@ -8,6 +8,7 @@ form.migrateForm dl { border: 0; margin-top: 25px; width: 800px; + dt { border-bottom: 1px solid #EEE; float: left; @@ -18,6 +19,7 @@ form.migrateForm dl { text-align: right; width: 200px; } + dd { border-bottom: 1px solid #EEE; display: inline; @@ -32,7 +34,8 @@ form.migrateForm dl { } } -#submit-label, #submit-element { +#submit-label, +#submit-element { border-bottom: 0; } diff --git a/core/public/scss/admin/admin.upgrade.scss b/core/public/scss/admin/admin.upgrade.scss index 4e6bc2083..976ff93a2 100644 --- a/core/public/scss/admin/admin.upgrade.scss +++ b/core/public/scss/admin/admin.upgrade.scss @@ -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; diff --git a/core/public/scss/assetstore/assetstore.add.scss b/core/public/scss/assetstore/assetstore.add.scss index 2defeaa50..f7730c72c 100644 --- a/core/public/scss/assetstore/assetstore.add.scss +++ b/core/public/scss/assetstore/assetstore.add.scss @@ -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; @@ -27,6 +30,7 @@ form.assetstoreForm { display: none; } -dd.submit-element, #addassetstore-label { +dd.submit-element, +#addassetstore-label { border-bottom: 0; } diff --git a/core/public/scss/assetstore/assetstore.movedialog.scss b/core/public/scss/assetstore/assetstore.movedialog.scss index ad659afb4..426831c58 100644 --- a/core/public/scss/assetstore/assetstore.movedialog.scss +++ b/core/public/scss/assetstore/assetstore.movedialog.scss @@ -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 { diff --git a/core/public/scss/browse/browse.index.scss b/core/public/scss/browse/browse.index.scss index 0ffc0cf85..8b7b4b2a2 100644 --- a/core/public/scss/browse/browse.index.scss +++ b/core/public/scss/browse/browse.index.scss @@ -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; @@ -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; diff --git a/core/public/scss/browse/browse.movecopy.scss b/core/public/scss/browse/browse.movecopy.scss index 79f62c4a6..e3b11d239 100644 --- a/core/public/scss/browse/browse.movecopy.scss +++ b/core/public/scss/browse/browse.movecopy.scss @@ -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 { @@ -22,10 +23,12 @@ div { float: right; margin-top: 10px; } + &.copySymlinkSelect { margin-bottom: 8px; padding-top: 6px; } + &.destinationDisplay { margin-bottom: 8px; } diff --git a/core/public/scss/browse/browse.selectfolder.scss b/core/public/scss/browse/browse.selectfolder.scss index 254017575..e916c188b 100644 --- a/core/public/scss/browse/browse.selectfolder.scss +++ b/core/public/scss/browse/browse.selectfolder.scss @@ -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; } #moveTable .browserPrivacyInformation { @@ -14,21 +15,20 @@ table#moveTable { } #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; } diff --git a/core/public/scss/browse/browse.selectitem.scss b/core/public/scss/browse/browse.selectitem.scss index 2a49a71ba..48a07bde4 100644 --- a/core/public/scss/browse/browse.selectitem.scss +++ b/core/public/scss/browse/browse.selectitem.scss @@ -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 { @@ -17,6 +18,7 @@ div { &.selectedItemContainer { margin-bottom: 5px; } + &.bottomButtons { float: right; margin-top: 10px; @@ -24,18 +26,18 @@ div { } 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; diff --git a/core/public/scss/common/common.browser.scss b/core/public/scss/common/common.browser.scss index 9023dce96..586cb0f40 100644 --- a/core/public/scss/common/common.browser.scss +++ b/core/public/scss/common/common.browser.scss @@ -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; @@ -9,6 +9,7 @@ input { &.deleteSelectedYes { margin-left: 0 !important; } + &.deleteSelectedNo { margin-left: 15px !important; } diff --git a/core/public/scss/common/common.feed.scss b/core/public/scss/common/common.feed.scss index e045b8993..05ef6ad94 100644 --- a/core/public/scss/common/common.feed.scss +++ b/core/public/scss/common/common.feed.scss @@ -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.feedContainer div { &.feedElement { @@ -6,9 +6,11 @@ div.feedContainer div { min-height: 30px; position: relative; } + &.feedUserImage { float: left; } + &.feedDate { bottom: 0; color: #808080; @@ -37,7 +39,7 @@ div.feedDelete { img.newFeedElement { float: right; - position: relative; left: -13px; + position: relative; top: 2px; } diff --git a/core/public/scss/common/common.genericPage.scss b/core/public/scss/common/common.genericPage.scss index 4e3369e05..d6db43db0 100644 --- a/core/public/scss/common/common.genericPage.scss +++ b/core/public/scss/common/common.genericPage.scss @@ -1,45 +1,56 @@ -/* 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 { &.tabs { display: none; } + &.genericThumbnail { float: left; } + &.genericInfo { height: 40px; } + &.genericAction { border-bottom: 1px solid #FFF; padding-bottom: 10px; + ul { list-style: none; margin: 0; padding: 0; } } + &.genericCommunities { + border-bottom: 1px solid #FFF; + border-top: 1px solid #DAD8D4; + padding-bottom: 10px; + ul { list-style: none; margin: 0; padding: 0; } - border-bottom: 1px solid #FFF; - border-top: 1px solid #DAD8D4; - padding-bottom: 10px; } + &.genericStats { border-top: 1px solid #DAD8D4; } - &.viewAction, &.viewInfo { + + &.viewAction, + &.viewInfo { display: none; } + &.genericInfo { .genericName { font-size: 16px; font-weight: bold; } + .genericSubtitle { font-weight: bold; } diff --git a/core/public/scss/common/common.listfiles.scss b/core/public/scss/common/common.listfiles.scss index a10895774..234725ab0 100644 --- a/core/public/scss/common/common.listfiles.scss +++ b/core/public/scss/common/common.listfiles.scss @@ -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.listFilesContainer div { &.fileElement { @@ -6,6 +6,7 @@ div.listFilesContainer div { min-height: 30px; position: relative; } + &.fileDate { bottom: 0; color: #808080; @@ -13,6 +14,7 @@ div.listFilesContainer div { position: absolute; right: 0; } + &.feedUserImage { float: left; } diff --git a/core/public/scss/community/community.create.scss b/core/public/scss/community/community.create.scss index 407a4b4c0..e662390dc 100644 --- a/core/public/scss/community/community.create.scss +++ b/core/public/scss/community/community.create.scss @@ -1,23 +1,27 @@ -/* 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#createCommunityForm { label { width: 100px !important; } + div.radioElement { label { float: inherit !important; width: 400px !important; } + ul { list-style: none; margin: 0 0 0 100px; - padding: 0 0 0 0; + padding: 0; width: 300px !important; } + br { display: none; } + h4 { margin-bottom: 4px; } diff --git a/core/public/scss/community/community.index.scss b/core/public/scss/community/community.index.scss index dc8bdf70e..f6acf3f4b 100644 --- a/core/public/scss/community/community.index.scss +++ b/core/public/scss/community/community.index.scss @@ -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 { &.communityList { @@ -7,14 +7,17 @@ div { padding-bottom: 5px; padding-top: 5px; } + a.communityTitle { font-size: 14px; font-weight: bold; } + span { padding-left: 15px; } } + &.communityBlock:hover { background-color: #F6F9FE; cursor: pointer; diff --git a/core/public/scss/community/community.invitation.scss b/core/public/scss/community/community.invitation.scss index 4e8fafe50..8c091dd88 100644 --- a/core/public/scss/community/community.invitation.scss +++ b/core/public/scss/community/community.invitation.scss @@ -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. input#urlInput { width: 300px; @@ -9,6 +9,7 @@ div#permissionsContent a { cursor: pointer; font-weight: 500; text-decoration: none; + &:hover { text-decoration: underline; } diff --git a/core/public/scss/community/community.manage.scss b/core/public/scss/community/community.manage.scss index e090cdd44..c2b369780 100644 --- a/core/public/scss/community/community.manage.scss +++ b/core/public/scss/community/community.manage.scss @@ -1,19 +1,22 @@ -/* 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.radioElement { label { float: inherit !important; width: 600px !important; } + ul { list-style: none; margin: 0 0 0 100px; - padding: 0 0 0 0; + padding: 0; width: 600px !important; } + h4 { margin-bottom: 4px; } + br { display: none; } @@ -24,8 +27,8 @@ img.folderLoading { } h1 { - padding: .2em; margin: 0; + padding: .2em; } #products { @@ -37,6 +40,7 @@ h1 { #cart { float: left; width: 200px; + ol { margin: 0; padding: 1em 0 1em 3em; diff --git a/core/public/scss/community/community.promotedialog.scss b/core/public/scss/community/community.promotedialog.scss index 239205ed1..45f220958 100644 --- a/core/public/scss/community/community.promotedialog.scss +++ b/core/public/scss/community/community.promotedialog.scss @@ -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. input.addToGroupsSubmit { float: right; diff --git a/core/public/scss/community/community.selectgroup.scss b/core/public/scss/community/community.selectgroup.scss index 04f75a405..8a2849ed8 100644 --- a/core/public/scss/community/community.selectgroup.scss +++ b/core/public/scss/community/community.selectgroup.scss @@ -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.bottomButtons { float: right; diff --git a/core/public/scss/community/community.view.scss b/core/public/scss/community/community.view.scss index f6642d53f..8efe9da39 100644 --- a/core/public/scss/community/community.view.scss +++ b/core/public/scss/community/community.view.scss @@ -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. @import 'bourbon'; @@ -15,10 +15,12 @@ div { &.genericInfo .genericSubtitle { font-weight: normal; } + &.genericBigButton input { @include linear-gradient(to bottom, #FFF, #C4C4C4); - border: none; + border: 0; cursor: pointer; + &:hover { @include linear-gradient(to bottom, #BDDCC9, #8AB79B); } diff --git a/core/public/scss/error/error.error.scss b/core/public/scss/error/error.error.scss index 46557e0be..1a085a3e1 100644 --- a/core/public/scss/error/error.error.scss +++ b/core/public/scss/error/error.error.scss @@ -1,10 +1,11 @@ -/* 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 { &.errorMessage { margin-bottom: 10px; margin-top: 5px; } + &.exceptionText { margin-top: 20px; } diff --git a/core/public/scss/feed/feed.index.scss b/core/public/scss/feed/feed.index.scss index aee136be6..6ed496a97 100644 --- a/core/public/scss/feed/feed.index.scss +++ b/core/public/scss/feed/feed.index.scss @@ -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.feedThumbnail { img { @@ -7,6 +7,7 @@ div.feedThumbnail { margin-right: 4px; width: 31px; } + a { border: 0; } diff --git a/core/public/scss/folder/folder.createfolder.scss b/core/public/scss/folder/folder.createfolder.scss index b9f36a05f..607a734e8 100644 --- a/core/public/scss/folder/folder.createfolder.scss +++ b/core/public/scss/folder/folder.createfolder.scss @@ -1,11 +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. form#editFolderForm { input { - &[type="text"], &[type="password"] { + &[type='text'], + &[type='password'] { width: 350px !important; } } + textarea { width: 350px !important; } diff --git a/core/public/scss/folder/folder.edit.scss b/core/public/scss/folder/folder.edit.scss index b9f36a05f..607a734e8 100644 --- a/core/public/scss/folder/folder.edit.scss +++ b/core/public/scss/folder/folder.edit.scss @@ -1,11 +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. form#editFolderForm { input { - &[type="text"], &[type="password"] { + &[type='text'], + &[type='password'] { width: 350px !important; } } + textarea { width: 350px !important; } diff --git a/core/public/scss/folder/folder.view.scss b/core/public/scss/folder/folder.view.scss index 742d5b7bb..3356fb641 100644 --- a/core/public/scss/folder/folder.view.scss +++ b/core/public/scss/folder/folder.view.scss @@ -1,12 +1,14 @@ -/* 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 { &.defaultSideTrigger { display: none; } + &.viewInfo { display: inherit !important; } + &.genericBigButton { position: relative; top: -20px; diff --git a/core/public/scss/import/import.index.scss b/core/public/scss/import/import.index.scss index a330b40bd..6abc0daa6 100644 --- a/core/public/scss/import/import.index.scss +++ b/core/public/scss/import/import.index.scss @@ -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. form.importForm dl { border: 0; margin-top: 25px; width: 800px; + dt { border-bottom: 1px solid #EEE; float: left; @@ -14,6 +15,7 @@ form.importForm dl { text-align: right; width: 200px; } + dd { border-bottom: 1px solid #EEE; display: inline; @@ -28,7 +30,8 @@ form.importForm dl { } } -#submit-label, #submit-element { +#submit-label, +#submit-element { border-bottom: 0; } diff --git a/core/public/scss/install/install.scss b/core/public/scss/install/install.scss index e0bfa343e..42725c576 100644 --- a/core/public/scss/install/install.scss +++ b/core/public/scss/install/install.scss @@ -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.viewWrapper { padding-right: 40px !important; diff --git a/core/public/scss/install/install.step2.scss b/core/public/scss/install/install.step2.scss index 964f6feba..4ed4effdf 100644 --- a/core/public/scss/install/install.step2.scss +++ b/core/public/scss/install/install.step2.scss @@ -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. .dbForm { display: none; @@ -6,6 +6,7 @@ #dbResult { position: relative; + div { height: 30px; margin-left: 203px; diff --git a/core/public/scss/item/item.edit.scss b/core/public/scss/item/item.edit.scss index d06d65604..71def85d9 100644 --- a/core/public/scss/item/item.edit.scss +++ b/core/public/scss/item/item.edit.scss @@ -1,11 +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. form#editItemForm { input { - &[type="text"], &[type="password"] { + &[type='text'], + &[type='password'] { width: 350px !important; } } + textarea { width: 350px !important; } @@ -13,8 +15,8 @@ form#editItemForm { div.updateBitstreamNameNotice { background-color: #CDD; - border-radius: 4px; border: 2px solid #ACC; + border-radius: 4px; margin-bottom: 5px; padding: 8px; } diff --git a/core/public/scss/item/item.editbitstream.scss b/core/public/scss/item/item.editbitstream.scss index d0f6e25ca..c826ca4b7 100644 --- a/core/public/scss/item/item.editbitstream.scss +++ b/core/public/scss/item/item.editbitstream.scss @@ -1,10 +1,11 @@ -/* 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#editBitstreamForm input { - &[type="text"] { + &[type='text'] { width: 350px !important; } - &[type="submit"] { + + &[type='submit'] { margin: 0 150px !important; } } diff --git a/core/public/scss/item/item.editmetadata.scss b/core/public/scss/item/item.editmetadata.scss index 947f96526..973f89e57 100644 --- a/core/public/scss/item/item.editmetadata.scss +++ b/core/public/scss/item/item.editmetadata.scss @@ -1,11 +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. form#editItemForm { input { - &[type="text"], &[type="password"] { + &[type='text'], + &[type='password'] { width: 350px !important; } } + textarea { width: 350px !important; } diff --git a/core/public/scss/item/item.view.scss b/core/public/scss/item/item.view.scss index 908ecca74..0ff331a5b 100644 --- a/core/public/scss/item/item.view.scss +++ b/core/public/scss/item/item.view.scss @@ -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. @import 'bourbon'; div { - &.viewAction, &.viewInfo { + &.viewAction, + &.viewInfo { display: block !important; } } @@ -12,12 +13,15 @@ table { &.bitstreamList { display: table !important; } + &#metadataTable { display: table !important; table-layout: fixed; + th.elementHeader { width: 6em; } + td { overflow: hidden; text-overflow: ellipsis; @@ -28,6 +32,7 @@ table { div.genericInfo { position: relative; + .genericSubtitle { font-size: 10px; } @@ -39,15 +44,17 @@ iframe#fullscreenVisualizeIframe { div#fullscreenPanel { background-color: #FFF; - border-radius: 6px; border: 1px solid #D7D7D7; + border-radius: 6px; box-shadow: 0 0 6px #CCC; float: right; padding: 0 0 7px; width: 380px; + h1 { font-size: 14px; } + ul { list-style: none; margin: 0; @@ -68,6 +75,7 @@ span.manageMetadata { h3 a { text-decoration: none; } + a img { float: left; margin-right: 2px; @@ -79,32 +87,36 @@ span.manageMetadata { top: 3px; } -#licenseDiv {} - div.itemViewMainSection { border-top: 1px solid #D7D7D7; margin-bottom: 14px; + h4 { color: #999; font-size: 11px; - margin-bottom: 0.67em; - margin-top: 0.67em; + margin-bottom: .67em; + margin-top: .67em; text-shadow: #FFF 0 1px 1px; text-transform: uppercase; } } table { - &.bitstreamList, &.metadataList { + &.bitstreamList, + &.metadataList { border-collapse: collapse; border-spacing: 0; width: 100%; } - &.bitstreamList th, &.metadataList th { + + &.bitstreamList th, + &.metadataList th { background-color: #D0D0F6; border: 1px solid #808080; } - &.bitstreamList td, &.metadataList td { + + &.bitstreamList td, + &.metadataList td { border: 1px solid #B5B5B5; } } @@ -120,23 +132,26 @@ img { cursor: pointer; float: none; } - &.deleteBitstreamIcon, &.bitstreamInfoIcon { + + &.deleteBitstreamIcon, + &.bitstreamInfoIcon { cursor: pointer; float: right; } } button.topDownloadButton { - @include linear-gradient(to bottom, #4499CC, #4466AA); - border-radius: 6px; + @include linear-gradient(to bottom, #49C, #46A); border: #354856 1px solid; + border-radius: 6px; color: #FFF; cursor: pointer; font-size: 14px; font-weight: bold; height: 35px; width: 100px; + &:hover { - @include linear-gradient(to bottom, #227777, #224444); + @include linear-gradient(to bottom, #277, #244); } } diff --git a/core/public/scss/layout/form.scss b/core/public/scss/layout/form.scss index 69a60deb1..36470983b 100644 --- a/core/public/scss/layout/form.scss +++ b/core/public/scss/layout/form.scss @@ -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. @import 'bourbon'; @@ -10,9 +10,11 @@ form.genericForm { text-align: right; width: 200px; } + input { - &[type=submit], &[type=button] { - background: #F6F9FE url(images/ui-bg_glass_85_f6f9fe_1x400.png) repeat-x 50% 50%; + &[type=submit], + &[type=button] { + background: #F6F9FE url('images/ui-bg_glass_85_f6f9fe_1x400.png') repeat-x 50% 50%; border: 1px solid #808080; -moz-box-align: center; -webkit-box-align: center; @@ -23,19 +25,23 @@ form.genericForm { font-weight: bold; line-height: 1.4; margin-left: 116px; - margin-right: 0.1em; + margin-right: .1em; overflow: visible; position: relative; text-align: center; text-decoration: none !important; zoom: 1; } - &[type=submit]:hover, &[type=button]:hover { + + &[type=submit]:hover, + &[type=button]:hover { background: #CBD9E3 none; color: #1D5987; text-decoration: none; } - &[type=submit][disabled], &[type=button][disabled] { + + &[type=submit][disabled], + &[type=button][disabled] { background: #DBDBDB none; color: #808080; cursor: default; @@ -52,9 +58,10 @@ form.genericForm { } form.genericForm input { - &[type=submit][disabled]:hover, &[type=button][disabled]:hover { - background-image: none; + &[type=submit][disabled]:hover, + &[type=button][disabled]:hover { background: #DBDBDB !important; + background-image: none; color: #808080 !important; cursor: default; text-decoration: none; @@ -62,8 +69,8 @@ form.genericForm input { } .globalButton[disabled]:hover { - background-image: none; background: #DBDBDB !important; + background-image: none; color: #808080 !important; cursor: default; text-decoration: none; @@ -77,8 +84,10 @@ form.genericForm { text-align: left; width: 200px; } + input { - &[type=text], &[type=password] { + &[type=text], + &[type=password] { background: #F3F1EC; border: 1px solid #808080; color: #000; @@ -86,6 +95,7 @@ form.genericForm { margin-right: 10px; } } + textarea { background: #F3F1EC; border: 1px solid #808080; @@ -93,25 +103,32 @@ form.genericForm { height: 18px; margin-right: 10px; } + input { - &[type=text], &[type=password] { + &[type=text], + &[type=password] { width: 250px; } } + textarea { - width: 247px; height: 35px; + width: 247px; } + input { - &[type=text]:hover, &[type=password]:hover { + &[type=text]:hover, + &[type=password]:hover { background: #FFF; } } + textarea:hover { background: #FFF; } + div input[type=submit] { - background: #F6F9FE url(images/ui-bg_glass_85_f6f9fe_1x400.png) repeat-x 50% 50%; + background: #F6F9FE url('images/ui-bg_glass_85_f6f9fe_1x400.png') repeat-x 50% 50%; border: 1px solid #808080; -moz-box-align: center; -webkit-box-align: center; @@ -123,7 +140,7 @@ form.genericForm { font-weight: bold; line-height: 1.4; margin-left: 208px; - margin-right: 0.1em; + margin-right: .1em; overflow: visible; position: relative; text-align: center; @@ -133,7 +150,7 @@ form.genericForm { } input.globalButton { - background: #F6F9FE url(images/ui-bg_glass_85_f6f9fe_1x400.png) repeat-x 50% 50%; + background: #F6F9FE url('images/ui-bg_glass_85_f6f9fe_1x400.png') repeat-x 50% 50%; border: 1px solid #808080; -moz-box-align: center; -webkit-box-align: center; @@ -145,7 +162,7 @@ input.globalButton { font-weight: bold; line-height: 1.4; margin-left: 208px; - margin-right: 0.1em; + margin-right: .1em; overflow: visible; position: relative; text-align: center; @@ -155,7 +172,7 @@ input.globalButton { form.genericForm input { &[type=button] { - background: #F6F9FE url(images/ui-bg_glass_85_f6f9fe_1x400.png) repeat-x 50% 50%; + background: #F6F9FE url('images/ui-bg_glass_85_f6f9fe_1x400.png') repeat-x 50% 50%; border: 1px solid #808080; -moz-box-align: center; -webkit-box-align: center; @@ -167,13 +184,14 @@ form.genericForm input { font-weight: bold; line-height: 1.4; margin-left: 208px; - margin-right: 0.1em; + margin-right: .1em; overflow: visible; position: relative; text-align: center; text-decoration: none !important; zoom: 1; } + &[type=submit]:hover { background: #CBD9E3 none; color: #1D5987; diff --git a/core/public/scss/layout/jquery.treeTable.scss b/core/public/scss/layout/jquery.treeTable.scss index a7ca3f929..49e57ba58 100644 --- a/core/public/scss/layout/jquery.treeTable.scss +++ b/core/public/scss/layout/jquery.treeTable.scss @@ -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. @import 'bourbon'; @@ -11,33 +11,42 @@ padding: 0; zoom: 1; } + &.collapsed td .expander { - background-image: url(../../images/TreeTable/toggle-expand-dark.png); + background-image: url('../../images/TreeTable/toggle-expand-dark.png'); } + &.expanded td .expander { - background-image: url(../../images/TreeTable/toggle-collapse-dark.png); + background-image: url('../../images/TreeTable/toggle-collapse-dark.png'); } } + span.elementSize { - padding: 0px !important; + padding: 0 !important; } + tr { - &.selected, &.accept { + &.selected, + &.accept { background-color: #C0D1FE !important; border: 1px solid #808080; } - &.selected td {} + &.collapsed { - &.selected td .expander, &.accept td .expander { - background-image: url(../../images/TreeTable/toggle-expand-dark.png); + &.selected td .expander, + &.accept td .expander { + background-image: url('../../images/TreeTable/toggle-expand-dark.png'); } } + &.expanded { - &.selected td .expander, &.accept td .expander { - background-image: url(../../images/TreeTable/toggle-collapse-dark.png); + &.selected td .expander, + &.accept td .expander { + background-image: url('../../images/TreeTable/toggle-collapse-dark.png'); } } } + .ui-draggable-dragging { color: #000; z-index: 1; @@ -45,50 +54,61 @@ } table.midasTree { - width: 580px; - display: none; @include user-select(none); border-collapse: collapse; + display: none; + width: 580px; + thead th { - font-family: $lucida-grande; - font-size: 8pt; - color: #000; background-color: #E6EEEE; + background-position: center right; + background-repeat: no-repeat; border: 1px solid #AAA; + color: #000; + font-family: $lucida-grande; + font-size: 8pt; padding: 3px; - background-repeat: no-repeat; - background-position: center right; + &.thData { - padding-left: 10px; + background-image: url('images/asc.gif'); cursor: pointer; - background-image: url(images/asc.gif); + padding-left: 10px; } + &.thDate { - width: 15%; - padding-left: 10px; + background-image: url('images/bg.gif'); cursor: pointer; - background-image: url(images/bg.gif); + padding-left: 10px; + width: 15%; } + &.thSize { - width: 14%; - padding-left: 10px; + background-image: url('images/bg.gif'); cursor: pointer; - background-image: url(images/bg.gif); + padding-left: 10px; + width: 14%; } } + th { &.sortasc { - background-image: url(images/asc.gif) !important; + background-image: url('images/asc.gif') !important; } + &.sortdesc { - background-image: url(images/desc.gif) !important; + background-image: url('images/desc.gif') !important; } + &.sortnone { - background-image: url(images/bg.gif) !important; + background-image: url('images/bg.gif') !important; } - &.thSize:hover, &.thData:hover, &.thDate:hover { - background-color: #CCDDDD; + + &.thSize:hover, + &.thData:hover, + &.thDate:hover { + background-color: #CDD; } + &.thCheckbox { width: 20px; } @@ -96,10 +116,10 @@ table.midasTree { } #browseTableHeaderCheckbox { - margin-top: 2px; margin-bottom: 2px; margin-left: 3px; margin-right: 3px; + margin-top: 2px; } table.midasTree { @@ -108,51 +128,65 @@ table.midasTree { cursor: default; padding-left: 3px; } + tr { border-bottom: 1px #CCD7E0 dotted; + &:hover { background-color: #F3F1EC; } } + tbody tr { td.treeBrowseElement { - padding-left: 1.5em !important; cursor: pointer; + padding-left: 1.5em !important; } + &.even { background: #F3F3F3; } + &.odd { background: #FFF; } } + span { background-position: center left; background-repeat: no-repeat; padding: .2em 0 .2em 1.5em; + &.file { - background-image: url(../../images/TreeTable/page_white_text.png); + background-image: url('../../images/TreeTable/page_white_text.png'); } + &.filePrivate { - background-image: url(../../images/TreeTable/page_white_text_private.png); + background-image: url('../../images/TreeTable/page_white_text_private.png'); } + &.filePublic { - background-image: url(../../images/TreeTable/page_white_text_world.png); + background-image: url('../../images/TreeTable/page_white_text_world.png'); } + &.folder { - background-image: url(../../images/TreeTable/folder.png); + background-image: url('../../images/TreeTable/folder.png'); } + &.folderPrivate { - background-image: url(../../images/TreeTable/folder_private.png); + background-image: url('../../images/TreeTable/folder_private.png'); } + &.folderPublic { - background-image: url(../../images/TreeTable/folder_world.png); + background-image: url('../../images/TreeTable/folder_world.png'); } + &.loading { - background-image: url(../../images/icons/loading.gif); + background-image: url('../../images/icons/loading.gif'); } + &.community { - background-image: url(../../images/icons/community.png); + background-image: url('../../images/icons/community.png'); } } } diff --git a/core/public/scss/layout/loginForm.scss b/core/public/scss/layout/loginForm.scss index e2642ee39..3037d02a5 100644 --- a/core/public/scss/layout/loginForm.scss +++ b/core/public/scss/layout/loginForm.scss @@ -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. form#loginForm { color: #FFF; @@ -7,23 +7,29 @@ form#loginForm { position: relative; top: 13px; width: 600px; + div { &.loginError { color: #57BB7D; position: absolute; top: -15px; - span, img { + + span, + img { display: none; position: relative; } } + display: inline; + &.rememberMe { float: right; left: -453px; position: relative; top: 20px; } + &.links { float: right; left: -100px; @@ -31,15 +37,19 @@ form#loginForm { top: 1px; } } + a { color: #FFF; text-decoration: none; } + div.links a:hover { color: #808080; } + input { - &[type=text], &[type=password] { + &[type=text], + &[type=password] { background: #F3F1EC !important; border: 1px solid #808080; color: #000; @@ -47,12 +57,17 @@ form#loginForm { margin-right: 10px; width: 150px; } - &[type=text], &[type=password] { + + &[type=text], + &[type=password] { width: 200px; } - &[type=text]:hover, &[type=password]:hover { + + &[type=text]:hover, + &[type=password]:hover { background: #FFF !important; } + &[type=submit] { left: 0; margin-left: 0; @@ -60,9 +75,11 @@ form#loginForm { top: 0; } } + table { border-spacing: 0; } + #rememberMeText { cursor: pointer; } diff --git a/core/public/scss/layout/midas.empty.scss b/core/public/scss/layout/midas.empty.scss index 77c0838cc..f60f83a6a 100644 --- a/core/public/scss/layout/midas.empty.scss +++ b/core/public/scss/layout/midas.empty.scss @@ -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. @import 'normalize'; @import 'bourbon'; @@ -20,16 +20,20 @@ img { a { cursor: pointer; + &:visited { - border: none; + border: 0; text-decoration: none; } + &:active { outline: none; } } -a:focus, li:active, li:focus { +a:focus, +li:active, +li:focus { outline: none; } @@ -48,10 +52,11 @@ div { &#guideRobot { display: none; } + &.genericBigButton { @include linear-gradient(to bottom, #FFF, #C4C4C4); - border-radius: 3px; border: #354856 1px solid; + border-radius: 3px; box-shadow: 0 0 2px #666; color: #000; cursor: pointer; @@ -60,30 +65,42 @@ div { font-size: 12px; font-weight: normal; list-style-type: none; - padding: 1px 3px 2px 3px; + padding: 1px 3px 2px; + a { color: #000 !important; font-size: 12px !important; font-weight: normal !important; + &:hover { text-decoration: none !important; } } + &:hover { @include linear-gradient(to bottom, #BDDCC9, #8AB79B); } } + &.genericWrapperTopRight { float: right; } - &.viewAction li a:hover, &.genericAction li a:hover, &.viewSelected li a:hover { + + &.viewAction li a:hover, + &.genericAction li a:hover, + &.viewSelected li a:hover { text-decoration: none; } - &.viewAction li img, &.genericAction li img, &.viewSelected li img { + + &.viewAction li img, + &.genericAction li img, + &.viewSelected li img { position: relative; top: 3px; } - &.viewAction hr, &.genericAction hr { + + &.viewAction hr, + &.genericAction hr { background-color: #D7D7D7; border: 0; color: #D7D7D7; @@ -93,11 +110,12 @@ div { margin-top: 3px; width: 130px; } + &.viewSideBar h1 { color: #999; font-size: 11px; - margin-bottom: 0.67em; - margin-top: 0.67em; + margin-bottom: .67em; + margin-top: .67em; text-shadow: #FFF 0 1px 1px; text-transform: uppercase; } @@ -123,17 +141,17 @@ div { } .growlError { - background: url(../../images/icons/nok.png) no-repeat; + background: url('../../images/icons/nok.png') no-repeat; padding-left: 18px; } .growlWarning { - background: url(../../images/icons/warning.png) no-repeat; + background: url('../../images/icons/warning.png') no-repeat; padding-left: 18px; } .growlOk { - background: url(../../images/icons/ok.png) no-repeat; + background: url('../../images/icons/ok.png') no-repeat; padding-left: 18px; } @@ -149,10 +167,12 @@ div { cursor: pointer; font-weight: 500; text-decoration: none; + &:hover { text-decoration: underline; } } + &.errorText { color: #F00; } diff --git a/core/public/scss/layout/midas.layout.scss b/core/public/scss/layout/midas.layout.scss index 7cd934d7d..cda4c8173 100644 --- a/core/public/scss/layout/midas.layout.scss +++ b/core/public/scss/layout/midas.layout.scss @@ -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. @import 'normalize'; @import 'bourbon'; @@ -33,24 +33,26 @@ dl { padding: 0; } -dt {} - img { border: 0; } a { cursor: pointer; + &:visited { - border: none; + border: 0; text-decoration: none; } + &:active { outline: none; } } -a:focus, li:active, li:focus { +a:focus, +li:active, +li:focus { outline: none; } @@ -69,10 +71,11 @@ div { &#guideRobot { display: none; } + &.genericBigButton { @include linear-gradient(to bottom, #FFF, #C4C4C4); - border-radius: 3px; border: #354856 1px solid; + border-radius: 3px; box-shadow: 0 0 2px #666; color: #000; cursor: pointer; @@ -81,47 +84,62 @@ div { font-size: 12px; font-weight: normal; list-style-type: none; - padding: 1px 3px 2px 3px; + padding: 1px 3px 2px; + a { color: #000 !important; font-size: 12px !important; font-weight: normal !important; + &:hover { text-decoration: none !important; } } + &:hover { @include linear-gradient(to bottom, #BDDCC9, #8AB79B); } } + &.genericWrapperTopRight { float: right; } + &.viewAction li a { display: inline-block; padding-bottom: 2px; + &:hover { text-decoration: none; } } - &.genericAction li a:hover, &.viewSelected li a:hover { + + &.genericAction li a:hover, + &.viewSelected li a:hover { text-decoration: none; } - &.viewAction li img, &.genericAction li img, &.viewSelected li img { + + &.viewAction li img, + &.genericAction li img, + &.viewSelected li img { position: relative; top: 2px; } + &.genericAction li { &:hover { background-color: #E5E5E5; color: #000; } + a { display: inline-block; padding-bottom: 2px; } } - &.viewAction hr, &.genericAction hr { + + &.viewAction hr, + &.genericAction hr { background-color: #D7D7D7; border: 0; color: #D7D7D7; @@ -158,26 +176,30 @@ div { display: none; min-height: 50px; } + &.TopDynamicClose { margin-right: 10px; margin-top: 0; + a { color: #FFF; font-size: 12px; text-decoration: none; } } + &.TopDynamicBar { .closeButton { float: right; + span { left: -3px; position: relative; top: -4px; } } - .TopDynamicLoading {} } + &.Topbar { @include linear-gradient(to top, #414141, #4B4B4B); border-bottom: 2px #354856 solid; @@ -186,24 +208,29 @@ div { height: 20px; text-align: left; z-index: 99; + div { &.TopbarContent { color: #FFF; padding-top: 4px; } + &.TopbarLeft { float: left; } + &.TopbarRight { float: right; } } + ul { display: block; list-style-type: disc; margin: 0 25px 0 15px; padding: 0; position: relative; + li { border-left: 1px #808080 solid; display: block; @@ -212,8 +239,9 @@ div { margin-left: 10px; padding-left: 10px; position: relative; + &.first { - border: none; + border: 0; display: block; float: left; list-style-type: none; @@ -222,54 +250,62 @@ div { } } } + li a { color: #DDD; display: block; text-decoration: none; + &:hover { background-color: #1D1D1D; text-decoration: none; } } } + &.Header { @include linear-gradient(to top, #56758B, #63869F); box-shadow: 0 0 3px #666; margin: 0 0 15px; padding: 5px 30px; + div { &.HeaderContent { height: 45px; margin: 0 auto; max-width: 1200px; min-width: 800px; - padding: 0 0 0; + padding: 0; } + &.HeaderLogo { - background: url(../../images/midasLogo.gif) no-repeat 0 0; + background: url('../../images/midasLogo.gif') no-repeat 0 0; cursor: pointer; float: left; height: 45px; width: 126px; } + &.HeaderSearch { float: left; padding-left: 35px; padding-top: 6px; position: relative; + a#advancedSearchLink { bottom: -13px; color: #F3F1EC; position: absolute; right: 3px; } + input#live_search { - background: #FFF url(../../images/icons/search.png) no-repeat scroll 3px 4px; - border-radius: 4px; + background: #FFF url('../../images/icons/search.png') no-repeat scroll 3px 4px; border: 1px solid #FFF; + border-radius: 4px; box-shadow: 0 0 15px #666; font-size: 14px; - opacity: 0.9; + opacity: .9; padding: 5px 10px 5px 24px; width: 400px; } @@ -279,7 +315,7 @@ div { } #searchloading { - background: url("../../images/icons/loading-small.gif") bottom center no-repeat; + background: url('../../images/icons/loading-small.gif') bottom center no-repeat; color: #FFF; height: 16px; position: absolute; @@ -307,6 +343,7 @@ div { padding-left: 35px; padding-top: 7px; } + &.HeaderAction { ul { display: block; @@ -314,47 +351,54 @@ div { margin: 0 25px 0 15px; padding: 0; } + a { color: #FFF; display: block; font-size: 14px; font-weight: bold; list-style-type: disc; - margin: 0 5px 0 5px; + margin: 0 5px; padding: 0; text-decoration: none; + img { border: 0; position: relative; top: 2px; } } + ul { li { @include linear-gradient(to bottom, #57BB7D, #32724A); - border-radius: 6px; border: #354856 1px solid; + border-radius: 6px; box-shadow: 0 0 5px #666; cursor: pointer; display: block; float: left; list-style-type: none; - padding: 0 5px 6px 5px; + padding: 0 5px 6px; + &:hover { @include linear-gradient(to bottom, #5BD288, #429D64); } } + img { - padding: 5px 0 0 0; + padding: 5px 0 0; } } } + &.Wrapper { margin: 0 auto; max-width: 1200px; min-width: 800px; padding: 0 30px 30px; } + &.SubWrapper { float: left; margin: 0; @@ -363,64 +407,76 @@ div { width: 100%; z-index: 1; } + &.MainContent { float: left; padding-left: 130px; position: relative; z-index: 1; } + &.SubMainContent { background-color: #FFF; - border-radius: 6px; border: 1px solid #D7D7D7; + border-radius: 6px; box-shadow: 0 0 6px #CCC; min-height: 500px; padding: 0 0 7px; position: relative; width: 850px; } + &.MainContent a { - cursor: pointer; color: #56758B; - text-decoration: none; + cursor: pointer; font-weight: 500; + text-decoration: none; + &:hover { text-decoration: underline; } } + &.SideBar { float: left; margin-left: -18%; right: 215px; width: 150px; + ul { list-style: none; margin: 0; padding: 0; + li { border-bottom: #FFF 1px dotted; color: #354856; cursor: pointer; padding-top: 3px; + &.active { background-color: #E5E5E5; color: #000; } + &.last { border-bottom: none !important; } + &:hover { background-color: #E5E5E5; color: #000; } + a { color: #808080; font-size: 13px; text-decoration: none; + &:hover { text-decoration: none; } - img {} + span { left: 3px; position: relative; @@ -429,28 +485,32 @@ div { } } } + hr { border-bottom: 1px solid #FFF; border-top: 1px solid #DAD8D4; margin: 5px -30px 5px 0; } + h1 { color: #999; font-size: 11px; - margin-bottom: 0.67em; - margin-top: 0.67em; + margin-bottom: .67em; + margin-top: .67em; text-shadow: #FFF 0 1px 1px; text-transform: uppercase; } } + &.viewSideBar h1 { color: #999; font-size: 11px; - margin-bottom: 0.67em; - margin-top: 0.67em; + margin-bottom: .67em; + margin-top: .67em; text-shadow: #FFF 0 1px 1px; text-transform: uppercase; } + &.Footer { clear: both; color: #666; @@ -460,6 +520,7 @@ div { padding-top: 20px; text-align: center; } + &.TopbarRight { li { ul { @@ -467,25 +528,29 @@ div { display: none; height: auto; margin: 0; - padding: 4px 0 0 0; + padding: 4px 0 0; position: absolute; width: 120px; } + &:hover ul { display: block; } } + img { &.arrowUser { position: relative; top: 1px; } + &.languageIcon { position: absolute; right: 0; top: 0; } } + li { li { display: block; @@ -496,11 +561,13 @@ div { position: relative; z-index: 200; } + &:hover li a { background: #4B4B4B; color: #FFF; z-index: 200; } + ul { a { box-shadow: 0 0 5px #666; @@ -514,17 +581,20 @@ div { padding: 0 0 0 5px; text-align: left; z-index: 200; + &:hover { background: #000; text-decoration: none; } } + li:hover a { background: #000; text-decoration: none; } } } + p { clear: left; } @@ -532,13 +602,14 @@ div { } #dialogStartingGuide .blockSet { - border-radius: 10px; border: 1px solid #CCC; + border-radius: 10px; cursor: pointer; float: left; margin: 5px; padding: 1px; width: 262px; + &:hover { border: 2px solid #D3E8F8; box-shadow: 1px 2px 4px #B9B9B9; @@ -558,17 +629,17 @@ div { } .growlError { - background: url(../../images/icons/nok.png) no-repeat; + background: url('../../images/icons/nok.png') no-repeat; padding-left: 18px; } .growlWarning { - background: url(../../images/icons/warning.png) no-repeat; + background: url('../../images/icons/warning.png') no-repeat; padding-left: 18px; } .growlOk { - background: url(../../images/icons/ok.png) no-repeat; + background: url('../../images/icons/ok.png') no-repeat; padding-left: 18px; } diff --git a/core/public/scss/layout/view.scss b/core/public/scss/layout/view.scss index f84739ac4..146cc7f24 100644 --- a/core/public/scss/layout/view.scss +++ b/core/public/scss/layout/view.scss @@ -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.viewHeader { background-color: #F6F9FE; @@ -24,6 +24,7 @@ div { padding-right: 275px; position: relative; } + &.viewMain { float: left; margin: 0; @@ -31,16 +32,16 @@ div { position: relative; width: 100%; } + &.viewSideBar { background-color: transparent; - border-bottom: none; + border-bottom: 0; border-left: 1px solid #EFEFEF; - border-radius: 0 0; - border-right: none; - border-top: none; + border-radius: 0; + border-right: 0; + border-top: 0; float: left; height: auto !important; - height: 100%; margin-right: -300px; min-height: 500px; padding-left: 10px; @@ -49,9 +50,11 @@ div { width: 215px; z-index: 2; } + &.viewSelected { display: none; } + &.viewNotice { background-color: #45B775; border: 1px solid #168846; @@ -60,39 +63,51 @@ div { padding: 2px 10px; position: absolute; } + &.viewNoticeWrapper { left: 145px; position: relative; top: 4px; } + &.viewSideBar div { &.sideElement { border-bottom: 1px solid #FFF; border-top: 1px solid #DAD8D4; padding-bottom: 10px; } + &.sideElementFirst { border-top: none !important; padding-bottom: 5px; } + &.sideElementActions { border-bottom: 1px solid #FFF; border-top: 1px solid #DAD8D4; padding-top: 5px; } - &.sideElement, &.sideElementActions, &.sideElementFirst { + + &.sideElement, + &.sideElementActions, + &.sideElementFirst { border-bottom: 1px solid #DAD8D4; border-top: none !important; padding-bottom: 10px; padding-top: 3px; } + &.sideElementLast { border-bottom: none !important; border-top: none !important; padding-bottom: 10px; padding-top: 5px; } - &.sideElement ul, &.sideElementFirst ul, &.sideElementActions ul, &.sideElementLast ul { + + &.sideElement ul, + &.sideElementFirst ul, + &.sideElementActions ul, + &.sideElementLast ul { list-style: none; margin: 0; padding: 0; @@ -105,27 +120,32 @@ ul.pathBrowser { list-style-type: disc; margin: 0; padding-left: 0; + li { - background: url("../../images/icons/path-divider.png") no-repeat right; + background: url('../../images/icons/path-divider.png') no-repeat right; display: list-item; float: left; list-style: none; margin: 0; min-height: 19px; padding: 5px 16px 0 3px; + img { margin-right: 2px; position: relative; top: -2px; } + span { position: relative; top: -4px; } + a { color: #333B80; font-size: 14px; font-weight: bold; + &:hover { color: #375; text-decoration: none; @@ -137,23 +157,27 @@ ul.pathBrowser { div { &.ui-tabs { border: 0; - padding: 0 0 0 0 !important; + padding: 0 !important; } + &.tabs { .ui-tabs-nav { background: none !important; border: 0 !important; border-bottom: 1px dotted #808080; } - .ui-state-default {} } } -.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { +.ui-state-active, +.ui-widget-content .ui-state-active, +.ui-widget-header .ui-state-active { border: 1px solid #C5DBEC !important; } -.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { +.ui-state-default, +.ui-widget-content .ui-state-default, +.ui-widget-header .ui-state-default { border: 1px solid #F3F1EC; } @@ -161,7 +185,8 @@ div { background: #FFF !important; } -div.tabs .ui-tabs .ui-tabs-nav li a, .ui-tabs .ui-tabs-nav li a { +div.tabs .ui-tabs .ui-tabs-nav li a, +.ui-tabs .ui-tabs-nav li a { padding: 3px 10px !important; } @@ -170,28 +195,32 @@ div.tabs { color: #1D5987 !important; font-weight: bold; height: 19px !important; + a { color: #1D5987 !important; font-weight: bold; height: 19px !important; } } + .ui-state-default { height: 20px; } + .ui-tabs-panel { border-top: 1px solid #F3F1EC; left: -15px !important; position: relative !important; width: 99%; } + display: none; } img.progressIndeterminate { display: block; - margin-top: 13px; margin-bottom: 13px; + margin-top: 13px; } div.MainDialog h4 { diff --git a/core/public/scss/licenses/licenses.index.scss b/core/public/scss/licenses/licenses.index.scss index 8f0347c79..c10fdd964 100644 --- a/core/public/scss/licenses/licenses.index.scss +++ b/core/public/scss/licenses/licenses.index.scss @@ -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. input.licenseName { margin-bottom: 8px !important; diff --git a/core/public/scss/rest/rest.index.scss b/core/public/scss/rest/rest.index.scss index 0d5011efc..19d29650d 100644 --- a/core/public/scss/rest/rest.index.scss +++ b/core/public/scss/rest/rest.index.scss @@ -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. @import 'bourbon'; @@ -13,6 +13,7 @@ form#loginForm { border-collapse: separate !important; border-color: #808080 !important; border-spacing: 2px !important; + tbody tr td { border-bottom: none !important; border-collapse: separate !important; @@ -22,6 +23,7 @@ form#loginForm { padding: 0 !important; } } + td { display: table-cell !important; vertical-align: inherit !important; @@ -33,7 +35,8 @@ th { vertical-align: inherit !important; } -strong, b { +strong, +b { font-weight: bold; } @@ -44,9 +47,11 @@ div { cursor: pointer !important; padding-top: 3px !important; } + &.viewMain { width: 820px !important; } + &.footer { display: none !important; } diff --git a/core/public/scss/search/search.index.scss b/core/public/scss/search/search.index.scss index df4c25f1c..d6570e15d 100644 --- a/core/public/scss/search/search.index.scss +++ b/core/public/scss/search/search.index.scss @@ -1,11 +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. ul#searchResults { display: none; list-style: none; - margin: 0 0 0 0; - padding: 0 0 0 0; + margin: 0; + padding: 0; position: relative; + li.searchElement { border-bottom: 1px dotted #808080; margin-top: 3px; @@ -32,6 +33,7 @@ span { position: absolute; right: 10px; } + &.descriptionSearchResult { margin-left: 20px; } diff --git a/core/public/scss/share/share.dialog.scss b/core/public/scss/share/share.dialog.scss index 8a34e2912..a82b899b1 100644 --- a/core/public/scss/share/share.dialog.scss +++ b/core/public/scss/share/share.dialog.scss @@ -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. input { &#urlInput { width: 300px; } + &#live_share_search { width: 350px; } @@ -12,18 +13,22 @@ input { div { &#permissionEntity table { width: 330px; + td { &.changePermissionSelect { width: 150px; } + &.changePermissionDelete { width: 30px; } + &.changePermissionSelectBox { width: 100px; } } } + &#permissionsContent { a { color: #56758B; @@ -31,23 +36,28 @@ div { font-weight: 500; text-decoration: none; } + h4 { margin-top: 10px; } + a:hover { text-decoration: underline; } } + &#applyPoliciesRecursiveProgressBar { height: 20px; } + &#applyPoliciesRecursiveMessage { padding-bottom: 5px; padding-top: 5px; } } -#permissionPublic, #permissionPrivate { +#permissionPublic, +#permissionPrivate { border-bottom: 1px solid #D7D7D7; padding-bottom: 10px; } diff --git a/core/public/scss/share/share.links.scss b/core/public/scss/share/share.links.scss index c02e17c3c..5a01d44b9 100644 --- a/core/public/scss/share/share.links.scss +++ b/core/public/scss/share/share.links.scss @@ -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. -#resourceViewDisplay, #resourceDownloadDisplay { +#resourceViewDisplay, +#resourceDownloadDisplay { height: 16px; width: 360px; } -.viewLinkContainer, .downloadLinkContainer { +.viewLinkContainer, +.downloadLinkContainer { margin-bottom: 20px; } -#selectViewUrl, #selectDownloadUrl { - background: url(../../images/icons/paste_plain.png) no-repeat 2px 2px; +#selectViewUrl, +#selectDownloadUrl { + background: url('../../images/icons/paste_plain.png') no-repeat 2px 2px; border: 1px solid #777; height: 22px; position: relative; @@ -18,7 +21,8 @@ width: 22px; } -#selectViewUrl:hover, #selectDownloadUrl:hover { +#selectViewUrl:hover, +#selectDownloadUrl:hover { background-color: #ADA; cursor: pointer; } diff --git a/core/public/scss/upload/upload.revision.scss b/core/public/scss/upload/upload.revision.scss index 7c05db5d7..c1954306a 100644 --- a/core/public/scss/upload/upload.revision.scss +++ b/core/public/scss/upload/upload.revision.scss @@ -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. @import 'bourbon'; @@ -9,6 +9,7 @@ .uploadValidationError { display: none; margin: 5px 0; + img { position: relative; top: 3px; @@ -25,14 +26,15 @@ .drop-zone { background-color: #5CB85C; - border-radius: 5px; border: 1px solid #4CAE4C; + border-radius: 5px; color: #FFF; display: inline-block; font-size: 16px; font-weight: bold; margin-bottom: 8px; padding: 14px 20px; + &:hover { @include linear-gradient(to bottom, #4CA84C, #5CB85C); border: 1px solid #484; @@ -42,8 +44,8 @@ .start-upload { background-color: #5C5CB8; - border-radius: 3px; border: 1px solid #4C4CAE; + border-radius: 3px; color: #FFF; cursor: pointer; display: inline-block; @@ -72,9 +74,9 @@ .upload-status-container { background-color: #FAFAFA; - border-radius: 4px; border: 1px solid #F0F0F0; - box-shadow: inset 0 0 3px 2px rgba(0, 0, 0, 0.02); + border-radius: 4px; + box-shadow: inset 0 0 3px 2px rgba(0, 0, 0, .02); margin-bottom: 12px; margin-right: 10px; padding: 10px; diff --git a/core/public/scss/upload/upload.simpleupload.scss b/core/public/scss/upload/upload.simpleupload.scss index cd0c4bd36..cd482e70a 100644 --- a/core/public/scss/upload/upload.simpleupload.scss +++ b/core/public/scss/upload/upload.simpleupload.scss @@ -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. @import 'bourbon'; @@ -13,6 +13,7 @@ div.uploadValidationError { display: none; margin: 5px 0; + img { position: relative; top: 3px; @@ -29,14 +30,15 @@ div.uploadValidationError { .drop-zone { background-color: #5CB85C; - border-radius: 5px; border: 1px solid #4CAE4C; + border-radius: 5px; color: #FFF; display: inline-block; font-size: 16px; font-weight: bold; margin-bottom: 8px; padding: 14px 20px; + &:hover { @include linear-gradient(to bottom, #4CA84C, #5CB85C); border: 1px solid #484; @@ -46,8 +48,8 @@ div.uploadValidationError { .start-upload { background-color: #5C5CB8; - border-radius: 3px; border: 1px solid #4C4CAE; + border-radius: 3px; color: #FFF; cursor: pointer; display: inline-block; @@ -76,9 +78,9 @@ div.uploadValidationError { .upload-status-container { background-color: #FAFAFA; - border-radius: 4px; border: 1px solid #F0F0F0; - box-shadow: inset 0 0 3px 2px rgba(0, 0, 0, 0.02); + border-radius: 4px; + box-shadow: inset 0 0 3px 2px rgba(0, 0, 0, .02); margin-bottom: 12px; margin-right: 10px; padding: 10px; diff --git a/core/public/scss/user/user.deletedialog.scss b/core/public/scss/user/user.deletedialog.scss index be871330b..a0d59d37b 100644 --- a/core/public/scss/user/user.deletedialog.scss +++ b/core/public/scss/user/user.deletedialog.scss @@ -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. span { &#deleteDialogUserName { font-weight: bold; } + &#deleteDialogCaution { color: #B00; font-weight: bolder; diff --git a/core/public/scss/user/user.emailregister.scss b/core/public/scss/user/user.emailregister.scss index 69d052137..dafd649f0 100644 --- a/core/public/scss/user/user.emailregister.scss +++ b/core/public/scss/user/user.emailregister.scss @@ -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.viewMain { width: 820px !important; @@ -12,6 +12,7 @@ div { &.emailLabelContainer { height: 22px; } + &.tosContainer { margin-bottom: 10px; margin-top: 12px; diff --git a/core/public/scss/user/user.index.scss b/core/public/scss/user/user.index.scss index 369db943a..145062877 100644 --- a/core/public/scss/user/user.index.scss +++ b/core/public/scss/user/user.index.scss @@ -1,15 +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 { - &.userList {} &.userBlock { border-bottom: 1px dotted #808080; padding-bottom: 5px; padding-top: 5px; } + &.userList span { padding-left: 15px; } + &.userBlock:hover { background-color: #F6F9FE; cursor: pointer; @@ -23,18 +24,22 @@ div { div { &.userStats { - border: none; + border: 0; color: #777; float: right; font-size: 10px; } + &.adminCreateUser { margin-top: 20px; } - &.loginError, &.registerError { + + &.loginError, + &.registerError { color: #F00; font-weight: bold; } + &.loginError { padding-bottom: 8px; } @@ -44,6 +49,7 @@ input { &.invalidField { background-color: #FF9191; } + &.validField { background-color: #91FF91; } @@ -51,18 +57,24 @@ input { .dialogForm { margin-bottom: 0; + td { font-size: 14px; } + input { font-size: 14px; - &[type=text], &[type=password] { + + &[type=text], + &[type=password] { width: 200px; } - &[type=button], &[type=submit] { + + &[type=button], + &[type=submit] { background: #8689DE; - border-radius: 3px; border: 0; + border-radius: 3px; color: #FFF; cursor: pointer; float: right; @@ -70,9 +82,11 @@ input { font-weight: bold; margin-right: 0; margin-top: 5px; - padding: 6px 8px 6px 8px; + padding: 6px 8px; } - &[type=button]:hover, &[type=submit]:hover { + + &[type=button]:hover, + &[type=submit]:hover { background: #CBD9E3; color: #1D5987; text-decoration: none; diff --git a/core/public/scss/user/user.manage.scss b/core/public/scss/user/user.manage.scss index b509fe92b..a55ee6bed 100644 --- a/core/public/scss/user/user.manage.scss +++ b/core/public/scss/user/user.manage.scss @@ -1,19 +1,22 @@ -/* 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.radioElement { label { float: inherit !important; width: 600px !important; } + ul { list-style: none; margin: 0 0 0 100px; - padding: 0 0 0 0; + padding: 0; width: 600px !important; } + h4 { margin-bottom: 4px; } + br { display: none; } @@ -37,6 +40,7 @@ h1 { #cart { float: left; width: 200px; + ol { margin: 0; padding: 1em 0 1em 3em; @@ -60,6 +64,7 @@ span.communityTitle { div.communityList { opacity: .90; + span.communityShortDescription { padding-left: 15px; } diff --git a/core/public/scss/user/user.register.scss b/core/public/scss/user/user.register.scss index 74f12e75f..f261d3697 100644 --- a/core/public/scss/user/user.register.scss +++ b/core/public/scss/user/user.register.scss @@ -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 { &.registerContent { @@ -6,35 +6,41 @@ div { margin-right: auto; width: 900px; } + &.registerInfo { background-color: #363535; - border-radius: 4px; border: 1px solid #808080; + border-radius: 4px; color: #FFF; float: left; margin-bottom: 7px; margin-top: 15px; padding: 8px; width: 250px; + h4 { color: #84ACC8; margin-bottom: 3px; margin-left: 5px; margin-top: 2px; } + h3 { margin-bottom: 0; margin-top: 0; } + ul { list-style: circle; margin-top: 0; padding-left: 20px; padding-top: 3px; } + li { color: #DDD; } + a { color: #84ACC8; font-size: 13px; @@ -42,37 +48,42 @@ div { text-decoration: underline; } } - &.register {} } form#registerForm { color: #FFF; margin-left: 280px; padding-top: 19px; - div {} + input { - &[type=text], &[type=password] { + &[type=text], + &[type=password] { background: #F3F1EC !important; border: 1px solid #808080; color: #000; height: 18px; width: 185px; } - &[type=text]:hover, &[type=password]:hover { + + &[type=text]:hover, + &[type=password]:hover { background: #FFF !important; } - &[type=submit] {} } + div span img { position: relative; top: 3px; } + .termLabel { display: block; } + div.registerError { color: #57BB7D; position: absolute; + span { display: none; position: relative; @@ -83,6 +94,7 @@ form#registerForm { a.termOfService { color: #F3F1EC; + &:hover { color: #F3F1EC; } diff --git a/core/public/scss/user/user.settings.scss b/core/public/scss/user/user.settings.scss index 5f7c3c314..1397ff938 100644 --- a/core/public/scss/user/user.settings.scss +++ b/core/public/scss/user/user.settings.scss @@ -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#tabsSettings { display: none; @@ -11,13 +11,16 @@ form { float: left; width: 80px; } + input { - &[type="text"], &[type="password"] { + &[type='text'], + &[type='password'] { width: 200px !important; } } } - &#modifyPassword input[type="password"] { + + &#modifyPassword input[type='password'] { width: 200px !important; } } @@ -25,14 +28,17 @@ form { div { &#accountPrivacy { margin-left: 100px; + label { float: none !important; width: auto !important; } + br { display: none; } } + &#imageActual { float: right; } @@ -43,6 +49,8 @@ div { } div#tabsSettings { + background: none !important; + .ui-tabs-nav { background: none !important; border-bottom: 1px solid #D7D7D7 !important; @@ -53,10 +61,11 @@ div#tabsSettings { height: 22px !important; padding-left: 10px; } + .ui-widget-content { background: none !important; } - background: none !important; + .ui-tabs .ui-tabs-nav li a { padding: 3px 10px !important; } @@ -71,15 +80,18 @@ div#tabsSettings { color: #1D5987 !important; font-weight: bold; height: 19px !important; + a { color: #1D5987 !important; font-weight: bold; height: 19px !important; } } + .ui-state-default { height: 20px; } + .ui-tabs-panel { width: 99%; } diff --git a/core/public/scss/user/user.userpage.scss b/core/public/scss/user/user.userpage.scss index 89f04725a..dcd34773c 100644 --- a/core/public/scss/user/user.userpage.scss +++ b/core/public/scss/user/user.userpage.scss @@ -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. #locationUser { color: #808080; diff --git a/modules/api/public/scss/index/index.index.scss b/modules/api/public/scss/index/index.index.scss index a6d3a7b33..1238e2fec 100644 --- a/modules/api/public/scss/index/index.index.scss +++ b/modules/api/public/scss/index/index.index.scss @@ -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.helpContent { background-color: #DDD; diff --git a/modules/archive/public/scss/extract/extract.dialog.scss b/modules/archive/public/scss/extract/extract.dialog.scss index 318a8765f..399e9ddca 100644 --- a/modules/archive/public/scss/extract/extract.dialog.scss +++ b/modules/archive/public/scss/extract/extract.dialog.scss @@ -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. #extractArchiveProgressMessage { margin-bottom: 20px; diff --git a/modules/cleanup/public/scss/item/index.index.scss b/modules/cleanup/public/scss/item/index.index.scss index cb699d7ef..3efb548ca 100644 --- a/modules/cleanup/public/scss/item/index.index.scss +++ b/modules/cleanup/public/scss/item/index.index.scss @@ -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. div { &.viewSideBar input.globalButton { margin-left: 0 !important; } + &.viewWrapper { padding-right: 40px !important; } diff --git a/modules/comments/public/scss/item/item.comments.scss b/modules/comments/public/scss/item/item.comments.scss index 87bc1e5c0..4dc0c3a8b 100644 --- a/modules/comments/public/scss/item/item.comments.scss +++ b/modules/comments/public/scss/item/item.comments.scss @@ -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. @import 'bourbon'; @@ -7,27 +7,30 @@ div { border-bottom: 1px dashed #C0C0C0; padding-bottom: 5px; } + &.loginToComment { border-bottom: 1px dashed #C0C0C0; padding-bottom: 8px; } } -#registerToComment, #loginToComment { +#registerToComment, +#loginToComment { color: #56758B; font-weight: bold; text-decoration: none; } -#registerToComment:hover, #loginToComment:hover { +#registerToComment:hover, +#loginToComment:hover { cursor: pointer; text-decoration: underline; } #addCommentDiv { + border: 1px solid #BDC7D8; border-collapse: separate; border-spacing: 0; - border: 1px solid #BDC7D8; width: 100%; } @@ -43,7 +46,8 @@ div { width: 99%; } -.commentLimit, .commentAs { +.commentLimit, +.commentAs { border-right: 1px solid #E2E2E2; color: #777; float: left; @@ -53,7 +57,8 @@ div { padding-right: 5px; } -.commentLimitString, .postingAsString { +.commentLimitString, +.postingAsString { margin-top: 5px; } @@ -90,12 +95,14 @@ a.commentUserName { font-weight: bold !important; margin-left: 8px; text-decoration: none; + &:visited { color: #56758B; font-weight: bold !important; margin-left: 8px; text-decoration: none; } + &:hover { text-decoration: underline; } @@ -106,8 +113,6 @@ a.commentUserName { margin-top: 8px; } -.commentText {} - .commentDate { color: #969696; } @@ -144,6 +149,7 @@ a.commentItrLink { font-size: 13px; font-weight: bold; text-decoration: none; + &:visited { color: #56758B; font-family: $lucida-grande; @@ -151,6 +157,7 @@ a.commentItrLink { font-weight: bold; text-decoration: none; } + &:hover { color: #B85541; text-decoration: underline; diff --git a/modules/communityagreement/public/scss/community/community.agreementdialog.scss b/modules/communityagreement/public/scss/community/community.agreementdialog.scss index ef6305711..c8bf79d88 100644 --- a/modules/communityagreement/public/scss/community/community.agreementdialog.scss +++ b/modules/communityagreement/public/scss/community/community.agreementdialog.scss @@ -1,10 +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. div { &.agreementWarning { background-color: #E7FFD1; - border-radius: 3px; border: #3A3 1px solid; + border-radius: 3px; box-shadow: 0 0 2px #666; color: #000; display: block; @@ -12,8 +12,9 @@ div { font-weight: normal; list-style-type: none; margin-bottom: 12px; - padding: 1px 4px 4px 4px; + padding: 1px 4px 4px; } + &.licenseDisplay { border-bottom: #D7D7D7 1px solid; border-top: #D7D7D7 1px solid; @@ -23,11 +24,13 @@ div { padding-bottom: 8px; padding-top: 8px; } + &.agreementWarning img { padding: 0; position: relative; top: 3px; } + &.agreementButtons { float: right; margin-top: 10px; diff --git a/modules/communityagreement/public/scss/community/community.agreementtab.scss b/modules/communityagreement/public/scss/community/community.agreementtab.scss index c350abcaa..402e4db2f 100644 --- a/modules/communityagreement/public/scss/community/community.agreementtab.scss +++ b/modules/communityagreement/public/scss/community/community.agreementtab.scss @@ -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. textarea#agreement { height: 160px; @@ -9,8 +9,8 @@ div.formLabel { color: #999; font-size: 11px; font-weight: bold; - margin-bottom: 0.67em; - margin-top: 0.67em; + margin-bottom: .67em; + margin-top: .67em; text-transform: uppercase; } diff --git a/modules/dicomanonymize/public/scss/upload/upload.index.scss b/modules/dicomanonymize/public/scss/upload/upload.index.scss index f347782d3..ae07da6de 100644 --- a/modules/dicomanonymize/public/scss/upload/upload.index.scss +++ b/modules/dicomanonymize/public/scss/upload/upload.index.scss @@ -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.chooseFolderMessage { margin-bottom: 10px; diff --git a/modules/dicomserver/public/scss/admin/admin.index.scss b/modules/dicomserver/public/scss/admin/admin.index.scss index 6e149b120..da18b0ffd 100644 --- a/modules/dicomserver/public/scss/admin/admin.index.scss +++ b/modules/dicomserver/public/scss/admin/admin.index.scss @@ -1,11 +1,15 @@ -/* 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 { &.running_status { color: #090; font-weight: bold; } - &.not_running_status, &.only_storescp_running_status, &.only_dcmqrscp_running_status, &.not_supported_status { + + &.not_running_status, + &.only_storescp_running_status, + &.only_dcmqrscp_running_status, + &.not_supported_status { color: #C80000; font-weight: bold; } diff --git a/modules/javauploaddownload/public/scss/download/download.index.scss b/modules/javauploaddownload/public/scss/download/download.index.scss index b2d0849f3..fddaf3053 100644 --- a/modules/javauploaddownload/public/scss/download/download.index.scss +++ b/modules/javauploaddownload/public/scss/download/download.index.scss @@ -1,9 +1,9 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. .downloadDescription { background-color: #AFA; - border-radius: 5px; border: 2px solid #9D9; + border-radius: 5px; margin-top: 6px; padding: 6px 5px 6px 8px; } diff --git a/modules/javauploaddownload/public/scss/upload/upload.index.scss b/modules/javauploaddownload/public/scss/upload/upload.index.scss index 4a53a6643..9daa5dd5b 100644 --- a/modules/javauploaddownload/public/scss/upload/upload.index.scss +++ b/modules/javauploaddownload/public/scss/upload/upload.index.scss @@ -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. .belowDestinationUpload { display: none; diff --git a/modules/javauploaddownload/public/scss/upload/upload.revision.scss b/modules/javauploaddownload/public/scss/upload/upload.revision.scss index d987c1e5e..71e521e59 100644 --- a/modules/javauploaddownload/public/scss/upload/upload.revision.scss +++ b/modules/javauploaddownload/public/scss/upload/upload.revision.scss @@ -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. .belowDestinationUpload { display: none; diff --git a/modules/keyfiles/public/scss/item/keyfiles.item.view.scss b/modules/keyfiles/public/scss/item/keyfiles.item.view.scss index 2b0820bc5..2d47fadb2 100644 --- a/modules/keyfiles/public/scss/item/keyfiles.item.view.scss +++ b/modules/keyfiles/public/scss/item/keyfiles.item.view.scss @@ -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. img.downloadKeyFileIcon { cursor: pointer; diff --git a/modules/mfa/public/scss/config/config.index.scss b/modules/mfa/public/scss/config/config.index.scss index 741156536..2e6a8b4c8 100644 --- a/modules/mfa/public/scss/config/config.index.scss +++ b/modules/mfa/public/scss/config/config.index.scss @@ -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. .formElement { margin-top: 10px; diff --git a/modules/mfa/public/scss/config/config.usertab.scss b/modules/mfa/public/scss/config/config.usertab.scss index 1db166d60..e60a2e38a 100644 --- a/modules/mfa/public/scss/config/config.usertab.scss +++ b/modules/mfa/public/scss/config/config.usertab.scss @@ -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. #otpLength { width: 25px; diff --git a/modules/mfa/public/scss/login/login.dialog.scss b/modules/mfa/public/scss/login/login.dialog.scss index 6e87fc4ea..e99a65134 100644 --- a/modules/mfa/public/scss/login/login.dialog.scss +++ b/modules/mfa/public/scss/login/login.dialog.scss @@ -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. #otpLoginSubmit { float: right; @@ -6,7 +6,7 @@ } #otpToken { - background: #FFF url(../../../../../core/public/images/icons/lock.png) no-repeat scroll 2px 2px; + background: #FFF url('../../../../../core/public/images/icons/lock.png') no-repeat scroll 2px 2px; padding-left: 20px; width: 90%; } diff --git a/modules/oauth/public/scss/authorize/authorize.index.scss b/modules/oauth/public/scss/authorize/authorize.index.scss index 3a61dd8a1..67c57681a 100644 --- a/modules/oauth/public/scss/authorize/authorize.index.scss +++ b/modules/oauth/public/scss/authorize/authorize.index.scss @@ -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. body { background-color: #F5F5F5; @@ -8,17 +8,21 @@ body { .form-login { background-color: #FAFAFA; - border-radius: 5px; border: 1px solid #E5E5E5; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + border-radius: 5px; + box-shadow: 0 1px 2px rgba(0, 0, 0, .05); margin: 0 auto 20px; max-width: 600px; padding: 19px 29px 29px; - .form-login-heading, .checkbox { + + .form-login-heading, + .checkbox { margin-bottom: 10px; } + input { - &[type="text"], &[type="password"] { + &[type='text'], + &[type='password'] { font-size: 16px; height: auto; margin-bottom: 15px; @@ -38,17 +42,19 @@ ul.scopeList { div { &.authorizationText { background-color: #FFB; - border-radius: 5px; border: 1px solid #C0C0C0; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + border-radius: 5px; + box-shadow: 0 1px 2px rgba(0, 0, 0, .05); margin-bottom: 18px; - padding: 10px 12px 5px 12px; + padding: 10px 12px 5px; } + &.loginErrorMessage { color: #EE1010; font-weight: bold; margin-bottom: 10px; } + &.logoContainer { border-bottom: 1px solid #D7D7D7; margin-bottom: 12px; @@ -56,6 +62,7 @@ div { padding-bottom: 8px; text-align: right; } + &.buttonBar { text-align: right; } diff --git a/modules/oauth/public/scss/client/client.index.scss b/modules/oauth/public/scss/client/client.index.scss index b71a55031..f2264aac1 100644 --- a/modules/oauth/public/scss/client/client.index.scss +++ b/modules/oauth/public/scss/client/client.index.scss @@ -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 { &.sectionHeader { @@ -9,24 +9,28 @@ div { margin-bottom: 5px; padding-top: 3px; } + &.sectionContainer { margin-bottom: 30px; padding-top: 6px; } } -.myClientsTable th, .myAuthorizationsTable th { +.myClientsTable th, +.myAuthorizationsTable th { background-color: #DDE4E4; font-weight: normal; padding: 3px 10px 3px 5px; } -.myClientsTable td, .myAuthorizationsTable td { +.myClientsTable td, +.myAuthorizationsTable td { background-color: #FBFBFB; padding: 3px; } -.myClientsTable, .myAuthorizationsTable { +.myClientsTable, +.myAuthorizationsTable { width: 100%; } @@ -45,6 +49,7 @@ div { div.bottomButtons { float: right; margin-top: 25px; + input { margin-left: 10px; } diff --git a/modules/packages/public/scss/application/packages.application.latest.scss b/modules/packages/public/scss/application/packages.application.latest.scss index 57e108d11..2364c6482 100644 --- a/modules/packages/public/scss/application/packages.application.latest.scss +++ b/modules/packages/public/scss/application/packages.application.latest.scss @@ -1,7 +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.viewMain { width: 805px; + h2 { color: #545454; font-size: 15px; @@ -11,6 +12,7 @@ div.viewMain { #platformList { margin-top: 15px; + h3 a { text-decoration: none; } @@ -24,23 +26,27 @@ div.platformContainer { } table.packagesTable { - border-collapse: collapse; border: 0; + border-collapse: collapse; width: 100%; + a img { position: relative; top: 2px; } + td { border: 1px solid #D7D7D7; padding-bottom: 3px; padding-left: 4px; padding-top: 2px; } + tr { &.odd { background-color: #F4F4F4; } + &.even { background-color: #FFF; } diff --git a/modules/packages/public/scss/application/packages.application.view.scss b/modules/packages/public/scss/application/packages.application.view.scss index 55566062c..05da4e4b1 100644 --- a/modules/packages/public/scss/application/packages.application.view.scss +++ b/modules/packages/public/scss/application/packages.application.view.scss @@ -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. @import 'bourbon'; @@ -6,12 +6,14 @@ div { &.titleWrapper { border-bottom: 1px solid #D7D7D7; } + &.applicationName { color: #525252; font-size: 20px; font-weight: bold; margin-bottom: 5px; } + &.applicationDescription { color: #6D6D6D; margin-bottom: 8px; @@ -20,6 +22,7 @@ div { #packageList { margin-top: 15px; + h3 a { text-decoration: none; } @@ -32,9 +35,10 @@ div.releaseEntry { } table.packagesTable { - border-collapse: collapse; @include user-select(none); + border-collapse: collapse; width: 550px; + th { background-color: #CCD7E0; border: 1px #888 solid; @@ -49,7 +53,9 @@ th { &.actions { width: 40%; } - &.platform, &.type { + + &.platform, + &.type { width: 30%; } } @@ -60,6 +66,7 @@ table.packagesTable tbody td { padding-bottom: 3px; padding-left: 3px; padding-top: 3px; + img { position: relative; top: 2px; @@ -70,6 +77,7 @@ form.editApplication { input[type=text] { width: 300px; } + textarea { resize: none; width: 298px; diff --git a/modules/packages/public/scss/package/package.manage.scss b/modules/packages/public/scss/package/package.manage.scss index 68386b8ea..4f00ba393 100644 --- a/modules/packages/public/scss/package/package.manage.scss +++ b/modules/packages/public/scss/package/package.manage.scss @@ -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 { &.viewMain { + width: 805px; + h2 { color: #545454; margin-bottom: 3px; margin-top: 3px; } - width: 805px; } + &.headerSection { border-bottom: 1px solid #D7D7D7; margin-bottom: 10px; diff --git a/modules/packages/public/scss/view/packages.view.project.scss b/modules/packages/public/scss/view/packages.view.project.scss index deded9f99..6a8cd77af 100644 --- a/modules/packages/public/scss/view/packages.view.project.scss +++ b/modules/packages/public/scss/view/packages.view.project.scss @@ -1,28 +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. div { &.introText { margin-bottom: 20px; } + &.applicationList a.applicationLink { font-size: 18px; font-weight: bold; text-decoration: none; + &:hover { text-decoration: underline; } } + &.noApplications { font-style: italic; } + &.applicationDescription { margin-top: 6px; } + &.applicationContainer { border-top: 1px solid #D7D7D7; margin-top: 20px; padding-top: 8px; } + &.createApplicationContainer { border-top: 1px solid #D7D7D7; margin-top: 20px; @@ -34,6 +40,7 @@ form.createApplication { input[type=text] { width: 300px; } + textarea { resize: none; width: 298px; diff --git a/modules/pvw/public/scss/admin/admin.status.scss b/modules/pvw/public/scss/admin/admin.status.scss index a242a9564..c11cd2740 100644 --- a/modules/pvw/public/scss/admin/admin.status.scss +++ b/modules/pvw/public/scss/admin/admin.status.scss @@ -1,12 +1,14 @@ -/* 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.instances { border-collapse: collapse; + th { background-color: #BDD; border: 1px solid #D7D7D7; padding: 3px; } + td { border: 1px solid #D7D7D7; padding: 3px; @@ -17,6 +19,7 @@ span { &.running { color: #008000; } + &.dead { color: #F00; } diff --git a/modules/pvw/public/scss/paraview/paraview.common.scss b/modules/pvw/public/scss/paraview/paraview.common.scss index a3642acb7..56e8c34da 100644 --- a/modules/pvw/public/scss/paraview/paraview.common.scss +++ b/modules/pvw/public/scss/paraview/paraview.common.scss @@ -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.midas-pvw-status { font-size: 14px; diff --git a/modules/pvw/public/scss/paraview/paraview.slice.scss b/modules/pvw/public/scss/paraview/paraview.slice.scss index f3c2fe337..153b1e2ed 100644 --- a/modules/pvw/public/scss/paraview/paraview.slice.scss +++ b/modules/pvw/public/scss/paraview/paraview.slice.scss @@ -1,11 +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. -#sliceSlider, #windowLevelSlider { +#sliceSlider, +#windowLevelSlider { margin: 8px 14px 8px 10px; width: 551px; } -#sliceInfo, #windowLevelInfo { +#sliceInfo, +#windowLevelInfo { color: #FFF; margin-left: 10px; z-index: 3; @@ -51,14 +53,17 @@ button { height: 25px; width: 25px; } + &.actionActive { background-color: #9C9; } + &.actionInactive { background-color: #CCC; } + &.pointSelectButton { - background-image: url(../../images/pointSelect.png); + background-image: url('../../images/pointSelect.png'); } } diff --git a/modules/pvw/public/scss/paraview/paraview.surface.scss b/modules/pvw/public/scss/paraview/paraview.surface.scss index 39a36ed9e..58797e920 100644 --- a/modules/pvw/public/scss/paraview/paraview.surface.scss +++ b/modules/pvw/public/scss/paraview/paraview.surface.scss @@ -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. #renderercontainer { display: none; diff --git a/modules/pvw/public/scss/paraview/paraview.volume.scss b/modules/pvw/public/scss/paraview/paraview.volume.scss index e6d14df51..5fcffd0dc 100644 --- a/modules/pvw/public/scss/paraview/paraview.volume.scss +++ b/modules/pvw/public/scss/paraview/paraview.volume.scss @@ -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.infoValue { color: #7A7A7A; @@ -8,13 +8,16 @@ table.extractSubgridTable { td { padding-bottom: 20px; } + input.sb { border: 1px solid #808080; width: 55px; } } -.sliderX, .sliderY, .sliderZ { +.sliderX, +.sliderY, +.sliderZ { margin-left: 11px; margin-right: 11px; width: 370px; @@ -28,24 +31,31 @@ button { margin-right: 10px; width: 32px; } + &.plusX { - background-image: url(../../images/pqXPlus24.png); + background-image: url('../../images/pqXPlus24.png'); } + &.minusX { - background-image: url(../../images/pqXMinus24.png); + background-image: url('../../images/pqXMinus24.png'); } + &.plusY { - background-image: url(../../images/pqYPlus24.png); + background-image: url('../../images/pqYPlus24.png'); } + &.minusY { - background-image: url(../../images/pqYMinus24.png); + background-image: url('../../images/pqYMinus24.png'); } + &.plusZ { - background-image: url(../../images/pqZPlus24.png); + background-image: url('../../images/pqZPlus24.png'); } + &.minusZ { - background-image: url(../../images/pqZMinus24.png); + background-image: url('../../images/pqZMinus24.png'); } + &.cameraPreset:hover { background-color: #ADA; } @@ -56,15 +66,17 @@ div { float: right; margin-top: 15px; } + &.sofPointEdit { display: none; - margin-top: 10px; float: right; + margin-top: 10px; } } input { - &.scalarValueEdit, &.opacityValueEdit { + &.scalarValueEdit, + &.opacityValueEdit { border: 1px solid #808080; margin-left: 5px; margin-right: 10px; @@ -73,7 +85,7 @@ input { } .scmColorPicker { - background: url(../../images/select2.png) -3px -3px; + background: url('../../images/select2.png') -3px -3px; cursor: pointer; display: inline-block; height: 30px; @@ -95,9 +107,11 @@ div { margin-bottom: 10px; margin-top: 10px; } + &.scmDivider { border-top: 1px solid #D7D7D7; } + &.scmBottomButtons { float: right; padding-top: 10px; @@ -112,14 +126,17 @@ button.scmDeletePoint { table.objectList { border-collapse: collapse; width: 100%; + th { - &.visibility { - width: 20px; - } background-color: #D0D0F6; border: 1px solid #808080; padding-left: 4px; + + &.visibility { + width: 20px; + } } + td { border: 1px solid #808080; padding-left: 2px; diff --git a/modules/ratings/public/scss/item/item.ratings.scss b/modules/ratings/public/scss/item/item.ratings.scss index 233801cf9..c47fe715c 100644 --- a/modules/ratings/public/scss/item/item.ratings.scss +++ b/modules/ratings/public/scss/item/item.ratings.scss @@ -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. #ratingsAverage { float: left; @@ -14,7 +14,6 @@ div { &.ratingsVSpacer { height: 30px; } - &.ratingCountWrapper {} } span { @@ -22,6 +21,7 @@ span { color: #676767; margin-left: 7px; } + &.addRating { color: #676767; float: left; @@ -35,13 +35,15 @@ div.loginToRate { padding-bottom: 8px; } -#registerToRate, #loginToRate { +#registerToRate, +#loginToRate { color: #56758B; font-weight: bold; text-decoration: none; } -#registerToRate:hover, #loginToRate:hover { +#registerToRate:hover, +#loginToRate:hover { cursor: pointer; text-decoration: underline; } diff --git a/modules/remoteprocessing/public/scss/executable/executable.define.scss b/modules/remoteprocessing/public/scss/executable/executable.define.scss index 9c34861e7..5e89d12fa 100644 --- a/modules/remoteprocessing/public/scss/executable/executable.define.scss +++ b/modules/remoteprocessing/public/scss/executable/executable.define.scss @@ -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. #jsonMetadataContent { display: none; @@ -15,22 +15,24 @@ .portlet-header { cursor: move; - margin: 0.3em; + margin: .3em; padding-bottom: 4px; - padding-left: 0.2em; + padding-left: .2em; + .ui-icon { float: right; } } .portlet-content { - padding: 0.4em; + padding: .4em; } .ui-sortable-placeholder { border: 1px dotted #000; height: 50px !important; visibility: visible !important; + * { visibility: hidden; } diff --git a/modules/remoteprocessing/public/scss/index/index.selectaction.scss b/modules/remoteprocessing/public/scss/index/index.selectaction.scss index f528b5b7d..239f7eec6 100644 --- a/modules/remoteprocessing/public/scss/index/index.selectaction.scss +++ b/modules/remoteprocessing/public/scss/index/index.selectaction.scss @@ -1,15 +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. @import 'bourbon'; #selectactionBlock .blockSet { - border-radius: 10px; border: 1px solid #CCC; + border-radius: 10px; cursor: pointer; float: left; margin: 5px; padding: 1px; width: 262px; + &:hover { border: 2px solid #D3E8F8; box-shadow: 1px 2px 4px #B9B9B9; diff --git a/modules/remoteprocessing/public/scss/job/job.init.scss b/modules/remoteprocessing/public/scss/job/job.init.scss index 71a9d4c66..bf0e91251 100644 --- a/modules/remoteprocessing/public/scss/job/job.init.scss +++ b/modules/remoteprocessing/public/scss/job/job.init.scss @@ -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. -.optionWrapper, .nameWrapper { - border-radius: 6px; +.optionWrapper, +.nameWrapper { border: #354856 1px solid; + border-radius: 6px; box-shadow: 0 0 5px #666; margin-bottom: 2px; - padding: 0 5px 6px 5px; + padding: 0 5px 6px; } -.optionWrapper h4, .nameWrapper h4 { +.optionWrapper h4, +.nameWrapper h4 { border-bottom: 1px solid #808080; font-size: 14px; margin-bottom: 0; @@ -16,8 +18,8 @@ } #schedulerWrapper { - border-radius: 6px; border: #354856 1px solid; + border-radius: 6px; box-shadow: 0 0 5px #666; margin-bottom: 2px; } @@ -26,7 +28,8 @@ background: #F8F8F8 !important; } -.reviewUploaded form, #wizard { +.reviewUploaded form, +#wizard { display: none; } @@ -42,6 +45,7 @@ #metaWrapper { display: none; + .viewMain { width: 95% !important; } diff --git a/modules/remoteprocessing/public/scss/job/job.manage.scss b/modules/remoteprocessing/public/scss/job/job.manage.scss index 4712c2ceb..f51c4fb81 100644 --- a/modules/remoteprocessing/public/scss/job/job.manage.scss +++ b/modules/remoteprocessing/public/scss/job/job.manage.scss @@ -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. .midasTree td { cursor: pointer !important; diff --git a/modules/remoteprocessing/public/scss/job/job.view.scss b/modules/remoteprocessing/public/scss/job/job.view.scss index 219a00e6f..d9e66ec46 100644 --- a/modules/remoteprocessing/public/scss/job/job.view.scss +++ b/modules/remoteprocessing/public/scss/job/job.view.scss @@ -1,11 +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.viewWrapper { padding-right: 40px !important; } table { - &#tableResults, &#tableXml { + &#tableResults, + &#tableXml { width: 100%; } } @@ -14,7 +15,7 @@ table { border: #354856 1px solid; border-radius: 6px; box-shadow: 0 0 5px #666; - padding: 5px 10px 25px 10px; + padding: 5px 10px 25px; } table#tableResults td { @@ -22,21 +23,21 @@ table#tableResults td { } #hiddenLog { - border-radius: 6px; border: #354856 1px solid; + border-radius: 6px; box-shadow: 0 0 5px #666; display: none; height: 400px; margin-bottom: 2px; overflow: scroll; - padding: 0 5px 6px 5px; + padding: 0 5px 6px; } #metricsWrapper { - border-radius: 6px; border: #354856 1px solid; + border-radius: 6px; box-shadow: 0 0 5px #666; display: none; margin-bottom: 2px; - padding: 0 5px 6px 5px; + padding: 0 5px 6px; } diff --git a/modules/remoteprocessing/public/scss/layout/remoteprocessing.scss b/modules/remoteprocessing/public/scss/layout/remoteprocessing.scss index 2331b98f0..6d119b90c 100644 --- a/modules/remoteprocessing/public/scss/layout/remoteprocessing.scss +++ b/modules/remoteprocessing/public/scss/layout/remoteprocessing.scss @@ -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. @import 'bourbon'; div.HeaderAction ul li.processButton { @include linear-gradient(to bottom, #578DBB, #325372); + &:hover { @include linear-gradient(to bottom, #5B7AD2, #42779D); } diff --git a/modules/sizequota/public/scss/folder/folder.index.scss b/modules/sizequota/public/scss/folder/folder.index.scss index 20fd06337..2b6ce3161 100644 --- a/modules/sizequota/public/scss/folder/folder.index.scss +++ b/modules/sizequota/public/scss/folder/folder.index.scss @@ -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. #hFreeSpaceValue { display: none; diff --git a/modules/solr/public/scss/admin/admin.index.scss b/modules/solr/public/scss/admin/admin.index.scss index fe0a3f515..10ef34f4e 100644 --- a/modules/solr/public/scss/admin/admin.index.scss +++ b/modules/solr/public/scss/admin/admin.index.scss @@ -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 { &.rebuildIndexContainer { @@ -7,7 +7,7 @@ div { } #rebuildIndexButton { - margin: 10px 0 10px 0 !important; + margin: 10px 0 !important; } #rebuildProgressMessage { diff --git a/modules/solr/public/scss/advanced/advanced.index.scss b/modules/solr/public/scss/advanced/advanced.index.scss index 9d27a0ea3..f9672407c 100644 --- a/modules/solr/public/scss/advanced/advanced.index.scss +++ b/modules/solr/public/scss/advanced/advanced.index.scss @@ -1,12 +1,14 @@ -/* 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 { &.viewWrapper { padding-right: 30px !important; } + &.queryArea { margin-top: 10px; } + &.topText { margin-top: 8px; } @@ -20,7 +22,7 @@ div { #advancedSearchButton { margin-left: 0 !important; - padding: 4px 13px 4px 13px; + padding: 4px 13px; } #resultsArea { @@ -39,6 +41,7 @@ div { padding-bottom: 10px; padding-top: 10px; } + &.pageItrButtons { float: right; margin-top: 15px; diff --git a/modules/statistics/public/scss/index/index.index.scss b/modules/statistics/public/scss/index/index.index.scss index cb699d7ef..3efb548ca 100644 --- a/modules/statistics/public/scss/index/index.index.scss +++ b/modules/statistics/public/scss/index/index.index.scss @@ -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. div { &.viewSideBar input.globalButton { margin-left: 0 !important; } + &.viewWrapper { padding-right: 40px !important; } diff --git a/modules/statistics/public/scss/item/item.index.scss b/modules/statistics/public/scss/item/item.index.scss index a0a93c501..dd1ba52ce 100644 --- a/modules/statistics/public/scss/item/item.index.scss +++ b/modules/statistics/public/scss/item/item.index.scss @@ -1,16 +1,17 @@ -/* 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; } } input.dateSelect { - background: #FFF url(../../images/calendar.png) no-repeat scroll 2px 0; + background: #FFF url('../../images/calendar.png') no-repeat scroll 2px 0; border: 1px solid #808080; padding-left: 20px; } @@ -28,25 +29,27 @@ input.dateSelect { input.filterButton { background: #F6F9FE; + border: 1px solid #808080; -moz-box-align: center; -webkit-box-align: center; - border: 1px solid #808080; box-sizing: border-box; color: #2E6E9E; cursor: pointer; font-weight: bold; line-height: 1.4; - margin-right: 0.1em; + margin-right: .1em; overflow: visible; position: relative; text-align: center; text-decoration: none !important; zoom: 1; + &:hover { background: #CBD9E3 none; color: #1D5987; text-decoration: none; } + &[disabled] { background: #DBDBDB none; color: #808080; @@ -65,6 +68,7 @@ span { color: #959595; font-weight: lighter; } + &#filteredCount { display: inline-block; padding-top: 5px; diff --git a/modules/thumbnailcreator/public/scss/admin/admin.index.scss b/modules/thumbnailcreator/public/scss/admin/admin.index.scss index 252edf028..a48c7151c 100644 --- a/modules/thumbnailcreator/public/scss/admin/admin.index.scss +++ b/modules/thumbnailcreator/public/scss/admin/admin.index.scss @@ -1 +1 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. diff --git a/modules/thumbnailcreator/public/scss/item/thumbnailcreator.item.view.scss b/modules/thumbnailcreator/public/scss/item/thumbnailcreator.item.view.scss index 309166467..72620c15e 100644 --- a/modules/thumbnailcreator/public/scss/item/thumbnailcreator.item.view.scss +++ b/modules/thumbnailcreator/public/scss/item/thumbnailcreator.item.view.scss @@ -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. img { &.makeThumbnailIcon { @@ -7,6 +7,7 @@ img { padding-left: 2px; padding-right: 2px; } + &.largeImage { padding-top: 10px; } diff --git a/modules/tracker/public/scss/producer/producer.edit.scss b/modules/tracker/public/scss/producer/producer.edit.scss index d21ffdcc6..ce00268d6 100644 --- a/modules/tracker/public/scss/producer/producer.edit.scss +++ b/modules/tracker/public/scss/producer/producer.edit.scss @@ -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.submitButtonContainer { float: right; diff --git a/modules/tracker/public/scss/producer/producer.list.scss b/modules/tracker/public/scss/producer/producer.list.scss index 661e785b4..21ab0fe0d 100644 --- a/modules/tracker/public/scss/producer/producer.list.scss +++ b/modules/tracker/public/scss/producer/producer.list.scss @@ -1,28 +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. div { &.introText { margin-bottom: 20px; } + &.producerList a.producerLink { font-size: 18px; font-weight: bold; text-decoration: none; + &:hover { text-decoration: underline; } } + &.noProducers { font-style: italic; } + &.producerDescription { margin-top: 6px; } + &.producerContainer { border-top: 1px solid #D7D7D7; margin-top: 20px; padding-top: 8px; } + &.createProducerContainer { border-top: 1px solid #D7D7D7; margin-top: 20px; @@ -34,6 +40,7 @@ form.createProducer { input[type=text] { width: 300px; } + textarea { resize: none; width: 298px; diff --git a/modules/tracker/public/scss/producer/producer.view.scss b/modules/tracker/public/scss/producer/producer.view.scss index b6998317a..20770b356 100644 --- a/modules/tracker/public/scss/producer/producer.view.scss +++ b/modules/tracker/public/scss/producer/producer.view.scss @@ -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 { &.producerInfoContainer { @@ -6,21 +6,26 @@ div { margin-bottom: 6px; padding-bottom: 4px; } - &.producerData, &.datasetHeader { + + &.producerData, + &.datasetHeader { color: #777; margin-bottom: 6px; } + &.sectionTitle { color: #707070; font-size: 18px; margin-bottom: 8px; } + &.trendGroupContainer { - border-radius: 5px; border: 1px solid #A7A7A7; + border-radius: 5px; margin-bottom: 15px; padding: 6px; } + &.headerSeparator { background-color: #D7D7D7; height: 1px; @@ -28,11 +33,13 @@ div { margin-top: 8px; width: 100%; } + &.trendContainer { color: #56758B; font-size: 14px; margin-bottom: 2px; - input[type="checkbox"] { + + input[type='checkbox'] { position: relative; top: 1px; } @@ -47,6 +54,7 @@ a.trendLink { padding-left: 3px; padding-top: 3px; width: 90%; + &:hover { background-color: #E5E5E5; color: #16354B; diff --git a/modules/tracker/public/scss/scalar/scalar.details.scss b/modules/tracker/public/scss/scalar/scalar.details.scss index dad4ae722..77a95eb22 100644 --- a/modules/tracker/public/scss/scalar/scalar.details.scss +++ b/modules/tracker/public/scss/scalar/scalar.details.scss @@ -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.sectionDivider { background-color: #C7C7C7; @@ -22,6 +22,7 @@ div { &.thisScalarInfo { margin-bottom: 13px; } + &.otherScalars { margin-bottom: 15px; } @@ -33,11 +34,13 @@ span.resultItemLabel { } table { - &.scalarInfoTable th, &.otherScalarTable th { + &.scalarInfoTable th, + &.otherScalarTable th { color: #555; font-weight: bold; padding-right: 6px; } + &.otherScalarTable td { text-align: right; } @@ -47,6 +50,7 @@ div { &.resultItemContainer { margin-top: 3px; } + &.bottomButtons { float: right; margin-top: 10px; diff --git a/modules/tracker/public/scss/trend/trend.edit.scss b/modules/tracker/public/scss/trend/trend.edit.scss index d19ef5b90..320c1b316 100644 --- a/modules/tracker/public/scss/trend/trend.edit.scss +++ b/modules/tracker/public/scss/trend/trend.edit.scss @@ -1,19 +1,22 @@ -/* 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 { &.formWrapper { padding-left: 15px; width: 840px; } + &.editTitle { color: #797979; font-size: 16px; margin-bottom: 12px; margin-top: 8px; } + &.submitButtonContainer { margin-top: 25px; } + &.formRow { margin-bottom: 6px; } @@ -25,7 +28,8 @@ span.noItem { } input { - &.selectItem, &.removeItem { + &.selectItem, + &.removeItem { margin-left: 8px !important; } } diff --git a/modules/tracker/public/scss/trend/trend.notify.scss b/modules/tracker/public/scss/trend/trend.notify.scss index 172d94f57..171795c0f 100644 --- a/modules/tracker/public/scss/trend/trend.notify.scss +++ b/modules/tracker/public/scss/trend/trend.notify.scss @@ -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.thresholdInfoContainer { margin-top: 10px; @@ -13,6 +13,7 @@ div { float: right; margin-top: 15px; } + &.registeredEmail { color: #797979; margin-top: 10px; diff --git a/modules/tracker/public/scss/trend/trend.view.scss b/modules/tracker/public/scss/trend/trend.view.scss index 4bc7dbb53..6a953198c 100644 --- a/modules/tracker/public/scss/trend/trend.view.scss +++ b/modules/tracker/public/scss/trend/trend.view.scss @@ -1,10 +1,11 @@ -/* 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 { &.itemsContainer { margin-bottom: 10px; margin-top: 6px; } + &.dateControlContainer { border-bottom: 1px solid #D7D7D7; margin-bottom: 8px; @@ -13,7 +14,7 @@ div { } input.dateSelect { - background: #FFF url(../../images/calendar.png) no-repeat scroll 2px 1px; + background: #FFF url('../../images/calendar.png') no-repeat scroll 2px 1px; border: 1px solid #808080; box-sizing: border-box; height: 20px; @@ -27,7 +28,8 @@ input.dateSelect { height: 20px; } -#filterButton, #branchFilterButton { +#filterButton, +#branchFilterButton { margin-left: 2px !important; } @@ -40,10 +42,12 @@ span { &.infoItem { color: #979797; } + &.itemLinkNone { color: #A5A5A5; font-style: italic; } + &.noPoints { color: #909090; display: inline-block; @@ -51,7 +55,10 @@ span { } } -.yMin, .yMax, .y2Min, .y2Max { +.yMin, +.yMax, +.y2Min, +.y2Max { margin-left: 10px; margin-right: 10px; width: 70px; @@ -62,10 +69,12 @@ div { float: right; margin-top: 15px; } + &.deleteProgressBar { margin-bottom: 6px; margin-top: 10px; } + &.bottomButtonsDelete { float: right; margin-top: 20px; @@ -73,7 +82,8 @@ div { } input { - &.deleteYes, &.deleteNo { + &.deleteYes, + &.deleteNo { margin-left: 10px !important; } } @@ -97,23 +107,26 @@ div.toggleUnofficialIcon { position: relative; top: 2px; width: 16px; + &.toHide { border: 1px dashed #F22; } + &.toShow { background-color: #F22; } } button.add-branchfilter { - margin-left: 15px; background-color: #6263AA; + border: 0; + border-radius: 2px; color: #FFF; + cursor: pointer; font-weight: bold; - border: none; - border-radius: 2px; + margin-left: 15px; padding: 4px 11px; - cursor: pointer; + &:hover { background-color: #525399; } diff --git a/modules/validation/public/scss/validation.index.scss b/modules/validation/public/scss/validation.index.scss index 7bdea8dc7..a0e9bda64 100644 --- a/modules/validation/public/scss/validation.index.scss +++ b/modules/validation/public/scss/validation.index.scss @@ -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. @import 'bourbon'; @@ -7,12 +7,14 @@ div { margin-top: 2px; padding-top: 0; } + &.dashEntry { border-top: 1px solid #DAD8D4; cursor: pointer; padding-bottom: 10px; padding-top: 10px; } + &.grayEntry { background-color: #EEE; } @@ -28,8 +30,8 @@ div { .dashTitle { font-size: 13px; - margin-bottom: 0.67em; - margin-top: 0.67em; + margin-bottom: .67em; + margin-top: .67em; padding-left: 2ex; text-shadow: #FFF 0 1px 1px; vertical-align: middle; @@ -48,21 +50,23 @@ div.dashPanel { border: 1px dotted #999; margin-right: 2px; padding: 6px 1px 2px; + &:hover { + @include user-select(none); background-color: #EEE; border: 1px dotted #999; cursor: pointer; margin-right: 2px; padding: 6px 1px 2px; - @include user-select(none); } + &:active { + @include user-select(none); background-color: #AAA; border: 1px dotted #999; cursor: pointer; margin-right: 2px; padding: 6px 1px 2px; - @include user-select(none); } } diff --git a/modules/visualize/public/scss/media/media.index.scss b/modules/visualize/public/scss/media/media.index.scss index f02a06069..21acb2edd 100644 --- a/modules/visualize/public/scss/media/media.index.scss +++ b/modules/visualize/public/scss/media/media.index.scss @@ -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.helpContent { background-color: #DDD; diff --git a/modules/visualize/public/scss/paraview/paraview.dual.scss b/modules/visualize/public/scss/paraview/paraview.dual.scss index 96177af85..64860d84b 100644 --- a/modules/visualize/public/scss/paraview/paraview.dual.scss +++ b/modules/visualize/public/scss/paraview/paraview.dual.scss @@ -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.rendererWrapper { position: relative; @@ -22,14 +22,16 @@ div.rendererWrapper { } img { - &.leftLoading, &.rightLoading { + &.leftLoading, + &.rightLoading { margin-left: 10px; margin-top: 10px; z-index: 100; } } -#leftRendererOverlay, #rightRendererOverlay { +#leftRendererOverlay, +#rightRendererOverlay { position: absolute; right: 3px; top: 3px; @@ -41,10 +43,12 @@ div { position: relative; top: 426px; } + &.sliceControlContainer { position: absolute; width: 424px; } + &.windowControlContainer { left: 425px; position: absolute; @@ -52,11 +56,13 @@ div { } } -#windowSlider, #sliceSlider { +#windowSlider, +#sliceSlider { margin: 8px 14px 8px 15px; } -#windowInfo, #sliceInfo { +#windowInfo, +#sliceInfo { margin-left: 15px; } @@ -68,24 +74,30 @@ button { margin-top: 10px; width: 25px; } + &.actionActive { background-color: #9C9; } + &.actionInactive { background-color: #CCC; } + &.pointSelectButton { - background-image: url(../../images/pointSelect.png); + background-image: url('../../images/pointSelect.png'); } + &.pointMapListButton { - background-image: url(../../images/pqNodeSetData16.png); + background-image: url('../../images/pqNodeSetData16.png'); } + &.cameraLinkButton { - background-image: url(../../images/camera_link.png); + background-image: url('../../images/camera_link.png'); } } -#leftLoadingStatus, #rightLoadingStatus { +#leftLoadingStatus, +#rightLoadingStatus { margin-left: 10px; } @@ -96,18 +108,21 @@ span.infoValue { .pointListTable { border-collapse: collapse; width: 100%; + th { background-color: #CDD; border: 1px solid #A0A0A0; padding: 5px 3px 5px 5px; } + tbody tr { border-bottom: 1px dotted #A0A0A0; } } div { - &.colorSwatchL, &.colorSwatchR { + &.colorSwatchL, + &.colorSwatchR { border: 1px solid #707070; display: inline-block; height: 14px; @@ -119,20 +134,28 @@ div { } button { - &.highlightPoints, &.deletePoints, &.processButton, &.closeButton { + &.highlightPoints, + &.deletePoints, + &.processButton, + &.closeButton { background-color: #F0F0F0; - border-radius: 1px; border: 1px solid #B0B0B0; - padding: 3px 6px 3px 6px; + border-radius: 1px; + padding: 3px 6px; } - &.highlightPoints:hover, &.deletePoints:hover, &.processButton:hover, &.closeButton:hover { + + &.highlightPoints:hover, + &.deletePoints:hover, + &.processButton:hover, + &.closeButton:hover { background-color: #DADADA; border: 1px solid #808080; } + &.highlightOn { background-color: #CDF9CD !important; - border-radius: 2px; border: 1px solid #B0B0B0; + border-radius: 2px; } } diff --git a/modules/visualize/public/scss/paraview/paraview.slice.scss b/modules/visualize/public/scss/paraview/paraview.slice.scss index 68aed5569..bfd857f4b 100644 --- a/modules/visualize/public/scss/paraview/paraview.slice.scss +++ b/modules/visualize/public/scss/paraview/paraview.slice.scss @@ -1,11 +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. -#sliceSlider, #windowLevelSlider { +#sliceSlider, +#windowLevelSlider { margin: 8px 14px 8px 10px; width: 551px; } -#sliceInfo, #windowLevelInfo { +#sliceInfo, +#windowLevelInfo { color: #FFF; margin-left: 10px; z-index: 3; @@ -51,14 +53,17 @@ button { height: 25px; width: 25px; } + &.actionActive { background-color: #9C9; } + &.actionInactive { background-color: #CCC; } + &.pointSelectButton { - background-image: url(../../images/pointSelect.png); + background-image: url('../../images/pointSelect.png'); } } diff --git a/modules/visualize/public/scss/paraview/paraview.surface.scss b/modules/visualize/public/scss/paraview/paraview.surface.scss index 39a36ed9e..58797e920 100644 --- a/modules/visualize/public/scss/paraview/paraview.surface.scss +++ b/modules/visualize/public/scss/paraview/paraview.surface.scss @@ -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. #renderercontainer { display: none; diff --git a/modules/visualize/public/scss/paraview/paraview.volume.scss b/modules/visualize/public/scss/paraview/paraview.volume.scss index 60a2c9010..f8708b700 100644 --- a/modules/visualize/public/scss/paraview/paraview.volume.scss +++ b/modules/visualize/public/scss/paraview/paraview.volume.scss @@ -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. #renderercontainer { display: none; @@ -30,13 +30,16 @@ table.extractSubgridTable { td { padding-bottom: 20px; } + input.sb { border: 1px solid #808080; width: 55px; } } -.sliderX, .sliderY, .sliderZ { +.sliderX, +.sliderY, +.sliderZ { margin-left: 11px; margin-right: 11px; width: 370px; @@ -50,24 +53,31 @@ button { margin-right: 10px; width: 32px; } + &.plusX { - background-image: url(../../images/pqXPlus24.png); + background-image: url('../../images/pqXPlus24.png'); } + &.minusX { - background-image: url(../../images/pqXMinus24.png); + background-image: url('../../images/pqXMinus24.png'); } + &.plusY { - background-image: url(../../images/pqYPlus24.png); + background-image: url('../../images/pqYPlus24.png'); } + &.minusY { - background-image: url(../../images/pqYMinus24.png); + background-image: url('../../images/pqYMinus24.png'); } + &.plusZ { - background-image: url(../../images/pqZPlus24.png); + background-image: url('../../images/pqZPlus24.png'); } + &.minusZ { - background-image: url(../../images/pqZMinus24.png); + background-image: url('../../images/pqZMinus24.png'); } + &.cameraPreset:hover { background-color: #ADA; } @@ -78,15 +88,17 @@ div { float: right; margin-top: 15px; } + &.sofPointEdit { display: none; - margin-top: 10px; float: right; + margin-top: 10px; } } input { - &.scalarValueEdit, &.opacityValueEdit { + &.scalarValueEdit, + &.opacityValueEdit { border: 1px solid #808080; margin-left: 5px; margin-right: 10px; @@ -95,7 +107,7 @@ input { } .scmColorPicker { - background: url(../../images/select2.png) -3px -3px; + background: url('../../images/select2.png') -3px -3px; cursor: pointer; display: inline-block; height: 30px; @@ -117,9 +129,11 @@ div { margin-bottom: 10px; margin-top: 10px; } + &.scmDivider { border-top: 1px solid #D7D7D7; } + &.scmBottomButtons { float: right; padding-top: 10px; @@ -134,14 +148,17 @@ button.scmDeletePoint { table.objectList { border-collapse: collapse; width: 100%; + th { - &.visibility { - width: 20px; - } background-color: #D0D0F6; border: 1px solid #808080; padding-left: 4px; + + &.visibility { + width: 20px; + } } + td { border: 1px solid #808080; padding-left: 2px; diff --git a/modules/visualize/public/scss/webgl/webgl.index.scss b/modules/visualize/public/scss/webgl/webgl.index.scss index 3970d9855..56f91c77d 100644 --- a/modules/visualize/public/scss/webgl/webgl.index.scss +++ b/modules/visualize/public/scss/webgl/webgl.index.scss @@ -1,76 +1,84 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. @import 'bourbon'; body { - @include linear-gradient(to bottom, #336699, #72B9FF); + @include linear-gradient(to bottom, #369, #72B9FF); color: #EEE; - padding: 0; - margin: 0; - font-weight: bold; - overflow: hidden; font-family: $monospace; font-size: 13px; + font-weight: bold; + margin: 0; + overflow: hidden; + padding: 0; text-align: center; } #info { - position: absolute; bottom: 0; - width: 100%; padding: 5px; + position: absolute; + width: 100%; z-index: 100; } #onliver { + color: #FFF; + padding: 5px; position: absolute; top: 70px; width: 100%; - padding: 5px; z-index: 100; - color: #FFF; } #helpDialog1 { text-align: left; } -a, b { +a, +b { color: #008000; } button { &.buttonNav { + border-image: initial; + box-shadow: 0 0 15px #666; height: 20px !important; - width: 20px !important; position: absolute !important; - box-shadow: 0 0 15px #666; - border-image: initial; + width: 20px !important; } + &#buttonUp { left: 50px; top: 100px; } + &#buttonDown { left: 50px; top: 150px; } + &#buttonLeft { left: 25px; top: 125px; } + &#buttonRight { left: 75px; top: 125px; } + &#buttonReset { left: 50px; top: 125px; } + &#buttonPlus { left: 50px; top: 180px; } + &#buttonMinus { left: 50px; top: 205px; @@ -78,6 +86,6 @@ button { } div#axesContainer { - position: absolute; bottom: 0; + position: absolute; } diff --git a/utils/moduleTemplate/public/scss/thing/thing.get.scss b/utils/moduleTemplate/public/scss/thing/thing.get.scss index 252edf028..a48c7151c 100644 --- a/utils/moduleTemplate/public/scss/thing/thing.get.scss +++ b/utils/moduleTemplate/public/scss/thing/thing.get.scss @@ -1 +1 @@ -/* Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */ +// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0.