Permalink
Browse files

BUG: File Uploading Notifications (fixes #7883)

Put "File upload complete" and "back to folder" together. Turned 'File
upload' into a message, and updated the message styles.
Moved allowed file types into the area where users are uploading files.
This is a temporary fix until js tooltips are implemented, at which
point, these details will be shown when clicking a question mark beside
"Choose files".
Added small animation effect to files when opening iframe to edit. Now
slides down, rather than just appearing open
Linked to silverstripe/silverstripe-cms#223
  • Loading branch information...
1 parent 43cd54b commit 2dabaebad8f202f014a1f700480959721b53e382 @adrexia adrexia committed Nov 1, 2012
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -436,35 +436,34 @@ body.cms {
clear: both;
margin: 0 0 $grid-y 0;
padding: $grid-y - 1 $grid-x - 1;
- font-weight: bold;
-
- border: 1px black solid;
-
+ font-weight: bold;
+ border: 1px #ccc solid;
+ background:#fff; //for browsers that don't understand rgba
+ background:rgba(#fff,0.5);
+ @include border-radius(3px 3px 3px 3px);
&.notice {
- background-color: lighten($color-notice, 20%);
- border-color: $color-notice;
-
+ background: $color-notice;
+ border-color: darken(adjust-hue($color-notice, -10), 7%);
a {
color: #999;
}
- }
-
+ }
&.warning {
background-color: lighten($color-warning, 20%);
border-color: $color-warning;
}
&.error, &.bad, &.required, &.validation {
- background-color: lighten($color-error, 20%);
- border-color: $color-error;
- }
-
+ background: lighten($color-error, 43%);//for browsers that don't understand rgba
+ background: rgba(lighten($color-error, 40%), 0.5);
+ border-color: lighten(adjust-hue($color-error, -10), 38%);
+ color:$color-error;
+ }
&.good {
- background-color: $color-good;//for browsers that don't understand rgba
- background-color: rgba($color-good,0.7);
+ background: $color-good;//for browsers that don't understand rgba
+ background: rgba($color-good,0.7);
border-color: $color-good;
- color:#fff;
- @include text-shadow(1px -1px 0 $color-button-constructive);
- @include border-radius(3px 3px 3px 3px);
+ color:#fff;
+ @include text-shadow(1px -1px 0 $color-button-constructive);
a {
text-shadow:none;
}
@@ -521,7 +520,7 @@ body.cms {
padding-top:5px; //aligns label with point of arrow
font-weight:bold; //to match pagetype label
@include text-shadow(1px 1px 0 $color-text-shadow);
- }
+ }
}
ul.SelectionGroup {
padding-left:28px;
@@ -1709,10 +1708,10 @@ body.cms-dialog {
.title {
height: 26px - 2*4px; // minus padding
padding: 4px;
- }
-
+ }
}
+
/** --------------------------------------------
* Item Edit Form
* -------------------------------------------- */
@@ -1881,12 +1880,10 @@ form.import-form {
.ss-uploadfield-item-edit-all .ui-button-text{
padding-right:0;
}
-
-
.toggle-details-icon {
background: sprite($sprites32, menu-arrow-down) no-repeat;
- .fileOverview &{
+ .ss-uploadfield-item-edit-all &{
background: sprite($sprites32, menu-arrow-deselected-down) no-repeat;
display:inline-block;
width:8px;
@@ -1896,7 +1893,7 @@ form.import-form {
&.opened {
background: sprite($sprites32, menu-arrow-up) no-repeat;
- .fileOverview &{
+ .ss-uploadfield-item-edit-all &{
background: sprite($sprites32, menu-arrow-deselected-up) no-repeat;
}
}
@@ -55,8 +55,8 @@ $color-button-destructive: #f00 !default;
$color-button-disabled: #eeeded !default;
$color-warning: #FF9300 !default;
-$color-error: #FF9300 !default;
-$color-notice: #FF9300 !default;
+$color-error: #b94a48 !default;
+$color-notice: #d9edf7 !default;
$color-good: #65A839 !default;
$color-cms-batchactions-menu-background: #f5f5f5 !default;
Oops, something went wrong.

0 comments on commit 2dabaeb

Please sign in to comment.