Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1a1e08f
liyanzeng-modify-registration-email-invalid-message
liyanzeng Sep 11, 2016
fa620e3
Merge pull request #185 from GrowthRocket/liyanzeng-modify-registrati…
shaojunda Sep 11, 2016
cd87f90
fix landingpage img RoutingError & change devise error msg color
nfreeness Sep 12, 2016
5376cf5
modified project index min width
nfreeness Sep 12, 2016
8738f04
custom http error pages
nfreeness Sep 12, 2016
3e583a1
fix search bar style
nfreeness Sep 12, 2016
0773d4b
fix navbar link style
nfreeness Sep 12, 2016
a5972e2
liyanzeng-modify-about-us
liyanzeng Sep 12, 2016
08cd780
fix navbar buttoon style
nfreeness Sep 12, 2016
fee706c
fix account/project/post view
nfreeness Sep 12, 2016
ebb78e8
liyanzeng-modify-contact-us
liyanzeng Sep 12, 2016
8a9e7a5
Merge pull request #186 from GrowthRocket/liyanzeng-modify-about-us
shaojunda Sep 12, 2016
e6db1ca
Merge pull request #188 from GrowthRocket/liyanzeng-contact-us
shaojunda Sep 12, 2016
a5b8347
Merge pull request #187 from GrowthRocket/nfreeness-fix-view-style
shaojunda Sep 12, 2016
fdbcf2a
liyanzeng-refine-contact-us
liyanzeng Sep 13, 2016
2b41f59
rewrite progress bar lenghth
rebecca9201 Sep 13, 2016
29939f3
Merge pull request #189 from GrowthRocket/rebecca-standardzing-fronte…
shaojunda Sep 13, 2016
a05a848
liyanzeng-refine-user-verify-message
liyanzeng Sep 13, 2016
0ca855f
fix groupy by bug
shaojunda Sep 13, 2016
5c97649
Merge pull request #191 from GrowthRocket/shaojunda-fix-group-bug
shaojunda Sep 13, 2016
69967bf
Merge pull request #190 from GrowthRocket/liyanzeng-refine-user-verif…
shaojunda Sep 13, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/assets/javascripts/errors.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
17 changes: 17 additions & 0 deletions app/assets/stylesheets/account/posts.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
// Place all the styles related to the account::posts controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

