Permalink
Browse files

Merge branch 'dev'

  • Loading branch information...
2 parents e492245 + b5dd3a4 commit 70786d7e22fc4ea4288f147f43c9f877b8cbeaba @FatherShawn FatherShawn committed Dec 8, 2011
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
@@ -0,0 +1 @@
+body{background:white;background-image:none;font-family:"Droid Serif", "Georgia", "Times New Roman", "Palatino", "Hoefler Text", "Baskerville", serif}a,a:link{color:#e5a100}a:visited{color:#ce9817}a:hover,a:focus,a:active{text-decoration:underline;color:#e5a100}#slogan{float:right;display:none}h1#site-name,#slogan,h1.title{text-shadow:none;font-size:2em}#userbar,#header-group,#primary-menu,#content-messages,#content-tabs,.links{display:none}#content-group{text-shadow:none;font-size:1em;line-height:1.4em}#content-group a{text-shadow:none}#content-group #content-inner{-moz-border-radius:none;-webkit-border-radius:none;-o-border-radius:none;-ms-border-radius:none;-khtml-border-radius:none;border-radius:none;-moz-box-shadow:none;-webkit-box-shadow:none;-o-box-shadow:none;box-shadow:none;background:white;background-image:none;margin:0;padding:0 !important;width:100%}#pid-program-session-schedule h1{display:none}#view-id-cod_schedule-page_1 h2,#view-id-cod_schedule-page_4 h2{font-size:1em}#view-id-cod_schedule-page_1 p,#view-id-cod_schedule-page_4 p{display:none}#view-id-cod_schedule-page_1 table,#view-id-cod_schedule-page_4 table{text-shadow:none;border:solid 1px rgba(0, 0, 0, 0.5)}#view-id-cod_schedule-page_1 table th,#view-id-cod_schedule-page_4 table th{font-size:.7em;background:none;border:none;background:rgba(155, 155, 155, 0.15);line-height:.7em;text-align:center;border:solid 1px rgba(0, 0, 0, 0.25)}#view-id-cod_schedule-page_1 table tbody,#view-id-cod_schedule-page_4 table tbody{background:rgba(255, 255, 255, 0.15)}#view-id-cod_schedule-page_1 table tbody td,#view-id-cod_schedule-page_4 table tbody td{border:solid 1px rgba(0, 0, 0, 0.25);font-size:.5em;line-height:1.5em;word-wrap:break-word;padding:0.25em 0.25em;vertical-align:top}#view-id-cod_schedule-page_1 table tbody td .views-field-field-track-value,#view-id-cod_schedule-page_4 table tbody td .views-field-field-track-value{padding:0.25em 0.15em;display:block;height:24px;font-weight:bold;color:#333}#view-id-cod_schedule-page_1 table tbody td a,#view-id-cod_schedule-page_4 table tbody td a{color:#000;text-shadow:none}#view-id-cod_schedule-page_1 table tbody td .views-field-field-experience-value label,#view-id-cod_schedule-page_1 table tbody td .views-field-ops,#view-id-cod_schedule-page_4 table tbody td .views-field-field-experience-value label,#view-id-cod_schedule-page_4 table tbody td .views-field-ops{display:none}#view-id-cod_schedule-page_1 table tbody td:nth-child(odd),#view-id-cod_schedule-page_4 table tbody td:nth-child(odd){background:rgba(155, 155, 155, 0.25)}#view-id-cod_schedule-page_1 table tbody td.time-label,#view-id-cod_schedule-page_4 table tbody td.time-label{background:rgba(255, 255, 255, 0.15)}#view-id-cod_schedule-page_1 table tbody tr.odd,#view-id-cod_schedule-page_4 table tbody tr.odd{background:rgba(155, 155, 155, 0.15)}#view-id-cod_schedule-page_1 table tbody tr:nth-child(2) .views-field-field-track-value,#view-id-cod_schedule-page_1 table tbody tr:nth-child(5) .views-field-field-track-value,#view-id-cod_schedule-page_1 table tbody tr:nth-child(5) .views-field-field-experience-value,#view-id-cod_schedule-page_1 table tbody tr:nth-child(9) .views-field-field-track-value,#view-id-cod_schedule-page_4 table tbody tr:nth-child(2) .views-field-field-track-value,#view-id-cod_schedule-page_4 table tbody tr:nth-child(5) .views-field-field-track-value,#view-id-cod_schedule-page_4 table tbody tr:nth-child(5) .views-field-field-experience-value,#view-id-cod_schedule-page_4 table tbody tr:nth-child(9) .views-field-field-track-value{display:none}
@@ -7,7 +7,8 @@ engine = phptemplate
stylesheets[all][] = css/global.css
stylesheets[all and (min-width : 768px)][] = css/desktop-tablet-fluid.css
-
+stylesheets[print][] = css/print.css
+
;scripts[] = js/jquery-1.6.2.min.js
scripts[] = js/jquery.lettering.js
scripts[] = js/kerning.js
@@ -451,61 +451,6 @@ h1.title {
}
}
}
-#view-id-cod_schedule-page_1 {
- table {
- border:solid 2px rgba(0,0,0,.25);
- margin-right: 2em;
- thead {
- tr {
- }
- }
- th {
- @include border-background-reset;
- @include background-image(linear-gradient($menu-top-background-gradient 20%, $menu-middle-background-gradient 45%, $menu-bottom-background-gradient 85%));
- padding:0.15em;
- text-align:center;
- border-left:solid 2px rgba(0,0,0,.125);
- border-bottom:solid 2px rgba(0,0,0,.25);
- }
- th:first-child {
- border-left:solid 1px rgba(0,0,0,.25);
- }
- tbody {
- background:rgba(255,255,255,.15);
- td {
- font-size:.8em;
- line-height:1.5em;
- word-wrap: break-word;
- padding: 0.25em 0.25em;
- vertical-align:top;
- .views-field-field-track-value {
- padding: 0.25em 0.15em;
- display:block;
- height:42px;
- font-weight:bold;
- }
- .views-field-field-experience-value label {
- display:none;
- }
- &:nth-child(odd) {
- background:rgba(25,25,25,.15);
- }
- &.time-label {
- background:rgba(255,255,255,.15);
- }
- }
- tr.odd {
- @include background-image(linear-gradient($menu-top-background-gradient 20%, $menu-middle-background-gradient 45%, $menu-bottom-background-gradient 85%));
- }
- tr:nth-child(2) .views-field-field-track-value,
- tr:nth-child(5) .views-field-field-track-value,
- tr:nth-child(5) .views-field-field-experience-value,
- tr:nth-child(9) .views-field-field-track-value {
- display:none;
- }
- }
- }
-}
a.uc_signup_edit_info {
@include text-shadow(none);
}
@@ -1141,18 +1141,76 @@ thead th, th.active {
}
}
-#pid-program-session-schedule #main-group .row, #pid-program-session-schedule #main-group .nested, , #pid-program-session-schedule #main-group .block {
+#pid-program-session-schedule #main-group .row,
+#pid-program-session-schedule #main-group .nested,
+#pid-program-session-schedule #main-group .block,
+#pid-program-session-schedule-your-schedule #main-group .row,
+#pid-program-session-schedule-your-schedule #main-group .nested,
+#pid-program-session-schedule-your-schedule #main-group .block {
overflow-x: visible !important;
}
-#pid-program-session-schedule #content-group #content-inner-inner {
+#pid-program-session-schedule #content-group #content-inner-inner,
+#pid-program-session-schedule-your-schedule #content-group #content-inner-inner {
border:none;
outline:none;
padding:0;
-}
-#pid-program-session-schedule #content-group #content-inner {
+}
+
+#pid-program-session-schedule #content-group #content-inner,
+#pid-program-session-schedule-your-schedule #content-group #content-inner {
@include box-shadow(0px 0px 0px rgba(0,0,0,0));
}
-
+#view-id-cod_schedule-page_1, , #view-id-cod_schedule-page_4 {
+ table {
+ border:solid 2px rgba(0,0,0,.25);
+ margin-right: 2em;
+ th {
+ @include border-background-reset;
+ @include background-image(linear-gradient($menu-top-background-gradient 20%, $menu-middle-background-gradient 45%, $menu-bottom-background-gradient 85%));
+ padding:0.15em;
+ text-align:center;
+ border-left:solid 2px rgba(0,0,0,.125);
+ border-bottom:solid 2px rgba(0,0,0,.25);
+ }
+ th:first-child {
+ border-left:solid 1px rgba(0,0,0,.25);
+ }
+ tbody {
+ background:rgba(255,255,255,.15);
+ td {
+ font-size:.8em;
+ line-height:1.5em;
+ word-wrap: break-word;
+ padding: 0.25em 0.25em;
+ vertical-align:top;
+ .views-field-field-track-value {
+ padding: 0.25em 0.15em;
+ display:block;
+ height:42px;
+ font-weight:bold;
+ }
+ .views-field-field-experience-value label {
+ display:none;
+ }
+ &:nth-child(odd) {
+ background:rgba(25,25,25,.15);
+ }
+ &.time-label {
+ background:rgba(255,255,255,.15);
+ }
+ }
+ tr.odd {
+ @include background-image(linear-gradient($menu-top-background-gradient 20%, $menu-middle-background-gradient 45%, $menu-bottom-background-gradient 85%));
+ }
+ tr:nth-child(2) .views-field-field-track-value,
+ tr:nth-child(5) .views-field-field-track-value,
+ tr:nth-child(5) .views-field-field-experience-value,
+ tr:nth-child(9) .views-field-field-track-value {
+ display:none;
+ }
+ }
+ }
+}
@media only screen and (min-width : 240px) and (max-width : 767px) {
body {
@@ -1,3 +1,130 @@
-/* Welcome to Compass. Use this file to define print styles.
- * Import this file using the following HTML or equivalent:
- * <link href="/stylesheets/print.css" media="print" rel="stylesheet" type="text/css" /> */
+@import "partials/_base";
+// Default Page styles
+body {
+ background:white;
+ background-image:none;
+ font-family: $maintext-font;
+}
+a, a:link {
+
+ color:$link-color;
+}
+a:visited {
+
+ color:$link-color-visited;
+}
+/* Hover/active link styles. Don't forget :focus for accessibility */
+a:hover,
+a:focus,
+a:active {
+ text-decoration:underline;
+ color:$link-color-over;
+}
+
+
+
+
+#slogan {
+ float:right;
+ display:none;
+}
+
+h1#site-name,
+#slogan,
+h1.title {
+ @include text-shadow(none);
+ font-size: 2em;
+}
+#userbar,
+#header-group,
+#primary-menu,
+#content-messages,
+#content-tabs,
+.links {
+ display:none;
+}
+
+#content-group {
+ @include text-shadow(none);
+ font-size:1em;
+ line-height:1.4em;
+ a {
+ @include text-shadow(none);
+ }
+ #content-inner {
+ @include border-radius(none);
+ @include box-shadow(none);
+ background:white;
+ background-image:none;
+ margin:0;
+ padding:0 !important;
+ width:100%;
+ }
+}
+// Session Schedule
+#pid-program-session-schedule {
+ h1 {
+ display:none;
+ }
+}
+#view-id-cod_schedule-page_1, #view-id-cod_schedule-page_4 {
+ h2 {
+ font-size:1em;
+ }
+ p {
+ display:none;
+ }
+ table {
+ @include text-shadow(none);
+ border:solid 1px rgba(0,0,0,.5);
+ th {
+ font-size:.7em;
+ @include border-background-reset;
+ background:rgba(155,155,155,.15);
+ line-height:.7em;
+ text-align:center;
+ border:solid 1px rgba(0,0,0,.25);
+ }
+ tbody {
+ background:rgba(255,255,255,.15);
+ td {
+
+ border:solid 1px rgba(0,0,0,.25);
+ font-size:.5em;
+ line-height:1.5em;
+ word-wrap: break-word;
+ padding: 0.25em 0.25em;
+ vertical-align:top;
+ .views-field-field-track-value {
+ padding: 0.25em 0.15em;
+ display:block;
+ height:24px;
+ font-weight:bold;
+ color:#333;
+ } a {
+ color:#000;
+ @include text-shadow(none);
+ }
+ .views-field-field-experience-value label,
+ .views-field-ops {
+ display:none;
+ }
+ &:nth-child(odd) {
+ background:rgba(155,155,155,.25);
+ }
+ &.time-label {
+ background:rgba(255,255,255,.15);
+ }
+ }
+ tr.odd {
+ background:rgba(155,155,155,.15);
+ }
+ tr:nth-child(2) .views-field-field-track-value,
+ tr:nth-child(5) .views-field-field-track-value,
+ tr:nth-child(5) .views-field-field-experience-value,
+ tr:nth-child(9) .views-field-field-track-value {
+ display:none;
+ }
+ }
+ }
+ }

0 comments on commit 70786d7

Please sign in to comment.