aboutsummaryrefslogtreecommitdiff
path: root/assets
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-08-07 21:35:43 -0700
committerMark Otto <[email protected]>2017-08-07 21:35:43 -0700
commitda3185ee0a3957627d918956c9c2266cfa2d3029 (patch)
treeb35195d019d1110ea93c60151f1852888ebbb872 /assets
parent92c26af81481e9fdcd9bcff7e477d0750a359979 (diff)
downloadbootstrap-da3185ee0a3957627d918956c9c2266cfa2d3029.tar.xz
bootstrap-da3185ee0a3957627d918956c9c2266cfa2d3029.zip
new homepage, new assets, clean out old stuff
Diffstat (limited to 'assets')
-rw-r--r--assets/img/bootstrap-stack.pngbin0 -> 138403 bytes
-rw-r--r--assets/img/bootstrap-themes.pngbin0 -> 225111 bytes
-rw-r--r--assets/img/bs-themes.pngbin178413 -> 0 bytes
-rw-r--r--assets/img/components.pngbin2926 -> 0 bytes
-rw-r--r--assets/img/devices.pngbin3307 -> 0 bytes
-rw-r--r--assets/img/expo-lyft.jpgbin159269 -> 0 bytes
-rw-r--r--assets/img/expo-newsweek.jpgbin201643 -> 0 bytes
-rw-r--r--assets/img/expo-riot.jpgbin161711 -> 0 bytes
-rw-r--r--assets/img/expo-vogue.jpgbin198620 -> 0 bytes
-rw-r--r--assets/img/sass.pngbin11365 -> 0 bytes
-rw-r--r--assets/scss/_ads.scss45
-rw-r--r--assets/scss/_content.scss3
-rw-r--r--assets/scss/_featurettes.scss84
-rw-r--r--assets/scss/_footer.scss2
-rw-r--r--assets/scss/_masthead.scss71
-rw-r--r--assets/scss/_sidebar.scss2
-rw-r--r--assets/scss/docs.scss1
17 files changed, 35 insertions, 173 deletions
diff --git a/assets/img/bootstrap-stack.png b/assets/img/bootstrap-stack.png
new file mode 100644
index 000000000..4d7060b8f
--- /dev/null
+++ b/assets/img/bootstrap-stack.png
Binary files differ
diff --git a/assets/img/bootstrap-themes.png b/assets/img/bootstrap-themes.png
new file mode 100644
index 000000000..3ab3123eb
--- /dev/null
+++ b/assets/img/bootstrap-themes.png
Binary files differ
diff --git a/assets/img/bs-themes.png b/assets/img/bs-themes.png
deleted file mode 100644
index cf1f20f57..000000000
--- a/assets/img/bs-themes.png
+++ /dev/null
Binary files differ
diff --git a/assets/img/components.png b/assets/img/components.png
deleted file mode 100644
index b544d4306..000000000
--- a/assets/img/components.png
+++ /dev/null
Binary files differ
diff --git a/assets/img/devices.png b/assets/img/devices.png
deleted file mode 100644
index 41c157286..000000000
--- a/assets/img/devices.png
+++ /dev/null
Binary files differ
diff --git a/assets/img/expo-lyft.jpg b/assets/img/expo-lyft.jpg
deleted file mode 100644
index 763db8208..000000000
--- a/assets/img/expo-lyft.jpg
+++ /dev/null
Binary files differ
diff --git a/assets/img/expo-newsweek.jpg b/assets/img/expo-newsweek.jpg
deleted file mode 100644
index bcecdea51..000000000
--- a/assets/img/expo-newsweek.jpg
+++ /dev/null
Binary files differ
diff --git a/assets/img/expo-riot.jpg b/assets/img/expo-riot.jpg
deleted file mode 100644
index e9c6bd1ab..000000000
--- a/assets/img/expo-riot.jpg
+++ /dev/null
Binary files differ
diff --git a/assets/img/expo-vogue.jpg b/assets/img/expo-vogue.jpg
deleted file mode 100644
index 324f81849..000000000
--- a/assets/img/expo-vogue.jpg
+++ /dev/null
Binary files differ
diff --git a/assets/img/sass.png b/assets/img/sass.png
deleted file mode 100644
index b67c81649..000000000
--- a/assets/img/sass.png
+++ /dev/null
Binary files differ
diff --git a/assets/scss/_ads.scss b/assets/scss/_ads.scss
index efb91e565..11fdc6959 100644
--- a/assets/scss/_ads.scss
+++ b/assets/scss/_ads.scss
@@ -5,38 +5,26 @@
//
#carbonads {
+ position: static;
display: block;
+ max-width: 400px;
padding: 15px 15px 15px 160px;
- margin: 50px -15px 0;
+ margin: 2rem 0;
overflow: hidden;
font-size: 13px;
- line-height: 1.5;
+ line-height: 1.4;
text-align: left;
- border: solid #866ab3;
- border-width: 1px 0 0;
+ background-color: rgba(0,0,0,.05);
a {
- color: #fff;
+ color: #333;
text-decoration: none;
}
@include media-breakpoint-up(sm) {
max-width: 330px;
- margin: 50px auto 0;
- border-width: 1px;
border-radius: 4px;
}
-
- @include media-breakpoint-up(lg) {
- position: absolute;
- top: 0;
- right: 15px;
- margin-top: 0;
-
- .bd-masthead & {
- position: static;
- }
- }
}
.carbon-img {
@@ -46,24 +34,5 @@
.carbon-poweredby {
display: block;
- color: #cdbfe3 !important;
-}
-
-.bd-content {
- #carbonads {
- position: static;
- max-width: 400px;
- margin: 2rem 0;
- line-height: 1.4;
- background-color: #f5f5f5;
- border: 0;
-
- a {
- color: #333;
- }
-
- .carbon-poweredby {
- color: #777 !important;
- }
- }
+ color: #777 !important;
}
diff --git a/assets/scss/_content.scss b/assets/scss/_content.scss
index 70b4969ba..0ac80c7b3 100644
--- a/assets/scss/_content.scss
+++ b/assets/scss/_content.scss
@@ -105,3 +105,6 @@
font-size: 1.5rem;
}
}
+
+.bd-text-purple { color: $bd-purple; }
+.bd-text-purple-bright { color: $bd-purple-bright; }
diff --git a/assets/scss/_featurettes.scss b/assets/scss/_featurettes.scss
deleted file mode 100644
index f214eb927..000000000
--- a/assets/scss/_featurettes.scss
+++ /dev/null
@@ -1,84 +0,0 @@
-.bd-featurette {
- padding-top: 3rem;
- padding-bottom: 3rem;
- font-size: 1rem;
- line-height: 1.5;
- color: #555;
- text-align: center;
- background-color: #fff;
- border-top: 1px solid #eee;
-
- .highlight {
- text-align: left;
- }
-
- .lead {
- margin-right: auto;
- margin-bottom: 2rem;
- margin-left: auto;
- font-size: 1rem;
- text-align: center;
- }
-}
-
-.bd-featurette-title {
- margin-bottom: .5rem;
- font-size: 2rem;
- font-weight: normal;
- color: #333;
- text-align: center;
-}
-
-.half-rule {
- width: 6rem;
- margin: 2.5rem auto;
-
- @include media-breakpoint-up(sm) {
- margin-right: 0;
- margin-left: 0;
- }
-}
-.bd-featurette h4 {
- margin-top: 1rem;
- margin-bottom: .5rem;
- font-weight: normal;
- color: #333;
-}
-.bd-featurette-img {
- display: block;
- margin-bottom: 1.25rem;
- color: #333;
-}
-.bd-featurette-img:hover {
- color: $blue;
- text-decoration: none;
-}
-.bd-featurette-img img {
- display: block;
- margin-bottom: 1rem;
-}
-
-@media (min-width: 480px) {
- .bd-featurette .img-fluid {
- margin-top: 2rem;
- }
-}
-@media (min-width: 768px) {
- .bd-featurette {
- padding-top: 6rem;
- padding-bottom: 6rem;
- }
- .bd-featurette-title {
- font-size: 2.5rem;
-
- + .lead {
- font-size: 1.5rem;
- }
- }
- .bd-featurette .lead {
- max-width: 80%;
- }
- .bd-featurette .img-fluid {
- margin-top: 0;
- }
-}
diff --git a/assets/scss/_footer.scss b/assets/scss/_footer.scss
index e6f56d51e..ab605d285 100644
--- a/assets/scss/_footer.scss
+++ b/assets/scss/_footer.scss
@@ -3,8 +3,6 @@
//
.bd-footer {
- padding: 4rem 0;
- margin-top: 4rem;
font-size: 85%;
text-align: center;
background-color: #f7f7f7;
diff --git a/assets/scss/_masthead.scss b/assets/scss/_masthead.scss
index ec2dfe6cf..f891d4e91 100644
--- a/assets/scss/_masthead.scss
+++ b/assets/scss/_masthead.scss
@@ -2,53 +2,28 @@
.bd-masthead {
position: relative;
- padding: 3rem ($grid-gutter-width / 2) 2rem;
- color: $bd-purple-light;
- text-align: center;
- background-image: linear-gradient(135deg, darken($bd-purple, 20%), $bd-purple, lighten(saturate($bd-purple, 5%), 15%));
-
- .bd-booticon {
- margin: 0 auto 2rem;
- color: $bd-purple-light;
- border-color: $bd-purple-light;
- }
+ padding: 3rem ($grid-gutter-width / 2);
+ // background-image: linear-gradient(45deg, #fafafa, #f5f5f5);
h1 {
- font-weight: 300;
line-height: 1;
}
- .lead {
- margin-right: auto;
- margin-bottom: 2rem;
- margin-left: auto;
- font-size: 1.25rem;
- color: #fff;
- }
-
- .version {
- margin-top: -1rem;
- margin-bottom: 2rem;
- }
-
.btn {
width: 100%;
- padding: 1rem 2rem;
+ padding: .8rem 2rem;
font-size: 1.25rem;
font-weight: 500;
}
.carbonad {
- margin-bottom: -2rem !important;
+ margin-top: 0 !important;
+ margin-bottom: -3rem !important;
}
@include media-breakpoint-up(sm) {
- padding-top: 8rem;
- padding-bottom: 2rem;
-
- .btn {
- width: auto;
- }
+ padding-top: 5rem;
+ padding-bottom: 5rem;
.carbonad {
margin-bottom: 0 !important;
@@ -56,29 +31,31 @@
}
@include media-breakpoint-up(md) {
- padding-bottom: 4rem;
-
- .bd-header {
- margin-bottom: 4rem;
- }
-
h1 {
font-size: 4rem;
}
- .lead {
- font-size: 1.5rem;
- }
-
.carbonad {
margin-top: 3rem !important;
}
}
+}
- @include media-breakpoint-up(lg) {
- .lead {
- width: 85%;
- font-size: 2rem;
- }
+.bd-pretext {
+ overflow: hidden;
+ resize: none;
+}
+
+.half-rule {
+ width: 6rem;
+ margin: 2.5rem 0;
+}
+
+.masthead-followup {
+ .bd-clipboard { display: none; }
+
+ .highlight {
+ padding: .5rem 0;
+ background-color: transparent;
}
}
diff --git a/assets/scss/_sidebar.scss b/assets/scss/_sidebar.scss
index b9acf308b..beadf9de5 100644
--- a/assets/scss/_sidebar.scss
+++ b/assets/scss/_sidebar.scss
@@ -51,7 +51,7 @@
.bd-sidebar {
order: 0;
- background-color: #f5f2f9;
+ // background-color: #f5f2f9;
border-bottom: 1px solid rgba(0,0,0,.1);
@include media-breakpoint-up(md) {
diff --git a/assets/scss/docs.scss b/assets/scss/docs.scss
index 6535c0ce1..b091a092f 100644
--- a/assets/scss/docs.scss
+++ b/assets/scss/docs.scss
@@ -32,7 +32,6 @@
@import "variables";
@import "nav";
@import "masthead";
-@import "featurettes";
@import "featured-sites";
@import "ads";
@import "content";