Add 'is-divided' style to simple lists

Minor fix to popup docs
This commit is contained in:
Samuel Georges 2015-07-18 16:14:39 +10:00
parent 4c54b53da6
commit 1636f79224
3 changed files with 43 additions and 14 deletions

View File

@ -120,7 +120,7 @@
.control-simplelist ul{padding-left:15px}
.control-simplelist.form-control ul{margin-bottom:0}
.control-simplelist.form-control li{padding-top:5px;padding-bottom:5px}
.control-simplelist.with-icons ul,.control-simplelist.with-checkboxes ul,.control-simplelist.is-selectable ul{list-style-type:none;padding-left:0}
.control-simplelist.with-icons ul,.control-simplelist.with-checkboxes ul,.control-simplelist.is-divided ul,.control-simplelist.is-selectable ul{list-style-type:none;padding-left:0}
.control-simplelist.is-sortable li.placeholder{position:relative}
.control-simplelist.is-sortable li.placeholder:before{top:-10px;position:absolute;content:'';display:block;width:0;height:0;border-top:4.5px solid transparent;border-bottom:4.5px solid transparent;border-left:5px solid #999999}
.control-simplelist.is-sortable li.dragged{position:absolute;opacity:0.5;filter:alpha(opacity=50);z-index:2000;color:#e67e22;width:auto !important}
@ -130,13 +130,13 @@
.control-simplelist.is-scrollable.size-large{min-height:400px}
.control-simplelist.is-scrollable.size-huge{min-height:450px}
.control-simplelist.is-scrollable.size-giant{min-height:550px}
.control-simplelist.is-selectable li{padding:5px 10px;border-bottom:1px solid #e2e2e2}
.control-simplelist.is-selectable li .heading{font-size:14px;font-weight:bold}
.control-simplelist.is-divided li,.control-simplelist.is-selectable li{padding:5px 10px;border-bottom:1px solid #e2e2e2}
.control-simplelist.is-divided li .heading,.control-simplelist.is-selectable li .heading{font-size:14px;font-weight:bold}
.control-simplelist.is-divided li:last-child,.control-simplelist.is-selectable li:last-child{border-bottom:none}
.control-simplelist.is-selectable li a{padding:5px 10px;margin:-5px -10px;display:block;color:#333333}
.control-simplelist.is-selectable li:hover{background:#4da7e8;cursor:pointer}
.control-simplelist.is-selectable li:hover,.control-simplelist.is-selectable li:hover a{color:white}
.control-simplelist.is-selectable li:hover a{text-decoration:none}
.control-simplelist.is-selectable li:last-child{border-bottom:none}
.control-simplelist.is-selectable li.active a{background:#f0f0f0}
.control-simplelist.is-selectable li.active a:hover{background:#4da7e8}
.list-preview .control-simplelist.is-selectable ul{margin-bottom:0}

View File

@ -1,14 +1,14 @@
//
// Simple List
// --------------------------------------------------
// Usage:
// Usage (bullets):
// <div class="control-simplelist">
// <ul>
// <li>Hello friend</li>
// </ul>
// </div>
//
// With icons:
// With icons (no bullets):
// <div class="control-simplelist with-icons">
// <ul>
// <li class="oc-icon-check">Hello friend</li>
@ -26,6 +26,26 @@
// </li>
// </ul>
// </div>
//
// Divided (basic):
// <div class="control-simplelist is-divided">
// <ul>
// <li>Hello friend</li>
// </ul>
// </div>
//
// Selectable:
// <div class="control-simplelist is-selectable">
// <ul>
// <li>
// <a href="#">
// <h5 class="heading">Hello friend</h5>
// <p class="description">Something cool over here</p>
// </a>
// </li>
// </ul>
// </div>
//
.control-simplelist {
@ -41,7 +61,10 @@
}
}
&.with-icons, &.with-checkboxes, &.is-selectable {
&.with-icons,
&.with-checkboxes,
&.is-divided,
&.is-selectable {
ul {
list-style-type: none;
padding-left: 0;
@ -80,6 +103,7 @@
&.size-giant { min-height: @size-giant + 200; }
}
&.is-divided,
&.is-selectable {
li {
padding: 5px 10px;
@ -88,9 +112,17 @@
font-size: 14px;
font-weight: bold;
}
.description {
.description {}
&:last-child {
border-bottom: none;
}
}
}
&.is-selectable {
li {
a {
padding: 5px 10px;
margin: -5px -10px;
@ -104,10 +136,6 @@
a { text-decoration: none; }
}
&:last-child {
border-bottom: none;
}
&.active {
a {
background: #f0f0f0;

View File

@ -12,12 +12,13 @@
* - data-ajax="popup-content.htm" - ajax content to load
* - data-handler="widget:pluginName" - October ajax request name
* - data-keyboard="false" - Allow popup to be closed with the keyboard
* - data-request-data="file_id: 1" - October ajax request data
* - data-extra-data="file_id: 1" - October ajax request data
* - data-size="large" - Popup size, available sizes: giant, huge, large, small, tiny
*
* JavaScript API:
* $('a#someLink').popup({ ajax: 'popup-content.htm' })
* $('a#someLink').popup({ handler: 'onOpenPopupForm' })
* $('a#someLink').popup({ handler: 'onLoadSomePopup' })
* $('a#someLink').popup({ handler: 'onLoadSomePopup', extraData: { id: 3 } })
*
* Dependences:
* - Bootstrap Modal (modal.js)