fixes invisible close buttons, closes thomaspark#272

Serle66 · Jul 2, 2014 · 655f3e5 · 655f3e5
1 parent 6921252
commit 655f3e5
Show file tree

Hide file tree

Showing 23 changed files with 263 additions and 152 deletions.
diff --git a/cosmo/bootstrap.css b/cosmo/bootstrap.css
@@ -5329,14 +5329,14 @@ a.list-group-item-danger.active:focus {
   font-size: 22.5px;
   font-weight: bold;
   line-height: 1;
-  color: #000000;
+  color: #ffffff;
   text-shadow: 0 1px 0 #ffffff;
   opacity: 0.2;
   filter: alpha(opacity=20);
 }
 .close:hover,
 .close:focus {
-  color: #000000;
+  color: #ffffff;
   text-decoration: none;
   cursor: pointer;
   opacity: 0.5;
@@ -5389,7 +5389,7 @@ button.close {
   position: relative;
   background-color: #ffffff;
   border: 1px solid #999999;
-  border: 1px solid rgba(0, 0, 0, 0.2);
+  border: 1px solid transparent;
   border-radius: 0;
   -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
   box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
@@ -6260,23 +6260,22 @@ table .info a,
 .dropdown-menu > li > a:focus {
   background-image: none;
 }
-.alert {
-  border: none;
-}
-.alert .alert-link {
-  text-decoration: underline;
-  color: #fff;
-}
 .close {
-  color: #fff;
   text-decoration: none;
+  text-shadow: none;
   opacity: 0.4;
 }
 .close:hover,
 .close:focus {
-  color: #fff;
   opacity: 1;
 }
+.alert {
+  border: none;
+}
+.alert .alert-link {
+  text-decoration: underline;
+  color: #fff;
+}
 .label {
   border-radius: 0;
 }
@@ -6294,3 +6293,17 @@ table .info a,
   border-top-right-radius: 0;
   border-top-left-radius: 0;
 }
+.panel-default .close {
+  color: #333333;
+}
+.modal-content {
+  border: none;
+}
+.modal-header {
+  background-color: #222222;
+  color: #fff;
+}
+.modal-body .close,
+.modal-footer .close {
+  color: #333333;
+}
diff --git a/cosmo/bootstrap.min.css b/cosmo/bootstrap.min.css
diff --git a/cosmo/bootswatch.less b/cosmo/bootswatch.less
@@ -135,27 +135,26 @@ table,
 
 // Indicators =================================================================
 
-.alert {
-  border: none;
-
-  .alert-link {
-    text-decoration: underline;
-    color: #fff;
-  }
-}
-
 .close {
-  color: #fff;
   text-decoration: none;
+  text-shadow: none;
   opacity: 0.4;
 
   &:hover,
   &:focus {
-    color: #fff;
     opacity: 1;
   }
 }
 
+.alert {
+  border: none;
+
+  .alert-link {
+    text-decoration: underline;
+    color: #fff;
+  }
+}
+
 .label {
   border-radius: 0;
 }
@@ -179,4 +178,29 @@ table,
     border-top-right-radius: 0;
     border-top-left-radius: 0;
   }
+
+  &-default {
+    .close {
+      color: @text-color;
+    }
+  }
+}
+
+.modal {
+
+  &-content {
+    border: none;
+  }
+
+  &-header {
+    background-color: @navbar-default-bg;
+    color: #fff;
+  }
+
+  &-body,
+  &-footer {
+    .close {
+      color: @text-color;
+    }
+  }
 }
diff --git a/cosmo/variables.less b/cosmo/variables.less
@@ -577,7 +577,7 @@
 //** Background color of modal content area
 @modal-content-bg:                             #fff;
 //** Modal content border color
-@modal-content-border-color:                   rgba(0,0,0,.2);
+@modal-content-border-color:                   transparent;
 //** Modal content border color **for IE8**
 @modal-content-fallback-border-color:          #999;
 
@@ -798,7 +798,7 @@
 //##
 
 @close-font-weight:           bold;
-@close-color:                 #000;
+@close-color:                 #fff;
 @close-text-shadow:           0 1px 0 #fff;
 
 

