From c8d672a1e560571f1fc6f04c983a6d90272ce38b Mon Sep 17 00:00:00 2001 From: vsn4ik Date: Tue, 27 Jan 2015 19:03:27 +0300 Subject: [PATCH] Bump v1.2.11. --- Gruntfile.js | 2 +- LICENSE | 2 +- README.md | 4 +- _config.yml | 2 +- bower.json | 2 +- dist/css/bootstrap-submenu.css | 47 +++++++++++++++------- dist/css/bootstrap-submenu.css.map | 2 +- dist/css/bootstrap-submenu.min.css | 4 +- dist/js/bootstrap-submenu.js | 2 +- dist/js/bootstrap-submenu.min.js | 2 +- docs/_includes/dropdown-menu-elements.html | 14 +++++++ docs/_includes/dropdown-menu-right.html | 4 ++ docs/_includes/dropdown-menu.html | 15 +------ docs/index.html | 24 +++++++++++ package.json | 6 +-- 15 files changed, 90 insertions(+), 42 deletions(-) create mode 100644 docs/_includes/dropdown-menu-elements.html create mode 100644 docs/_includes/dropdown-menu-right.html diff --git a/Gruntfile.js b/Gruntfile.js index c3aa3a8..ece0fb9 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,7 +1,7 @@ /*! * Bootstrap-submenu's Gruntfile * http://vsn4ik.github.io/bootstrap-submenu - * Copyright 2014 Vasily A. (https://github.com/vsn4ik) + * Copyright 2015 Vasily A. (https://github.com/vsn4ik) * Licensed under MIT (https://github.com/vsn4ik/bootstrap-submenu/blob/master/LICENSE) */ diff --git a/LICENSE b/LICENSE index d9b0988..2cb53c3 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright Vasily A., 2014 +Copyright Vasily A., 2015 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/README.md b/README.md index 3b5d750..29e4307 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Six quick start options are available: -- [Download the latest release](https://github.com/vsn4ik/bootstrap-submenu/releases/download/v1.2.10/bootstrap-submenu-1.2.10-dist.zip "Download Bootstrap-submenu"). +- [Download the latest release](https://github.com/vsn4ik/bootstrap-submenu/releases/download/v1.2.11/bootstrap-submenu-1.2.11-dist.zip "Download Bootstrap-submenu"). - Clone the repo: `git clone https://github.com/vsn4ik/bootstrap-submenu.git`. - Install with [Bower](http://bower.io): `bower install bootstrap-submenu`. - Install with [npm](https://www.npmjs.com): `npm install bootstrap-submenu`. @@ -52,7 +52,7 @@ For some working examples, visit our [examples](http://vsn4ik.github.io/bootstra ## Copyright and license -Copyright Vasily A., 2014. +Copyright Vasily A., 2015. Licensed under [the MIT License][license]. diff --git a/_config.yml b/_config.yml index 3c94901..7ed83ac 100644 --- a/_config.yml +++ b/_config.yml @@ -7,7 +7,7 @@ repo: https://github.com/vsn4ik/bootstrap-submenu description: Bootstrap Sub-Menus. download: - dist: https://github.com/vsn4ik/bootstrap-submenu/releases/download/v1.2.10/bootstrap-submenu-1.2.10-dist.zip + dist: https://github.com/vsn4ik/bootstrap-submenu/releases/download/v1.2.11/bootstrap-submenu-1.2.11-dist.zip path: jquery: http://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery diff --git a/bower.json b/bower.json index ee028c0..299be9b 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "bootstrap-submenu", - "version": "1.2.10", + "version": "1.2.11", "description": "Bootstrap Sub-Menus", "keywords": [ "bootstrap", diff --git a/dist/css/bootstrap-submenu.css b/dist/css/bootstrap-submenu.css index b7e776a..8a62285 100644 --- a/dist/css/bootstrap-submenu.css +++ b/dist/css/bootstrap-submenu.css @@ -1,5 +1,5 @@ /*! - * Bootstrap-submenu v1.2.10 (http://vsn4ik.github.io/bootstrap-submenu) + * Bootstrap-submenu v1.2.11 (http://vsn4ik.github.io/bootstrap-submenu) * Copyright 2015 Vasily A. (https://github.com/vsn4ik) * Licensed under MIT (https://github.com/vsn4ik/bootstrap-submenu/blob/master/LICENSE) */ @@ -13,12 +13,6 @@ .dropdown-submenu { position: relative; } - .dropdown-submenu > a:after { - margin-top: 6px; - border-left: 4px dashed; - border-top: 4px solid transparent; - border-bottom: 4px solid transparent; - } .dropdown-submenu .dropdown-menu { top: 0; left: 100%; @@ -29,25 +23,50 @@ .navbar-fixed-bottom .dropdown-submenu .dropdown-menu { top: auto; bottom: 0; - margin-top: 0px; + margin-top: 0; margin-bottom: -6px; border-top-left-radius: 4px; border-bottom-left-radius: 0; } -} -@media (max-width: 767px) { + .dropdown-menu-right .dropdown-submenu .dropdown-menu { + left: auto; + right: 100%; + border-top-left-radius: 4px; + border-top-right-radius: 0; + } + .dropup .dropdown-menu-right .dropdown-submenu .dropdown-menu, + .navbar-fixed-bottom .dropdown-menu-right .dropdown-submenu .dropdown-menu { + border-radius: 4px 4px 0; + } .dropdown-submenu > a:after { - margin-top: 8px; - border-top: 4px dashed; - border-left: 4px solid transparent; - border-right: 4px solid transparent; + margin-top: 6px; + border-left: 4px dashed; + border-top: 4px solid transparent; + border-bottom: 4px solid transparent; } + .dropdown-menu-right .dropdown-submenu > a:after { + float: left; + border-left: none; + margin-left: -10px; + margin-right: 0; + border-right: 4px dashed; + border-top: 4px solid transparent; + border-bottom: 4px solid transparent; + } +} +@media (max-width: 767px) { .dropdown-submenu .dropdown-menu { position: static; margin-top: 0; border: 0; box-shadow: none; } + .dropdown-submenu > a:after { + margin-top: 8px; + border-top: 4px dashed; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + } .dropdown > .dropdown-menu > .dropdown-submenu > .dropdown-menu > li.dropdown-header, .dropup > .dropdown-menu > .dropdown-submenu > .dropdown-menu > li.dropdown-header, .btn-group > .dropdown-menu > .dropdown-submenu > .dropdown-menu > li.dropdown-header, diff --git a/dist/css/bootstrap-submenu.css.map b/dist/css/bootstrap-submenu.css.map index 1e63614..9941bef 100644 --- a/dist/css/bootstrap-submenu.css.map +++ b/dist/css/bootstrap-submenu.css.map @@ -1 +1 @@ -{"version":3,"sources":["less/bootstrap-submenu.less","less/mixins.less"],"names":[],"mappings":"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","sourcesContent":["@import \"../node_modules/bootstrap/less/variables.less\";\n@import \"mixins.less\";\n\n//\n// Sub-Menus\n// --------------------------------------------------\n\n.dropdown-submenu > a:after {\n content: \"\";\n float: right;\n margin-right: -@caret-width-base * 2 - 2;\n}\n\n@media (min-width: @grid-float-breakpoint) {\n .dropdown-submenu {\n position: relative;\n\n .make-caret(@line-height-computed / 2 - @caret-width-base, left, top, bottom);\n\n .dropdown-menu {\n top: 0;\n left: 100%;\n margin-top: -6px;\n border-top-left-radius: 0;\n\n .dropup &,\n .navbar-fixed-bottom & {\n top: auto;\n bottom: 0;\n margin-top: 0px;\n margin-bottom: -6px;\n border-top-left-radius: @border-radius-base;\n border-bottom-left-radius: 0;\n }\n }\n }\n}\n\n@media (max-width: @grid-float-breakpoint-max) {\n .dropdown-submenu {\n .make-caret((@line-height-computed - @caret-width-base) / 2, top, left, right);\n\n .dropdown-menu {\n position: static;\n margin-top: 0;\n border: 0;\n box-shadow: none;\n }\n }\n\n .dropdown-menu > .dropdown-submenu {\n .dropdown > &,\n .dropup > &,\n .btn-group > & {\n .make-nested-list(30px, 0, 4);\n }\n\n .navbar-nav > .dropdown > & {\n .make-nested-list(35px, 0, 4);\n }\n }\n}\n",".make-caret(@margin-top, @begin, @left, @right) {\n > a:after {\n margin-top: @margin-top;\n\n // dashed: fix caret size for Mozilla Firefox\n border-@{begin}: @caret-width-base dashed;\n\n border-@{left}: @caret-width-base solid transparent;\n border-@{right}: @caret-width-base solid transparent;\n }\n}\n\n.make-nested-list(@offset, @i, @n) when (@i < @n) {\n > .dropdown-menu > li {\n &.dropdown-header,\n > a {\n padding-left: @offset + (10 * @i);\n }\n\n .make-nested-list(@offset, @i + 1, @n);\n }\n}\n"]} \ No newline at end of file +{"version":3,"sources":["less/bootstrap-submenu.less","less/mixins.less"],"names":[],"mappings":"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","sourcesContent":["@import \"../node_modules/bootstrap/less/variables.less\";\n@import \"mixins.less\";\n\n// Variables\n@caret-margin: -@caret-width-base * 2 - 2;\n\n//\n// Sub-Menus\n// --------------------------------------------------\n\n.dropdown-submenu > a:after {\n content: \"\";\n float: right;\n margin-right: @caret-margin;\n}\n\n@media (min-width: @grid-float-breakpoint) {\n .dropdown-submenu {\n position: relative;\n\n .dropdown-menu {\n top: 0;\n left: 100%;\n margin-top: -6px;\n border-top-left-radius: 0;\n\n // Strictly before .dropdown-menu-right\n .dropup &,\n .navbar-fixed-bottom & {\n top: auto;\n bottom: 0;\n margin-top: 0;\n margin-bottom: -6px;\n border-top-left-radius: @border-radius-base;\n border-bottom-left-radius: 0;\n }\n\n .dropdown-menu-right & {\n left: auto;\n right: 100%;\n\n border-top-left-radius: @border-radius-base;\n border-top-right-radius: 0;\n\n .dropup &,\n .navbar-fixed-bottom & {\n border-radius: @border-radius-base @border-radius-base 0;\n }\n }\n }\n\n > a:after {\n margin-top: @line-height-computed / 2 - @caret-width-base;\n\n .make-caret(left, top, bottom);\n\n .dropdown-menu-right & {\n float: left;\n border-left: none;\n margin-left: @caret-margin;\n margin-right: 0;\n\n .make-caret(right, top, bottom);\n }\n }\n }\n}\n\n@media (max-width: @grid-float-breakpoint-max) {\n .dropdown-submenu {\n .dropdown-menu {\n position: static;\n margin-top: 0;\n border: 0;\n box-shadow: none;\n }\n\n > a:after {\n margin-top: (@line-height-computed - @caret-width-base) / 2;\n\n .make-caret(top, left, right);\n }\n }\n\n .dropdown-menu > .dropdown-submenu {\n .dropdown > &,\n .dropup > &,\n .btn-group > & {\n .make-nested-list(30px, 0, 4);\n }\n\n .navbar-nav > .dropdown > & {\n .make-nested-list(35px, 0, 4);\n }\n }\n}\n",".make-caret(@begin, @left, @right) {\n // dashed: fix caret size for Mozilla Firefox\n border-@{begin}: @caret-width-base dashed;\n\n border-@{left}: @caret-width-base solid transparent;\n border-@{right}: @caret-width-base solid transparent;\n}\n\n.make-nested-list(@offset, @i, @n) when (@i < @n) {\n > .dropdown-menu > li {\n &.dropdown-header,\n > a {\n padding-left: @offset + (10 * @i);\n }\n\n .make-nested-list(@offset, @i + 1, @n);\n }\n}\n"]} \ No newline at end of file diff --git a/dist/css/bootstrap-submenu.min.css b/dist/css/bootstrap-submenu.min.css index ede682f..0b8fc53 100644 --- a/dist/css/bootstrap-submenu.min.css +++ b/dist/css/bootstrap-submenu.min.css @@ -1,7 +1,7 @@ /*! - * Bootstrap-submenu v1.2.10 (http://vsn4ik.github.io/bootstrap-submenu) + * Bootstrap-submenu v1.2.11 (http://vsn4ik.github.io/bootstrap-submenu) * Copyright 2015 Vasily A. (https://github.com/vsn4ik) * Licensed under MIT (https://github.com/vsn4ik/bootstrap-submenu/blob/master/LICENSE) */ -.dropdown-submenu>a:after{content:"";float:right;margin-right:-10px}@media (min-width:768px){.dropdown-submenu{position:relative}.dropdown-submenu>a:after{margin-top:6px;border-left:4px dashed;border-top:4px solid transparent;border-bottom:4px solid transparent}.dropdown-submenu .dropdown-menu{top:0;left:100%;margin-top:-6px;border-top-left-radius:0}.dropup .dropdown-submenu .dropdown-menu,.navbar-fixed-bottom .dropdown-submenu .dropdown-menu{top:auto;bottom:0;margin-top:0;margin-bottom:-6px;border-top-left-radius:4px;border-bottom-left-radius:0}}@media (max-width:767px){.dropdown-submenu>a:after{margin-top:8px;border-top:4px dashed;border-left:4px solid transparent;border-right:4px solid transparent}.dropdown-submenu .dropdown-menu{position:static;margin-top:0;border:0;box-shadow:none}.btn-group>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li.dropdown-header,.btn-group>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>a,.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li.dropdown-header,.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>a,.dropup>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li.dropdown-header,.dropup>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>a{padding-left:30px}.btn-group>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li.dropdown-header,.btn-group>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>a,.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li.dropdown-header,.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>a,.dropup>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li.dropdown-header,.dropup>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>a{padding-left:40px}.btn-group>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li.dropdown-header,.btn-group>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>a,.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li.dropdown-header,.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>a,.dropup>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li.dropdown-header,.dropup>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>a{padding-left:50px}.btn-group>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li.dropdown-header,.btn-group>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>a,.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li.dropdown-header,.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>a,.dropup>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li.dropdown-header,.dropup>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>a{padding-left:60px}.navbar-nav>.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li.dropdown-header,.navbar-nav>.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>a{padding-left:35px}.navbar-nav>.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li.dropdown-header,.navbar-nav>.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>a{padding-left:45px}.navbar-nav>.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li.dropdown-header,.navbar-nav>.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>a{padding-left:55px}.navbar-nav>.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li.dropdown-header,.navbar-nav>.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>a{padding-left:65px}} \ No newline at end of file +.dropdown-submenu>a:after{content:"";float:right;margin-right:-10px}@media (min-width:768px){.dropdown-submenu{position:relative}.dropdown-submenu .dropdown-menu{top:0;left:100%;margin-top:-6px;border-top-left-radius:0}.dropup .dropdown-submenu .dropdown-menu,.navbar-fixed-bottom .dropdown-submenu .dropdown-menu{top:auto;bottom:0;margin-top:0;margin-bottom:-6px;border-top-left-radius:4px;border-bottom-left-radius:0}.dropdown-menu-right .dropdown-submenu .dropdown-menu{left:auto;right:100%;border-top-left-radius:4px;border-top-right-radius:0}.dropup .dropdown-menu-right .dropdown-submenu .dropdown-menu,.navbar-fixed-bottom .dropdown-menu-right .dropdown-submenu .dropdown-menu{border-radius:4px 4px 0}.dropdown-submenu>a:after{margin-top:6px;border-left:4px dashed;border-top:4px solid transparent;border-bottom:4px solid transparent}.dropdown-menu-right .dropdown-submenu>a:after{float:left;border-left:none;margin-left:-10px;margin-right:0;border-right:4px dashed;border-top:4px solid transparent;border-bottom:4px solid transparent}}@media (max-width:767px){.dropdown-submenu .dropdown-menu{position:static;margin-top:0;border:0;box-shadow:none}.dropdown-submenu>a:after{margin-top:8px;border-top:4px dashed;border-left:4px solid transparent;border-right:4px solid transparent}.btn-group>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li.dropdown-header,.btn-group>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>a,.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li.dropdown-header,.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>a,.dropup>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li.dropdown-header,.dropup>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>a{padding-left:30px}.btn-group>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li.dropdown-header,.btn-group>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>a,.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li.dropdown-header,.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>a,.dropup>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li.dropdown-header,.dropup>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>a{padding-left:40px}.btn-group>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li.dropdown-header,.btn-group>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>a,.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li.dropdown-header,.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>a,.dropup>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li.dropdown-header,.dropup>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>a{padding-left:50px}.btn-group>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li.dropdown-header,.btn-group>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>a,.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li.dropdown-header,.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>a,.dropup>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li.dropdown-header,.dropup>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>a{padding-left:60px}.navbar-nav>.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li.dropdown-header,.navbar-nav>.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>a{padding-left:35px}.navbar-nav>.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li.dropdown-header,.navbar-nav>.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>a{padding-left:45px}.navbar-nav>.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li.dropdown-header,.navbar-nav>.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>a{padding-left:55px}.navbar-nav>.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li.dropdown-header,.navbar-nav>.dropdown>.dropdown-menu>.dropdown-submenu>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>.dropdown-menu>li>a{padding-left:65px}} \ No newline at end of file diff --git a/dist/js/bootstrap-submenu.js b/dist/js/bootstrap-submenu.js index b2bddc2..fbf0804 100644 --- a/dist/js/bootstrap-submenu.js +++ b/dist/js/bootstrap-submenu.js @@ -1,5 +1,5 @@ /*! - * Bootstrap-submenu v1.2.10 (http://vsn4ik.github.io/bootstrap-submenu) + * Bootstrap-submenu v1.2.11 (http://vsn4ik.github.io/bootstrap-submenu) * Copyright 2015 Vasily A. (https://github.com/vsn4ik) * Licensed under MIT (https://github.com/vsn4ik/bootstrap-submenu/blob/master/LICENSE) */ diff --git a/dist/js/bootstrap-submenu.min.js b/dist/js/bootstrap-submenu.min.js index f0a5d3d..d472bfd 100644 --- a/dist/js/bootstrap-submenu.min.js +++ b/dist/js/bootstrap-submenu.min.js @@ -1,5 +1,5 @@ /*! - * Bootstrap-submenu v1.2.10 (http://vsn4ik.github.io/bootstrap-submenu) + * Bootstrap-submenu v1.2.11 (http://vsn4ik.github.io/bootstrap-submenu) * Copyright 2015 Vasily A. (https://github.com/vsn4ik) * Licensed under MIT (https://github.com/vsn4ik/bootstrap-submenu/blob/master/LICENSE) */ diff --git a/docs/_includes/dropdown-menu-elements.html b/docs/_includes/dropdown-menu-elements.html new file mode 100644 index 0000000..2a0049e --- /dev/null +++ b/docs/_includes/dropdown-menu-elements.html @@ -0,0 +1,14 @@ +
  • Action
    • +
  • + Another action + + +
    • +
  • Something else here
    • +
  • +
  • Separated link
    • diff --git a/docs/_includes/dropdown-menu-right.html b/docs/_includes/dropdown-menu-right.html new file mode 100644 index 0000000..9ffc7bd --- /dev/null +++ b/docs/_includes/dropdown-menu-right.html @@ -0,0 +1,4 @@ + + diff --git a/docs/_includes/dropdown-menu.html b/docs/_includes/dropdown-menu.html index e1b4747..d30e4b7 100644 --- a/docs/_includes/dropdown-menu.html +++ b/docs/_includes/dropdown-menu.html @@ -1,17 +1,4 @@ diff --git a/docs/index.html b/docs/index.html index 4d6ece2..4393811 100644 --- a/docs/index.html +++ b/docs/index.html @@ -33,6 +33,7 @@

    Installation

    Examples

    Dropdown

    +

    With button

    +

    With button-group

    +

    With button (right align)

    +
    + + + {% include dropdown-menu-right.html %} +
    +

    Dropup

    +

    With button

    +

    With button-group

    +

    With button (right align)

    +
    + + + {% include dropdown-menu-right.html %} +
    +

    Navbar