Skip to content

Commit

Permalink
Merge pull request #23 from DesignRevision/patch-2.0.1
Browse files Browse the repository at this point in the history
Patch 2.0.1
  • Loading branch information
hisk authored Feb 19, 2018
2 parents d908ad0 + abde651 commit 6990557
Show file tree
Hide file tree
Showing 19 changed files with 109 additions and 28 deletions.
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## 📦 2.0.1 - 2018-02-19

### Added
- Small dropdown menu modifier class.
- Small card modifier.

### Changed
- BS4 dependency import path.
- Fixed the package entrypoint path so Shards' JavaScript package could be imported as a module.
- Input group append/prepend z-index issue.

## 📦 2.0.0 - 2018-02-08

- Skipped minor version due to changes that break backward compatibility.
Expand Down Expand Up @@ -42,4 +53,4 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a


## [1.0.0] - 2017-11-07
- Initial release.
- Initial release.
4 changes: 2 additions & 2 deletions dist/agency-landing.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<!-- CSS Dependencies -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
<link rel="stylesheet" href="css/shards.min.css?version=2.0.0">
<link rel="stylesheet" href="css/shards-extras.min.css?version=2.0.0">
<link rel="stylesheet" href="css/shards.min.css?version=2.0.1">
<link rel="stylesheet" href="css/shards-extras.min.css?version=2.0.1">
</head>
<body class="shards-landing-page--1">
<!-- Welcome Section -->
Expand Down
4 changes: 2 additions & 2 deletions dist/app-promo.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<!-- CSS Dependencies -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
<link rel="stylesheet" href="css/shards.min.css?version=2.0.0">
<link rel="stylesheet" href="css/shards-extras.min.css?version=2.0.0">
<link rel="stylesheet" href="css/shards.min.css?version=2.0.1">
<link rel="stylesheet" href="css/shards-extras.min.css?version=2.0.1">
</head>
<body class="shards-app-promo-page--1">
<!-- Welcome Section -->
Expand Down
2 changes: 1 addition & 1 deletion dist/css/shards-demo.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/shards-extras.css.map

Large diffs are not rendered by default.

29 changes: 27 additions & 2 deletions dist/css/shards.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/shards.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/shards.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/shards.min.css.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/shards-demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm"
crossorigin="anonymous">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="css/shards.min.css?v=2.0.0">
<link rel="stylesheet" href="css/shards-demo.min.css?v=2.0.0">
<link rel="stylesheet" href="css/shards.min.css?v=2.0.1">
<link rel="stylesheet" href="css/shards-demo.min.css?v=2.0.1">
</head>

