Skip to content

Commit

Permalink
Address review comments.
Browse files Browse the repository at this point in the history
Use the more specific "background-color" instead of "background" where applicable.
  • Loading branch information
itsjeyd committed Jan 14, 2016
1 parent a80ee8f commit fc063d9
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
16 changes: 8 additions & 8 deletions drag_and_drop_v2/public/css/drag_and_drop.css
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
.xblock--drag-and-drop .drag-container {
width: auto;
padding: 1%;
background: #ebf0f2;
background-color: #ebf0f2;
}

/*** DRAGGABLE ITEMS ***/
Expand Down Expand Up @@ -166,12 +166,12 @@
}

.xblock--drag-and-drop .drag-container .option .numerical-input.correct .input {
background: #ceffce;
background-color: #ceffce;
color: #087108;
}

.xblock--drag-and-drop .drag-container .option .numerical-input.incorrect .input {
background: #ffcece;
background-color: #ffcece;
color: #ad0d0d;
}

Expand All @@ -190,7 +190,7 @@
height: auto;
position: relative;
margin-top: 1%;
background: #fff;
background-color: #fff;
}

.xblock--drag-and-drop .target-img-wrapper {
Expand Down Expand Up @@ -274,7 +274,7 @@
top: 5%;
right: 5%;
border: 1px solid #fff;
background: none repeat scroll 0 0 rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.8);
width: 500px;
max-width: 90%;
min-height: 50px;
Expand Down Expand Up @@ -325,7 +325,7 @@
left: 0;
width: 100%;
height: 100%;
background: #000;
background-color: #000;
opacity: 0.5;
z-index: 1500;
}
Expand All @@ -349,7 +349,7 @@

.xblock--drag-and-drop .modal-content {
border-radius: 5px;
background: #ffffff;
background-color: #ffffff;
margin-bottom: 5px;
padding: 5px;
}
Expand Down Expand Up @@ -379,6 +379,6 @@
padding: 0;
position: absolute;
width: 1px;
background: #ffffff;
background-color: #ffffff;
color: #000000;
}
20 changes: 10 additions & 10 deletions drag_and_drop_v2/public/css/drag_and_drop_edit.css
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@

.xblock--drag-and-drop--editor .tab {
width: 100%;
background: #eee;
background-color: #eee;
padding: 3px 0;
position: relative;
}
Expand Down Expand Up @@ -177,7 +177,7 @@
}

.xblock--drag-and-drop--editor .items-form .item {
background: #8fcaec;
background-color: #8fcaec;
padding: 10px 0 1px;
margin: 15px 0;
}
Expand Down Expand Up @@ -219,7 +219,7 @@

/** Buttons **/
.xblock--drag-and-drop--editor .btn {
background: #1d5280;
background-color: #1d5280;
color: #fff;
border: 1px solid #156ab4;
border-radius: 6px;
Expand Down Expand Up @@ -257,7 +257,7 @@
width: 14px;
height: 14px;
border-radius: 7px;
background: #1d5280;
background-color: #1d5280;
position: relative;
float: left;
margin: 0 5px 0 0;
Expand All @@ -274,7 +274,7 @@
content: '';
height: 10px;
width: 2px;
background: #fff;
background-color: #fff;
position: relative;
display: inline;
float: left;
Expand All @@ -286,7 +286,7 @@
content: '';
height: 2px;
width: 10px;
background: #fff;
background-color: #fff;
position: relative;
display: inline;
float: left;
Expand All @@ -298,7 +298,7 @@
content: '';
height: 10px;
width: 2px;
background: #fff;
background-color: #fff;
position: relative;
display: inline;
float: left;
Expand All @@ -313,7 +313,7 @@
content: '';
height: 2px;
width: 10px;
background: #fff;
background-color: #fff;
position: relative;
display: inline;
float: left;
Expand All @@ -325,10 +325,10 @@
}

.xblock--drag-and-drop--editor .remove-item .icon.remove {
background: #fff;
background-color: #fff;
color: #0072a7; /* Override default color from Studio to ensure contrast is large enough */
}
.xblock--drag-and-drop--editor .remove-item .icon.remove:before,
.xblock--drag-and-drop--editor .remove-item .icon.remove:after {
background: #1d5280;
background-color: #1d5280;
}
12 changes: 6 additions & 6 deletions drag_and_drop_v2/public/themes/apros.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.themed-xblock.xblock--drag-and-drop {
background: #fff;
background-color: #fff;
}

/* Shared styles used in header and footer */
Expand All @@ -14,7 +14,7 @@
/* drag-container holds the .item-bank and the .target */

.themed-xblock.xblock--drag-and-drop .drag-container {
background: #ebf0f2;
background-color: #ebf0f2;
}

.themed-xblock.xblock--drag-and-drop .item-bank {
Expand All @@ -32,12 +32,12 @@
}

.themed-xblock.xblock--drag-and-drop .drag-container .option .numerical-input.correct .input {
background: #ceffce;
background-color: #ceffce;
color: #087108;
}

.themed-xblock.xblock--drag-and-drop .drag-container .option .numerical-input.incorrect .input {
background: #ffcece;
background-color: #ffcece;
color: #ad0d0d;
}

Expand All @@ -48,7 +48,7 @@
/*** DROP TARGET ***/

.themed-xblock.xblock--drag-and-drop .target {
background: #fff;
background-color: #fff;
}

.themed-xblock.xblock--drag-and-drop .zone p {
Expand All @@ -66,7 +66,7 @@
}

.themed-xblock.xblock--drag-and-drop .popup {
background: none repeat scroll 0 0 #66a5b5;
background-color: #66a5b5;
}

.themed-xblock.xblock--drag-and-drop .popup .popup-content {
Expand Down

0 comments on commit fc063d9

Please sign in to comment.