.post-box{
width:760px;
min-height: 200px;
.id{
width: 30px;
}
.description{
width: 430px;
}
.oprate{
width: 100px;
}
.create-time{
width: 200px;
}
}
12 changes: 12 additions & 0 deletions app/assets/stylesheets/devise.scss.erb
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,18 @@
a:visited {color: #fff} ;
a:hover {text-decoration:underline; color: #fff} ;
a:active {text-decoration:underline; color: #fff} ;
.has-error .help-block,
.has-error .control-label,
.has-error .radio,
.has-error .checkbox,
.has-error .radio-inline,
.has-error .checkbox-inline,
.has-error.radio label,
.has-error.checkbox label,
.has-error.radio-inline label,
.has-error.checkbox-inline label{
color: #fff;
}
.btn-devise,
.btn-devise:focus,
.btn-devise.focus ,
Expand Down
25 changes: 25 additions & 0 deletions app/assets/stylesheets/errors.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Place all the styles related to the errors controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

.error-block{
background-color: #fff;
margin: 20px;
padding-top: 100px;
width: 500px;
height: 300px;
i{
font-size:1.2em;
padding-right: 5px;
color: #3499E0;
}
h1{
font-size: 1.5em;
}
h2{
font-size: 1.2em;
}
p{
margin-top: 20px;
}
}
19 changes: 19 additions & 0 deletions app/assets/stylesheets/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,25 @@ hr{
border-bottom: 1px solid #CCCCCC;
}

.navbar-link{
font-size: 1em;
font-weight: bold;
margin-top: 20px;
margin-left: 30px;
a:link {color: #666};
a:visited {color: #666} ;
a:hover {color: #43cb83} ;
a:active {color: #43cb83};
a{
margin-left: 12px;
}
}

.logo span{
font-size: 22px;
font-weight: bold;
// color: #43cb83
}

// config navbar end

Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/newwelcome.scss.erb
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
top: 41px;
z-index: 49;
position: absolute;
background-image: url('<%= asset_path("quotes2.jpg") %>');
// background-image: url('<%= asset_path("quotes2.jpg") %>');
}
.lp-pom-box-77 {
display: block;
Expand Down
259 changes: 255 additions & 4 deletions app/assets/stylesheets/projects.scss.erb
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@
margin-top: 40px;
.sh-progress-whole {
margin: 10px 0 5px;
width: 100%;
min-width: 1200px;
width: 325px;
height: 15px;
}
.sh-progress-content {
Expand Down Expand Up @@ -244,7 +243,7 @@
// config project index

.index-out{
min-width:900px;
min-width: 1200px;
margin: auto;
text-align:center;
}
Expand Down Expand Up @@ -491,7 +490,259 @@
margin: -15px 0 15px;
}

.user-info-edit{
.user-center-detail-block{
width:400px;
min-height: 630px;
}

.project-post-manage{
width:400px;
min-height: 630px;
}

// config new search bar
.header-categories__search {
float: right;
padding-top: 7px;
width: 170px
}


.search-field {
display: -webkit-flex;
display: -ms-flexbox;
display: flex
}

.search-field.-size-xl {
font-size: 16px;
height: 60px
}

.search-field.-size-l {
font-size: 16px;
height: 50px
}

.search-field.-size-m {
font-size: 14px;
height: 40px
}

.search-field,.search-field.-size-s {
font-size: 16px;
height: 30px
}

@media (min-width: 1025px) {
.search-field,.search-field.-size-s {
font-size: 13px
}
}

.search-field__input {
-webkit-flex: 1 auto;
-ms-flex: 1 auto;
flex: 1 auto;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
min-width: 0
}

input.search-field__input-field {
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
box-sizing: border-box;
padding: 5px 8px 6px;
border: 1px solid #bababa;
border-radius: 7px 0 0 7px;
border-right: 0;
color: gray;
-webkit-appearance: none;
outline: none;
min-width: 0
}

@media (min-width: 1025px) {
.-size-xl input.search-field__input-field {
padding: 5px 20px
}
}

@media (min-width: 1025px) {
.-size-l input.search-field__input-field {
padding: 5px 15px
}
}

.-border-none input.search-field__input-field {
border: none
}

.-border-light input.search-field__input-field {
border-color: #dedede
}

@media (min-width: 1025px) {
input.search-field__input-field.is-autosuggest-visible {
border-bottom-left-radius: 0
}
}

button.search-field__button {
-webkit-flex: 0 0 30px;
-ms-flex: 0 0 30px;
flex: 0 0 30px;
padding: 3px 0 2px;
background-color: #fff;
color: #999;
border-radius: 0 7px 7px 0;
border: 1px solid #bababa;
border-left: none;
font-size: 14px;
-webkit-transition: background-color 0.2s;
transition: background-color 0.2s
}

button.search-field__button:hover {
background-color: #f5f5f5
}

button.search-field__button:hover:before {
color: #333
}

button.search-field__button:focus {
background-color: #fff
}

button.search-field__button:active {
background-color: #ededed
}

.-theme-3docean button.search-field__button:hover {
color: #ab0f34
}

.-theme-audiojungle button.search-field__button:hover {
color: #9ac130
}

.-theme-codecanyon button.search-field__button:hover {
color: #e78733
}

.-theme-graphicriver button.search-field__button:hover {
color: #308eb1
}

.-theme-photodune button.search-field__button:hover {
color: #0f8c98
}

.-theme-themeforest button.search-field__button:hover {
color: #1abc9c
}

.-theme-videohive button.search-field__button:hover {
color: #e7a802
}

.-size-l button.search-field__button {
-webkit-flex-basis: 45px;
-ms-flex-preferred-size: 45px;
flex-basis: 45px;
font-size: 20px
}

@media (min-width: 569px) {
.-size-l button.search-field__button {
-webkit-flex-basis: 70px;
-ms-flex-preferred-size: 70px;
flex-basis: 70px;
font-size: 24px
}
}

.-size-xl button.search-field__button {
-webkit-flex-basis: 45px;
-ms-flex-preferred-size: 45px;
flex-basis: 45px;
font-size: 20px
}

@media (min-width: 569px) {
.-size-xl button.search-field__button {
-webkit-flex-basis: 80px;
-ms-flex-preferred-size: 80px;
flex-basis: 80px;
font-size: 26px
}
}

.-border-none button.search-field__button {
border: none
}

.-border-light button.search-field__button {
border-color: #dedede
}

.no-flexbox .search-field {
display: block;
width: 100%
}

.no-flexbox .search-field:after {
content: "";
display: table;
clear: both
}

.no-flexbox .search-field.-size-l .search-field__button {
width: 18%;
max-width: 70px;
font-size: 24px
}

.no-flexbox .search-field.-size-xl .search-field__button {
width: 18%;
max-width: 80px;
font-size: 26px
}

.no-flexbox .search-field__input {
display: block;
float: left;
width: 85%;
height: 100%
}

@media (max-width: 568px) {
.no-flexbox .search-field__input {
width: 82%
}
}

.no-flexbox input[type='search']::-ms-clear {
height: 0;
width: 0
}

.no-flexbox .search-field__input-field {
width: 100%;
height: 100%
}

.no-flexbox .search-field__button {
display: block;
float: left;
height: 100%;
width: 15%
}

// new searchbar end
Loading
Loading