<body>
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "shards-ui",
"description": "A free, modern and lightweight Bootstrap 4 UI toolkit for web makers.",
"version": "2.0.0",
"main": "js/index.js",
"version": "2.0.1",
"main": "dist/js/shards",
"scripts": {
"start": "npm-run-all --parallel watch serve-dist",
"copy-html": "copyfiles -f src/extras/*.html dist",
Expand Down
4 changes: 2 additions & 2 deletions src/extras/agency-landing.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<!-- CSS Dependencies -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
<link rel="stylesheet" href="css/shards.min.css?version=2.0.0">
<link rel="stylesheet" href="css/shards-extras.min.css?version=2.0.0">
<link rel="stylesheet" href="css/shards.min.css?version=2.0.1">
<link rel="stylesheet" href="css/shards-extras.min.css?version=2.0.1">
</head>
<body class="shards-landing-page--1">
<!-- Welcome Section -->
Expand Down
4 changes: 2 additions & 2 deletions src/extras/app-promo.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<!-- CSS Dependencies -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
<link rel="stylesheet" href="css/shards.min.css?version=2.0.0">
<link rel="stylesheet" href="css/shards-extras.min.css?version=2.0.0">
<link rel="stylesheet" href="css/shards.min.css?version=2.0.1">
<link rel="stylesheet" href="css/shards-extras.min.css?version=2.0.1">
</head>
<body class="shards-app-promo-page--1">
<!-- Welcome Section -->
Expand Down
4 changes: 2 additions & 2 deletions src/extras/shards-demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm"
crossorigin="anonymous">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="css/shards.min.css?v=2.0.0">
<link rel="stylesheet" href="css/shards-demo.min.css?v=2.0.0">
<link rel="stylesheet" href="css/shards.min.css?v=2.0.1">
<link rel="stylesheet" href="css/shards-demo.min.css?v=2.0.1">
</head>

<body>
Expand Down
17 changes: 14 additions & 3 deletions src/scss/_card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
.card {
background-color: $card-bg;
border: none;

@include border-radius($card-border-radius);
@include box-shadow($card-box-shadow);

Expand Down Expand Up @@ -34,6 +34,17 @@
a:hover {
text-decoration: none;
}

// Small card modifier.
&-small {
.card-header,
.card-body,
.card-footer {
padding: $card-small-spacer-y $card-small-spacer-x;
}

box-shadow: $card-small-box-shadow;
}
}

.card-body {
Expand Down Expand Up @@ -180,7 +191,7 @@

> .card {
box-shadow: none;

// Handle rounded corners
@if $enable-rounded {
&:first-child {
Expand Down Expand Up @@ -232,4 +243,4 @@
column-count: $card-columns-count;
column-gap: $card-columns-gap;
}
}
}
15 changes: 15 additions & 0 deletions src/scss/_dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,21 @@
border: $dropdown-border-width solid $dropdown-border-color;
@include border-radius($dropdown-border-radius);
@include box-shadow($dropdown-box-shadow);

&-small {
@include box-shadow($dropdown-small-box-shadow);
padding: $dropdown-small-padding-y 0;
font-size: $dropdown-small-font-size;

.dropdown-item {
padding: $dropdown-small-item-padding-y $dropdown-small-item-padding-x;
font-size: $dropdown-small-item-font-size;
}

.dropdown-divider {
margin: $dropdown-small-divider-margin-y $dropdown-small-divider-margin-x;
}
}
}

.dropup .dropdown-menu {
Expand Down
2 changes: 1 addition & 1 deletion src/scss/_input-group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
position: absolute;
top: 0;
bottom: 0;
z-index: $zindex-sticky;
z-index: 4;

.input-group-text {
padding: $input-group-padding-y $input-group-padding-x;
Expand Down
19 changes: 19 additions & 0 deletions src/scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,19 @@ $dropdown-item-transition: background-color $transition-duration $ease-in-

$dropdown-header-color: $gray-600 !default;

// Small dropdowns
$dropdown-small-padding-y: .25rem !default;
$dropdown-small-font-size: 0.813rem !default;
$dropdown-small-box-shadow: 0 0.5rem 2rem rgba(0,0,0,.11), 0 3px 10px rgba(0,0,0,.05), 0 2px 3px rgba(0,0,0,.06) !default;

$dropdown-small-item-padding-y: 0.375rem !default;
$dropdown-small-item-padding-x: 0.875rem !default;

$dropdown-small-item-font-size: 0.813rem !default;

$dropdown-small-divider-margin-x: 0 !default;
$dropdown-small-divider-margin-y: 0.25rem !default;


// Z-index master list
//
Expand Down Expand Up @@ -679,6 +692,12 @@ $card-columns-count: 3 !default;
$card-columns-gap: 1.25rem !default;
$card-columns-margin: $card-spacer-y !default;

$card-small-spacer-y: 1rem !default;
$card-small-spacer-x: 1rem !default;
$card-small-box-shadow: 0 2px 0 rgba($blueish-grey, 0.11),
0 4px 8px rgba($blueish-grey, 0.12),
0 10px 10px rgba($blueish-grey, 0.06),
0 7px 70px rgba($blueish-grey, 0.1) !default;

// Tooltips

Expand Down
4 changes: 2 additions & 2 deletions src/scss/shards.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
* Shards v2.0.0 (https://designrevision.com/product/shards)
* Shards v2.0.1 (https://designrevision.com/downloads/shards/)
* Based on: Bootstrap v4.0.0 (final) (https://getbootstrap.com)
* Copyright 2017-* DesignRevision (https://designrevision.com)
* Copyright 2017-* Catalin Vasile (http://catalin.me)
*/

// Bootstrap 4 dependencies
@import "../../node_modules/bootstrap/scss/functions";
@import "node_modules/bootstrap/scss/functions";

// Core
@import "mixins";
Expand Down

0 comments on commit 6990557

Please sign in to comment.