Merge branch 'master' of https://github.com/creativetimofficial/argon…

…-design-system

README.md

@@ -68,6 +68,7 @@
 <h2 id="download-and-installation">Download and Installation</h2>
 
 <ul>
+<<<<<<< HEAD
   <li><a href="https://github.com/creativetimofficial/argon-design-system/archive/master.zip">Download from Github</a></li>
   <li>
     <p><a href="https://www.creative-tim.com/product/argon-design-system">Download from Creative Tim</a></p>
@@ -85,6 +86,15 @@
     <p>Install with Npm: <code class="highlighter-rouge">npm i argon-design-system-free</code></p>
   </li>
   <li>Install with Yarn: <code class="highlighter-rouge">yarn add argon-design-system-free</code></li>
+=======
+  <li>Install with npm: <code class="highlighter-rouge">npm i argon-design-system-free</code></li>
+  <li>Install with Yarn: <code class="highlighter-rouge">yarn add argon-design-system-free</code></li>
+  <li>Install with Bower: <code class="highlighter-rouge">bower install argon-design-system</code></li>
+  <li><a href="https://github.com/creativetimofficial/argon-design-system/archive/master.zip">Download from Github</a>.</li>
+  <li><a href="https://www.creative-tim.com/product/argon-design-system">Download from Creative Tim</a>.</li>
+  <li>Clone the repo: <code class="highlighter-rouge">git clone https://github.com/creativetimofficial/argon-design-system.git</code>.</li>
+
+>>>>>>> 5803185ba70fac5510e1580c57fed28f665dc56f
 </ul>
 
 <h2 id="documentation">Documentation</h2>

bower.json

@@ -0,0 +1,25 @@
+{
+  "name": "argon-design-system-free",
+  "homepage": "https://demos.creative-tim.com/argon-design-system/index.html",
+  "authors": [
+    "creative-tim"
+  ],
+  "description": "A beautiful Design System for Bootstrap 4. It's Free and Open Source.",
+  "main": "gulpfile.js",
+  "keywords": [
+    "argon",
+    "system design",
+    "bootstrap",
+    "design",
+    "google",
+    "twitter"
+  ],
+  "license": "Creative TIM License",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ]
+}

composer.json

@@ -0,0 +1,13 @@
+{
+    "name": "creativetimofficial/argon-design-system",
+    "description": "A beautiful Design System for Bootstrap 4. It's Free and Open Source.",
+    "type": "project",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Creative Tim",
+            "email": "[email protected]"
+        }
+    ],
+    "require": {}
+}

package.json

@@ -1,9 +1,9 @@
 {
-  "name": "argon-design-system",
+  "name": "argon-design-system-free",
   "version": "1.0.0",
   "description": "A beautiful Design System for Bootstrap 4. It's Free and Open Source.",
   "main": "gulpfile.js",
-  "author": "Creative Tim",
+  "author": "Creative Tim <[email protected]> (https://www.creative-tim.com/)",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
@@ -33,6 +33,14 @@
     "pump": "^3.0.0",
     "run-sequence": "^2.2.1"
   },
-  "repository": "https://github.com/creativetimofficial/argon-design-system",
-  "license": "MIT"
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/creativetimofficial/argon-design-system/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/creativetimofficial/argon-design-system.git"
+  },
+  "license": "MIT",
+  "homepage": "http://demos.creative-tim.com/argon-design-system/index.html"
 }