Skip to content

Commit

Permalink
Merge branch 'local-v4-dev' into v4-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@ygatesoupe
ygatesoupe committed Jun 9, 2016
2 parents 0883991 + 85bdfbc commit 2873ff0
Show file tree
Hide file tree
Showing 36 changed files with 953 additions and 492 deletions.
82 changes: 9 additions & 73 deletions docs-orange/_includes/boostwatch/accordion.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h4 class="panel-title">
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title" id="accordion-1-title-2">
<a data-toggle="collapse" data-parent="#accordion-1" href="#collapseTwo"> Collapsible Group Item #2 </a>
<a class="collapsed" data-toggle="collapse" data-parent="#accordion-1" href="#collapseTwo"> Collapsible Group Item #2 </a>
</h4>
</div>
<div id="collapseTwo" class="panel-collapse collapse">
Expand All @@ -45,7 +45,7 @@ <h4 class="panel-title" id="accordion-1-title-2">
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title" id="accordion-1-title-3">
<a data-toggle="collapse" data-parent="#accordion-1" href="#collapseThree"> Collapsible Group Item #3 </a>
<a class="collapsed" data-toggle="collapse" data-parent="#accordion-1" href="#collapseThree"> Collapsible Group Item #3 </a>
</h4>
</div>
<div id="collapseThree" class="panel-collapse collapse">
Expand All @@ -65,11 +65,11 @@ <h4 class="panel-title" id="accordion-1-title-3">
</div> <!-- row -->
<div class="row" id="section-2">
<h3 id="accordion2">multiple-opened-items version:</h3>
<div class="o-accordion panel-group" id="accordion-2" data-multipleAtATime="true">
<div class="panel multipleAtATime panel-default">
<div class="o-accordion panel-group" id="accordion-2">
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title" id="accordion-2-title-1">
<a class="accordion-toggle" data-toggle="collapse" href="#collapse2One"> Collapsible Group Item #1 </a>
<a class="" data-toggle="collapse" href="#collapse2One"> Collapsible Group Item #1 </a>
</h4>
</div>
<div id="collapse2One" class="panel-collapse collapse in">
Expand All @@ -85,10 +85,10 @@ <h4 class="panel-title" id="accordion-2-title-1">
haven't heard of them accusamus labore sustainable VHS.</div>
</div>
</div>
<div class="panel multipleAtATime panel-default">
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title" id="accordion-2-title-2">
<a class="accordion-toggle" data-toggle="collapse" href="#collapse2Two"> Collapsible Group Item #2 </a>
<a class="collapsed" data-toggle="collapse" href="#collapse2Two"> Collapsible Group Item #2 </a>
</h4>
</div>
<div id="collapse2Two" class="panel-collapse collapse">
Expand All @@ -104,10 +104,10 @@ <h4 class="panel-title" id="accordion-2-title-2">
haven't heard of them accusamus labore sustainable VHS.</div>
</div>
</div>
<div class="panel multipleAtATime panel-default">
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title" id="accordion-2-title-3">
<a class="accordion-toggle" data-toggle="collapse" href="#collapse2Three"> Collapsible Group Item #3 </a>
<a class="collapsed" data-toggle="collapse" href="#collapse2Three"> Collapsible Group Item #3 </a>
</h4>
</div>
<div id="collapse2Three" class="panel-collapse collapse">
Expand All @@ -125,68 +125,4 @@ <h4 class="panel-title" id="accordion-2-title-3">
</div>
</div>
</div> <!-- row -->


