From 37e5918e43d1c22c4f7cea19f30106e56d569d49 Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Tue, 26 May 2015 19:54:35 +1000 Subject: [PATCH] Move rowlink + utility classes out --- modules/backend/assets/js/october.js | 3 +- .../backend/assets/less/core/bootstrap.less | 8 +- modules/system/assets/ui/js/list.js | 3 + .../assets/ui/js/list.rowlink.js} | 0 modules/system/assets/ui/less/list.less | 1 + .../system/assets/ui/less/list.rowlink.less | 20 +++ .../system/assets/ui/less/site.utility.less | 134 ++++++++++++++++++ 7 files changed, 163 insertions(+), 6 deletions(-) create mode 100644 modules/system/assets/ui/js/list.js rename modules/{backend/assets/js/october.rowlink.js => system/assets/ui/js/list.rowlink.js} (100%) create mode 100644 modules/system/assets/ui/less/list.rowlink.less create mode 100644 modules/system/assets/ui/less/site.utility.less diff --git a/modules/backend/assets/js/october.js b/modules/backend/assets/js/october.js index faeba8af2..7837b6558 100644 --- a/modules/backend/assets/js/october.js +++ b/modules/backend/assets/js/october.js @@ -10,6 +10,7 @@ =require ../../../system/assets/ui/js/foundation.js =require ../../../system/assets/ui/js/flashmessage.js =require ../../../system/assets/ui/js/dropdown.js +=require ../../../system/assets/ui/js/list.js =require october.controls.js =require october.utils.js @@ -37,14 +38,12 @@ =require october.simplelist.js =require october.sortable.js =require october.inspector.js -=require october.dropdown.js =require october.changemonitor.js =require october.chartutils.js =require october.chartpie.js =require october.chartbar.js =require october.chartline.js =require october.balloonselector.js -=require october.rowlink.js =require october.treelist.js =require october.autocomplete.js =require october.callout.js diff --git a/modules/backend/assets/less/core/bootstrap.less b/modules/backend/assets/less/core/bootstrap.less index 1a35e3f4c..0e14096c0 100644 --- a/modules/backend/assets/less/core/bootstrap.less +++ b/modules/backend/assets/less/core/bootstrap.less @@ -19,7 +19,7 @@ //@import "../../../../system/assets/vendor/bootstrap/less/buttons"; // Components -@import "../../../../system/assets/vendor/bootstrap/less/dropdowns"; +//@import "../../../../system/assets/vendor/bootstrap/less/dropdowns"; //@import "../../../../system/assets/vendor/bootstrap/less/button-groups"; //@import "../../../../system/assets/vendor/bootstrap/less/input-groups"; @import "../../../../system/assets/vendor/bootstrap/less/navs"; @@ -31,11 +31,11 @@ @import "../../../../system/assets/vendor/bootstrap/less/tooltip"; // Utility classes -@import "../../../../system/assets/vendor/bootstrap/less/utilities"; -@import "../../../../system/assets/vendor/bootstrap/less/responsive-utilities"; +//@import "../../../../system/assets/vendor/bootstrap/less/utilities"; +//@import "../../../../system/assets/vendor/bootstrap/less/responsive-utilities"; // Jasny -@import "../../../../system/assets/vendor/bootstrap/less/rowlink"; +//@import "../../../../system/assets/vendor/bootstrap/less/rowlink"; // Override some Bootstrap styles table { diff --git a/modules/system/assets/ui/js/list.js b/modules/system/assets/ui/js/list.js new file mode 100644 index 000000000..375e01172 --- /dev/null +++ b/modules/system/assets/ui/js/list.js @@ -0,0 +1,3 @@ +/* +=require list.rowlink.js +*/ \ No newline at end of file diff --git a/modules/backend/assets/js/october.rowlink.js b/modules/system/assets/ui/js/list.rowlink.js similarity index 100% rename from modules/backend/assets/js/october.rowlink.js rename to modules/system/assets/ui/js/list.rowlink.js diff --git a/modules/system/assets/ui/less/list.less b/modules/system/assets/ui/less/list.less index 3012a753c..a3f99491a 100644 --- a/modules/system/assets/ui/less/list.less +++ b/modules/system/assets/ui/less/list.less @@ -10,6 +10,7 @@ // -------------------------------------------------- @import "list.variables.less"; +@import "list.rowlink.less"; @import "list.mixins.less"; @import "list.base.less"; diff --git a/modules/system/assets/ui/less/list.rowlink.less b/modules/system/assets/ui/less/list.rowlink.less new file mode 100644 index 000000000..0bef102a8 --- /dev/null +++ b/modules/system/assets/ui/less/list.rowlink.less @@ -0,0 +1,20 @@ +// Rowlink.less +// CSS for rowlink plugin +// ---------------------- + +tr.rowlink td { + cursor: pointer; + &.nolink { + cursor: auto; + } +} + +.table tbody tr.rowlink:hover td { + background-color: @table-bg-hover; +} + +a.rowlink { + color: inherit; + font: inherit; + text-decoration: inherit; +} diff --git a/modules/system/assets/ui/less/site.utility.less b/modules/system/assets/ui/less/site.utility.less new file mode 100644 index 000000000..5f7d89f47 --- /dev/null +++ b/modules/system/assets/ui/less/site.utility.less @@ -0,0 +1,134 @@ +// +// Utility classes +// -------------------------------------------------- + + +// Floats +// ------------------------- + +.clearfix { + .clearfix(); +} +.pull-right { + float: right !important; +} +.pull-left { + float: left !important; +} + + +// Toggling content +// ------------------------- + +.hide { + display: none !important; +} +.show { + display: block !important; +} +.invisible { + visibility: hidden; +} +.text-hide { + .text-hide(); +} + + +// For Affix plugin +// ------------------------- + +.affix { + position: fixed; +} + +// +// Responsive: Utility classes +// -------------------------------------------------- + +// IE10 in Windows (Phone) 8 +// +// Support for responsive views via media queries is kind of borked in IE10, for +// Surface/desktop in split view and for Windows Phone 8. This particular fix +// must be accompanied by a snippet of JavaScript to sniff the user agent and +// apply some conditional CSS to *only* the Surface/desktop Windows 8. Look at +// our Getting Started page for more information on this bug. +// +// For more information, see the following: +// +// Issue: https://github.com/twbs/bootstrap/issues/10497 +// Docs: http://getbootstrap.com/getting-started/#browsers +// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/ + +@-ms-viewport { + width: device-width; +} + + +// Visibility utilities +.visible-xs, +.visible-sm, +.visible-md, +.visible-lg { + .responsive-invisibility(); +} + +.visible-xs { + @media (max-width: @screen-xs-max) { + .responsive-visibility(); + } +} +.visible-sm { + @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) { + .responsive-visibility(); + } +} +.visible-md { + @media (min-width: @screen-md-min) and (max-width: @screen-md-max) { + .responsive-visibility(); + } +} +.visible-lg { + @media (min-width: @screen-lg-min) { + .responsive-visibility(); + } +} + +.hidden-xs { + @media (max-width: @screen-xs-max) { + .responsive-invisibility(); + } +} +.hidden-sm { + @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) { + .responsive-invisibility(); + } +} +.hidden-md { + @media (min-width: @screen-md-min) and (max-width: @screen-md-max) { + .responsive-invisibility(); + } +} +.hidden-lg { + @media (min-width: @screen-lg-min) { + .responsive-invisibility(); + } +} + + +// Print utilities +// +// Media queries are placed on the inside to be mixin-friendly. + +.visible-print { + .responsive-invisibility(); + + @media print { + .responsive-visibility(); + } +} + +.hidden-print { + @media print { + .responsive-invisibility(); + } +}