summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJake Strawn2012-10-11 14:00:30 (GMT)
committer Jake Strawn2012-10-11 14:00:30 (GMT)
commit6233f90c9763624ebdf8bca556ad60384a5cb413 (patch)
treef09f0ece437d45a9e0f56a5cacbf8df80fd651ee
parentec9af782a89883b11f082c8e20072896e6524820 (diff)
updates for css site wide.
-rw-r--r--scss/blocks.scss3
-rw-r--r--scss/mixins.scss2
-rw-r--r--scss/node.scss100
-rw-r--r--scss/nodemaker.scss147
-rw-r--r--scss/omega-nodemaker-alpha-default-normal.scss26
-rw-r--r--scss/omega-nodemaker-alpha-default-wide.scss18
-rw-r--r--scss/tables.scss2
-rw-r--r--scss/taxonomy.scss8
8 files changed, 194 insertions, 112 deletions
diff --git a/scss/blocks.scss b/scss/blocks.scss
index 3f2c81c..8872a94 100644
--- a/scss/blocks.scss
+++ b/scss/blocks.scss
@@ -16,7 +16,8 @@
.block-inner {
//@include element-background();
- margin-bottom: 40px;
+ margin-top: 20px;
+ margin-bottom: 20px;
}
ul.menu {
diff --git a/scss/mixins.scss b/scss/mixins.scss
index 929ed3e..c5a2fbe 100644
--- a/scss/mixins.scss
+++ b/scss/mixins.scss
@@ -179,7 +179,7 @@
display: inline-block;
*display: inline;
padding: 4px 10px 4px;
- margin-bottom: 0;
+ margin-bottom: 5px;
*margin-left: .3em;
margin-right: 5px;
font-size: 12px;
diff --git a/scss/node.scss b/scss/node.scss
index 44e4d37..b3d9cf3 100644
--- a/scss/node.scss
+++ b/scss/node.scss
@@ -51,21 +51,29 @@ dl.node-type-list {
// include default background for nodes in the primary view for a page
-#block-system-main .view .node {
- @include element-background();
+.node {
margin-bottom: 20px;
+
+ .node-content {
+ @include element-background();
+ }
+
+ .node-comments #comment-form {
+ @include element-background();
+ margin-bottom: 40px;
+ }
+
+}
+
+.node-river {
+ margin-top: 20px;
}
// node VIEW
.node {
// on the full node page, we add our background to the node content and comments wrapper
&.full-theme-view {
-
- .node-content,
- .node-comments #comment-form {
- @include element-background();
- margin-bottom: 40px;
- }
+
}
// headline image
@@ -93,6 +101,7 @@ dl.node-type-list {
.field-name-field-nm-tags,
+ .field-name-taxonomy-forums,
.field-name-field-nm-event-category,
.field-name-field-nm-announcement-category,
.field-name-field-nm-blog-category {
@@ -145,7 +154,7 @@ dl.node-type-list {
// submitted by information on posts
.submitted {
- font-size: 12px;
+ font-size: 10px;
color: #888;
}
@@ -173,6 +182,7 @@ dl.node-type-list {
.image-widget {
position: relative;
width: 100%;
+ max-width: 100%;
.image-widget-data {
width: 100%;
@@ -196,18 +206,42 @@ dl.node-type-list {
float: right;
margin-left: 5px;
}
+
+ .form-item {
+ margin-bottom: 20px;
+ }
+ }
+ }
+ .field-type-image {
+ max-width: 100%;
+ }
+
+ .file-remove-button {
+ background-color: #DA4F49;
+ background-image: -moz-linear-gradient(center top , #EE5F5B, #DA4F49);
+ background-repeat: repeat-x;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ color: #FFFFFF;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+
+ &:hover {
+ background-color: #DA4F49;
+ background-image: -moz-linear-gradient(center top , #DA4F49, #DA4F49);
+ color: #FFFFFF;
+ text-decoration: none;
}
}
.image-preview {
float: none;
display: block;
- width: 100;
+ width: 100%;
position: relative;
padding: 0;
margin-bottom: 10px;
+
img {
- width: 100%;
+ //width: 100%;
max-width: 100%;
height: auto;
}
@@ -344,11 +378,6 @@ dl.node-type-list {
// main vertical tabs content
.vertical-tabs-panes {
position: relative;
- top: 0;
- right: 0;
- bottom: 0;
- //left: 0;
-
z-index: 100;
width: 100%;
position: relative;
@@ -356,16 +385,25 @@ dl.node-type-list {
@include boxsizing();
.vertical-tabs-pane {
- display: block;
-
-
+ display: block;
+ position: relative;
border: 1px solid #CCC;
padding: 10px 20px;
background: #FFF;
+ max-width: 100%;
+ img {
+ height: auto;
+ max-width: 100%;
+ }
@include boxsizing();
+ .fieldset-wrapper {
+ max-width: 100%;
+ width: 100%;
+ }
+
&>legend {
display: none;
}
@@ -374,10 +412,19 @@ dl.node-type-list {
}
}
+body.page-node-edit,
+body.page-node-revisions {
+ #region-content {
+ width: 100%;
+ @include boxsizing();
+ margin: 0;
+ padding: 0 10px;
+ }
+}
// custom displays for a mobile screen and for something large enough to render the vertical tabs
// properly in the overlay...
-@media all and (min-width: 800px) {
+@media all and (min-width: 980px) {
.node-form {
// Main Vertical Tabs Styles
@@ -439,12 +486,12 @@ dl.node-type-list {
// main vertical tabs content
.vertical-tabs-panes {
- position: absolute;
- top: 0;
- right: 0;
- bottom: 0;
+ //position: absolute;
+ //top: 0;
+ //right: 0;
+ //bottom: 0;
//left: 0;
-
+ max-width: 100%;
z-index: 100;
width: 100%;
position: relative;
@@ -454,12 +501,13 @@ dl.node-type-list {
.vertical-tabs-pane {
display: block;
height: 100%;
-
+ max-width: 100% !important;
border: 1px solid #CCC;
padding: 20px 40px;
background: #FFF;
+
@include boxsizing();
&>legend {
diff --git a/scss/nodemaker.scss b/scss/nodemaker.scss
index 0300867..a83bbee 100644
--- a/scss/nodemaker.scss
+++ b/scss/nodemaker.scss
@@ -29,7 +29,7 @@ div.more-link {
margin-bottom: 20px;
}
.node {
- @include element-background();
+ //@include element-background();
}
}
}
@@ -47,10 +47,12 @@ div.more-link {
margin-bottom: 20px;
}
.node {
- @include element-background();
+ //@include element-background();
}
}
+
+
#block-views-nm-announcements-recent {
.views-row {
margin-bottom: 20px;
@@ -63,7 +65,7 @@ div.more-link {
}
#block-views-nm-galleries-recent,
-#block-system-main .view-nm-galleries {
+#block-system-main .view-nm-galleries {
position: relative;
width: 100%;
.view-content {
@@ -74,19 +76,49 @@ div.more-link {
max-width: 100%;
margin-bottom: 20px;
}
- .node {
- @include element-background();
-
+}
+
+.node-nm-gallery {
+ .node-content {
+ //@include element-background();
+ }
+
+
+
+ h2.node-title {
+ @include h3();
+ margin-top: 5px;
+ }
+ .photo-count {
+ font-size: 11px;
+ color: #777;
+ }
+
+ &.node-teaser {
h2.node-title {
- @include h3();
- margin-top: 5px;
+ @include h5();
+ font-size: 12px;
+ margin-bottom: 0;
}
-
.photo-count {
- font-size: 11px;
- color: #777;
+
}
- }
+ }
+
+}
+
+
+.page-landing #block-system-main .view-nm-landing {
+ position: relative;
+ width: 100%;
+ .view-content {
+ position: relative;
+ }
+ .views-row {
+ width: 100%;
+ max-width: 100%;
+ margin-bottom: 0;
+ }
}
#region-sidebar-first #block-views-nm-galleries-recent .block-inner {
@@ -156,15 +188,42 @@ div.more-link {
}
}
}
-.view-nm-events {
-
-
+.node-forum {
+ &.node-teaser {
+ h2.node-title {
+ @include h3();
+ margin-top: 0;
+ margin-bottom: 5px;
+ }
+ }
+}
+.node-nm-event {
+ .field-name-field-nm-date {
+ font-size: 12px;
+ color: #888;
+ }
// calendar icons
+ .event-summary {
+ position: relative;
+ padding-left: 60px;
+ min-height: 55px;
+
+ h2.node-title {
+ @include h3();
+ margin-top: 5px;
+ margin-bottom: 5px;
+ }
+ }
+
.calendar-icon {
- float: left;
+ position: absolute;
+ top: 0;
+ left: 0;
+
margin-right: 10px;
- margin-bottom: 10px;
+ margin-bottom: 0;
width: 50px;
+
border: 1px solid #999;
text-align: center;
@@ -191,15 +250,15 @@ div.more-link {
}
.field-name-field-nm-date {
- font-size: 14px;
+ font-size: 12px;
}
.field-name-field-nm-headline-image {
clear: both;
+ margin-top: 10px;
}
}
-
.view-display-id-month,
.view-display-id-week,
.view-display-id-day,
@@ -373,20 +432,17 @@ div.more-link {
}
#block-views-nm-events-upcoming {
- .attachment {
- margin-bottom: 20px;
- padding-bottom: 20px;
- border-bottom: 1px solid #DDD;
- }
+ margin-bottom: 20px;
+
+
- .view-display-id-upcoming {
+ .view-display-id-upcoming > .view-content {
@include element-background();
+ margin-bottom: 20px;
}
.view-nm-events {
-
-
h2.node-title {
font-size: 20px;
margin-bottom: 0;
@@ -399,16 +455,29 @@ div.more-link {
margin-top: 0;
}
- .field-name-field-nm-date {
- font-size: 12px;
- color: #888;
- }
- // the attachment (first one) should be bigger;
- .attachment .field-name-field-nm-date {
- font-size: 14px;
+ .node {
+ border-bottom: 1px solid #DDD;
+ margin-bottom: 10px;
+ padding-bottom: 10px;
+
+
}
+ ul li:last-child .node {
+ border-bottom: 0;
+ padding-bottom: 0;
+ margin-bottom: 0;
+ }
+ .attachment .node,
+ .attachment ul li:last-child .node {
+ border-bottom: 1px solid #DDD;
+ margin-bottom: 20px;
+ padding-bottom: 20px;
+ }
+ .attachment .node .event-summary {
+ margin-bottom: 10px;
+ }
.item-list ul {
margin: 0;
font-size: 12px;
@@ -417,7 +486,6 @@ div.more-link {
list-style-type: none;
margin: 0;
-
}
}
}
@@ -484,8 +552,11 @@ div.more-link {
display: none;
}
- .view-nm-home,
- .view-nm-landing {
- margin-top: 20px;
+ .zone-content {
+ padding-top: 20px;
}
+}
+
+#block-menu-block-nm-core-footer-menu {
+ display: none;
} \ No newline at end of file
diff --git a/scss/omega-nodemaker-alpha-default-normal.scss b/scss/omega-nodemaker-alpha-default-normal.scss
index 72be861..570c0a6 100644
--- a/scss/omega-nodemaker-alpha-default-normal.scss
+++ b/scss/omega-nodemaker-alpha-default-normal.scss
@@ -150,36 +150,12 @@ body {
display: block; // was hidden on mobile, now we'll show it
}
-
-#block-views-nm-announcements-recent {
- .views-row {
- position: relative;
-
- article {
- padding-left: 140px;
- min-height: 140px;
- position: relative;
- }
-
- .field-name-field-nm-headline-image {
- position: absolute;
- top: 10px;
- left: 10px;
-
- a {
- width: 120px;
- height: 120px;
- }
- }
- }
-}
-
#zone-footer-wrapper {
#block-menu-block-nm-core-footer-menu {
+ display: block;
ul.menu li {
- //width: 220px;
}
}
diff --git a/scss/omega-nodemaker-alpha-default-wide.scss b/scss/omega-nodemaker-alpha-default-wide.scss
index b694ca5..7254b94 100644
--- a/scss/omega-nodemaker-alpha-default-wide.scss
+++ b/scss/omega-nodemaker-alpha-default-wide.scss
@@ -10,24 +10,6 @@
}
-
-#block-views-nm-announcements-recent {
- .views-row {
-
- article {
- padding-left: 170px;
- min-height: 150px;
- }
-
- .field-name-field-nm-headline-image {
- a {
- width: 150px;
- height: 150px;
- }
- }
- }
-}
-
#zone-footer-wrapper {
#block-menu-block-nm-core-footer-menu {
diff --git a/scss/tables.scss b/scss/tables.scss
index 6575cd4..4d4e90e 100644
--- a/scss/tables.scss
+++ b/scss/tables.scss
@@ -15,6 +15,8 @@ table {
background: $table-background-color;
border: $table-border;
width: 100%;
+ max-width: 100%;
+
@include boxsizing();
margin-bottom: 20px;
diff --git a/scss/taxonomy.scss b/scss/taxonomy.scss
index 84150ca..fa10a42 100644
--- a/scss/taxonomy.scss
+++ b/scss/taxonomy.scss
@@ -14,10 +14,10 @@ body.page-taxonomy-term {
#block-system-main {
-
.block-inner {
position: relative;
width: 100%;
+
.term-nodes {
position: relative;
}
@@ -27,9 +27,11 @@ body.page-taxonomy-term {
max-width: 100%;
margin-bottom: 20px;
@include boxsizing();
- @include element-background();
+
+ .node-content {
+ @include element-background();
+ }
}
}
-
}
} \ No newline at end of file