From ec34d407a904fea9ba4222ebf37131c9b8a34ca8 Mon Sep 17 00:00:00 2001 From: Yves Gatesoupe Date: Wed, 13 Jan 2016 16:13:32 +0100 Subject: [PATCH] fix(doc): component pages megamenu local navigation stepbar pagination pointed tabs footer --- Gruntfile.js | 2 +- docs-orange/_data/nav.yml | 82 +++++++++ .../_includes/boostwatch/navLocal.html | 155 ++++++++-------- docs-orange/_includes/boostwatch/ofooter.html | 5 +- docs-orange/_includes/nav-boostwatch.html | 2 +- docs-orange/_includes/nav-docs.html | 63 +++++++ docs-orange/assets/img/logo-orange.png | Bin 0 -> 4112 bytes docs-orange/assets/scss/_boosted-docs.scss | 17 +- docs-orange/components/local-navigation.md | 87 +++++++++ docs-orange/components/orange-accordion.md | 135 ++++++++++++++ docs-orange/components/orange-footer.md | 99 +++++++++++ docs-orange/components/orange-forms.md | 10 ++ docs-orange/components/orange-megamenu.md | 167 ++++++++++++++++++ docs-orange/components/orange-modal.md | 10 ++ docs-orange/components/orange-pagination.md | 23 +++ docs-orange/components/orange-pointed-tabs.md | 47 +++++ docs-orange/components/orange-stepbar.md | 51 ++++++ docs-orange/components/orange-tables.md | 10 ++ docs-orange/examples/orange-news/index.html | 10 +- docs-orange/index.html | 122 ++----------- scss/_o-pagination.scss | 34 ++-- scss/_o-special_font-size.scss | 26 --- scss/_orange-css.scss | 40 ++--- 23 files changed, 922 insertions(+), 275 deletions(-) create mode 100644 docs-orange/_data/nav.yml create mode 100644 docs-orange/_includes/nav-docs.html create mode 100644 docs-orange/assets/img/logo-orange.png create mode 100644 docs-orange/components/local-navigation.md create mode 100644 docs-orange/components/orange-accordion.md create mode 100644 docs-orange/components/orange-footer.md create mode 100644 docs-orange/components/orange-forms.md create mode 100644 docs-orange/components/orange-megamenu.md create mode 100644 docs-orange/components/orange-modal.md create mode 100644 docs-orange/components/orange-pagination.md create mode 100644 docs-orange/components/orange-pointed-tabs.md create mode 100644 docs-orange/components/orange-stepbar.md create mode 100644 docs-orange/components/orange-tables.md delete mode 100644 scss/_o-special_font-size.scss diff --git a/Gruntfile.js b/Gruntfile.js index 09fc82f4e0..dca6f7ee26 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -520,7 +520,7 @@ module.exports = function (grunt) { }, docs: { /* boosted mod */ - files: ['docs/examples/**/*', 'docs/_includes/**/*', 'docs-orange/**/*', '!docs/assets/**/*'], + files: ['docs-orange/**/*'], tasks: ['dist-css', 'docs'] /* end mod */ } diff --git a/docs-orange/_data/nav.yml b/docs-orange/_data/nav.yml new file mode 100644 index 0000000000..d46775fcf7 --- /dev/null +++ b/docs-orange/_data/nav.yml @@ -0,0 +1,82 @@ +- title: Getting started + pages: + - title: Introduction + - title: Download + - title: Browsers & devices + - title: Options + - title: Flexbox + - title: Build tools + - title: Best practices + +- title: Layout + pages: + - title: Overview + - title: Grid + - title: Media object + - title: Responsive utilities + +- title: Content + pages: + - title: Reboot + - title: Typography + - title: Code + - title: Images + - title: Tables + - title: Figures + +- title: Components + pages: + - title: Buttons + - title: Button group + - title: Button dropdown + - title: Forms + - title: Input group + - title: Dropdowns + - title: Jumbotron + - title: Label + - title: Alerts + - title: Card + - title: Navs + - title: Navbar + # boosted mod + - title: Orange pointed tabs + - title: Local navigation + - title: Orange megamenu + - title: Orange footer + # end mod + - title: Breadcrumb + # boosted mod + - title: Stepbar + # end mod + - title: Pagination + # boosted mod + - title: Orange Pagination + # end mod + - title: Progress + - title: List group + - title: Modal + - title: Scrollspy + - title: Tooltips + - title: Popovers + - title: Collapse + # boosted mod + - title: Orange accordion + # end mod + - title: Carousel + - title: Utilities + +# - title: Extend +# pages: +# - title: Approach +# - title: Icon fonts + +- title: About + pages: + - title: History + - title: Team + - title: Accessibility + - title: Brand + - title: License + - title: Translations + +- title: Migration diff --git a/docs-orange/_includes/boostwatch/navLocal.html b/docs-orange/_includes/boostwatch/navLocal.html index 2ca29c0147..996acea5da 100644 --- a/docs-orange/_includes/boostwatch/navLocal.html +++ b/docs-orange/_includes/boostwatch/navLocal.html @@ -3,98 +3,85 @@

