diff options
| -rw-r--r-- | swatchmaker/test/bootswatch.css | 404 | ||||
| -rwxr-xr-x | swatchmaker/test/docs.css | 280 | ||||
| -rwxr-xr-x | swatchmaker/test/test-full.html | 2 | ||||
| -rwxr-xr-x | swatchmaker/test/test.html | 5 |
4 files changed, 407 insertions, 284 deletions
diff --git a/swatchmaker/test/bootswatch.css b/swatchmaker/test/bootswatch.css new file mode 100644 index 00000000..000c4b75 --- /dev/null +++ b/swatchmaker/test/bootswatch.css @@ -0,0 +1,404 @@ +body { + padding-top: 80px; + padding-bottom: 20px; +} + +.navbar a > i { + opacity: 0.5; +} + +.navbar a:hover > i { + opacity: 1; +} + +section { + margin-top: 100px; +} + +.subhead { + padding-bottom: 0; + margin-bottom: 9px; +} + +.subhead h1 { + font-size: 54px; +} + +.subnav { + margin-bottom: 60px; + width: 100%; + height: 36px; + background-color: #eeeeee; /* Old browsers */ + background-repeat: repeat-x; /* Repeat the gradient */ + background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */ + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(100%,#eeeeee)); /* Chrome,Safari4+ */ + background-image: -webkit-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Chrome 10+,Safari 5.1+ */ + background-image: -ms-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* IE10+ */ + background-image: -o-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Opera 11.10+ */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */ + background-image: linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* W3C */ + border: 1px solid #e5e5e5; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} + +.subnav .nav { + margin-bottom: 0; +} + +.subnav .nav > li > a { + margin: 0; + padding-top: 11px; + padding-bottom: 11px; + border-left: 1px solid #f5f5f5; + border-right: 1px solid #e5e5e5; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} + +.subnav .nav > .active > a, +.subnav .nav > .active > a:hover { + padding-left: 13px; + color: #777; + background-color: #e9e9e9; + border-right-color: #ddd; + border-left: 0; + -webkit-box-shadow: inset 0 3px 5px rgba(0,0,0,.05); + -moz-box-shadow: inset 0 3px 5px rgba(0,0,0,.05); + box-shadow: inset 0 3px 5px rgba(0,0,0,.05); +} + +.subnav .nav > .active > a .caret, +.subnav .nav > .active > a:hover .caret { + border-top-color: #777; +} + +.subnav .nav > li:first-child > a, +.subnav .nav > li:first-child > a:hover { + border-left: 0; + padding-left: 12px; + -webkit-border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; +} + +.subnav .nav > li:last-child > a { + border-right: 0; +} + +.subnav .dropdown-menu { + -webkit-border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; + border-radius: 0 0 4px 4px; +} + +.tooltip-inner { + max-width: 500px; +} + +.hero-unit { + margin-bottom: 10px; + text-align: center; +} + +.hero-unit h1, +.hero-unit p { + margin-bottom: 15px; +} + +#social { + display: inline-block; + margin-top: 45px; + text-align: center; +} + +#gh-star { + margin-right: 10px; +} + +.twitter-follow-button { + width: 60px !important; +} + +.twitter-share-button { + margin-right: 15px; +} + +.rss-button { + width: 40px; + height: 14px; + font-size: 11px; + line-height: 14px; + font-weight: bold; + margin: 0 0 10px; + padding: 2px 5px 2px 4px; +} + +.icon-rss { + background: url(../img/rss-icons.png) no-repeat 0 0; + opacity: .65; + width: 16px; +} + +#ticker { + margin-bottom: 40px; +} + +.about { + margin-top: 20px; +} + +.about > div { + margin-bottom: 20px; +} + +.about h3 { + margin: 0 0 5px 35px; +} + +.about img { + float: left; + margin-top: 5px; + opacity: 0.7; +} + +#gallery { + margin: 45px 0 30px 0; + padding-right: 20px; + text-align: center; +} + +.thumbnail { + margin-bottom: 20px; + background-color: rgba(0, 0, 0, 0.05); +} + +.thumbnail img { + width: 100%; + -webkit-border-radius: 7px; + -moz-border-radius: 7px; + border-radius: 7px; +} + +.thumbnail .caption { + color: inherit !important; +} + +.thumbnail h3 { + margin-bottom: 0; +} + +.thumbnail .btn-toolbar { + margin-top: 15px; + text-align: right; +} + +.links { + margin-bottom: 20px; +} + +.links > a { + margin-right: 10px; +} + +div.one .bsa_it_ad { + padding: 25px 25px 15px 25px; +} + +div.one .bsa_it_p { + display: none; +} + +.bsa { + float: right; + max-width: 400px; + padding: 0; +} + +body .one .bsa_it_ad { + margin-bottom: -10px; + background: none; + border: none; + font-family: inherit; + color: inherit; +} + +body .one .bsa_it_ad .bsa_it_t, +body .one .bsa_it_ad .bsa_it_d { + color: inherit; + font-size: inherit; +} + +body .one .bsa_it_p { + display: none; +} + +.links { + margin-bottom: 20px; +} + +.links > a { + margin-right: 10px; +} + +@media (max-width: 480px) { + + .hero-unit { + padding: 20px 20px 0; + margin: 0 0 20px; + } + + .hero-unit h1 { + font-size: 36px; + } + + .hero-unit iframe { + margin-right: 0 !important; + } + + #social { + margin-top: 0px; + margin-bottom: 20px; + } + + #social > span { + display: block; + } + + .about { + margin-top: 0; + } + + .about h3 { + margin-top: 20px; + } + + .about p { + margin-bottom: 0; + } + + .modal { + position: fixed !important; + top: 25% !important; + } +} + +/* Landscape phone to portrait tablet */ +@media (min-width: 481px) and (max-width: 767px) { + + .hero-unit { + margin-top: 0; + padding: 30px; + } + + .about { + margin-top: 0; + } +} + +@media (max-width: 767px) { + + body { + padding-top: 0; + } + + .subnav { + position: static; + top: auto; + z-index: auto; + width: auto; + height: auto; + background: #fff; /* whole background property since we use a background-image for gradient */ + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + } + + .subnav .nav > li { + float: none; + } + + .subnav .nav > li > a { + border: 0; + } + + .subnav .nav > li + li > a { + border-top: 1px solid #e5e5e5; + } + + .subnav .nav > li:first-child > a, + .subnav .nav > li:first-child > a:hover { + -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; + } + + .bsa { + float: none; + } +} + +/* Portrait tablet to landscape and desktop */ +@media (min-width: 768px) and (max-width: 979px) { + + .hero-unit { + margin-top: 0; + } + + .thumbnail p { + font-size: 12px; + } + + .thumbnail .btn { + padding: 8px 12px; + font-size: 12px; + } +} + +/* Fixed subnav on scroll, but only for 980px and up (sorry IE!) */ +@media (min-width: 980px) { + .subnav-fixed { + position: fixed; + top: 40px; + left: 0; + right: 0; + z-index: 1020; /* 10 less than .navbar-fixed to prevent any overlap */ + border-color: #d5d5d5; + border-width: 0 0 1px; /* drop the border on the fixed edges */ + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + -webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); + -moz-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); + box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */ + } + .subnav-fixed .nav { + width: 938px; + margin: 0 auto; + padding: 0 1px; + } + .subnav .nav > li:first-child > a, + .subnav .nav > li:first-child > a:hover { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + } +} + +@media (min-width: 768px) and (max-width: 979px) { + + /* Remove any padding from the body */ + body { + padding-top: 0; + } +} + +@media (min-width: 1210px) { + + .subnav-fixed .nav { + width: 1168px; /* 2px less to account for left/right borders being removed when in fixed mode */ + } +}
\ No newline at end of file diff --git a/swatchmaker/test/docs.css b/swatchmaker/test/docs.css deleted file mode 100755 index 4c4be6b5..00000000 --- a/swatchmaker/test/docs.css +++ /dev/null @@ -1,280 +0,0 @@ -/* Add additional stylesheets below --------------------------------------------------- */ -/* - Bootstrap's documentation styles - Special styles for presenting Bootstrap's documentation and examples -*/ - - -/* Body and structure --------------------------------------------------- */ -body { - position: relative; - padding-top: 90px; -/* background-color: #fff; - background-image: url(../img/grid-18px-masked.png);*/ - /*background-repeat: repeat-x;*/ - background-position: 0 40px; -} - -/* Jumbotrons --------------------------------------------------- */ -.jumbotron { - position: relative; -} -.jumbotron h1 { - margin-bottom: 9px; - font-size: 81px; - font-weight: bold; - letter-spacing: -1px; - line-height: 1; -} -.jumbotron p { - margin-bottom: 18px; - font-weight: 300; -} -.jumbotron .btn-large { - font-size: 20px; - font-weight: normal; - padding: 14px 24px; - margin-right: 10px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} -.jumbotron .btn-large small { - font-size: 14px; -} - - -/* Specific jumbotrons -------------------------- */ -/* supporting docs pages */ -.subhead { - padding-bottom: 0; - margin-bottom: 9px; -} -.subhead h1 { - font-size: 54px; -} - -/* Subnav */ -.subnav { - width: 100%; - height: 36px; - background-color: #eeeeee; /* Old browsers */ - background-repeat: repeat-x; /* Repeat the gradient */ - background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */ - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(100%,#eeeeee)); /* Chrome,Safari4+ */ - background-image: -webkit-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Chrome 10+,Safari 5.1+ */ - background-image: -ms-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* IE10+ */ - background-image: -o-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Opera 11.10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */ - background-image: linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* W3C */ - border: 1px solid #e5e5e5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.subnav .nav { - margin-bottom: 0; -} -.subnav .nav > li > a { - margin: 0; - padding-top: 11px; - padding-bottom: 11px; - border-left: 1px solid #f5f5f5; - border-right: 1px solid #e5e5e5; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.subnav .nav > .active > a, -.subnav .nav > .active > a:hover { - padding-left: 13px; - color: #777; - background-color: #e9e9e9; - border-right-color: #ddd; - border-left: 0; - -webkit-box-shadow: inset 0 3px 5px rgba(0,0,0,.05); - -moz-box-shadow: inset 0 3px 5px rgba(0,0,0,.05); - box-shadow: inset 0 3px 5px rgba(0,0,0,.05); -} -.subnav .nav > .active > a .caret, -.subnav .nav > .active > a:hover .caret { - border-top-color: #777; -} -.subnav .nav > li:first-child > a, -.subnav .nav > li:first-child > a:hover { - border-left: 0; - padding-left: 12px; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} -.subnav .nav > li:last-child > a { - border-right: 0; -} -.subnav .dropdown-menu { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} - -/* Fixed subnav on scroll, but only for 980px and up (sorry IE!) */ -@media (min-width: 980px) { - .subnav-fixed { - position: fixed; - top: 40px; - left: 0; - right: 0; - z-index: 1020; /* 10 less than .navbar-fixed to prevent any overlap */ - border-color: #d5d5d5; - border-width: 0 0 1px; /* drop the border on the fixed edges */ - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - -webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); - -moz-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); - box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */ - } - .subnav-fixed .nav { - width: 938px; - margin: 0 auto; - padding: 0 1px; - } - .subnav .nav > li:first-child > a, - .subnav .nav > li:first-child > a:hover { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - } -} - - - -/* Responsive Docs --------------------------------------------------- */ -@media (max-width: 480px) { - - /* Reduce padding above jumbotron */ - body { - padding-top: 70px; - } - - /* Adjust the jumbotron */ - .jumbotron h1, - .jumbotron p { - text-align: center; - margin-right: 0; - } - .jumbotron h1 { - font-size: 45px; - margin-right: 0; - } - .jumbotron p { - margin-right: 0; - margin-left: 0; - font-size: 18px; - line-height: 24px; - } - .jumbotron .btn { - display: block; - font-size: 18px; - padding: 10px 14px; - margin: 0 auto 10px; - } - -} - - -@media (max-width: 768px) { - - /* Remove any padding from the body */ - body { - padding-top: 0; - } - - /* Jumbotron buttons */ - .jumbotron .btn { - margin-bottom: 10px; - } - - /* Subnav */ - .subnav { - position: static; - top: auto; - z-index: auto; - width: auto; - height: auto; - background: #fff; /* whole background property since we use a background-image for gradient */ - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - } - .subnav .nav > li { - float: none; - } - .subnav .nav > li > a { - border: 0; - } - .subnav .nav > li + li > a { - border-top: 1px solid #e5e5e5; - } - .subnav .nav > li:first-child > a, - .subnav .nav > li:first-child > a:hover { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; - } -} - - -@media (min-width: 480px) and (max-width: 768px) { - - /* Scale down the jumbotron content */ - .jumbotron h1 { - font-size: 54px; - } - .jumbotron p { - margin-right: 0; - margin-left: 0; - } -} - - -@media (min-width: 768px) and (max-width: 980px) { - - /* Remove any padding from the body */ - body { - padding-top: 0; - } - - /* Scale down the jumbotron content */ - .jumbotron h1 { - font-size: 72px; - } -} - - -@media (max-width: 980px) { - - /* Unfloat brand */ - .navbar-fixed-top .brand { - float: left; - margin-left: 0; - padding-left: 10px; - padding-right: 10px; - } -} - - -/* LARGE DESKTOP SCREENS */ -@media (min-width: 1210px) { - - /* Update subnav container */ - .subnav-fixed .nav { - width: 1168px; /* 2px less to account for left/right borders being removed when in fixed mode */ - } -} diff --git a/swatchmaker/test/test-full.html b/swatchmaker/test/test-full.html index 9076ac3b..bb442964 100755 --- a/swatchmaker/test/test-full.html +++ b/swatchmaker/test/test-full.html @@ -11,7 +11,7 @@ <link href="../swatch/bootstrap.min.css" rel="stylesheet"> <link href="../bootstrap/docs/assets/css/bootstrap-responsive.css" rel="stylesheet"> <link href="../bootstrap/docs/assets/js/google-code-prettify/prettify.css" rel="stylesheet"> - <link href="docs.css" rel="stylesheet"> + <link href="bootswatch.css" rel="stylesheet"> <style> @media (min-width: 980px) { diff --git a/swatchmaker/test/test.html b/swatchmaker/test/test.html index bdf09106..1ab58e36 100755 --- a/swatchmaker/test/test.html +++ b/swatchmaker/test/test.html @@ -14,12 +14,12 @@ <link href="../swatch/bootstrap.min.css" rel="stylesheet"> <link href="../bootstrap/docs/assets/css/bootstrap-responsive.css" rel="stylesheet"> <link href="../bootstrap/docs/assets/js/google-code-prettify/prettify.css" rel="stylesheet"> - <link href="docs.css" rel="stylesheet"> + <link href="bootswatch.css" rel="stylesheet"> </head> <body class="preview" data-spy="scroll" data-target=".subnav" data-offset="80"> - <script src="../js/bsa.js"></script> + <script src="http://bootswatch.com/js/bsa.js"></script> <!-- Navbar @@ -90,7 +90,6 @@ <div class="span6"> <div class="bsa well"> <div id="bsap_1277971" class="bsarocks bsap_c466df00a3cd5ee8568b5c4983b6bb19"></div> - <div class="clearfix"><a href="http://adpacks.com" id="bsap_aplink">via Ad Packs</a></div> </div> </div> </div> |