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

Commit

Permalink
Remove duplicate and simplify some CSS properties
Browse files Browse the repository at this point in the history
  • Loading branch information
Jamie Snape committed Jul 14, 2014
1 parent 651c42e commit ef911d2
Show file tree
Hide file tree
Showing 20 changed files with 42 additions and 112 deletions.
2 changes: 1 addition & 1 deletion core/public/css/browse/browse.selectfolder.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ table#moveTable {
-khtml-border-radius: 6px;
-moz-border-radius: 6px;
-webkit-border-radius: 6px;
border: #354856 1px solid;
border: 1px #CCD7E0 dotted !important;
border: 1px #354856 solid;
box-shadow: #666 0 0 2px;
-moz-box-shadow: 0 0 2px #666;
-webkit-box-shadow: #666 0 0 2px;
Expand Down
11 changes: 3 additions & 8 deletions core/public/css/layout/form.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ form.genericForm input[type=submit], form.genericForm input[type=button] {
-webkit-box-sizing: border-box;
color: #2E6E9E;
cursor: pointer;
cursor: pointer;
display: inline-block;
font-weight: bold;
line-height: 1.4;
Expand All @@ -32,15 +31,13 @@ form.genericForm input[type=submit], form.genericForm input[type=button] {
}

form.genericForm input[type=submit]:hover, form.genericForm input[type=button]:hover {
background-image: none;
background: #CBD9E3;
background: #CBD9E3 none;
color: #1D5987;
text-decoration: none;
}

form.genericForm input[type=submit][disabled], form.genericForm input[type=button][disabled], .globalButton[disabled] {
background-image: none;
background: #DBDBDB;
background: #DBDBDB none;
color: gray;
cursor: default;
text-decoration: none;
Expand All @@ -63,7 +60,6 @@ form.genericForm div label {
float: left;
margin-right: 5px;
text-align: left;
text-align: right;
width: 200px;
}

Expand Down Expand Up @@ -109,8 +105,7 @@ form.genericForm div input[type=submit], input.globalButton, form.genericForm in
}

form.genericForm input[type=submit]:hover, input.globalButton:hover {
background-image: none;
background: #CBD9E3;
background: #CBD9E3 none;
color: #1D5987;
text-decoration: none;
}
11 changes: 5 additions & 6 deletions core/public/css/layout/midas.layout.css
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ div.Topbar {
background-color: #414141;
background-image: -moz-linear-gradient(center top, #4B4B4B 0%, #414141 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#4B4B4B), to(#414141));
background: #000;
border-bottom: 2px #354856 solid;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#4b4b4b', endColorstr='#414141');
font-family: 'Lucida Grande', Verdana, Arial, Helvetica, sans-serif;
Expand Down Expand Up @@ -376,17 +375,17 @@ div.HeaderAction a img {
}

div.HeaderAction ul li {
-khtml-border-radius: 6px;
-moz-border-radius: 6px;
-moz-box-shadow: 0 0 5px #666;
-webkit-border-radius: 6px;
-webkit-box-shadow: #666 0 0 5px;
background-color: #57BB7D;
background-image: -moz-linear-gradient(center top, #57BB7D 0%, #32724A 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#57BB7D), to(#32724A));
border-radius: 6px;
-khtml-border-radius: 6px;
-moz-border-radius: 6px;
-webkit-border-radius: 6px;
border: #354856 1px solid;
box-shadow: #666 0 0 5px;
-moz-box-shadow: 0 0 5px #666;
-webkit-box-shadow: #666 0 0 5px;
cursor: pointer;
display: block;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#57bb7d', endColorstr='#32724a');
Expand Down
24 changes: 7 additions & 17 deletions core/public/css/layout/view.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,39 +22,34 @@ span.headerSpan {

div.viewWrapper {
margin-top: 0;
padding-right: 245px;
padding-right: 275px;
position: relative;
}

div.viewMain {
float: left;
margin: 0;
padding-bottom: 1em;
padding: 0;
padding: 5px 15px;
position: relative;
width: 100%;
}

div.viewSideBar {
background-color: transparent;
border-bottom-left-radius: 0 0;
border-bottom-right-radius: 0 0;
border-bottom: none;
border-left: 1px solid #EFEFEF;
border-top-left-radius: 0 0;
border-top-right-radius: 0 0;
border: none;
border-radius: 0 0;
border-right: none;
border-top: none;
float: left;
height: 100%;
height: auto !important;
height: 100%;
margin-right: -300px;
min-height: 500px;
padding-left: 10px;
padding-top: 5px;
position: relative;
width: 215px;
width: 245px;
z-index: 2;
}

Expand All @@ -67,10 +62,7 @@ div.viewNotice {
border: 1px solid #168846;
color: #012844;
display: none;
padding-bottom: 2px;
padding-left: 10px;
padding-right: 10px;
padding-top: 2px;
padding: 2px 10px;
position: absolute;
}

Expand Down Expand Up @@ -127,9 +119,7 @@ ul.pathBrowser {
}

ul.pathBrowser li {
background-image: url("../../images/icons/path-divider.png");
background-position: right;
background-repeat: no-repeat;
background: url("../../images/icons/path-divider.png") no-repeat right;
display: list-item;
float: left;
list-style: none;
Expand Down
4 changes: 1 addition & 3 deletions core/public/css/share/share.links.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@
}

#selectViewUrl, #selectDownloadUrl {
background-image: url(../../images/icons/paste_plain.png);
background-position: 2px 2px;
background-repeat: no-repeat;
background: url(../../images/icons/paste_plain.png) no-repeat 2px 2px;
border: 1px solid #777;
height: 22px;
position: relative;
Expand Down
14 changes: 3 additions & 11 deletions core/public/css/upload/upload.revision.css
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,8 @@ div.tooBigUpload img {

#swfuploadContent div.flash {
border-color: #D9E4FF;
-moz-border-radius-bottomleft: 5px;
-moz-border-radius-bottomright: 5px;
-moz-border-radius-topleft: 5px;
-moz-border-radius-topright: 5px;
-webkit-border-bottom-left-radius: 5px;
-webkit-border-bottom-right-radius: 5px;
-webkit-border-top-left-radius: 5px;
-webkit-border-top-right-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
height: 90px;
margin: 10px 0;
overflow: auto;
Expand Down Expand Up @@ -190,9 +184,7 @@ div.tooBigUpload img {
}

a.progressCancel {
background-image: url(../../images/icons/cancelbutton.gif);
background-position: -14px 0;
background-repeat: no-repeat;
background: url(../../images/icons/cancelbutton.gif) no-repeat -14px 0;
display: block;
float: right;
font-size: 0;
Expand Down
22 changes: 6 additions & 16 deletions core/public/css/upload/upload.simpleupload.css
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ div.uploadValidationError img {
}

.drop-zone:hover {
background-color: #4CA84C;
background-image: linear-gradient(to bottom, #4CA84C 0%, #5CB85C 100%);
background: #4CA84C linear-gradient(to bottom, #4CA84C 0%, #5CB85C 100%);
border: 1px solid #484;
cursor: pointer;
}
Expand All @@ -53,20 +52,17 @@ div.uploadValidationError img {
cursor: pointer;
display: inline-block;
font-size: 13px;
margin 0;
margin-bottom: 8px;
margin: 0 0 8px;
padding: 5px 10px;
}

#startUploadLink:hover {
background-color: #4C4CA8;
background-image: linear-gradient(to bottom, #4C4CA8 0%, #5C5CB8 100%);
background: #4C4CA8 linear-gradient(to bottom, #4C4CA8 0%, #5C5CB8 100%);
border: 1px solid #448;
}

.disabled {
background-color: #DEDEDE !important;
background-image: none !important;
background: #DEDEDE none !important;
border: 1px solid #D0D0D0 !important;
color: #AAA;
cursor: default;
Expand Down Expand Up @@ -113,14 +109,8 @@ div.uploadValidationError img {

#swfuploadContent div.flash {
border-color: #D9E4FF;
-moz-border-radius-bottomleft: 5px;
-moz-border-radius-bottomright: 5px;
-moz-border-radius-topleft: 5px;
-moz-border-radius-topright: 5px;
-webkit-border-bottom-left-radius: 5px;
-webkit-border-bottom-right-radius: 5px;
-webkit-border-top-left-radius: 5px;
-webkit-border-top-right-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
height: 90px;
margin: 10px 0;
overflow: auto;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ div.licenseDisplay {
border-top: #D7D7D7 1px solid;
margin-bottom: 8px;
max-height: 180px;
overflow-x: hidden;
overflow-y: auto;
overflow: auto;
padding-bottom: 8px;
padding-top: 8px;
Expand Down
1 change: 0 additions & 1 deletion modules/packages/public/css/view/packages.view.project.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ div.applicationList a.applicationLink {

div.applicationList a.applicationLink:hover {
text-decoration: underline;
text-transform;
}

div.noApplications {
Expand Down
3 changes: 1 addition & 2 deletions modules/pvw/public/css/paraview/paraview.slice.css
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ img.visuLoading {
}

button.actionButton {
background-position: 2px 1px;
background-repeat: no-repeat;
background: no-repeat 2px 1px;
height: 25px;
width: 25px;
}
Expand Down
6 changes: 2 additions & 4 deletions modules/pvw/public/css/paraview/paraview.volume.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ table.extractSubgridTable input.sb {
}

button.cameraPreset {
background-position: 3px 3px;
background-repeat: no-repeat;
background: no-repeat 3px 3px;
border: 1px solid #AAA;
height: 32px;
margin-right: 10px;
Expand Down Expand Up @@ -80,8 +79,7 @@ input.scalarValueEdit, input.opacityValueEdit {
}

.scmColorPicker {
background-image: url(../../images/select2.png);
background-position: -3px -3px;
background: url(../../images/select2.png) -3px -3px;
cursor: pointer;
display: inline-block;
height: 30px;
Expand Down
4 changes: 0 additions & 4 deletions modules/remoteprocessing/public/css/job/job.init.css
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
/* MIDAS Server. Copyright Kitware SAS. Licensed under the Apache License 2.0. */

.optionWrapper, .nameWrapper {


border-radius: 6px;
-khtml-border-radius: 6px;
-moz-border-radius: 6px;
-webkit-border-radius: 6px;
border: #354856 1px solid;
border: 1px solid gray;
box-shadow: #666 0 0 5px;
-moz-box-shadow: 0 0 5px #666;
-webkit-box-shadow: #666 0 0 5px;
Expand All @@ -29,7 +26,6 @@
-moz-border-radius: 6px;
-webkit-border-radius: 6px;
border: #354856 1px solid;
border: 1px solid gray;
box-shadow: #666 0 0 5px;
-moz-box-shadow: 0 0 5px #666;
-webkit-box-shadow: #666 0 0 5px;
Expand Down
9 changes: 3 additions & 6 deletions modules/remoteprocessing/public/css/job/job.view.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@ table#tableResults, table#tableXml {
}

.dataTables_wrapper {
border: 1px solid gray;
border: #354856 1px solid;
border-radius: 6px;
-khtml-border-radius: 6px;
-moz-border-radius: 6px;
-webkit-border-radius: 6px;
-khtml-border-radius: 6px;
border-radius: 6px;
-webkit-box-shadow: #666 0 0 5px;
box-shadow: #666 0 0 5px;
-moz-box-shadow: 0 0 5px #666;
-webkit-box-shadow: #666 0 0 5px;
padding: 5px 10px 25px 10px;
}

Expand All @@ -31,7 +30,6 @@ table#tableResults td {
-moz-border-radius: 6px;
-webkit-border-radius: 6px;
border: #354856 1px solid;
border: 1px solid gray;
box-shadow: #666 0 0 5px;
-moz-box-shadow: 0 0 5px #666;
-webkit-box-shadow: #666 0 0 5px;
Expand All @@ -48,7 +46,6 @@ table#tableResults td {
-moz-border-radius: 6px;
-webkit-border-radius: 6px;
border: #354856 1px solid;
border: 1px solid gray;
box-shadow: #666 0 0 5px;
-moz-box-shadow: 0 0 5px #666;
-webkit-box-shadow: #666 0 0 5px;
Expand Down
3 changes: 1 addition & 2 deletions modules/sizequota/public/css/config/config.folder.css
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ form.quotaConfigForm div input[type=submit], input.globalButton, form.quotaConfi
}

form.quotaConfigForm input[type=submit]:hover, input.globalButton:hover {
background-image: none;
background: #CBD9E3;
background: #CBD9E3 none;
color: #1D5987;
text-decoration: none;
}
6 changes: 2 additions & 4 deletions modules/statistics/public/css/item/item.index.css
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,13 @@ input.filterButton {
}

input.filterButton:hover {
background-image: none;
background: #CBD9E3;
background: #CBD9E3 none;
color: #1D5987;
text-decoration: none;
}

input.filterButton[disabled] {
background-image: none;
background: #DBDBDB;
background: #DBDBDB none;
color: gray;
cursor: default;
text-decoration: none;
Expand Down
1 change: 0 additions & 1 deletion modules/tracker/public/css/producer/producer.list.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ div.producerList a.producerLink {

div.producerList a.producerLink:hover {
text-decoration: underline;
text-transform;
}

div.noProducers {
Expand Down
Loading

0 comments on commit ef911d2

Please sign in to comment.