upgraded to bootstrap 4.1

kol-ton · Apr 11, 2018 · 92b3569 · 92b3569
1 parent 40f2247
commit 92b3569
Show file tree

Hide file tree

Showing 9 changed files with 90 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,3 @@ Thumbs.db
 .DS_Store
 /node_modules/
 npm-debug.log
-test.html
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,10 @@
 # Release History
 
+## 1.0.6
+
+* Upgraded to Bootstrap 4.1.0
+* Added example.html
+
 ## 1.0.5
 
 * Upgraded to Bootstrap 4.0.0

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 Martin Haubek
+Copyright (c) 2017-18 Martin Haubek
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "bootstrap4c-buttons",
   "description": "Bootstrap 4 Component - Buttons",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "license": "MIT",
   "authors": [
     { "name": "Martin Haubek", "email": "[email protected]", "homepage": "https://haubek.github.io" }

diff --git a/dist/css/component-buttons.css b/dist/css/component-buttons.css
@@ -3,8 +3,8 @@
  *
  *
  * Bootstrap 4 Component - Buttons
- * Version: 1.0.5
- * Copyright (c) 2017 Martin Haubek
+ * Version: 1.0.6
+ * Copyright (c) 2017-18 Martin Haubek
  *
  *
  *

diff --git a/example.html b/example.html
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<html lang="en" class="h-100">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <title>Test</title>
+  <link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.1.0/css/bootstrap.min.css" rel="stylesheet">
+  <link href="dist/css/component-buttons.css" rel="stylesheet">
+</head>
+<body class="h-100">
+  <div class="container h-100">
+    <div class="d-flex align-items-start flex-column h-100">
+      <div class="w-100 m-auto py-5 text-center">
+
+
+<button type="button" class="btn btn-primary btn-pill">I'm a pill button</button>
+
+<hr>
+
+<div class="btn-group btn-group-toggle btn-group-pill" data-toggle="buttons">
+  <label class="btn btn-outline-secondary btn-switch-on active">
+    <input type="radio" name="options" id="on" autocomplete="off" checked> Start
+  </label>
+  <label class="btn btn-outline-secondary btn-switch-pause">
+    <input type="radio" name="options" id="pause" autocomplete="off"> Pause
+  </label>
+  <label class="btn btn-outline-secondary btn-switch-off">
+    <input type="radio" name="options" id="off" autocomplete="off"> Stop
+  </label>
+</div>
+
+<hr>
+
+<div class="bg-primary p-3">
+  <button type="button" class="btn btn-white">I'm a white button</button>
+  <button type="button" class="btn btn-outline-white">I'm a white outline button</button>
+</div>
+
+<hr>
+
+<div class="btn-toolbar btn-toolbar-row" role="toolbar" aria-label="A11Y">
+  <div class="btn-group btn-group-pill btn-group-xs-6 btn-group-md-reset" role="group" aria-label="A11Y">
+    <button type="button" class="btn btn-primary btn-block">Save</button>
+  </div>
+  <div class="btn-group btn-group-pill btn-group-xs-6 btn-group-md-reset" role="group" aria-label="A11Y">
+    <button type="button" class="btn btn-secondary btn-block">Cancel</button>
+  </div>
+</div>
+
+<hr>
+
+<div class="btn-toolbar btn-toolbar-row" role="toolbar" aria-label="a11y">
+  <div class="btn-group btn-group-xs-4 btn-group-lg-reset" role="group" aria-label="a11y">
+    <button type="button" class="btn btn-primary btn-block">Save</button>
+  </div>
+  <div class="btn-group btn-group-xs-4 btn-group-lg-reset" role="group" aria-label="a11y">
+    <button type="button" class="btn btn-secondary btn-block">Cancel</button>
+  </div>
+  <div class="btn-group btn-group-xs-4 btn-group-lg-reset pull-xs-right" role="group" aria-label="a11y">
+    <button type="button" class="btn btn-outline-danger btn-block">Delete</button>
+  </div>
+</div>
+
+
+      </div>
+    </div>
+  </div>
+  <script src="https://code.jquery.com/jquery-3.1.1.slim.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js"></script>
+  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.1.0/js/bootstrap.min.js"></script>
+</body>
+</html>
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bootstrap4c-buttons",
   "description": "Bootstrap 4 Component - Buttons",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "license": "MIT",
   "author": {
     "name": "Martin Haubek",
@@ -26,15 +26,16 @@
     "scss",
     "css"
   ],
-  "dependencies": {},
+  "dependencies": {
+    "bootstrap": "^4.0.0"
+  },
   "devDependencies": {
     "gulp": "^3.9.1",
     "gulp-autoprefixer": "^3.1.1",
     "gulp-clean-css": "^2.3.2",
     "gulp-plumber": "^1.0.1",
     "gulp-rename": "^1.2.2",
     "gulp-sass": "^2.1.0",
-    "gulp-strip-css-comments": "^1.2.0",
-    "bootstrap": "^4.0.0"
+    "gulp-strip-css-comments": "^1.2.0"
   }
 }
diff --git a/src/scss/build.scss b/src/scss/build.scss
@@ -3,8 +3,8 @@
  *
  *
  * Bootstrap 4 Component - Buttons
- * Version: 1.0.5
- * Copyright (c) 2017 Martin Haubek
+ * Version: 1.0.6
+ * Copyright (c) 2017-18 Martin Haubek
  *
  *
  *

diff --git a/yarn.lock b/yarn.lock
@@ -203,8 +203,8 @@ [email protected]:
     hoek "4.x.x"
 
 bootstrap@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.0.0.tgz#ceb03842c145fcc1b9b4e15da2a05656ba68469a"
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.0.tgz#110b05c31a236d56dbc9adcda6dd16f53738a28a"
 
 brace-expansion@^1.0.0, brace-expansion@^1.1.7:
   version "1.1.11"