Skip to content

Commit

Permalink
Updating to latest bootstrap release
Browse files Browse the repository at this point in the history
  • Loading branch information
simo101 committed Jul 26, 2015
1 parent 7b81d3c commit 53497d2
Show file tree
Hide file tree
Showing 659 changed files with 88,223 additions and 22,351 deletions.
Binary file modified Bootswatch.mpr
Binary file not shown.
Binary file added dist/Bootswatch-8.0.mpk
Binary file not shown.
1,025 changes: 813 additions & 212 deletions theme-builder/amelia/ui/theme-amelia/css/bootstrap.css

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions theme-builder/amelia/ui/theme-amelia/css/bootstrap.min.css

Large diffs are not rendered by default.

Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion theme-builder/assets/css/bootswatch.min.css

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

Binary file added theme-builder/assets/img/bg.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified theme-builder/assets/img/carboncostume.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added theme-builder/assets/img/gridgum.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added theme-builder/assets/img/logo-nav.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added theme-builder/assets/img/logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified theme-builder/assets/img/refs/eloquentjavascript.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added theme-builder/assets/img/shopify.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added theme-builder/assets/img/stickers.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added theme-builder/assets/img/tshirt.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions theme-builder/assets/js/bootswatch.js
@@ -1,4 +1,18 @@
(function(){
$(window).scroll(function () {
var top = $(document).scrollTop();
$('.splash').css({
'background-position': '0px -'+(top/3).toFixed(2)+'px'
});
if(top > 50)
$('#home > .navbar').removeClass('navbar-transparent');
else
$('#home > .navbar').addClass('navbar-transparent');
});

$("a[href='#']").click(function(e) {
e.preventDefault();
});

var $button = $("<div id='source-button' class='btn btn-primary btn-xs'>&lt; &gt;</div>").click(function(){
var html = $(this).parent().html();
Expand Down
125 changes: 76 additions & 49 deletions theme-builder/assets/less/bootswatch.less
@@ -1,8 +1,38 @@
body {
padding-top: 50px;

> .navbar {
-webkit-transition: background-color 300ms ease-in;
transition: background-color 300ms ease-in;
}
}

@media (min-width: 768px) {
body {
> .navbar-transparent {
background-color: transparent;

.navbar-nav > .open > a {
background-color: transparent !important;
}
}
}
}

#home {
padding-top: 0px;
.navbar-brand {
padding: 13.5px 15px 12.5px;
> img {
display: inline;
margin: 0 10px;
height: 100%;
}
}
}

#banner {
min-height: 300px;
border-bottom: none;
}

Expand Down Expand Up @@ -50,6 +80,10 @@ body {
font-weight: bold;
}

.nav-tabs {
margin-bottom: 15px;
}

.progress {
margin-bottom: 10px;
}
Expand All @@ -70,20 +104,20 @@ footer {
}

.splash {
padding: 4em 0 2em;
background: #141d27;
background: -moz-linear-gradient(70deg, #141d27 0%, #233344 72%, #2c4055 89%, #39526e 100%);
background: -webkit-gradient(linear, left bottom, right top, color-stop(0%,#141d27), color-stop(72%,#233344), color-stop(89%,#2c4055), color-stop(100%,#39526e));
background: -webkit-linear-gradient(70deg, #141d27 0%,#233344 72%,#2c4055 89%,#39526e 100%);
background: -o-linear-gradient(70deg, #141d27 0%,#233344 72%,#2c4055 89%,#39526e 100%);
background: -ms-linear-gradient(70deg, #141d27 0%,#233344 72%,#2c4055 89%,#39526e 100%);
background: linear-gradient(70deg, #141d27 0%,#233344 72%,#2c4055 89%,#39526e 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#141d27', endColorstr='#39526e',GradientType=1 );
padding: 9em 0 2em;
background-color: #141d27;
background-image: url(../img/bg.jpg);
background-size: cover;
background-attachment: fixed;
color: #fff;
text-align: center;

.logo {
width: 160px;
}

h1 {
font-size: 4em;
font-size: 3em;
}

#social {
Expand All @@ -93,27 +127,11 @@ footer {
.alert {
margin: 2em 0;
}

.bsa {
max-width: 350px;
margin: 0 auto;
background: none;

.one .bsa_it_ad {
border: 1px solid #3E4653 !important;
border-color: rgba(255, 255, 255, 0.2) !important;
}

a {
color: #fff;
}
}
}

.section-tout {
padding: 4em 0 3em;
border-top: 1px solid rgba(255, 255, 255, 0.1);
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
border-bottom: 1px solid rgba(0, 0, 0, 0.05);
background-color: #eaf1f1;

.fa {
Expand All @@ -132,11 +150,26 @@ footer {

margin-bottom: 4em;
background-color: #eaf1f1;
border: 1px solid rgba(0, 0, 0, 0.1);

.image {
position: relative;
}

.image:before {
box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
content: "";
pointer-events: none;
}

.options {
padding: 1em 2em 2em;
border-top: 1px solid rgba(0, 0, 0, 0.1);
border: 1px solid rgba(0, 0, 0, 0.05);
border-top: none;
text-align: center;

p {
Expand All @@ -163,37 +196,31 @@ footer {

.sponsor {

img {
border: 1px solid rgba(0, 0, 0, 0.1);
border-radius: 4px;
}
text-align: center;

a:hover {
text-decoration: none;
}
}

.bsa {
padding: 0;
@media (max-width: 767px) {

.one {
.splash {

.bsa_it_ad {
border: none !important;
background-color: transparent !important;
padding-top: 4em;

.bsa_it_t,
.bsa_it_d {
color: inherit !important;
}

.bsa_it_i {
margin-bottom: 0 !important;
}
.logo {
width: 100px;
}

.bsa_it_p {
display: none;
h1 {
font-size: 2em;
}
}

#banner {
margin-bottom: 2em;
text-align: center
}

}
2 changes: 1 addition & 1 deletion theme-builder/bower.json
Expand Up @@ -33,7 +33,7 @@
"*/thumbnail.png"
],
"dependencies": {
"bootstrap": "~3.2.0"
"bootstrap": "~3.3.5"
},
"devDependencies": {
"font-awesome": "~4.0.0",
Expand Down
45 changes: 45 additions & 0 deletions theme-builder/bower_components/bootstrap-sass-official/.bower.json
@@ -0,0 +1,45 @@
{
"name": "bootstrap-sass",
"homepage": "https://github.com/twbs/bootstrap-sass",
"authors": [
"Thomas McDonald",
"Tristan Harward",
"Peter Gumeson",
"Gleb Mazovetskiy"
],
"description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.",
"moduleType": "globals",
"main": [
"assets/stylesheets/_bootstrap.scss",
"assets/javascripts/bootstrap.js"
],
"keywords": [
"twbs",
"bootstrap",
"sass"
],
"license": "MIT",
"ignore": [
"**/.*",
"lib",
"tasks",
"templates",
"test",
"*.gemspec",
"Rakefile",
"Gemfile"
],
"dependencies": {
"jquery": ">= 1.9.0"
},
"version": "3.3.5",
"_release": "3.3.5",
"_resolution": {
"type": "version",
"tag": "v3.3.5",
"commit": "fe686dbe44641fabbb8960fc9e549dd9d1670366"
},
"_source": "git://github.com/twbs/bootstrap-sass.git",
"_target": "~3.3.5",
"_originalSource": "bootstrap-sass-official"
}

0 comments on commit 53497d2

Please sign in to comment.