aboutsummaryrefslogtreecommitdiff
path: root/docs/4.0/examples
diff options
context:
space:
mode:
authorGijs Boddeus <[email protected]>2017-10-15 11:55:02 +0200
committerGitHub <[email protected]>2017-10-15 11:55:02 +0200
commit98778164e04c581bfedab72a9a09b6525261c860 (patch)
tree10fe8118ce2dbecdb29c2215b4caba8d7f8ffc87 /docs/4.0/examples
parent8f483dc4322cc12849eda65246edfb47b5aaad0b (diff)
parent3ccb7ef16ad2fa858c767128a5414a0b1bd7fa30 (diff)
downloadbootstrap-98778164e04c581bfedab72a9a09b6525261c860.tar.xz
bootstrap-98778164e04c581bfedab72a9a09b6525261c860.zip
Merge branch 'v4-dev' into yiq-function-update
Diffstat (limited to 'docs/4.0/examples')
-rw-r--r--docs/4.0/examples/.stylelintrc12
-rw-r--r--docs/4.0/examples/blog/blog.css18
-rw-r--r--docs/4.0/examples/dashboard/dashboard.css8
3 files changed, 25 insertions, 13 deletions
diff --git a/docs/4.0/examples/.stylelintrc b/docs/4.0/examples/.stylelintrc
new file mode 100644
index 000000000..44cf7c0e0
--- /dev/null
+++ b/docs/4.0/examples/.stylelintrc
@@ -0,0 +1,12 @@
+{
+ "extends": "../../../build/.stylelintrc",
+ "rules": {
+ "at-rule-no-vendor-prefix": null,
+ "comment-empty-line-before": null,
+ "media-feature-name-no-vendor-prefix": null,
+ "property-no-vendor-prefix": null,
+ "selector-no-qualifying-type": null,
+ "selector-no-vendor-prefix": null,
+ "value-no-vendor-prefix": null
+ }
+}
diff --git a/docs/4.0/examples/blog/blog.css b/docs/4.0/examples/blog/blog.css
index 6eda0a7b1..0f319ec92 100644
--- a/docs/4.0/examples/blog/blog.css
+++ b/docs/4.0/examples/blog/blog.css
@@ -13,12 +13,18 @@ body {
color: #555;
}
-h1, .h1,
-h2, .h2,
-h3, .h3,
-h4, .h4,
-h5, .h5,
-h6, .h6 {
+h1,
+.h1,
+h2,
+.h2,
+h3,
+.h3,
+h4,
+.h4,
+h5,
+.h5,
+h6,
+.h6 {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 400;
color: #333;
diff --git a/docs/4.0/examples/dashboard/dashboard.css b/docs/4.0/examples/dashboard/dashboard.css
index a59005148..ca7135b08 100644
--- a/docs/4.0/examples/dashboard/dashboard.css
+++ b/docs/4.0/examples/dashboard/dashboard.css
@@ -27,18 +27,12 @@ h1 {
bottom: 0;
left: 0;
z-index: 1000;
- padding: 20px;
+ padding: 20px 0;
overflow-x: hidden;
overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
border-right: 1px solid #eee;
}
-/* Sidebar navigation */
-.sidebar {
- padding-right: 0;
- padding-left: 0;
-}
-
.sidebar .nav {
margin-bottom: 20px;
}