diff options
| author | Zog | 2018-01-31 16:09:55 +0100 | 
|---|---|---|
| committer | Zog | 2018-01-31 16:09:55 +0100 | 
| commit | f671a1dfe6fed6422db0fbefd15de264bd383721 (patch) | |
| tree | 724942a3fd4eadfaaa77f6ae7b02836a7ce10a98 | |
| parent | ee7fe7a4760c3fdde987ef666db45c161e788ee9 (diff) | |
| download | chouette-core-f671a1dfe6fed6422db0fbefd15de264bd383721.tar.bz2 | |
Refs #5796; Fix dropdown menu5796-fix-vjs-index
| -rw-r--r-- | app/assets/stylesheets/components/_buttons.sass | 77 | ||||
| -rw-r--r-- | app/assets/stylesheets/components/_tables.sass | 2 | 
2 files changed, 40 insertions, 39 deletions
| diff --git a/app/assets/stylesheets/components/_buttons.sass b/app/assets/stylesheets/components/_buttons.sass index 93f9907a5..2881cee3e 100644 --- a/app/assets/stylesheets/components/_buttons.sass +++ b/app/assets/stylesheets/components/_buttons.sass @@ -142,47 +142,48 @@ table, .table          margin: 0          border-radius: 0          box-shadow: 0 0 3px rgba($darkgrey, 0.25) -        > ul -          padding: 0 -          margin: 0 -          > li > a, > li > button -            padding: 5px 15px -            white-space: nowrap -            padding: 5px 15px -            font-weight: normal -            line-height: $line-height -            display: block -            font-size: 14px -            &:hover, &:focus -              text-decoration: none -              background-color: whitesmoke -              outline: none -          &:not(:first-child) +        & > ul:not(:first-child) +          position: relative +          margin-top: 11px +          &:before +            content: '' +            display: block +            position: absolute +            left: 15px +            right: 15px +            top: -6px +            height: 1px +            background-color: $grey + +      ul.dropdown-menu, .dropdown-menu > ul +        padding: 0 +        margin: 0 +        > li > a, > li > button +          padding: 5px 15px +          white-space: nowrap +          padding: 5px 15px +          font-weight: normal +          line-height: $line-height +          display: block +          font-size: 14px +          &:hover, &:focus +            text-decoration: none +            background-color: whitesmoke +            outline: none + +        > li.delete-action +          > a, > button +            display: block              position: relative -            margin-top: 11px -            &:before -              content: '' -              display: block -              position: absolute -              left: 15px -              right: 15px -              top: -6px -              height: 1px -              background-color: $grey - -          > li.delete-action +            .fa:first-child +              margin-right: 0.5em + +          & + li.delete-action              > a, > button -              display: block -              position: relative -              .fa:first-child -                margin-right: 0.5em - -            & + li.delete-action -              > a, > button -                margin-top: 0 -                &:before -                  display: none +              margin-top: 0 +              &:before +                display: none    &.table-2entries .t2e-item diff --git a/app/assets/stylesheets/components/_tables.sass b/app/assets/stylesheets/components/_tables.sass index 119a38c07..35e1122f3 100644 --- a/app/assets/stylesheets/components/_tables.sass +++ b/app/assets/stylesheets/components/_tables.sass @@ -372,7 +372,7 @@        white-space: nowrap        // border-right: 1px solid rgba($grey, 0.5)        max-width: 100% -      min-width: 280px +      min-width: 330px        padding-right: 1px      .t2e-item | 
