update the modals and alert-messages to use the same .close styles, save for some positioning in the modal after knocking down the modal padding

This commit is contained in:
Mark Otto
2011-09-08 23:01:28 -07:00
parent c474f996a9
commit ba08055a7b
6 changed files with 130 additions and 85 deletions

View File

@@ -553,15 +553,34 @@ input[type=submit].btn {
}
// CLOSE ICONS
// -----------
.close {
float: right;
color: @black;
font-size: 20px;
font-weight: bold;
line-height: @baseline * .75;
text-shadow: 0 1px 0 rgba(255,255,255,1);
.opacity(20);
&:hover {
color: @black;
text-decoration: none;
.opacity(40);
}
}
// ERROR STYLES
// ------------
// Base alert styles
.alert-message {
.gradientBar(#fceec1, #eedc94); // warning by default
position: relative;
padding: 7px 15px;
margin-bottom: @baseline;
padding: 7px 14px;
color: @grayDark;
.gradientBar(#fceec1, #eedc94); // warning by default
text-shadow: 0 1px 0 rgba(255,255,255,.5);
border-width: 1px;
border-style: solid;
@@ -584,20 +603,6 @@ input[type=submit].btn {
// Provide actions with buttons
.box-shadow(0 1px 0 rgba(255,255,255,.25));
}
.close {
float: right;
margin-top: -2px;
color: @black;
font-size: 20px;
font-weight: bold;
text-shadow: 0 1px 0 rgba(255,255,255,1);
.opacity(20);
&:hover {
color: @black;
text-decoration: none;
.opacity(40);
}
}
&.block-message {
background-image: none;
@@ -731,25 +736,20 @@ input[type=submit].btn {
.border-radius(6px);
.box-shadow(0 3px 7px rgba(0,0,0,0.3));
.background-clip(padding-box);
.close {
margin-top: 7px;
}
}
.modal-header {
border-bottom: 1px solid #eee;
padding: 5px 20px;
.close {
position: absolute;
right: 10px;
top: 10px;
color: #999;
line-height:10px;
font-size: 18px;
}
padding: 5px 15px;
}
.modal-body {
padding: 20px;
padding: 15px;
}
.modal-footer {
background-color: #f5f5f5;
padding: 14px 20px 15px;
padding: 14px 15px 15px;
border-top: 1px solid #ddd;
.border-radius(0 0 6px 6px);
.box-shadow(inset 0 1px 0 #fff);

View File

@@ -11,23 +11,43 @@ table {
width: 100%;
margin-bottom: @baseline;
padding: 0;
border-collapse: collapse;
border-collapse: separate;
font-size: @basefont;
border: 1px solid #ddd;
.border-radius(4px);
th, td {
padding: 10px 10px 9px;
line-height: @baseline;
text-align: left;
border: 1px solid #ddd;
}
th {
padding-top: 9px;
font-weight: bold;
vertical-align: middle;
border-bottom-width: 2px;
border-bottom: 1px solid #ddd;
}
td {
vertical-align: top;
}
th + th,
td + td {
border-left: 1px solid #ddd;
}
tr + tr td {
border-top: 1px solid #ddd;
}
tbody tr:first-child td:first-child {
.border-radius(4px 0 0 0);
}
tbody tr:first-child td:last-child {
.border-radius(0 4px 0 0);
}
tbody tr:last-child td:first-child {
.border-radius(0 0 0 4px);
}
tbody tr:last-child td:last-child {
.border-radius(0 0 4px 0);
}
}
@@ -63,7 +83,6 @@ table {
.headerSortDown {
background-color: rgba(141,192,219,.25);
text-shadow: 0 1px 1px rgba(255,255,255,.75);
.border-radius(3px 3px 0 0);
}
// Style the ascending (reverse alphabetical) column header
.header:hover {

View File

@@ -122,7 +122,6 @@ hr {
strong {
font-style: inherit;
font-weight: bold;
line-height: inherit;
}
em {
font-style: italic;