Skip to content
Browse files

add org

  • Loading branch information...
1 parent db00c98 commit 5e57d8e5886452ffe78b619a2f448653a720724d @diapluscn committed Oct 8, 2012
Showing with 94 additions and 82 deletions.
  1. +84 −76 css/style.css
  2. +7 −0 sass/_custom.scss
  3. +3 −6 templates/page--node--108.tpl.php
View
160 css/style.css
@@ -429,26 +429,34 @@ div.status {
margin-top: 15px;
margin-right: 35px;
}
+/* line 166, ../sass/_custom.scss */
+.front .org {
+ float: left;
+ display: inline;
+ margin-left: 15px;
+ margin-top: 15px;
+ color: black;
+}
-/* line 170, ../sass/_custom.scss */
+/* line 177, ../sass/_custom.scss */
#header li {
padding: 3px;
}
-/* line 173, ../sass/_custom.scss */
+/* line 180, ../sass/_custom.scss */
#header li.zh-hans {
float: left;
margin-left: 35px;
}
-/* line 177, ../sass/_custom.scss */
+/* line 184, ../sass/_custom.scss */
#header li.zh-hans:after {
content: " |";
}
-/* line 180, ../sass/_custom.scss */
+/* line 187, ../sass/_custom.scss */
#header li.en {
float: left;
}
-/* line 185, ../sass/_custom.scss */
+/* line 192, ../sass/_custom.scss */
.jiathis_style_in {
float: right;
margin-top: 0px;
@@ -457,13 +465,13 @@ div.status {
clear: both;
}
-/* line 193, ../sass/_custom.scss */
+/* line 200, ../sass/_custom.scss */
#footer {
width: 100%;
float: left;
margin-bottom: 20px;
}
-/* line 197, ../sass/_custom.scss */
+/* line 204, ../sass/_custom.scss */
#footer .copy {
width: 1002px;
margin: 0 auto;
@@ -474,37 +482,37 @@ div.status {
color: white;
}
-/* line 208, ../sass/_custom.scss */
+/* line 215, ../sass/_custom.scss */
#header {
height: 173px;
width: 100%;
}
-/* line 213, ../sass/_custom.scss */
+/* line 220, ../sass/_custom.scss */
.logo {
width: 200px;
padding: 15px 20px 0;
text-align: center;
}
-/* line 217, ../sass/_custom.scss */
+/* line 224, ../sass/_custom.scss */
.logo li {
padding: 3px;
}
-/* line 226, ../sass/_custom.scss */
+/* line 233, ../sass/_custom.scss */
#block-menu_block-1 {
background: url(../images/menu.png);
width: 190px;
height: 291px;
}
-/* line 230, ../sass/_custom.scss */
+/* line 237, ../sass/_custom.scss */
#block-menu_block-1 ul {
margin-top: 14px;
float: left;
width: 100%;
padding-left: 0;
}
-/* line 236, ../sass/_custom.scss */
+/* line 243, ../sass/_custom.scss */
#block-menu_block-1 li {
background: url(../images/menuline.png) no-repeat 20px 23px;
height: 25px;
@@ -513,7 +521,7 @@ div.status {
margin: 0px;
padding: 0px;
}
-/* line 243, ../sass/_custom.scss */
+/* line 250, ../sass/_custom.scss */
#block-menu_block-1 li a {
text-indent: 1em;
width: 165px;
@@ -522,7 +530,7 @@ div.status {
font-size: 13px;
color: #694C29;
}
-/* line 251, ../sass/_custom.scss */
+/* line 258, ../sass/_custom.scss */
#block-menu_block-1 li a:hover, #block-menu_block-1 li a.active {
background: url(../images/ahover.jpg) repeat-y 2px 0;
float: left;
@@ -531,13 +539,13 @@ div.status {
width: 165px;
}
-/* line 261, ../sass/_custom.scss */
+/* line 268, ../sass/_custom.scss */
ul li.expanded {
list-style-image: none;
list-style-type: none;
}
-/* line 268, ../sass/_custom.scss */
+/* line 275, ../sass/_custom.scss */
#content-inner {
padding-top: 1px;
color: white;
@@ -547,259 +555,259 @@ ul li.expanded {
_background: #A87C48;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true,sizingMethod=scale,src="../images/common.png");
}
-/* line 277, ../sass/_custom.scss */
+/* line 284, ../sass/_custom.scss */
#content-inner #content-header {
padding: 1px 35px 1px 35px;
}
-/* line 279, ../sass/_custom.scss */
+/* line 286, ../sass/_custom.scss */
#content-inner #content-header h1 {
font-size: 18px;
font-family: 黑体;
margin-top: 20px;
text-align: center;
}
-/* line 286, ../sass/_custom.scss */
+/* line 293, ../sass/_custom.scss */
#content-inner #content-area {
padding: 10px 20px 0 35px;
font-size: 13px;
height: 490px;
overflow: auto;
width: 694px;
}
-/* line 292, ../sass/_custom.scss */
+/* line 299, ../sass/_custom.scss */
#content-inner #content-area p {
text-indent: 2em;
}
-/* line 295, ../sass/_custom.scss */
+/* line 302, ../sass/_custom.scss */
#content-inner #content-area .view-update {
width: 630px;
margin-top: 30px;
}
-/* line 298, ../sass/_custom.scss */
+/* line 305, ../sass/_custom.scss */
#content-inner #content-area .view-update a:link, #content-inner #content-area .view-update a:visited {
color: white;
font-size: 14px;
}
-/* line 302, ../sass/_custom.scss */
+/* line 309, ../sass/_custom.scss */
#content-inner #content-area .view-update .views-row {
border-bottom: 1px dotted white;
margin-bottom: 10px;
}
-/* line 306, ../sass/_custom.scss */
+/* line 313, ../sass/_custom.scss */
#content-inner #content-area .view-update span.views-field-changed {
float: right;
}
-/* line 310, ../sass/_custom.scss */
+/* line 317, ../sass/_custom.scss */
#content-inner #content-area span.submitted {
display: block;
text-align: center;
}
-/* line 319, ../sass/_custom.scss */
+/* line 326, ../sass/_custom.scss */
#content-inner h2, #content-inner h3, #content-inner h4 {
margin-top: 0.8em;
margin-bottom: 0px;
}
-/* line 322, ../sass/_custom.scss */
+/* line 329, ../sass/_custom.scss */
#content-inner h2 a, #content-inner h3 a, #content-inner h4 a {
font-size: 14px;
color: white;
}
-/* line 329, ../sass/_custom.scss */
+/* line 336, ../sass/_custom.scss */
ul li.leaf {
list-style: none;
}
-/* line 332, ../sass/_custom.scss */
+/* line 339, ../sass/_custom.scss */
ul li {
list-style: none;
}
-/* line 337, ../sass/_custom.scss */
+/* line 344, ../sass/_custom.scss */
.page-node-38 #page {
background: url(../images/about.jpg) no-repeat #ceb08a;
}
-/* line 340, ../sass/_custom.scss */
+/* line 347, ../sass/_custom.scss */
.page-organization #page {
background: url(../images/organization.jpg) no-repeat #ceb08a;
}
-/* line 343, ../sass/_custom.scss */
+/* line 350, ../sass/_custom.scss */
.page-news #page {
background: url(../images/news.jpg) no-repeat #ceb08a;
}
-/* line 346, ../sass/_custom.scss */
+/* line 353, ../sass/_custom.scss */
.page-schedule #page {
background: url(../images/schedule.jpg) no-repeat #ceb08a;
}
-/* line 349, ../sass/_custom.scss */
+/* line 356, ../sass/_custom.scss */
.page-performance #page {
background: url(../images/performance.jpg) no-repeat #ceb08a;
}
-/* line 352, ../sass/_custom.scss */
+/* line 359, ../sass/_custom.scss */
.page-forum #page {
background: url(../images/forum.jpg) no-repeat #ceb08a;
}
-/* line 355, ../sass/_custom.scss */
+/* line 362, ../sass/_custom.scss */
.page-masterclass #page {
background: url(../images/masterclass.jpg) no-repeat #ceb08a;
}
-/* line 358, ../sass/_custom.scss */
+/* line 365, ../sass/_custom.scss */
.page-history #page {
background: url(../images/history.jpg) no-repeat #ceb08a;
}
-/* line 361, ../sass/_custom.scss */
+/* line 368, ../sass/_custom.scss */
.page-node-111 #page {
background: url(../images/taijiaward.jpg) no-repeat #ceb08a;
}
-/* line 364, ../sass/_custom.scss */
+/* line 371, ../sass/_custom.scss */
.page-node-190 #page {
background: url(../images/activity.jpg) no-repeat #ceb08a;
}
-/* line 369, ../sass/_custom.scss */
+/* line 376, ../sass/_custom.scss */
.page-performanced {
background: url(../images/performance.jpg) no-repeat #ceb08a;
}
-/* line 372, ../sass/_custom.scss */
+/* line 379, ../sass/_custom.scss */
.page-forumd {
background: url(../images/forum.jpg) no-repeat #ceb08a;
}
-/* line 375, ../sass/_custom.scss */
+/* line 382, ../sass/_custom.scss */
.page-masterclassd {
background: url(../images/masterclass.jpg) no-repeat #ceb08a;
}
-/* line 378, ../sass/_custom.scss */
+/* line 385, ../sass/_custom.scss */
.page-newsd {
background: url(../images/news.jpg) no-repeat #ceb08a;
}
-/* line 381, ../sass/_custom.scss */
+/* line 388, ../sass/_custom.scss */
.page-historyd {
background: url(../images/history.jpg) no-repeat #ceb08a;
}
-/* line 384, ../sass/_custom.scss */
+/* line 391, ../sass/_custom.scss */
.page-lectured {
background: url(../images/lecture.jpg) no-repeat #ceb08a;
}
-/* line 387, ../sass/_custom.scss */
+/* line 394, ../sass/_custom.scss */
.page-activityd {
background: url(../images/activity.jpg) no-repeat #ceb08a;
}
-/* line 395, ../sass/_custom.scss */
+/* line 402, ../sass/_custom.scss */
.view-performance table a, .view-academy table a {
font-size: 14px;
color: white;
}
-/* line 399, ../sass/_custom.scss */
+/* line 406, ../sass/_custom.scss */
.view-performance table caption, .view-academy table caption {
font-size: 16px;
margin: 20px 0px;
}
-/* line 407, ../sass/_custom.scss */
+/* line 414, ../sass/_custom.scss */
ul li.collapsed {
list-style-image: none;
list-style-type: none;
}
-/* line 419, ../sass/_custom.scss */
+/* line 426, ../sass/_custom.scss */
.jspDrag {
background: #976425;
}
-/* line 424, ../sass/_custom.scss */
+/* line 431, ../sass/_custom.scss */
.page-schedule #content-inner #content-area {
height: 540px;
padding: 10px 0px 0 5px;
width: 755px;
}
-/* line 430, ../sass/_custom.scss */
+/* line 437, ../sass/_custom.scss */
.page-schedule #content-inner #content-area .region-content td.multi-day a {
color: white;
font-size: 12px;
}
-/* line 435, ../sass/_custom.scss */
+/* line 442, ../sass/_custom.scss */
.page-schedule #content-inner #content-area .region-content td.today {
background: white;
}
-/* line 444, ../sass/_custom.scss */
+/* line 451, ../sass/_custom.scss */
.page-masterclass table th.views-field-title {
width: 350px;
}
-/* line 447, ../sass/_custom.scss */
+/* line 454, ../sass/_custom.scss */
.page-masterclass table .item-list ul li {
margin-left: 0px;
}
-/* line 454, ../sass/_custom.scss */
+/* line 461, ../sass/_custom.scss */
.page-organization #content-inner #content-header {
padding-top: 20px;
}
-/* line 462, ../sass/_custom.scss */
+/* line 469, ../sass/_custom.scss */
.node-type-event #content-inner #content-area table td {
padding-left: 10px;
}
-/* line 465, ../sass/_custom.scss */
+/* line 472, ../sass/_custom.scss */
.node-type-event #content-inner #content-area table p {
text-indent: 0;
}
-/* line 474, ../sass/_custom.scss */
+/* line 481, ../sass/_custom.scss */
.page-node-133 #content-inner #content-area {
height: 470px;
}
-/* line 476, ../sass/_custom.scss */
+/* line 483, ../sass/_custom.scss */
.page-node-133 #content-inner #content-area table p {
text-indent: 0;
margin-left: 10px;
}
-/* line 482, ../sass/_custom.scss */
+/* line 489, ../sass/_custom.scss */
.page-node-133 #content-inner #content-header .breadcrumb {
padding-bottom: 0;
}
-/* line 484, ../sass/_custom.scss */
+/* line 491, ../sass/_custom.scss */
.page-node-133 #content-inner #content-header .breadcrumb a {
color: white;
font-size: 14px;
}
-/* line 493, ../sass/_custom.scss */
+/* line 500, ../sass/_custom.scss */
.page-node-190 #content-area a {
color: white;
}
-/* line 498, ../sass/_custom.scss */
+/* line 505, ../sass/_custom.scss */
.breadcrumb {
padding-bottom: 0;
}
-/* line 500, ../sass/_custom.scss */
+/* line 507, ../sass/_custom.scss */
.breadcrumb a {
color: white;
font-size: 14px;
}
-/* line 509, ../sass/_custom.scss */
+/* line 516, ../sass/_custom.scss */
.page-node-92 #content-area h2 {
margin-left: 20px;
}
-/* line 512, ../sass/_custom.scss */
+/* line 519, ../sass/_custom.scss */
.page-node-92 #content-area h2 a {
float: left;
width: 84px;
@@ -808,39 +816,39 @@ ul li.collapsed {
font-size: 16px;
background: url(../images/a01.jpg) no-repeat;
}
-/* line 520, ../sass/_custom.scss */
+/* line 527, ../sass/_custom.scss */
.page-node-92 #content-area h2 a:hover {
background: url(../images/a02.jpg) no-repeat;
}
-/* line 524, ../sass/_custom.scss */
+/* line 531, ../sass/_custom.scss */
.page-node-92 #content-area #block-views-speech_list-block {
float: left;
clear: both;
width: 500px;
}
-/* line 528, ../sass/_custom.scss */
+/* line 535, ../sass/_custom.scss */
.page-node-92 #content-area #block-views-speech_list-block a {
color: white;
}
-/* line 531, ../sass/_custom.scss */
+/* line 538, ../sass/_custom.scss */
.page-node-92 #content-area #block-views-speech_list-block h2 {
margin: 20px 0 20px 0;
font-size: 18px;
border-bottom: 1px solid;
}
-/* line 536, ../sass/_custom.scss */
+/* line 543, ../sass/_custom.scss */
.page-node-92 #content-area #block-views-speech_list-block .panel-col-first {
width: 120px;
}
-/* line 539, ../sass/_custom.scss */
+/* line 546, ../sass/_custom.scss */
.page-node-92 #content-area #block-views-speech_list-block .views-field-field-people-image {
float: left;
}
-/* line 542, ../sass/_custom.scss */
+/* line 549, ../sass/_custom.scss */
.page-node-92 #content-area #block-views-speech_list-block .views-field-title {
float: left;
}
-/* line 545, ../sass/_custom.scss */
+/* line 552, ../sass/_custom.scss */
.page-node-92 #content-area #block-views-speech_list-block .views-field-name-field {
float: left;
clear: left;
View
7 sass/_custom.scss
@@ -163,6 +163,13 @@
margin-top: 15px;
margin-right: 35px;
}
+ .org {
+ float: left;
+ display: inline;
+ margin-left: 15px;
+ margin-top: 15px;
+ color: black;
+ }
}
//language link
View
9 templates/page--node--108.tpl.php
@@ -14,12 +14,6 @@
<?php print render($page['fpnav']); ?>
</div>
<div class="common">
- <!-- <div class="announcement">
- <h2>主办:</h2>
- <p>北京市教委<br />文化部民族民间文艺发展中心</p>
- <h2>承办:</h2>
- <p>中国音乐学院</p>
- </div> -->
<div class="announcement">
<h2>主要活动</h2>
<p><a href="events/88" >第七届北京公园节</a><br/>
@@ -60,6 +54,9 @@
<script type="text/javascript" src="http://v3.jiathis.com/code/jia.js?uid=1334624431040383" charset="utf-8"></script>
<!-- JiaThis Button END -->
</div>
+ <div class="org">
+ <p>主办单位:北京市教委 文化部民族民间文艺发展中心 承办单位:中国音乐学院
+ </div>
</div>

0 comments on commit 5e57d8e

Please sign in to comment.
Something went wrong with that request. Please try again.