diff --git a/darkly/bootstrap.css b/darkly/bootstrap.css
@@ -5329,14 +5329,14 @@ a.list-group-item-danger.active:focus {
   font-size: 22.5px;
   font-weight: bold;
   line-height: 1;
-  color: #000000;
+  color: #ffffff;
   text-shadow: none;
   opacity: 0.2;
   filter: alpha(opacity=20);
 }
 .close:hover,
 .close:focus {
-  color: #000000;
+  color: #ffffff;
   text-decoration: none;
   cursor: pointer;
   opacity: 0.5;
@@ -6364,14 +6364,19 @@ textarea:focus {
 .breadcrumb a {
   color: #fff;
 }
-.alert a,
+.close {
+  text-decoration: none;
+  text-shadow: none;
+  opacity: 0.4;
+}
+.close:hover,
+.close:focus {
+  opacity: 1;
+}
 .alert .alert-link {
   color: #fff;
   text-decoration: underline;
 }
-.alert .close {
-  text-decoration: none;
-}
 .progress {
   height: 10px;
   -webkit-box-shadow: none;
@@ -6385,10 +6390,15 @@ textarea:focus {
   -webkit-box-shadow: none;
   box-shadow: none;
 }
-.popover,
 .modal {
   color: #ffffff;
 }
+.modal-header {
+  background-color: #375a7f;
+}
+.popover {
+  color: #ffffff;
+}
 .panel-default > .panel-heading {
   background-color: #464545;
 }
diff --git a/darkly/bootstrap.min.css b/darkly/bootstrap.min.css
diff --git a/darkly/bootswatch.less b/darkly/bootswatch.less
@@ -238,17 +238,22 @@ textarea {
 
 // Indicators =================================================================
 
-.alert {
+.close {
+  text-decoration: none;
+  text-shadow: none;
+  opacity: 0.4;
 
-  a,
+  &:hover,
+  &:focus {
+    opacity: 1;
+  }
+}
+
+.alert {
   .alert-link {
     color: #fff;
     text-decoration: underline;
   }
-
-  .close {
-    text-decoration: none;
-  }
 }
 
 // Progress bars ==============================================================
@@ -268,9 +273,16 @@ textarea {
   .box-shadow(none);
 }
 
-.popover,
 .modal {
   color: @text-color;
+
+  &-header {
+    background-color: @navbar-default-bg;
+  }
+}
+
+.popover {
+  color: @text-color;
 }
 
 .panel-default > .panel-heading {

diff --git a/darkly/variables.less b/darkly/variables.less
@@ -798,7 +798,7 @@
 //##
 
 @close-font-weight:           bold;
-@close-color:                 #000;
+@close-color:                 #fff;
 @close-text-shadow:           none;
 
 

diff --git a/flatly/bootstrap.css b/flatly/bootstrap.css
@@ -6339,14 +6339,6 @@ input:focus {
 .pager .disabled > span {
   background-color: #3be6c4;
 }
-.alert a,
-.alert .alert-link {
-  color: #fff;
-  text-decoration: underline;
-}
-.alert .close {
-  text-decoration: none;
-}
 .close {
   color: #fff;
   text-decoration: none;
@@ -6357,6 +6349,10 @@ input:focus {
   color: #fff;
   opacity: 1;
 }
+.alert .alert-link {
+  color: #fff;
+  text-decoration: underline;
+}
 .progress {
   height: 10px;
   -webkit-box-shadow: none;
@@ -6370,3 +6366,14 @@ input:focus {
   -webkit-box-shadow: none;
   box-shadow: none;
 }
+.panel-default .close {
+  color: #2c3e50;
+}
+.modal-header {
+  background-color: #2c3e50;
+  color: #fff;
+}
+.modal-body .close,
+.modal-footer .close {
+  color: #2c3e50;
+}
diff --git a/flatly/bootstrap.min.css b/flatly/bootstrap.min.css
diff --git a/flatly/bootswatch.less b/flatly/bootswatch.less
@@ -209,19 +209,6 @@ input, {
 
 // Indicators =================================================================
 
-.alert {
-
-  a,
-  .alert-link {
-    color: #fff;
-    text-decoration: underline;
-  }
-
-  .close {
-    text-decoration: none;
-  }
-}
-
 .close {
   color: #fff;
   text-decoration: none;
@@ -234,6 +221,14 @@ input, {
   }
 }
 
+.alert {
+
+  .alert-link {
+    color: #fff;
+    text-decoration: underline;
+  }
+}
+
 // Progress bars ==============================================================
 
 .progress {
@@ -250,3 +245,25 @@ input, {
 .well {
   .box-shadow(none);
 }
+
+.panel {
+  &-default {
+    .close {
+      color: @text-color;
+    }
+  }
+}
+
+.modal {
+  &-header {
+    background-color: @navbar-default-bg;
+    color: #fff;
+  }
+
+  &-body,
+  &-footer {
+    .close {
+      color: @text-color;
+    }
+  }
+}