Local navigation bar

Default local navigation

-
-
+ + +
+

Two levels local navigation

-
-
- +
-
diff --git a/docs-orange/_includes/boostwatch/ofooter.html b/docs-orange/_includes/boostwatch/ofooter.html index 064fc99c7f..6b73da37f7 100644 --- a/docs-orange/_includes/boostwatch/ofooter.html +++ b/docs-orange/_includes/boostwatch/ofooter.html @@ -1,6 +1,5 @@ - + + diff --git a/docs-orange/_includes/nav-boostwatch.html b/docs-orange/_includes/nav-boostwatch.html index 1f87644a03..83b068db1a 100644 --- a/docs-orange/_includes/nav-boostwatch.html +++ b/docs-orange/_includes/nav-boostwatch.html @@ -10,7 +10,7 @@ Bullet point
- Local navigation bar + Local navigation
Accordions diff --git a/docs-orange/_includes/nav-docs.html b/docs-orange/_includes/nav-docs.html new file mode 100644 index 0000000000..2155318fa8 --- /dev/null +++ b/docs-orange/_includes/nav-docs.html @@ -0,0 +1,63 @@ +
+ +
+ + +
+ + + + + +
diff --git a/docs-orange/assets/img/logo-orange.png b/docs-orange/assets/img/logo-orange.png new file mode 100644 index 0000000000000000000000000000000000000000..7e4340b335b230df01d1b479250afbc53ed83602 GIT binary patch literal 4112 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 O0000
- - diff --git a/scss/_o-pagination.scss b/scss/_o-pagination.scss index c4b50a1928..9381aa1eed 100644 --- a/scss/_o-pagination.scss +++ b/scss/_o-pagination.scss @@ -1,16 +1,19 @@ // -// Pagination (multiple pages) -// -------------------------------------------------- +// Orange pagination +// +.o-pagination .page-link { + border: none; +} + .o-pagination { display: inline-block; padding-left: 0; margin: $line-height-computed 0; border-radius: $border-radius-base; - > li { + > .page-item { display: inline; // Remove list-style and block-level defaults - > a, - > span { + > .page-link { position: relative; float: left; // Collapse white-space padding: $padding-base-vertical $padding-base-horizontal; @@ -22,16 +25,14 @@ margin-left: 0; } &:first-child { - > a, - > span { + > .page-link { margin-left: 0; @include border-left-radius($border-radius-base); margin-right: -1px; } } &:last-child { - > a, - > span { + > .page-link { @include border-right-radius($border-radius-base); border-right: 0; margin-left: -1px; @@ -39,8 +40,7 @@ } } - > li > a, - > li > span { + > .page-item > .page-link { &:hover, &:focus { color: $pagination-active-color; @@ -50,8 +50,7 @@ } } - > .active > a, - > .active > span { + > .active .page-link { &, &:hover, &:focus { @@ -64,12 +63,9 @@ } > .disabled { - > span, - > span:hover, - > span:focus, - > a, - > a:hover, - > a:focus { + > .page-link:hover, + > .page-link:focus, + > .page-link { color: $pagination-disabled-color; background-color: $pagination-disabled-bg; border-color: $pagination-disabled-border; diff --git a/scss/_o-special_font-size.scss b/scss/_o-special_font-size.scss deleted file mode 100644 index 91b1f2c395..0000000000 --- a/scss/_o-special_font-size.scss +++ /dev/null @@ -1,26 +0,0 @@ -.lead { - font-size: (floor(($font-size-base * 1.15)*10)/10); - - @media (min-width: $screen-sm-min) { - font-size: ($font-size-base * 1.5); - } -} -pre { - font-size: ($font-size-base - 0.1); // Xrem to X-0.1rem -} -.panel-title { - font-size: (ceil(($font-size-base * 1.125)*10)/10); -} -@media screen and (min-width: $screen-sm-min) { - .carousel-control { - .glyphicon-chevron-left, - .glyphicon-chevron-right, - .icon-prev, - .icon-next { - font-size: 3.0rem; - } - } -} -.popover-title { - line-height: 1.8rem; -} \ No newline at end of file diff --git a/scss/_orange-css.scss b/scss/_orange-css.scss index 07b4dc7f24..cd9f7d2363 100644 --- a/scss/_orange-css.scss +++ b/scss/_orange-css.scss @@ -589,29 +589,29 @@ caption { // bits from bootstrap-orange2015.less -// a { -// color: $link-color; -// text-decoration: underline; -// -// &:hover, -// &:focus { -// color: $link-hover-color; -// text-decoration: $link-hover-decoration; -// } -// +a { + color: $link-color; + text-decoration: underline; + + &:hover, + &:focus { + color: $link-hover-color; + text-decoration: $link-hover-decoration; + } + // &:focus { // @include tab-focus(); // } -// } -// -// nav a, -// .dropdown-menu a, -// .dropdown a, -// .navbar a, -// .nav a, -// a.btn { -// text-decoration: none; -// } +} + +nav a, +.dropdown-menu a, +.dropdown a, +.navbar a, +.nav a, +a.btn { + text-decoration: none; +} // Horizontal forms //