p71924506
/
wblog
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'disable_button_style_fix'

This commit is contained in:
yafeilee 2014-04-03 20:55:12 +08:00
parent cb114f0777 aa2c60f6f0
commit 823a38de18
5 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/stylesheets/comments.css.scss
View File

@ -55,6 +55,17 @@
}
}
.comment-submit[disabled] {
opacity: 0.4;
cursor: not-allowed;
}
.comment-submit {
background-color: #008cba;
opacity: 0.8;
}
.comment-success {
color: #66FAB5;
}

13
app/assets/stylesheets/foundation_and_overrides.scss
View File

@ -1190,16 +1190,3 @@
@import 'foundation';
@import 'foundation-icons';
.like-button {
color: #eaa296 !important;
background-color: transparent !important;
border: 1px solid #e79385 !important;
border-radius: 10rem;
&:hover {
background-color: #FCFF9E !important;
}
&:focus {
outline-style: none !important;
}
}

20
app/assets/stylesheets/like_and_weixin.css.scss
View File

@ -1,5 +1,25 @@
.like-button {
color: #eaa296 !important;
background-color: transparent !important;
border: 1px solid #e79385 !important;
border-radius: 10rem;
&:hover {
color: #e07662 !important;
border-color: #e27d6b !important;
}
&:focus {
outline-style: none !important;
}
span {
margin-left: 0.23rem;
}
}
.like-button.liked {
background-color: #EAA296 !important;
color: #FFF !important;
&:focus {
outline-style: none !important;
}
}

2
app/views/blogs/_comment.html.slim
View File

@ -8,7 +8,7 @@
.small-12.large-6.columns
= text_field_tag(:name, nil, placeholder: '你的名字', 'ng-model'=> 'name', 'ng-required'=> 'true')
= text_field_tag(:email, nil, placeholder: '你的邮箱', 'ng-model'=> 'email', 'ng-pattern'=>"/^.+@.+$/", 'ng-required'=>"true")
button ng-click="submit()" ng-disabled="form.$invalid" 发表
button.comment-submit ng-click="submit()" ng-disabled="form.$invalid" 发表
p.comment-success ng-show="publish_success" 发布成功
p.comment-fail ng-show="publish_success == false" 发布失败: {{ publish_fail_msg }}
.comment-diag ng-cloak=""

4
app/views/blogs/_post.html.slim
View File

@ -17,9 +17,9 @@ p ng-controller="LikesController" ng-cloak=""
button.like-button ng-show="! is_liked " ng-click="submit()"
|{{ count }}
span Like
button.like-button ng-show=" is_liked " ng-click="cancel()"
button.like-button.liked ng-show=" is_liked " ng-click="cancel()"
|{{ count }}
span Liked
span Like
div ng-controller = "QRCodesController"
.qrcode
a href="#" ng-model="qrcode" ng-init="qrcode=false" ng-click="show()"