summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--alpha/css/grid/alpha_default/fluid/alpha-default-fluid-12-rtl.css96
-rw-r--r--alpha/css/grid/alpha_default/fluid/alpha-default-fluid-16-rtl.css113
-rw-r--r--alpha/css/grid/alpha_default/fluid/alpha-default-fluid-24-rtl.css163
-rw-r--r--alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-12-rtl.css108
-rw-r--r--alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-16-rtl.css125
-rw-r--r--alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-24-rtl.css175
-rw-r--r--alpha/includes/alpha.inc33
-rw-r--r--alpha/template.php8
8 files changed, 236 insertions, 585 deletions
diff --git a/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-12-rtl.css b/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-12-rtl.css
index f11800b..5077d04 100644
--- a/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-12-rtl.css
+++ b/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-12-rtl.css
@@ -6,17 +6,7 @@
.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10,
.grid-11, .grid-12 {
- display: inline;
float: right;
- position: relative;
- margin-right: 1%;
- margin-left: 1%;
-}
-
-.push-1, .pull-1, .push-2, .pull-2, .push-3, .pull-3, .push-4, .pull-4,
-.push-5, .pull-5, .push-6, .pull-6, .push-7, .pull-7, .push-8, .pull-8,
-.push-9, .pull-9, .push-10, .pull-10, .push-11, .pull-11, .push-12, .pull-12 {
- position: relative;
}
/*
@@ -26,114 +16,67 @@
*/
.alpha {
+ margin-left: 1% !important;
margin-right: 0 !important;
}
.omega {
+ margin-right: 1% !important;
margin-left: 0 !important;
}
-/*
- * ==========================================================
- * Columns
- * ==========================================================
- */
-
-.container-12 .grid-1 {
- width: 6.333%;
-}
-
-.container-12 .grid-2 {
- width: 14.667%;
-}
-
-.container-12 .grid-3 {
- width: 23.0%;
-}
-
-.container-12 .grid-4 {
- width: 31.333%;
-}
-
-.container-12 .grid-5 {
- width: 39.667%;
-}
-
-.container-12 .grid-6 {
- width: 48.0%;
-}
-
-.container-12 .grid-7 {
- width: 56.333%;
-}
-
-.container-12 .grid-8 {
- width: 64.667%;
-}
-
-.container-12 .grid-9 {
- width: 73.0%;
-}
-
-.container-12 .grid-10 {
- width: 81.333%;
-}
-
-.container-12 .grid-11 {
- width: 89.667%;
-}
-
-.container-12 .grid-12 {
- width: 98.0%;
-}
-
-/*
- * ==========================================================
- * Prefix
- * ==========================================================
- */
-
.container-12 .prefix-1 {
- padding-right: 8.333%;
+ padding-left: 0;
+ padding-right: 8.333%;
}
.container-12 .prefix-2 {
+ padding-left: 0;
padding-right: 16.667%;
}
.container-12 .prefix-3 {
+ padding-left: 0;
padding-right: 25.0%;
}
.container-12 .prefix-4 {
+ padding-left: 0;
padding-right: 33.333%;
}
.container-12 .prefix-5 {
+ padding-left: 0;
padding-right: 41.667%;
}
.container-12 .prefix-6 {
+ padding-left: 0;
padding-right: 50.0%;
}
.container-12 .prefix-7 {
+ padding-left: 0;
padding-right: 58.333%;
}
.container-12 .prefix-8 {
+ padding-left: 0;
padding-right: 66.667%;
}
.container-12 .prefix-9 {
+ padding-left: 0;
padding-right: 75.0%;
}
.container-12 .prefix-10 {
+ padding-left: 0;
padding-right: 83.333%;
}
.container-12 .prefix-11 {
+ padding-left: 0;
padding-right: 91.667%;
}
@@ -144,46 +87,57 @@
*/
.container-12 .suffix-1 {
+ padding-right: 0;
padding-left: 8.333%;
}
.container-12 .suffix-2 {
+ padding-right: 0;
padding-left: 16.667%;
}
.container-12 .suffix-3 {
+ padding-right: 0;
padding-left: 25.0%;
}
.container-12 .suffix-4 {
+ padding-right: 0;
padding-left: 33.333%;
}
.container-12 .suffix-5 {
+ padding-right: 0;
padding-left: 41.667%;
}
.container-12 .suffix-6 {
+ padding-right: 0;
padding-left: 50.0%;
}
.container-12 .suffix-7 {
+ padding-right: 0;
padding-left: 58.333%;
}
.container-12 .suffix-8 {
+ padding-right: 0;
padding-left: 66.667%;
}
.container-12 .suffix-9 {
+ padding-right: 0;
padding-left: 75.0%;
}
.container-12 .suffix-10 {
+ padding-right: 0;
padding-left: 83.333%;
}
.container-12 .suffix-11 {
+ padding-right: 0;
padding-left: 91.667%;
}
diff --git a/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-16-rtl.css b/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-16-rtl.css
index addd7af..1c8d80a 100644
--- a/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-16-rtl.css
+++ b/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-16-rtl.css
@@ -6,18 +6,7 @@
.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10,
.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16 {
- display: inline;
float: right;
- position: relative;
- margin-right: 1%;
- margin-left: 1%;
-}
-
-.push-1, .pull-1, .push-2, .pull-2, .push-3, .pull-3, .push-4, .pull-4,
-.push-5, .pull-5, .push-6, .pull-6, .push-7, .pull-7, .push-8, .pull-8,
-.push-9, .pull-9, .push-10, .pull-10, .push-11, .pull-11, .push-12, .pull-12,
-.push-13, .pull-13, .push-14, .pull-14, .push-15, .pull-15, .push-16, .pull-16 {
- position: relative;
}
/*
@@ -27,146 +16,93 @@
*/
.alpha {
+ margin-left: 1% !important;
margin-right: 0 !important;
}
.omega {
+ margin-right: 1% !important;
margin-left: 0 !important;
}
/*
* ==========================================================
- * Columns
- * ==========================================================
- */
-
-.container-16 .grid-1 {
- width: 4.25%;
-}
-
-.container-16 .grid-2 {
- width: 10.5%;
-}
-
-.container-16 .grid-3 {
- width: 16.75%;
-}
-
-.container-16 .grid-4 {
- width: 23.0%;
-}
-
-.container-16 .grid-5 {
- width: 29.25%;
-}
-
-.container-16 .grid-6 {
- width: 35.5%;
-}
-
-.container-16 .grid-7 {
- width: 41.75%;
-}
-
-.container-16 .grid-8 {
- width: 48.0%;
-}
-
-.container-16 .grid-9 {
- width: 54.25%;
-}
-
-.container-16 .grid-10 {
- width: 60.5%;
-}
-
-.container-16 .grid-11 {
- width: 66.75%;
-}
-
-.container-16 .grid-12 {
- width: 73.0%;
-}
-
-.container-16 .grid-13 {
- width: 79.25%;
-}
-
-.container-16 .grid-14 {
- width: 85.5%;
-}
-
-.container-16 .grid-15 {
- width: 91.75%;
-}
-
-.container-16 .grid-16 {
- width: 98.0%;
-}
-
-/*
- * ==========================================================
* Prefix
* ==========================================================
*/
.container-16 .prefix-1 {
+ padding-left: 0;
padding-right: 6.25%;
}
.container-16 .prefix-2 {
+ padding-left: 0;
padding-right: 12.5%;
}
.container-16 .prefix-3 {
+ padding-left: 0;
padding-right: 18.75%;
}
.container-16 .prefix-4 {
+ padding-left: 0;
padding-right: 25.0%;
}
.container-16 .prefix-5 {
+ padding-left: 0;
padding-right: 31.25%;
}
.container-16 .prefix-6 {
+ padding-left: 0;
padding-right: 37.5%;
}
.container-16 .prefix-7 {
+ padding-left: 0;
padding-right: 43.75%;
}
.container-16 .prefix-8 {
+ padding-left: 0;
padding-right: 50.0%;
}
.container-16 .prefix-9 {
+ padding-left: 0;
padding-right: 56.25%;
}
.container-16 .prefix-10 {
+ padding-left: 0;
padding-right: 62.5%;
}
.container-16 .prefix-11 {
+ padding-left: 0;
padding-right: 68.75%;
}
.container-16 .prefix-12 {
+ padding-left: 0;
padding-right: 75.0%;
}
.container-16 .prefix-13 {
+ padding-left: 0;
padding-right: 81.25%;
}
.container-16 .prefix-14 {
+ padding-left: 0;
padding-right: 87.5%;
}
.container-16 .prefix-15 {
+ padding-left: 0;
padding-right: 93.75%;
}
@@ -177,62 +113,77 @@
*/
.container-16 .suffix-1 {
+ padding-right: 0;
padding-left: 6.25%;
}
.container-16 .suffix-2 {
+ padding-right: 0;
padding-left: 12.5%;
}
.container-16 .suffix-3 {
+ padding-right: 0;
padding-left: 18.75%;
}
.container-16 .suffix-4 {
+ padding-right: 0;
padding-left: 25.0%;
}
.container-16 .suffix-5 {
+ padding-right: 0;
padding-left: 31.25%;
}
.container-16 .suffix-6 {
+ padding-right: 0;
padding-left: 37.5%;
}
.container-16 .suffix-7 {
+ padding-right: 0;
padding-left: 43.75%;
}
.container-16 .suffix-8 {
+ padding-right: 0;
padding-left: 50.0%;
}
.container-16 .suffix-9 {
+ padding-right: 0;
padding-left: 56.25%;
}
.container-16 .suffix-10 {
+ padding-right: 0;
padding-left: 62.5%;
}
.container-16 .suffix-11 {
+ padding-right: 0;
padding-left: 68.75%;
}
.container-16 .suffix-12 {
+ padding-right: 0;
padding-left: 75.0%;
}
.container-16 .suffix-13 {
+ padding-right: 0;
padding-left: 81.25%;
}
.container-16 .suffix-14 {
+ padding-right: 0;
padding-left: 87.5%;
}
.container-16 .suffix-15 {
+ padding-right: 0;
padding-left: 93.75%;
}
diff --git a/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-24-rtl.css b/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-24-rtl.css
index aee3d30..c22f8f8 100644
--- a/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-24-rtl.css
+++ b/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-24-rtl.css
@@ -7,20 +7,7 @@
.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10,
.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .grid-17, .grid-18, .grid-19,
.grid-20, .grid-21, .grid-22, .grid-23, .grid-24 {
- display: inline;
float: right;
- position: relative;
- margin-right: 1%;
- margin-left: 1%;
-}
-
-.push-1, .pull-1, .push-2, .pull-2, .push-3, .pull-3, .push-4, .pull-4,
-.push-5, .pull-5, .push-6, .pull-6, .push-7, .pull-7, .push-8, .pull-8,
-.push-9, .pull-9, .push-10, .pull-10, .push-11, .pull-11, .push-12, .pull-12,
-.push-13, .pull-13, .push-14, .pull-14, .push-15, .pull-15, .push-16, .pull-16,
-.push-17, .pull-17, .push-18, .pull-18, .push-19, .pull-19, .push-20, .pull-20,
-.push-21, .pull-21, .push-22, .pull-22, .push-23, .pull-23, .push-24, .pull-24 {
- position: relative;
}
/*
@@ -30,210 +17,133 @@
*/
.alpha {
+ margin-left: 1% !important;
margin-right: 0 !important;
}
.omega {
+ margin-right: 1% !important;
margin-left: 0 !important;
}
/*
* ==========================================================
- * Columns
- * ==========================================================
- */
-
-.container-24 .grid-1 {
- width: 2.167%;
-}
-
-.container-24 .grid-2 {
- width: 6.333%;
-}
-
-.container-24 .grid-3 {
- width: 10.5%;
-}
-
-.container-24 .grid-4 {
- width: 14.667%;
-}
-
-.container-24 .grid-5 {
- width: 18.833%;
-}
-
-.container-24 .grid-6 {
- width: 23.0%;
-}
-
-.container-24 .grid-7 {
- width: 27.167%;
-}
-
-.container-24 .grid-8 {
- width: 31.333%;
-}
-
-.container-24 .grid-9 {
- width: 35.5%;
-}
-
-.container-24 .grid-10 {
- width: 39.667%;
-}
-
-.container-24 .grid-11 {
- width: 43.833%;
-}
-
-.container-24 .grid-12 {
- width: 48.0%;
-}
-
-.container-24 .grid-13 {
- width: 52.167%;
-}
-
-.container-24 .grid-14 {
- width: 56.333%;
-}
-
-.container-24 .grid-15 {
- width: 60.5%;
-}
-
-.container-24 .grid-16 {
- width: 64.667%;
-}
-
-.container-24 .grid-17 {
- width: 68.833%;
-}
-
-.container-24 .grid-18 {
- width: 73.0%;
-}
-
-.container-24 .grid-19 {
- width: 77.167%;
-}
-
-.container-24 .grid-20 {
- width: 81.333%;
-}
-
-.container-24 .grid-21 {
- width: 85.5%;
-}
-
-.container-24 .grid-22 {
- width: 89.667%;
-}
-
-.container-24 .grid-23 {
- width: 93.833%;
-}
-
-.container-24 .grid-24 {
- width: 98.0%;
-}
-
-/*
- * ==========================================================
* Prefix
* ==========================================================
*/
.container-24 .prefix-1 {
+ padding-left: 0;
padding-right: 4.167%;
}
.container-24 .prefix-2 {
+ padding-left: 0;
padding-right: 8.333%;
}
.container-24 .prefix-3 {
+ padding-left: 0;
padding-right: 12.5%;
}
.container-24 .prefix-4 {
+ padding-left: 0;
padding-right: 16.667%;
}
.container-24 .prefix-5 {
+ padding-left: 0;
padding-right: 20.833%;
}
.container-24 .prefix-6 {
+ padding-left: 0;
padding-right: 25.0%;
}
.container-24 .prefix-7 {
+ padding-left: 0;
padding-right: 29.167%;
}
.container-24 .prefix-8 {
+ padding-left: 0;
padding-right: 33.333%;
}
.container-24 .prefix-9 {
+ padding-left: 0;
padding-right: 37.5%;
}
.container-24 .prefix-10 {
+ padding-left: 0;
padding-right: 41.667%;
}
.container-24 .prefix-11 {
+ padding-left: 0;
padding-right: 45.833%;
}
.container-24 .prefix-12 {
+ padding-left: 0;
padding-right: 50.0%;
}
.container-24 .prefix-13 {
+ padding-left: 0;
padding-right: 54.167%;
}
.container-24 .prefix-14 {
+ padding-left: 0;
padding-right: 58.333%;
}
.container-24 .prefix-15 {
+ padding-left: 0;
padding-right: 62.5%;
}
.container-24 .prefix-16 {
+ padding-left: 0;
padding-right: 66.667%;
}
.container-24 .prefix-17 {
+ padding-left: 0;
padding-right: 70.833%;
}
.container-24 .prefix-18 {
+ padding-left: 0;
padding-right: 75.0%;
}
.container-24 .prefix-19 {
+ padding-left: 0;
padding-right: 79.167%;
}
.container-24 .prefix-20 {
+ padding-left: 0;
padding-right: 83.333%;
}
.container-24 .prefix-21 {
+ padding-left: 0;
padding-right: 87.5%;
}
.container-24 .prefix-22 {
+ padding-left: 0;
padding-right: 91.667%;
}
.container-24 .prefix-23 {
+ padding-left: 0;
padding-right: 95.833%;
}
@@ -244,94 +154,117 @@
*/
.container-24 .suffix-1 {
+ padding-right: 0;
padding-left: 4.167%;
}
.container-24 .suffix-2 {
+ padding-right: 0;
padding-left: 8.333%;
}
.container-24 .suffix-3 {
+ padding-right: 0;
padding-left: 12.5%;
}
.container-24 .suffix-4 {
+ padding-right: 0;
padding-left: 16.667%;
}
.container-24 .suffix-5 {
+ padding-right: 0;
padding-left: 20.833%;
}
.container-24 .suffix-6 {
+ padding-right: 0;
padding-left: 25.0%;
}
.container-24 .suffix-7 {
+ padding-right: 0;
padding-left: 29.167%;
}
.container-24 .suffix-8 {
+ padding-right: 0;
padding-left: 33.333%;
}
.container-24 .suffix-9 {
+ padding-right: 0;
padding-left: 37.5%;
}
.container-24 .suffix-10 {
+ padding-right: 0;
padding-left: 41.667%;
}
.container-24 .suffix-11 {
+ padding-right: 0;
padding-left: 45.833%;
}
.container-24 .suffix-12 {
+ padding-right: 0;
padding-left: 50.0%;
}
.container-24 .suffix-13 {
+ padding-right: 0;
padding-left: 54.167%;
}
.container-24 .suffix-14 {
+ padding-right: 0;
padding-left: 58.333%;
}
.container-24 .suffix-15 {
+ padding-right: 0;
padding-left: 62.5%;
}
.container-24 .suffix-16 {
+ padding-right: 0;
padding-left: 66.667%;
}
.container-24 .suffix-17 {
+ padding-right: 0;
padding-left: 70.833%;
}
.container-24 .suffix-18 {
+ padding-right: 0;
padding-left: 75.0%;
}
.container-24 .suffix-19 {
+ padding-right: 0;
padding-left: 79.167%;
}
.container-24 .suffix-20 {
+ padding-right: 0;
padding-left: 83.333%;
}
.container-24 .suffix-21 {
+ padding-right: 0;
padding-left: 87.5%;
}
.container-24 .suffix-22 {
+ padding-right: 0;
padding-left: 91.667%;
}
.container-24 .suffix-23 {
+ padding-right: 0;
padding-left: 95.833%;
}
diff --git a/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-12-rtl.css b/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-12-rtl.css
index 658dbb9..5077d04 100644
--- a/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-12-rtl.css
+++ b/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-12-rtl.css
@@ -6,17 +6,7 @@
.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10,
.grid-11, .grid-12 {
- display: inline;
float: right;
- position: relative;
- margin-right: 1%;
- margin-left: 1%;
-}
-
-.push-1, .pull-1, .push-2, .pull-2, .push-3, .pull-3, .push-4, .pull-4,
-.push-5, .pull-5, .push-6, .pull-6, .push-7, .pull-7, .push-8, .pull-8,
-.push-9, .pull-9, .push-10, .pull-10, .push-11, .pull-11, .push-12, .pull-12 {
- position: relative;
}
/*
@@ -26,126 +16,67 @@
*/
.alpha {
+ margin-left: 1% !important;
margin-right: 0 !important;
}
.omega {
+ margin-right: 1% !important;
margin-left: 0 !important;
}
-/*
- * ==========================================================
- * Container
- * ==========================================================
- */
-
-.container-12 {
- width: 92%;
- margin-right: 4%;
- margin-left: 4%;
-}
-
-/*
- * ==========================================================
- * Columns
- * ==========================================================
- */
-
-.container-12 .grid-1 {
- width: 6.333%;
-}
-
-.container-12 .grid-2 {
- width: 14.667%;
-}
-
-.container-12 .grid-3 {
- width: 23.0%;
-}
-
-.container-12 .grid-4 {
- width: 31.333%;
-}
-
-.container-12 .grid-5 {
- width: 39.667%;
-}
-
-.container-12 .grid-6 {
- width: 48.0%;
-}
-
-.container-12 .grid-7 {
- width: 56.333%;
-}
-
-.container-12 .grid-8 {
- width: 64.667%;
-}
-
-.container-12 .grid-9 {
- width: 73.0%;
-}
-
-.container-12 .grid-10 {
- width: 81.333%;
-}
-
-.container-12 .grid-11 {
- width: 89.667%;
-}
-
-.container-12 .grid-12 {
- width: 98.0%;
-}
-
-/*
- * ==========================================================
- * Prefix
- * ==========================================================
- */
-
.container-12 .prefix-1 {
- padding-right: 8.333%;
+ padding-left: 0;
+ padding-right: 8.333%;
}
.container-12 .prefix-2 {
+ padding-left: 0;
padding-right: 16.667%;
}
.container-12 .prefix-3 {
+ padding-left: 0;
padding-right: 25.0%;
}
.container-12 .prefix-4 {
+ padding-left: 0;
padding-right: 33.333%;
}
.container-12 .prefix-5 {
+ padding-left: 0;
padding-right: 41.667%;
}
.container-12 .prefix-6 {
+ padding-left: 0;
padding-right: 50.0%;
}
.container-12 .prefix-7 {
+ padding-left: 0;
padding-right: 58.333%;
}
.container-12 .prefix-8 {
+ padding-left: 0;
padding-right: 66.667%;
}
.container-12 .prefix-9 {
+ padding-left: 0;
padding-right: 75.0%;
}
.container-12 .prefix-10 {
+ padding-left: 0;
padding-right: 83.333%;
}
.container-12 .prefix-11 {
+ padding-left: 0;
padding-right: 91.667%;
}
@@ -156,46 +87,57 @@
*/
.container-12 .suffix-1 {
+ padding-right: 0;
padding-left: 8.333%;
}
.container-12 .suffix-2 {
+ padding-right: 0;
padding-left: 16.667%;
}
.container-12 .suffix-3 {
+ padding-right: 0;
padding-left: 25.0%;
}
.container-12 .suffix-4 {
+ padding-right: 0;
padding-left: 33.333%;
}
.container-12 .suffix-5 {
+ padding-right: 0;
padding-left: 41.667%;
}
.container-12 .suffix-6 {
+ padding-right: 0;
padding-left: 50.0%;
}
.container-12 .suffix-7 {
+ padding-right: 0;
padding-left: 58.333%;
}
.container-12 .suffix-8 {
+ padding-right: 0;
padding-left: 66.667%;
}
.container-12 .suffix-9 {
+ padding-right: 0;
padding-left: 75.0%;
}
.container-12 .suffix-10 {
+ padding-right: 0;
padding-left: 83.333%;
}
.container-12 .suffix-11 {
+ padding-right: 0;
padding-left: 91.667%;
}
diff --git a/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-16-rtl.css b/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-16-rtl.css
index 9dd6ed9..1c8d80a 100644
--- a/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-16-rtl.css
+++ b/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-16-rtl.css
@@ -6,18 +6,7 @@
.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10,
.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16 {
- display: inline;
float: right;
- position: relative;
- margin-right: 1%;
- margin-left: 1%;
-}
-
-.push-1, .pull-1, .push-2, .pull-2, .push-3, .pull-3, .push-4, .pull-4,
-.push-5, .pull-5, .push-6, .pull-6, .push-7, .pull-7, .push-8, .pull-8,
-.push-9, .pull-9, .push-10, .pull-10, .push-11, .pull-11, .push-12, .pull-12,
-.push-13, .pull-13, .push-14, .pull-14, .push-15, .pull-15, .push-16, .pull-16 {
- position: relative;
}
/*
@@ -27,158 +16,93 @@
*/
.alpha {
+ margin-left: 1% !important;
margin-right: 0 !important;
}
.omega {
+ margin-right: 1% !important;
margin-left: 0 !important;
}
/*
* ==========================================================
- * Container
- * ==========================================================
- */
-
-.container-16 {
- width: 92%;
- margin-right: 4%;
- margin-left: 4%;
-}
-
-/*
- * ==========================================================
- * Columns
- * ==========================================================
- */
-
-.container-16 .grid-1 {
- width: 4.25%;
-}
-
-.container-16 .grid-2 {
- width: 10.5%;
-}
-
-.container-16 .grid-3 {
- width: 16.75%;
-}
-
-.container-16 .grid-4 {
- width: 23.0%;
-}
-
-.container-16 .grid-5 {
- width: 29.25%;
-}
-
-.container-16 .grid-6 {
- width: 35.5%;
-}
-
-.container-16 .grid-7 {
- width: 41.75%;
-}
-
-.container-16 .grid-8 {
- width: 48.0%;
-}
-
-.container-16 .grid-9 {
- width: 54.25%;
-}
-
-.container-16 .grid-10 {
- width: 60.5%;
-}
-
-.container-16 .grid-11 {
- width: 66.75%;
-}
-
-.container-16 .grid-12 {
- width: 73.0%;
-}
-
-.container-16 .grid-13 {
- width: 79.25%;
-}
-
-.container-16 .grid-14 {
- width: 85.5%;
-}
-
-.container-16 .grid-15 {
- width: 91.75%;
-}
-
-.container-16 .grid-16 {
- width: 98.0%;
-}
-
-/*
- * ==========================================================
* Prefix
* ==========================================================
*/
.container-16 .prefix-1 {
+ padding-left: 0;
padding-right: 6.25%;
}
.container-16 .prefix-2 {
+ padding-left: 0;
padding-right: 12.5%;
}
.container-16 .prefix-3 {
+ padding-left: 0;
padding-right: 18.75%;
}
.container-16 .prefix-4 {
+ padding-left: 0;
padding-right: 25.0%;
}
.container-16 .prefix-5 {
+ padding-left: 0;
padding-right: 31.25%;
}
.container-16 .prefix-6 {
+ padding-left: 0;
padding-right: 37.5%;
}
.container-16 .prefix-7 {
+ padding-left: 0;
padding-right: 43.75%;
}
.container-16 .prefix-8 {
+ padding-left: 0;
padding-right: 50.0%;
}
.container-16 .prefix-9 {
+ padding-left: 0;
padding-right: 56.25%;
}
.container-16 .prefix-10 {
+ padding-left: 0;
padding-right: 62.5%;
}
.container-16 .prefix-11 {
+ padding-left: 0;
padding-right: 68.75%;
}
.container-16 .prefix-12 {
+ padding-left: 0;
padding-right: 75.0%;
}
.container-16 .prefix-13 {
+ padding-left: 0;
padding-right: 81.25%;
}
.container-16 .prefix-14 {
+ padding-left: 0;
padding-right: 87.5%;
}
.container-16 .prefix-15 {
+ padding-left: 0;
padding-right: 93.75%;
}
@@ -189,62 +113,77 @@
*/
.container-16 .suffix-1 {
+ padding-right: 0;
padding-left: 6.25%;
}
.container-16 .suffix-2 {
+ padding-right: 0;
padding-left: 12.5%;
}
.container-16 .suffix-3 {
+ padding-right: 0;
padding-left: 18.75%;
}
.container-16 .suffix-4 {
+ padding-right: 0;
padding-left: 25.0%;
}
.container-16 .suffix-5 {
+ padding-right: 0;
padding-left: 31.25%;
}
.container-16 .suffix-6 {
+ padding-right: 0;
padding-left: 37.5%;
}
.container-16 .suffix-7 {
+ padding-right: 0;
padding-left: 43.75%;
}
.container-16 .suffix-8 {
+ padding-right: 0;
padding-left: 50.0%;
}
.container-16 .suffix-9 {
+ padding-right: 0;
padding-left: 56.25%;
}
.container-16 .suffix-10 {
+ padding-right: 0;
padding-left: 62.5%;
}
.container-16 .suffix-11 {
+ padding-right: 0;
padding-left: 68.75%;
}
.container-16 .suffix-12 {
+ padding-right: 0;
padding-left: 75.0%;
}
.container-16 .suffix-13 {
+ padding-right: 0;
padding-left: 81.25%;
}
.container-16 .suffix-14 {
+ padding-right: 0;
padding-left: 87.5%;
}
.container-16 .suffix-15 {
+ padding-right: 0;
padding-left: 93.75%;
}
diff --git a/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-24-rtl.css b/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-24-rtl.css
index 8932cfe..c22f8f8 100644
--- a/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-24-rtl.css
+++ b/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-24-rtl.css
@@ -7,20 +7,7 @@
.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10,
.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .grid-17, .grid-18, .grid-19,
.grid-20, .grid-21, .grid-22, .grid-23, .grid-24 {
- display: inline;
float: right;
- position: relative;
- margin-right: 1%;
- margin-left: 1%;
-}
-
-.push-1, .pull-1, .push-2, .pull-2, .push-3, .pull-3, .push-4, .pull-4,
-.push-5, .pull-5, .push-6, .pull-6, .push-7, .pull-7, .push-8, .pull-8,
-.push-9, .pull-9, .push-10, .pull-10, .push-11, .pull-11, .push-12, .pull-12,
-.push-13, .pull-13, .push-14, .pull-14, .push-15, .pull-15, .push-16, .pull-16,
-.push-17, .pull-17, .push-18, .pull-18, .push-19, .pull-19, .push-20, .pull-20,
-.push-21, .pull-21, .push-22, .pull-22, .push-23, .pull-23, .push-24, .pull-24 {
- position: relative;
}
/*
@@ -30,222 +17,133 @@
*/
.alpha {
+ margin-left: 1% !important;
margin-right: 0 !important;
}
.omega {
+ margin-right: 1% !important;
margin-left: 0 !important;
}
/*
* ==========================================================
- * Container
- * ==========================================================
- */
-
-.container-24 {
- width: 92%;
- margin-right: 4%;
- margin-left: 4%;
-}
-
-/*
- * ==========================================================
- * Columns
- * ==========================================================
- */
-
-.container-24 .grid-1 {
- width: 2.167%;
-}
-
-.container-24 .grid-2 {
- width: 6.333%;
-}
-
-.container-24 .grid-3 {
- width: 10.5%;
-}
-
-.container-24 .grid-4 {
- width: 14.667%;
-}
-
-.container-24 .grid-5 {
- width: 18.833%;
-}
-
-.container-24 .grid-6 {
- width: 23.0%;
-}
-
-.container-24 .grid-7 {
- width: 27.167%;
-}
-
-.container-24 .grid-8 {
- width: 31.333%;
-}
-
-.container-24 .grid-9 {
- width: 35.5%;
-}
-
-.container-24 .grid-10 {
- width: 39.667%;
-}
-
-.container-24 .grid-11 {
- width: 43.833%;
-}
-
-.container-24 .grid-12 {
- width: 48.0%;
-}
-
-.container-24 .grid-13 {
- width: 52.167%;
-}
-
-.container-24 .grid-14 {
- width: 56.333%;
-}
-
-.container-24 .grid-15 {
- width: 60.5%;
-}
-
-.container-24 .grid-16 {
- width: 64.667%;
-}
-
-.container-24 .grid-17 {
- width: 68.833%;
-}
-
-.container-24 .grid-18 {
- width: 73.0%;
-}
-
-.container-24 .grid-19 {
- width: 77.167%;
-}
-
-.container-24 .grid-20 {
- width: 81.333%;
-}
-
-.container-24 .grid-21 {
- width: 85.5%;
-}
-
-.container-24 .grid-22 {
- width: 89.667%;
-}
-
-.container-24 .grid-23 {
- width: 93.833%;
-}
-
-.container-24 .grid-24 {
- width: 98.0%;
-}
-
-/*
- * ==========================================================
* Prefix
* ==========================================================
*/
.container-24 .prefix-1 {
+ padding-left: 0;
padding-right: 4.167%;
}
.container-24 .prefix-2 {
+ padding-left: 0;
padding-right: 8.333%;
}
.container-24 .prefix-3 {
+ padding-left: 0;
padding-right: 12.5%;
}
.container-24 .prefix-4 {
+ padding-left: 0;
padding-right: 16.667%;
}
.container-24 .prefix-5 {
+ padding-left: 0;
padding-right: 20.833%;
}
.container-24 .prefix-6 {
+ padding-left: 0;
padding-right: 25.0%;
}
.container-24 .prefix-7 {
+ padding-left: 0;
padding-right: 29.167%;
}
.container-24 .prefix-8 {
+ padding-left: 0;
padding-right: 33.333%;
}
.container-24 .prefix-9 {
+ padding-left: 0;
padding-right: 37.5%;
}
.container-24 .prefix-10 {
+ padding-left: 0;
padding-right: 41.667%;
}
.container-24 .prefix-11 {
+ padding-left: 0;
padding-right: 45.833%;
}
.container-24 .prefix-12 {
+ padding-left: 0;
padding-right: 50.0%;
}
.container-24 .prefix-13 {
+ padding-left: 0;
padding-right: 54.167%;
}
.container-24 .prefix-14 {
+ padding-left: 0;
padding-right: 58.333%;
}
.container-24 .prefix-15 {
+ padding-left: 0;
padding-right: 62.5%;
}
.container-24 .prefix-16 {
+ padding-left: 0;
padding-right: 66.667%;
}
.container-24 .prefix-17 {
+ padding-left: 0;
padding-right: 70.833%;
}
.container-24 .prefix-18 {
+ padding-left: 0;
padding-right: 75.0%;
}
.container-24 .prefix-19 {
+ padding-left: 0;
padding-right: 79.167%;
}
.container-24 .prefix-20 {
+ padding-left: 0;
padding-right: 83.333%;
}
.container-24 .prefix-21 {
+ padding-left: 0;
padding-right: 87.5%;
}
.container-24 .prefix-22 {
+ padding-left: 0;
padding-right: 91.667%;
}
.container-24 .prefix-23 {
+ padding-left: 0;
padding-right: 95.833%;
}
@@ -256,94 +154,117 @@
*/
.container-24 .suffix-1 {
+ padding-right: 0;
padding-left: 4.167%;
}
.container-24 .suffix-2 {
+ padding-right: 0;
padding-left: 8.333%;
}
.container-24 .suffix-3 {
+ padding-right: 0;
padding-left: 12.5%;
}
.container-24 .suffix-4 {
+ padding-right: 0;
padding-left: 16.667%;
}
.container-24 .suffix-5 {
+ padding-right: 0;
padding-left: 20.833%;
}
.container-24 .suffix-6 {
+ padding-right: 0;
padding-left: 25.0%;
}
.container-24 .suffix-7 {
+ padding-right: 0;
padding-left: 29.167%;
}
.container-24 .suffix-8 {
+ padding-right: 0;
padding-left: 33.333%;
}
.container-24 .suffix-9 {
+ padding-right: 0;
padding-left: 37.5%;
}
.container-24 .suffix-10 {
+ padding-right: 0;
padding-left: 41.667%;
}
.container-24 .suffix-11 {
+ padding-right: 0;
padding-left: 45.833%;
}
.container-24 .suffix-12 {
+ padding-right: 0;
padding-left: 50.0%;
}
.container-24 .suffix-13 {
+ padding-right: 0;
padding-left: 54.167%;
}
.container-24 .suffix-14 {
+ padding-right: 0;
padding-left: 58.333%;
}
.container-24 .suffix-15 {
+ padding-right: 0;
padding-left: 62.5%;
}
.container-24 .suffix-16 {
+ padding-right: 0;
padding-left: 66.667%;
}
.container-24 .suffix-17 {
+ padding-right: 0;
padding-left: 70.833%;
}
.container-24 .suffix-18 {
+ padding-right: 0;
padding-left: 75.0%;
}
.container-24 .suffix-19 {
+ padding-right: 0;
padding-left: 79.167%;
}
.container-24 .suffix-20 {
+ padding-right: 0;
padding-left: 83.333%;
}
.container-24 .suffix-21 {
+ padding-right: 0;
padding-left: 87.5%;
}
.container-24 .suffix-22 {
+ padding-right: 0;
padding-left: 91.667%;
}
.container-24 .suffix-23 {
+ padding-right: 0;
padding-left: 95.833%;
}
diff --git a/alpha/includes/alpha.inc b/alpha/includes/alpha.inc
index 8a8b0e1..d461a00 100644
--- a/alpha/includes/alpha.inc
+++ b/alpha/includes/alpha.inc
@@ -30,7 +30,7 @@ function alpha_invoke($type, $hook, &$vars) {
$registry = &drupal_static(__FUNCTION__);
if (!isset($registry)) {
- $registry = alpha_cache_get('alpha_registry', $GLOBALS['theme_key']);
+ $registry = alpha_cache_get('hooks', $GLOBALS['theme_key']);
}
// If one of the themes in the theme trail implements this hook
@@ -133,8 +133,17 @@ function alpha_build_registry($registry, $theme = NULL) {
alpha_alter('alpha_registry', $cache, $theme);
- // Save the registry in the database.
- alpha_cache_set('alpha_registry', $cache, $theme);
+ // Save the hooks in the database.
+ alpha_cache_set('hooks', $cache, $theme);
+}
+
+/**
+ * @todo
+ */
+function alpha_clear_cache($theme = NULL) {
+ $theme = isset($theme) ? $theme : $GLOBALS['theme_key'];
+
+ cache_clear_all('alpha_registry:' . $theme, 'cache', TRUE);
}
/**
@@ -147,12 +156,14 @@ function alpha_cache_get($cid, $theme = NULL) {
if (empty($executed[$theme])) {
$executed[$theme] = TRUE;
- $items = array('alpha_registry:' . $theme, 'alpha_grids:' . $theme, 'alpha_css:' . $theme, 'alpha_libraries:' . $theme);
+ $items = array('alpha_registry:' . $theme . ':hooks', 'alpha_registry:' . $theme . ':grids', 'alpha_registry:' . $theme . ':css', 'alpha_registry:' . $theme . ':libraries');
cache_get_multiple($items);
}
-
- return cache_get($cid . ':' . $theme)->data;
+ echo $cid;
+ if ($cache = cache_get('alpha_registry:' . $theme . ':' . $cid)) {
+ return $cache->data;
+ }
}
/**
@@ -161,7 +172,7 @@ function alpha_cache_get($cid, $theme = NULL) {
function alpha_cache_set($cid, $data, $theme = NULL) {
$theme = isset($theme) ? $theme : $GLOBALS['theme_key'];
- return cache_set($cid . ':' . $theme, $data);
+ return cache_set('alpha_registry:' . $theme . ':' . $cid, $data);
}
/**
@@ -505,7 +516,7 @@ function alpha_css($theme = NULL) {
$css = &drupal_static(__FUNCTION__);
if (!isset($css[$theme])) {
- $css[$theme] = alpha_cache_get('alpha_css', $theme);
+ $css[$theme] = alpha_cache_get('css', $theme);
}
if (!isset($css[$theme])) {
@@ -566,7 +577,7 @@ function alpha_libraries($library = NULL, $theme = NULL) {
$libraries = &drupal_static(__FUNCTION__);
if (!isset($libraries[$theme])) {
- $libraries[$theme] = alpha_cache_get('alpha_libraries', $theme);
+ $libraries[$theme] = alpha_cache_get('libraries', $theme);
}
if (!isset($libraries[$theme])) {
@@ -629,7 +640,7 @@ function alpha_library_active($library, $theme = NULL) {
$theme = isset($theme) ? $theme : $GLOBALS['theme_key'];
$settings = alpha_settings($theme);
- if (isset($settings['libraries'][$library]) && $settings['libraries'][$library] === $library) {
+ if (alpha_libraries($library, $theme) && isset($settings['libraries'][$library]) && $settings['libraries'][$library] === $library) {
return TRUE;
}
@@ -945,7 +956,7 @@ function alpha_grids($grid = NULL, $theme = NULL) {
$grids = &drupal_static(__FUNCTION__);
if (!isset($grids[$theme])) {
- $grids[$theme] = alpha_cache_get('alpha_grids', $theme);
+ $grids[$theme] = alpha_cache_get('grids', $theme);
if (!isset($grids[$theme])) {
$grids[$theme] = alpha_register_grids($theme);
diff --git a/alpha/template.php b/alpha/template.php
index ca449be..a7deffe 100644
--- a/alpha/template.php
+++ b/alpha/template.php
@@ -64,10 +64,10 @@ function alpha_process(&$vars, $hook) {
* Implements hook_theme_registry_alter().
*/
function alpha_theme_registry_alter(&$registry) {
- alpha_build_registry($registry);
- alpha_register_grids();
- alpha_register_css();
- alpha_register_libraries();
+ $theme = isset($theme) ? $theme : $GLOBALS['theme_key'];
+
+ alpha_clear_cache($theme);
+ alpha_build_registry($registry, $theme);
}
/**