<div class="row" id="section-3">
<h3 id="accordion3">orange caret version:</h3>
<div class="o-accordion o-accordion-orange-style panel-group" id="accordion-3">
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title" id="accordion-3-title-1">
<a data-toggle="collapse" data-parent="#accordion-3" href="#collapse3One"> Collapsible Group Item #1 </a>
</h4>
</div>
<div id="collapse3One" class="panel-collapse collapse in">
<div class="panel-body">Anim pariatur cliche reprehenderit,
enim eiusmod high life accusamus terry richardson ad squid. 3 wolf
moon officia aute, non cupidatat <a href="#">test focus 1</a> skateboard dolor brunch. Food
truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor,
sunt aliqua put a bird on it squid single-origin coffee nulla
assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer
labore wes anderson cred nesciunt <a href="#">test focus 2</a> sapiente ea proident. Ad vegan
excepteur butcher vice lomo. Leggings occaecat craft beer
farm-to-table, raw denim aesthetic synth nesciunt you probably
haven't heard of them accusamus labore sustainable VHS.</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title" id="accordion-3-title-2">
<a data-toggle="collapse" data-parent="#accordion-3" href="#collapse3Two"> Collapsible Group Item #2 </a>
</h4>
</div>
<div id="collapse3Two" class="panel-collapse collapse">
<div class="panel-body">Anim pariatur cliche reprehenderit,
enim eiusmod high life accusamus terry richardson ad squid. 3 wolf
moon officia aute, non cupidatat skateboard dolor brunch. Food
truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor,
sunt aliqua put a bird on it squid single-origin coffee nulla
assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer
labore wes anderson cred nesciunt sapiente ea proident. Ad vegan <a href="#">test focus 3</a>
excepteur butcher vice lomo. Leggings occaecat craft beer
farm-to-table, raw denim aesthetic synth nesciunt you probably
haven't heard of them accusamus labore sustainable VHS.</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title" id="accordion-3-title-3">
<a data-toggle="collapse" data-parent="#accordion-3" href="#collapse3Three"> Collapsible Group Item #3 </a>
</h4>
</div>
<div id="collapse3Three" class="panel-collapse collapse">
<div class="panel-body">Anim pariatur cliche reprehenderit,
enim eiusmod high life accusamus terry richardson ad squid. 3 wolf
moon officia aute, non cupidatat skateboard dolor brunch. Food
truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor,
sunt aliqua put a bird on it squid single-origin coffee nulla
assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer
labore wes anderson cred nesciunt sapiente ea proident. Ad vegan
excepteur butcher vice lomo. Leggings occaecat craft beer
farm-to-table, raw denim aesthetic synth nesciunt you probably
haven't heard of them accusamus labore sustainable VHS.</div>
</div>
</div>
</div>
</div> <!-- row -->
</div> <!-- container -->
3 changes: 0 additions & 3 deletions docs-orange/_includes/boostwatch/stepbar.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ <h2 id="stepbar">Stepbar</h2>
<div data-example-id="default-stepbar">
<div class="row">
<nav class="o-stepbar">
<span class="hidden-md-up stepbar-header">Step</span>
<ol>
<li class="stepbar-item current">
<a class="stepbar-link" href="#" title="Step 1 : sign in">
Expand Down Expand Up @@ -44,7 +43,6 @@ <h2 id="stepbar">Stepbar</h2>

<div class="row">
<nav class="o-stepbar">
<span class="hidden-md-up stepbar-header">Step</span>
<ol>
<li class="done stepbar-item">
<a class="stepbar-link" href="#" title="Step 1 : sign in">
Expand Down Expand Up @@ -84,7 +82,6 @@ <h2 id="stepbar">Stepbar</h2>

