Fix theming (close #714) and font-size for content (close #713)

t4t5 · Sep 8, 2017 · 419bf67 · 419bf67
1 parent 42f2ae8
commit 419bf67
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/docs/assets/sweetalert/sweetalert.min.js b/docs/assets/sweetalert/sweetalert.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sweetalert",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "A beautiful replacement for JavaScript's \"alert\"",
   "main": "dist/sweetalert.min.js",
   "scripts": {

diff --git a/src/css/buttons.css b/src/css/buttons.css
@@ -41,7 +41,7 @@
   padding: 10px 24px;
   margin: 0;
   cursor: pointer;
-  &:hover {
+  &[not:disabled]:hover {
     background-color: var(--swal-btn-confirm-hover);
   }
   &:active {
@@ -53,6 +53,10 @@
       0px 0px 0px 1px white, 
       0px 0px 0px 3px rgba(43, 114, 165, 0.29);
   }
+  &[disabled] {
+    opacity: 0.5;
+    cursor: default;
+  }
   /* Remove ugly dotted lines in FireFox: */
   &::-moz-focus-inner {
     border: 0;
@@ -61,7 +65,7 @@
   &--cancel {
     color: #555555;
     background-color: var(--swal-btn-cancel);
-    &:hover {
+    &[not:disabled]:hover {
       background-color: var(--swal-btn-cancel-hover);
     }
     &:active {
@@ -76,7 +80,7 @@
 
   &--danger {
     background-color: var(--swal-btn-danger);
-    &:hover {
+    &[not:disabled]:hover {
       background-color: var(--swal-btn-danger-hover);
     }
     &:active {

diff --git a/src/css/content.css b/src/css/content.css
@@ -1,6 +1,7 @@
 .swal-content {
   padding: 0 20px;
   margin-top: 20px;
+  font-size: initial;
 
   &:last-child {
     margin-bottom: 20px;

diff --git a/webpack.config.js b/webpack.config.js
@@ -65,9 +65,15 @@ module.exports = (_env, args) => {
           /* Use PostCSS */
           test: /\.css$/,
           use: [
-            'style-loader',
+            {
+              loader: 'style-loader',
+              options: {
+                insertAt: 'top',
+              },
+            },
             { 
-              loader: 'css-loader', options: { 
+              loader: 'css-loader', 
+              options: { 
                 importLoaders: 1 
               } 
             },