Changeset 91315 in spip-zone


Ignore:
Timestamp:
Aug 10, 2015, 11:14:48 AM (4 years ago)
Author:
cedric@…
Message:

les chemins d'import de bs3 doivent toujours expliciter bs3/css/ (sinon on retombe sur bs2 par defaut)

Location:
_plugins_/bootstrap/trunk
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • _plugins_/bootstrap/trunk/bootstrap/bs3/css/bootstrap.less

    r90742 r91315  
    66
    77// Core variables and mixins
    8 @import "css/variables.less";
    9 @import "css/mixins.less";
     8@import "bs3/css/variables.less";
     9@import "bs3/css/mixins.less";
    1010
    1111// Reset and dependencies
    12 @import "css/normalize.less";
    13 @import "css/print.less";
    14 @import "css/glyphicons.less";
     12@import "bs3/css/normalize.less";
     13@import "bs3/css/print.less";
     14@import "bs3/css/glyphicons.less";
    1515
    1616// Core CSS
    17 @import "css/scaffolding.less";
    18 @import "css/type.less";
    19 @import "css/code.less";
    20 @import "css/grid.less";
    21 @import "css/tables.less";
    22 @import "css/forms.less";
    23 @import "css/buttons.less";
     17@import "bs3/css/scaffolding.less";
     18@import "bs3/css/type.less";
     19@import "bs3/css/code.less";
     20@import "bs3/css/grid.less";
     21@import "bs3/css/tables.less";
     22@import "bs3/css/forms.less";
     23@import "bs3/css/buttons.less";
    2424
    2525// Components
    26 @import "css/component-animations.less";
    27 @import "css/dropdowns.less";
    28 @import "css/button-groups.less";
    29 @import "css/input-groups.less";
    30 @import "css/navs.less";
    31 @import "css/navbar.less";
    32 @import "css/breadcrumbs.less";
    33 @import "css/pagination.less";
    34 @import "css/pager.less";
    35 @import "css/labels.less";
    36 @import "css/badges.less";
    37 @import "css/jumbotron.less";
    38 @import "css/thumbnails.less";
    39 @import "css/alerts.less";
    40 @import "css/progress-bars.less";
    41 @import "css/media.less";
    42 @import "css/list-group.less";
    43 @import "css/panels.less";
    44 @import "css/responsive-embed.less";
    45 @import "css/wells.less";
    46 @import "css/close.less";
     26@import "bs3/css/component-animations.less";
     27@import "bs3/css/dropdowns.less";
     28@import "bs3/css/button-groups.less";
     29@import "bs3/css/input-groups.less";
     30@import "bs3/css/navs.less";
     31@import "bs3/css/navbar.less";
     32@import "bs3/css/breadcrumbs.less";
     33@import "bs3/css/pagination.less";
     34@import "bs3/css/pager.less";
     35@import "bs3/css/labels.less";
     36@import "bs3/css/badges.less";
     37@import "bs3/css/jumbotron.less";
     38@import "bs3/css/thumbnails.less";
     39@import "bs3/css/alerts.less";
     40@import "bs3/css/progress-bars.less";
     41@import "bs3/css/media.less";
     42@import "bs3/css/list-group.less";
     43@import "bs3/css/panels.less";
     44@import "bs3/css/responsive-embed.less";
     45@import "bs3/css/wells.less";
     46@import "bs3/css/close.less";
    4747
    4848// Components w/ JavaScript
    49 @import "css/modals.less";
    50 @import "css/tooltip.less";
    51 @import "css/popovers.less";
    52 @import "css/carousel.less";
     49@import "bs3/css/modals.less";
     50@import "bs3/css/tooltip.less";
     51@import "bs3/css/popovers.less";
     52@import "bs3/css/carousel.less";
    5353
    5454// Utility classes
    55 @import "css/utilities.less";
    56 @import "css/responsive-utilities.less";
     55@import "bs3/css/utilities.less";
     56@import "bs3/css/responsive-utilities.less";

  • _plugins_/bootstrap/trunk/bootstrap/bs3/css/mixins.less

    r90742 r91315  
    33
    44// Utilities
    5 @import "css/mixins/hide-text.less";
    6 @import "css/mixins/opacity.less";
    7 @import "css/mixins/image.less";
    8 @import "css/mixins/labels.less";
    9 @import "css/mixins/reset-filter.less";
    10 @import "css/mixins/resize.less";
    11 @import "css/mixins/responsive-visibility.less";
    12 @import "css/mixins/size.less";
    13 @import "css/mixins/tab-focus.less";
    14 @import "css/mixins/reset-text.less";
    15 @import "css/mixins/text-emphasis.less";
    16 @import "css/mixins/text-overflow.less";
    17 @import "css/mixins/vendor-prefixes.less";
     5@import "bs3/css/mixins/hide-text.less";
     6@import "bs3/css/mixins/opacity.less";
     7@import "bs3/css/mixins/image.less";
     8@import "bs3/css/mixins/labels.less";
     9@import "bs3/css/mixins/reset-filter.less";
     10@import "bs3/css/mixins/resize.less";
     11@import "bs3/css/mixins/responsive-visibility.less";
     12@import "bs3/css/mixins/size.less";
     13@import "bs3/css/mixins/tab-focus.less";
     14@import "bs3/css/mixins/reset-text.less";
     15@import "bs3/css/mixins/text-emphasis.less";
     16@import "bs3/css/mixins/text-overflow.less";
     17@import "bs3/css/mixins/vendor-prefixes.less";
    1818
    1919// Components
    20 @import "css/mixins/alerts.less";
    21 @import "css/mixins/buttons.less";
    22 @import "css/mixins/panels.less";
    23 @import "css/mixins/pagination.less";
    24 @import "css/mixins/list-group.less";
    25 @import "css/mixins/nav-divider.less";
    26 @import "css/mixins/forms.less";
    27 @import "css/mixins/progress-bar.less";
    28 @import "css/mixins/table-row.less";
     20@import "bs3/css/mixins/alerts.less";
     21@import "bs3/css/mixins/buttons.less";
     22@import "bs3/css/mixins/panels.less";
     23@import "bs3/css/mixins/pagination.less";
     24@import "bs3/css/mixins/list-group.less";
     25@import "bs3/css/mixins/nav-divider.less";
     26@import "bs3/css/mixins/forms.less";
     27@import "bs3/css/mixins/progress-bar.less";
     28@import "bs3/css/mixins/table-row.less";
    2929
    3030// Skins
    31 @import "css/mixins/background-variant.less";
    32 @import "css/mixins/border-radius.less";
    33 @import "css/mixins/gradients.less";
     31@import "bs3/css/mixins/background-variant.less";
     32@import "bs3/css/mixins/border-radius.less";
     33@import "bs3/css/mixins/gradients.less";
    3434
    3535// Layout
    36 @import "css/mixins/clearfix.less";
    37 @import "css/mixins/center-block.less";
    38 @import "css/mixins/nav-vertical-align.less";
    39 @import "css/mixins/grid-framework.less";
    40 @import "css/mixins/grid.less";
     36@import "bs3/css/mixins/clearfix.less";
     37@import "bs3/css/mixins/center-block.less";
     38@import "bs3/css/mixins/nav-vertical-align.less";
     39@import "bs3/css/mixins/grid-framework.less";
     40@import "bs3/css/mixins/grid.less";

  • _plugins_/bootstrap/trunk/bootstrap/bs3/css/theme-dist.less

    r90760 r91315  
    99// --------------------------------------------------
    1010
    11 @import "css/variables.less";
    12 @import "css/mixins.less";
     11@import "bs3/css/variables.less";
     12@import "bs3/css/mixins.less";
    1313
    1414

  • _plugins_/bootstrap/trunk/bootstrap2spip/bs3/css/alerts.less

    r90743 r91315  
    1 @import "bootstrap/css/alerts.less";
     1@import "bootstrap/bs3/css/alerts.less";
    22
    33.info {.alert; .alert-info;}

  • _plugins_/bootstrap/trunk/bootstrap2spip/bs3/css/box.less

    r90743 r91315  
    1 @import "css/variables.less";
     1@import "bs3/css/variables.less";
    22
    33/*

  • _plugins_/bootstrap/trunk/bootstrap2spip/bs3/css/breadcrumbs.less

    r90750 r91315  
    1 @import "bootstrap/css/breadcrumbs.less";
     1@import "bootstrap/bs3/css/breadcrumbs.less";
    22
    33ul.breadcrumb,ol.breadcrumb {margin-left: 0;}

  • _plugins_/bootstrap/trunk/bootstrap2spip/bs3/css/buttons.less

    r90743 r91315  
    1 @import "bootstrap/css/buttons.less";
     1@import "bootstrap/bs3/css/buttons.less";
    22
    33/* boutons admin forum */

  • _plugins_/bootstrap/trunk/bootstrap2spip/bs3/css/code.less

    r90743 r91315  
    1 @import "bootstrap/css/code.less";
     1@import "bootstrap/bs3/css/code.less";
    22
    33code {white-space:inherit}

  • _plugins_/bootstrap/trunk/bootstrap2spip/bs3/css/forms.less

    r90764 r91315  
    1 @import "bootstrap/css/forms.less";
     1@import "bootstrap/bs3/css/forms.less";
    22
    33legend {

  • _plugins_/bootstrap/trunk/bootstrap2spip/bs3/css/grid.less

    r90767 r91315  
    1 @import "bootstrap/css/grid.less";
    2 @import "css/hashgrid.less";
     1@import "bootstrap/bs3/css/grid.less";
     2@import "bs3/css/hashgrid.less";
    33
    44

  • _plugins_/bootstrap/trunk/bootstrap2spip/bs3/css/jumbotron.less

    r90744 r91315  
    1 @import "bootstrap/css/jumbotron.less";
     1@import "bootstrap/bs3/css/jumbotron.less";
    22//
    33// Jumbotron

  • _plugins_/bootstrap/trunk/bootstrap2spip/bs3/css/list-group.less

    r90750 r91315  
    1 @import "bootstrap/css/list-group.less";
     1@import "bootstrap/bs3/css/list-group.less";
    22
    33ul.list-group,ol.list-group {margin-left: 0;}

  • _plugins_/bootstrap/trunk/bootstrap2spip/bs3/css/navbar.less

    r90759 r91315  
    1 @import "bootstrap/css/navbar.less";
     1@import "bootstrap/bs3/css/navbar.less";
    22
    33.navbar .navbar-inner {

  • _plugins_/bootstrap/trunk/bootstrap2spip/bs3/css/navs.less

    r90762 r91315  
    1 @import "bootstrap/css/navs.less";
     1@import "bootstrap/bs3/css/navs.less";
    22
    33ul.nav,ol.nav {margin-left: 0;}

  • _plugins_/bootstrap/trunk/bootstrap2spip/bs3/css/pager.less

    r66679 r91315  
    1 @import "bootstrap/css/pager.less";
     1@import "bootstrap/bs3/css/pager.less";
    22
    33div.pagination {
    4   @import "bootstrap/css/pager.less";
     4  @import "bootstrap/bs3/css/pager.less";
    55}
    66

  • _plugins_/bootstrap/trunk/bootstrap2spip/bs3/css/pagination.less

    r90750 r91315  
    1 @import "bootstrap/css/pagination.less";
     1@import "bootstrap/bs3/css/pagination.less";
    22
    33.pagination>ul {

  • _plugins_/bootstrap/trunk/bootstrap2spip/bs3/css/scaffolding.less

    r90743 r91315  
    1 @import "bootstrap/css/scaffolding.less";
    2 @import "css/spip.variables.less";
     1@import "bootstrap/bs3/css/scaffolding.less";
     2@import "bs3/css/spip.variables.less";
    33//
    44// Scaffolding

  • _plugins_/bootstrap/trunk/bootstrap2spip/bs3/css/spip.comment.less

    r90743 r91315  
    33---------------------------------------------- */
    44
    5 @import "css/variables.less";
    6 @import "css/spip.variables.less";
    7 @import "css/mixins.less";
     5@import "bs3/css/variables.less";
     6@import "bs3/css/spip.variables.less";
     7@import "bs3/css/mixins.less";
    88
    99/* * Habillage des forums */

  • _plugins_/bootstrap/trunk/bootstrap2spip/bs3/css/spip.list.less

    r90743 r91315  
    33/* ------------------------------------------ */
    44
    5 @import "css/variables.less";
    6 @import "css/spip.variables.less";
    7 @import "css/mixins.less";
     5@import "bs3/css/variables.less";
     6@import "bs3/css/spip.variables.less";
     7@import "bs3/css/mixins.less";
    88
    99/* Listes d'items */

  • _plugins_/bootstrap/trunk/bootstrap2spip/bs3/css/spip.sprites.less

    r90765 r91315  
    1 @import "css/variables.less";
    2 @import "css/spip.variables.less";
     1@import "bs3/css/variables.less";
     2@import "bs3/css/spip.variables.less";
    33
    44//

  • _plugins_/bootstrap/trunk/bootstrap2spip/bs3/css/tables.less

    r66294 r91315  
    1 @import "bootstrap/css/tables.less";
     1@import "bootstrap/bs3/css/tables.less";
    22
    33/* Tableaux SPIP */

  • _plugins_/bootstrap/trunk/bootstrap2spip/bs3/css/thumbnails.less

    r90743 r91315  
    1 @import "bootstrap/css/thumbnails.less";
     1@import "bootstrap/bs3/css/thumbnails.less";
    22
    33// The Grid

  • _plugins_/bootstrap/trunk/bootstrap2spip/bs3/css/utilities.less

    r67104 r91315  
    1 @import "bootstrap/css/utilities.less";
     1@import "bootstrap/bs3/css/utilities.less";
    22
    33/* Alignements */
Note: See TracChangeset for help on using the changeset viewer.