summaryrefslogtreecommitdiffstats
path: root/css/bootstrap/grid.less
diff options
context:
space:
mode:
authorArun Persaud <arun@nubati.net>2014-03-08 22:02:34 -0800
committerArun Persaud <arun@nubati.net>2014-03-08 22:26:07 -0800
commit72bdb543759b5ffbdf5c2cc71294ad4f1f2996b2 (patch)
treeaf2457b688e17c1709b5d2d45826a8379393abf1 /css/bootstrap/grid.less
parent742ba18eaf36386d2d0e0936975b3f2545afc59e (diff)
downloade-DoKo-72bdb543759b5ffbdf5c2cc71294ad4f1f2996b2.tar.gz
e-DoKo-72bdb543759b5ffbdf5c2cc71294ad4f1f2996b2.tar.bz2
e-DoKo-72bdb543759b5ffbdf5c2cc71294ad4f1f2996b2.zip
updated css/js libraries
* bootstrap 3.1.1 * jquery 2.1.0 * less 1.7.0 mostly bootstrap had to be adjusted, e.g. different names like hero-unit->jumbotron, etc.
Diffstat (limited to 'css/bootstrap/grid.less')
-rw-r--r--css/bootstrap/grid.less85
1 files changed, 74 insertions, 11 deletions
diff --git a/css/bootstrap/grid.less b/css/bootstrap/grid.less
index 750d203..e100655 100644
--- a/css/bootstrap/grid.less
+++ b/css/bootstrap/grid.less
@@ -3,19 +3,82 @@
// --------------------------------------------------
-// Fixed (940px)
-#grid > .core(@gridColumnWidth, @gridGutterWidth);
+// Container widths
+//
+// Set the container width, and override it for fixed navbars in media queries.
+
+.container {
+ .container-fixed();
+
+ @media (min-width: @screen-sm-min) {
+ width: @container-sm;
+ }
+ @media (min-width: @screen-md-min) {
+ width: @container-md;
+ }
+ @media (min-width: @screen-lg-min) {
+ width: @container-lg;
+ }
+}
+
+
+// Fluid container
+//
+// Utilizes the mixin meant for fixed width containers, but without any defined
+// width for fluid, full width layouts.
+
+.container-fluid {
+ .container-fixed();
+}
+
+
+// Row
+//
+// Rows contain and clear the floats of your columns.
+
+.row {
+ .make-row();
+}
+
+
+// Columns
+//
+// Common styles for small and large grid columns
+
+.make-grid-columns();
+
+
+// Extra small grid
+//
+// Columns, offsets, pushes, and pulls for extra small devices like
+// smartphones.
+
+.make-grid(xs);
+
+
+// Small grid
+//
+// Columns, offsets, pushes, and pulls for the small device range, from phones
+// to tablets.
+
+@media (min-width: @screen-sm-min) {
+ .make-grid(sm);
+}
+
-// Fluid (940px)
-#grid > .fluid(@fluidGridColumnWidth, @fluidGridGutterWidth);
+// Medium grid
+//
+// Columns, offsets, pushes, and pulls for the desktop device range.
-// Reset utility classes due to specificity
-[class*="span"].hide,
-.row-fluid [class*="span"].hide {
- display: none;
+@media (min-width: @screen-md-min) {
+ .make-grid(md);
}
-[class*="span"].pull-right,
-.row-fluid [class*="span"].pull-right {
- float: right;
+
+// Large grid
+//
+// Columns, offsets, pushes, and pulls for the large desktop device range.
+
+@media (min-width: @screen-lg-min) {
+ .make-grid(lg);
}