Permalink
Browse files

修改色调

  • Loading branch information...
1 parent 3b77eb3 commit 6d579b51f54257da1864054882327493ac6b21cd @liudangyi liudangyi committed Dec 5, 2012
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -20,12 +20,7 @@ a.thumbnail {
.controls > textarea {
width: 360px;
}
-.container-small{
- width: 580px;
- &>.well {
- box-shadow: 2px 3px 6px rgba(0,0,0,0.2);
- }
-}
+
small.author {
line-height: 20px;
font-size: 14px;
@@ -42,10 +37,10 @@ small.time {
a {
.transition(all 0.2s ease);
- color: #4b3000;
+ color: #555;
&:hover {
// text-shadow: 0 0 2px #999;
- color: #d69461;
+ color: #0088cc;
}
&.carousel-control {
@@ -69,36 +64,61 @@ html {
min-height: 100%;
}
body {
- background-color: white;
+ background-color: #e1f3ff;
}
body > * {
- width: 1100px;
+ width: 880px;
margin: 0 auto;
+ box-shadow: 0px 1px 8px rgba(0,0,0,0.8);
+}
+.container-small{
+ width: 580px;
+ &>.well {
+ // box-shadow: 2px 3px 6px rgba(0,0,0,0.2);
+ }
}
-
#top-banner {
- height: 100px;
- background-color: #860000;
- h1 {
- margin-top: 40px;
- color: #FDFEE2;
+ height: 115px;
+ background-color: #fff;
+ #gradient > .vertical(#eff9ff,#ffffff);
+ a {
+ margin-left: 20px;
+ display: inline-block;
+ text-decoration: none;
+ margin-top: 30px;
+ color: #222;
font-weight: normal;
- font-size: 32px;
+ font-size: 30px;
line-height: 40px;
+ text-shadow: 0px 1px 2px #5e8cb2;
+ img {
+ margin-right: 15px;
+ }
+ &:hover {
+ .transition(0.5s);
+ .transform(scale(1.02) rotate(-1deg));
+ }
+ &:active {
+ .transition(0s);
+ .transform(scale(1.00) translate(0,2px) rotate(-1deg));
+ opacity: 0.6;
+ }
}
}
#nav-bar {
- background-color: #C6A76C;
- #gradient > .vertical(#F7D390, #B89A64);
+ background-color: #0a73bc;
.navbar .nav {
li > a {
text-shadow: none;
- color: #000;
+ color: #fff;
&[href]:hover {
- #gradient > .vertical(#FFE6B8, #E3C38A);
+ background-color: #3eb0ff;
}
}
+ &.pull-right {
+ // background-color: #132a3d;
+ }
}
}
@@ -109,26 +129,52 @@ hr {
}
#main {
- background-color: #FDFEE2;
+ background-color: #fff;
padding: 20px 0 30px;
+ // border-bottom-right-radius: 5px;
+ // border-bottom-left-radius: 5px;
+}
+
+.red-block {
+ h4 a {
+ display: block;
+ padding: 6px 16px;
+ background-color: #e6f4ff;
+ color: #1b73bc;
+ font-size: 16px;
+ text-decoration: none;
+ &[href]:hover {
+ text-indent: 10px;
+ .transition(0.4s);
+ }
+ }
+ .with-icon li {
+ margin-bottom: 5px;
+ position: relative;
+ i {
+ position: absolute;
+ margin-top: 3px;
+ vertical-align: middle;
+ }
+ a {
+ display: inline-block;
+ margin-left: 20px;
+ }
+ }
}
.yellow-block {
margin-bottom: 30px;
- .yellow-ribbon {
- height: 10px;
- background: #BB9C63;
- }
- h4 {
- color: #7a5412;
- text-indent: 10px;
- a{
- color: #7a5412;
- &:hover {
- text-shadow: 0 0 5px #FFC96C;
- text-decoration: none;
- color: #e3a334;
- }
+ h4 a {
+ display: block;
+ background-color: #eeffe6;
+ padding: 6px 16px;
+ font-size: 16px;
+ color: #009c00;
+ text-decoration: none;
+ &[href]:hover {
+ text-indent: 10px;
+ .transition(0.4s);
}
}
.with-icon li {
@@ -147,16 +193,19 @@ hr {
}
#foot {
- background-color: #860000;
+ margin-top: 25px;
+ // border-top-right-radius: 5px;
+ // border-top-left-radius: 5px;
+ background-color: #fff;
padding: 30px 0 50px;
bottom: 0;
p {
- color: #FDFEE2;
+ color: #999;
font-size: 13px;
margin: 0;
text-align: center;
a {
- color: #FDFEE2;
+ color: #999;
margin-left: 5px;
}
}
@@ -166,7 +215,7 @@ hr {
right: 0;
top: 10px;
pre {
- background-color: #FDFEE2;
+ background-color: #fff;
}
}
@@ -262,6 +262,13 @@
}
// Transformations
+.transform(@content) { // added by Leedy
+ -webkit-transform: @content;
+ -moz-transform: @content;
+ -ms-transform: @content;
+ -o-transform: @content;
+ transform: @content;
+}
.rotate(@degrees) {
-webkit-transform: rotate(@degrees);
-moz-transform: rotate(@degrees);
@@ -50,7 +50,7 @@ def update
respond_to do |format|
if @donate.update_attributes(params[:donate])
- format.html { redirect_to @donate, notice: 'Donate was successfully updated.' }
+ format.html { redirect_to donates_path, notice: 'Donate was successfully updated.' }
format.json { head :no_content }
else
format.html { render action: "edit" }
@@ -10,7 +10,7 @@ h1
= link_to '新的赞助', new_donate_path, class: "btn btn-primar-0-y pull-right"
- @donates.each do |donate|
- .well
+ .well id="#{donate.id}"
== donate.content
|   
- if admin?
@@ -50,39 +50,6 @@
}
}
}
- .red-block {
- .red-ribbon {
- height: 10px;
- background: #860000;
- }
- h4 a{
- color: #B84406;
- &:hover {
- text-shadow: 0 0 5px #FF8E52;
- text-decoration: none;
- color: #ff7561;
- }
- span {
- width: 20px;
- background-color: #B84406;
- margin: 0 8px;
- font-size: 18px;
- }
- }
- .with-icon li {
- margin-bottom: 5px;
- position: relative;
- i {
- position: absolute;
- margin-top: 3px;
- vertical-align: middle;
- }
- a {
- display: inline-block;
- margin-left: 20px;
- }
- }
- }
.relative-link a{
margin-right: 10px;
}
@@ -130,25 +97,19 @@
.row
.span5.red-block
- .red-ribbon
h4
= link_to news_index_path do
- span  
| 新闻
- span  
ul.with-icon.unstyled
- @news.each do |news|
li
i.icon-circle-arrow-right
= link_to(news.title, news)
.span4.red-block
- .red-ribbon
h4
= link_to posts_path do
- span  
| 热门帖子
- span  
ul.with-icon.unstyled
- @posts.each do |post|
li
@@ -157,7 +118,6 @@
.span3
.yellow-block
- .yellow-ribbon
h4 = link_to "活动预告", events_path
ul.with-icon.unstyled
- @events.each do |event|
@@ -166,7 +126,6 @@
= link_to(event.title, event)
.yellow-block
- .yellow-ribbon
h4: a 通讯
ul.unstyled.broadcast
- News.reports.each do |press|
@@ -175,7 +134,6 @@
div = press.title
= image_tag press.images.first, width: '190'
- .yellow-ribbon
h4: a 相关链接
.relative-link
a href="http://www.pku.edu.cn/" target="_blank" 北京大学
@@ -5,14 +5,15 @@ html
meta name="keywords" content=""
meta name="author" content=""
= stylesheet_link_tag "application", :media => "all"
- = javascript_include_tag "application", media: "all"
= csrf_meta_tags
= yield :style
body
#top-banner
.container
- h1 之江发展论坛
+ a href="/"
+ = image_tag "logo.png", width: 60, height: 60
+ | 之江发展论坛
#nav-bar
.container
.navbar
@@ -75,5 +76,5 @@ html
| Copyright© 北京大学 之江发展论坛
= link_to '关于我们', about_path
-
+ = javascript_include_tag "application", media: "all"
= yield :script
@@ -11,7 +11,9 @@ html
body
#top-banner
.container
- h1 之江发展论坛
+ a href="/"
+ = image_tag "logo.png", width: 60, height: 60
+ | 之江发展论坛
#nav-bar
.container
.navbar
@@ -4,7 +4,7 @@
li {
padding: 3px 15px;
&:hover{
- background-color: #f0f1d7;
+ background-color: #e6f4ff;
}
a {
margin-right: 10px;
@@ -9,10 +9,10 @@
font-size: 15px;
}
&:hover{
- background-color: #f0f1d7;
+ background-color: #e6f4ff;
}
&:first-child:hover {
- background-color: #FDFEE2;
+ background-color: transparent;
}
th {
padding: 4px 8px;
@@ -21,11 +21,11 @@
text-align: center;
&:hover {
text-decoration: none;
- background-color: #e1e2c5;
+ background-color: #a4d6ff;
}
}
&:hover {
- background-color: #f0f1d7;
+ background-color: #e6f4ff;
box-shadow: 0 0 3px rgba(0,0,0,0.2);
a.delete {
display: block;

0 comments on commit 6d579b5

Please sign in to comment.