Skip to content

Commit

Permalink
fix(doc): remove navtab pointed and put font bold into popover and to…
Browse files Browse the repository at this point in the history
…oltips
  • Loading branch information
Lausselloic committed Jun 7, 2016
1 parent fb63d6a commit 76d9f3f
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 98 deletions.
44 changes: 0 additions & 44 deletions docs-orange/_includes/boostwatch/navTab.html
Original file line number Diff line number Diff line change
Expand Up @@ -81,50 +81,6 @@ <h3 id="tab-clear">Content without border</h3>
amet, consectetur adipiscing elit. In iaculis volutpat quam, non
suscipit arcu accumsan at. Aliquam pellentesque.</div>
</div>

<!-- Nav tabs B-->
<div>
<h3 id="tabB">Orange pointed tabs</h3>
</div>
<ul class="nav nav-tabs o-nav-tabs">
<li class="nav-item"><a class="nav-link active" href="#home2" data-toggle="tab">Home<div class="arrow" aria-hidden="true"></div></a></li>
<li class="nav-item"><a class="nav-link" href="#profile2" data-toggle="tab">Profile<div class="arrow" aria-hidden="true"></div></a></li>
<li class="nav-item"><a class="nav-link" href="#messages2" data-toggle="tab">Messages<div class="arrow" aria-hidden="true"></div></a></li>
<li class="nav-item"><a class="nav-link" href="#settings2" data-toggle="tab">Settings<div class="arrow" aria-hidden="true"></div></a></li>
</ul>
<div class="tab-content o-nav-tabs-content">
<div class="tab-pane active" id="home2">Lorem ipsum dolor sit
amet, consectetur adipiscing elit. In iaculis volutpat quam, non
suscipit arcu accumsan at. Aliquam pellentesque.</div>
<div class="tab-pane" id="profile2">Sed ut perspiciatis unde omnis iste natus error sit
voluptatem accusantium doloremque laudantium, totam rem aperiam,
eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo.
Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit,
sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt.
Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur,
adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore
magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem
ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur?
Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil
molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?
</div>
<div class="tab-pane" id="messages2">At vero eos et accusamus et iusto odio dignissimos ducimus
qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas
molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa
qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem
rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est
eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus,
omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et
aut officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae
sint et molestiae non recusandae. Itaque earum rerum hic tenetur a sapiente delectus,
ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus
asperiores repellat
</div>
<div class="tab-pane" id="settings2">Lorem ipsum dolor sit
amet, consectetur adipiscing elit. In iaculis volutpat quam, non
suscipit arcu accumsan at. Aliquam pellentesque.
</div>
</div>
</div>
</div>
</div>
47 changes: 0 additions & 47 deletions docs-orange/components/orange-pointed-tabs.md

This file was deleted.

4 changes: 2 additions & 2 deletions docs-orange/examples/orange-news/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -391,13 +391,13 @@ <h2>news 6</h2>


<div id="infos" class="col-xs-12 col-sm-12 col-md-4">
<ul class="nav nav-tabs o-nav-tabs">
<ul class="nav nav-tabs">
<li class="nav-item"><a class="nav-link active" href="#mostRead" data-toggle="tab">Most read<div class="arrow" aria-hidden="true"></div></a></li>
<li class="nav-item"><a class="nav-link" href="#mostShared" data-toggle="tab">Most shared<div class="arrow" aria-hidden="true"></div></a></li>
<li class="nav-item"><a class="nav-link" href="#mostRecent" data-toggle="tab">Most recent<div class="arrow" aria-hidden="true"></div></a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content o-nav-tabs-content">
<div class="tab-content">
<div class="tab-pane active" id="mostRead">
<ul>
<li><a href="#"><span class="bold">1. </span>iPad mini UP pricing will start at 249€, screenshot suggests</a></li>
Expand Down
3 changes: 1 addition & 2 deletions docs-orange/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ <h2 class="bd-featurette-title">All the core components of Bootstrap accessible
<li><a href='components/local-navigation'>Local navigation</a></li>
<li><a href='components/orange-stepbar'>Stepbar</a></li>
<!--<li><a href='components/orange-pagination'>Orange link pagination</a></li>-->
<li><a href='components/orange-accordion'>Accordions with indicator</a></li>
<li><a href='components/orange-pointed-tabs'>Orange pointed tabs</a></li>
<li><a href='components/orange-accordion'>Accordions with indicator</a></li>
<li><a href='components/orange-tables'>Complex table</a></li>
<li><a href='content/tables/#responsive-tables'>Responsive table, display as cards onto tablets and mobile</a></li>
<!--<li><a href='components/modal/'>Popin (modal window)</a></li>-->
Expand Down
8 changes: 5 additions & 3 deletions scss/_custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,9 @@ $grid-gutter-width: 20px;
//
// Font, line-height, and color for body text, headings, and more.

$font-family-sans-serif: "HelvNeueOrange",Helvetica,Arial,-apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", Arial, sans-serif;
$font-family-serif: "HelvNeueOrange",Helvetica,Georgia, "Times New Roman", Times, serif;
$font-family-monospace: "HelvNeueOrange",Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
$font-family-sans-serif: "HelvNeueOrange","Helvetica Neue",Helvetica,Arial,-apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", Arial, sans-serif;
$font-family-serif: "HelvNeueOrange","Helvetica Neue",Helvetica,Georgia, "Times New Roman", Times, serif;
$font-family-monospace: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
$font-family-base: $font-family-sans-serif;

// Pixel value used to responsively scale all typography. Applied to the `<html>` element.
Expand Down Expand Up @@ -621,6 +621,7 @@ $tooltip-opacity: .9;
$tooltip-padding-y: ($spacer / 2);
$tooltip-padding-x: ($spacer / 2);
$tooltip-margin: 5px;
$tooltip-font-weight: bold;

$tooltip-arrow-width: 5px;
$tooltip-arrow-color: $tooltip-bg;
Expand All @@ -633,6 +634,7 @@ $popover-max-width: 276px;
$popover-border-width: $border-width;
$popover-border-color: $gray-lighter-o;
$popover-box-shadow: none;
$popover-font-weight: bold;

$popover-title-bg: $popover-bg;
$popover-title-padding-x: 10px;
Expand Down
3 changes: 3 additions & 0 deletions scss/_popover.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
// So reset our font and text properties to avoid inheriting weird values.
@include reset-text();
font-size: $font-size-sm;
// boosted mod
font-weight: $popover-font-weight;
// end mod
// Allow breaking very long words so they don't overflow the popover's bounds
word-wrap: break-word;
background-color: $popover-bg;
Expand Down
3 changes: 3 additions & 0 deletions scss/_tooltip.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
// So reset our font and text properties to avoid inheriting weird values.
@include reset-text();
font-size: $font-size-sm;
// boosted mod
font-weight: $tooltip-font-weight;
// end mod
// Allow breaking very long words so they don't overflow the tooltip's bounds
word-wrap: break-word;
opacity: 0;
Expand Down

0 comments on commit 76d9f3f

Please sign in to comment.