<div class="row">
<nav class="o-stepbar">
<span class="hidden-md-up stepbar-header">Step</span>
<ol>
<li class="stepbar-item done">
<a class="stepbar-link" href="#" title="Step 1 : sign in">
Expand Down
69 changes: 19 additions & 50 deletions docs-orange/_includes/nav-home.html
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,22 @@
<header class="navbar navbar-dark navbar-static-top bd-navbar" role="banner">
<div class="container">
{% comment %}
<nav class="nav navbar-nav pull-xs-right">
<div class="nav-item dropdown">
<a class="nav-item nav-link dropdown-toggle" href="#" id="bd-versions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
v{{ site.current_version }}
</a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="bd-versions">
<a class="dropdown-item" href="#">v4.0.0-alpha</a>
<a class="dropdown-item" href="#">v3.3.5</a>
<a class="dropdown-item" href="#">v3.3.4</a>
<a class="dropdown-item" href="#">v3.3.2</a>
<a class="dropdown-item" href="#">v3.3.1</a>
<a class="dropdown-item" href="#">v3.3.0</a>
<a class="dropdown-item" href="#">v3.2.0</a>
<a class="dropdown-item" href="#">v3.1.1</a>
<a class="dropdown-item" href="#">v3.1.0</a>
<a class="dropdown-item" href="#">v3.0.3</a>
<a class="dropdown-item" href="#">v3.0.2</a>
<a class="dropdown-item" href="#">v3.0.1</a>
<a class="dropdown-item" href="#">v3.0.0</a>
<header class="" role="banner">
<nav class="navbar navbar-dark">
<button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#collapsingNavbar">
<span class="sr-only">toggle navigation</span>
<span class="icon-menu"></span>
</button>
<div class="container" >
<a class="navbar-brand"><img src="../../dist/img/ORANGE_LOGO_rgb.jpg" alt='Back to homepage' title='Back to homepage'/></a>
<ul class="nav navbar-nav collapse navbar-toggleable-xs" id="collapsingNavbar">
<li class="nav-item">
<a class="nav-link" href="{{ site.baseurl }}/">
B<span class="text-primary">oo</span>sted
</a>
</li>
<li class="nav-item"><a class="nav-link {% if page.layout == "docs" %}active{% endif %}" href="{{ site.baseurl }}/getting-started/introduction/">Documentation</a></li>
<li class="nav-item"><a class="nav-link {% if page.title == "Examples" %}active{% endif %}" href="{{ site.baseurl }}/examples/">Examples</a></li>
<li class="nav-item"><a class="nav-link {% if page.title == "Boostwatch" %}active{% endif %}" href="{{ site.baseurl }}/boostwatch/">Boostwatch</a></li>
<li class="nav-item" id="id_li_for_cdu"></li>
</ul>
</div>
</div>
</nav>
{% endcomment %}

<div class="clearfix">
<button class="navbar-toggler pull-xs-right hidden-sm-up" type="button" data-toggle="collapse" data-target="#bd-main-nav">
&#9776;
</button>
<a class="navbar-brand hidden-sm-up" href="{{ site.baseurl }}/">
B<span class="text-primary">oo</span>sted
</a>
</div>
<nav class="collapse navbar-toggleable-xs" id="bd-main-nav">
<a class="navbar-brand" href="{{ site.baseurl }}/">
<img src="dist/img/ORANGE_LOGO_rgb.jpg" alt='Back to homepage' title='Back to homepage'/>
</a>
<ul class="nav navbar-nav">
<li class="nav-item">
<a class="nav-link" href="{{ site.baseurl }}/">
B<span class="text-primary">oo</span>sted
</a>
</li>
<li class="nav-item"><a class="nav-link {% if page.layout == "docs" %}active{% endif %}" href="{{ site.baseurl }}/getting-started/introduction/">Documentation</a></li>
<li class="nav-item"><a class="nav-link {% if page.title == "Examples" %}active{% endif %}" href="{{ site.baseurl }}/examples/">Examples</a></li>
<li class="nav-item"><a class="nav-link {% if page.title == "Boostwatch" %}active{% endif %}" href="{{ site.baseurl }}/boostwatch/">Boostwatch</a></li>
<li class="nav-item" id="id_li_for_cdu"></li>
</ul>
</nav>
</div>
</header>
32 changes: 17 additions & 15 deletions docs-orange/assets/scss/_boosted-docs.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,26 +45,31 @@
background-color: #000;
color: #fff;
border-top: 2px solid $gray-dark;
padding-top: 3.75rem;
padding-bottom: 3.75rem;

@include media-breakpoint-up(md) {
h1 {
font-size: $font-size-h1;
}

p {
font-size: $font-size-base;
}
}
padding: 0;

h1 {
font-size: $font-size-h1;
font-weight: bold;
margin: 2.6875rem 0;
}

p {
font-size: $font-size-base;
}

@include media-breakpoint-down(xs) {
h1 {
font-size: $font-size-h2;
font-weight: bold;
text-align: left;
line-height: 1;
margin: 1.25rem 0;
}

p {
font-size: $font-size-base;
}
}
}

.bd-featurette {
Expand Down Expand Up @@ -220,9 +225,6 @@ $back-top-btn-height: 3.75rem;
body {
margin-bottom: $back-top-btn-height;
}
.container {
margin: 0 .625rem;
}
}

.scroll-top {
Expand Down
Loading

0 comments on commit 2873ff0

Please sign in to comment.