Skip to content

Commit

Permalink
added styling, changed location of check off milestone option
Browse files Browse the repository at this point in the history
  • Loading branch information
@empendium
empendium committed Dec 18, 2011
1 parent f1d3a12 commit f455b46
Show file tree
Hide file tree
Showing 18 changed files with 275 additions and 120 deletions.
Binary file added app/assets/images/bubble2.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/completed.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/glowstars.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/glowystars.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/goalgraphic.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/old_wall.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/quotebubble.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/select_background.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/tinystars3.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/yellow_wall.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/stylesheets/Nikaia.otf
View file
Binary file not shown.
269 changes: 205 additions & 64 deletions app/assets/stylesheets/application.css
View file
Expand Up @@ -5,38 +5,77 @@
*= require_tree .
*= require_self
*/
@font-face{
font-family: "dustismo";
src: url(/assets/stylesheets/dustismo.ttf) format("truetype");
}

@font-face{
font-family: "Forque";
src: url(/assets/stylesheets/Forque.ttf) format("truetype");
}

body{
background: #060213 url(/assets/tinystars2.png) right top;
background-repeat: no-repeat;
background: #060213 url(/assets/glowstars.png) top;
background-repeat: repeat-x;
font-family: tahoma;
}

input[type="submit"]{
margin: 10px;
padding: 8px 15px;
font-family: Tahoma, Arial, sans-serif;
font-family: dustismo.ttf, helvetica, Arial, sans-serif;
font-weight: bold;
font-size: 30px;
color: #ffffff;
line-height: 1;
padding: 14px;
border: none;
background-color: #1b6cb9;
-webkit-border-radius: 31px;
-moz-border-radius: 31px;
-o-border-radius: 31px;
border-radius: 31px;
}

input[type = "submit"].commentSubmit {
margin: 10px;
font-family: dustismo.ttf, helvetica, arial, sans-serif;
font-weight: bold;
font-size: 12px;
font-size: 30px;
color: #ffdcb8;
line-height: 1;
border: none;
background-color: #1b6cb9;
-webkit-border-radius: 31px;
-moz-border-radius: 31px;
-o-border-radius: 31px;
border-radius: 31px;
}

input[type="submit"].milestoneButton{
background-image: url(/assets/completed.png);
background-repeat: no-repeat;
background-color: transparent;
color: #000000;
height: 40px;
height: 60px;
width: 400px;
line-height: 1;
border: none;
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.85);
background-image: -webkit-gradient(linear,
0% 0%, 0% 100%, from (#c3e506), to (#1e1ec5));
background-image: -moz-linear-gradient (0 100%
90deg, #c3e506, #1e1ec5);
background-color: #62b2ff;
-webkit-border-radius: 12px;
-moz-border-radius: 12px;
-o-border-radius: 12px;
border-radius: 12px;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
}

#select_a_goal input.Go{
font-size: 40px;
}


.drop_down{
font-family: dustismo, helvetica, arial, sans-serif;
height: 60px;
width: 600px;
font-size: 40px;
}


select{
width: 175px;
height: 30px;
Expand All @@ -45,19 +84,51 @@ select{
font-size: 15px;
}

.changeborder:focus
{
outline:Yellow Solid 4px;
#sign_in{
font-family: dustismo, helvetica, arial, sans-serif;
font-size: 25px;
border-style: groove;
padding-bottom: 60px;
text-align: center;
width: 900px;
height: 200px;
padding-top: 70px;
margin: auto;
border-radius: 8px;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
}

#user_info{
text-align: left;
margin: 40px;
border-style: groove;
padding: 40px;
border-radius: 8px;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
}

@font-face{
font-family: 'Geometry_Soft_Pro-Bold_N';
font-style: normal;
font-weight: normal;
src: url('Geometry_Soft_Pro-Bold_N.otf');
#user_info input.field{
width: 400px;
font-size: 40px;
font-family: dustismo, helvetica, arial, sans-serif;
}

.field_label{
font-family: dustismo, helvetica, arial, sans-serif;
width: 400px;
font-size: 40px;
color: #ffffff;
padding: 12px;
margin: auto;
}

.changeborder:focus {
outline:Yellow Solid 4px;
}


#allcontent{
padding: 50px;
}
Expand Down Expand Up @@ -85,15 +156,15 @@ select{
margin-right: 150px;
}
#maincontent footer{
background-color: #ff3d2c;
background-image: url(/assets/connect_yellow.png);
height: 200px;
margin-bottom: none;
margin-top: 40px;
margin-top: 140px;
margin-bottom: 40px;
}

#maincontent input{
font-family: Tahoma, Arial, sans-serif;
font-family: dustismo, helvetica, arial, sans-serif;
font-size: 20px;
}

Expand All @@ -106,23 +177,42 @@ select{
-webkit-border-radius: 8px;
}

#text.field{
text-align: center;
} s

#center{
margin: auto;
padding-bottom: 60px;
#select_a_goal{
border-style: groove;
padding-bottom: 60px;
text-align: center;
width: 500px;
height: 200px;
width: 900px;
height: 350px;
padding-top: 70px;
margin: auto;
border-radius: 8px;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
}

#select_a_goal p{
font-family: Forque, helvetica, arial, sans-serif;
font-size: 80px;
color: #b9245b;
}

#homeTitle {
border-style: groove;
background-image: url(/assets/connect.png);
font-size: 70px;
width: 800px;
height: 350px;
margin: auto;
border-radius: 8px;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
}

#homeTitle h1{
font-style: dustismo, helvetica, Arial, sans-serif;
}


#your_milestones{
font-size: 25px;
line-height: 30px;
Expand All @@ -132,8 +222,24 @@ select{
margin-bottom: 40px;
}

#yourMilestonesTitle{
background-color: #ff1b2a;
width: 450px;
height: auto;
border-radius: 8px;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
text-align: left;
padding: 15px;
}

#yourMilestonesTitle h3{
font-size: 30px;
}

#todays_comments li {
background-color: #bce8ff;
list-style-image: url(/assets/quotebubble.png);
border-style: groove;
border-radius: 8px;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
Expand All @@ -146,59 +252,80 @@ select{

}

#your_milestones li{
background-color: #ffdcb8;
#todays_comments {
float: left;
width: 50%;
}

#others_comments {
float: left;
width: 50%;
}

#others_comments li {
list-style-image: url(/assets/bubble2.png);
border-style: groove;
border-radius: 8px;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
font-family: Tahoma, Arial, sans-serif;
font-size: 25px;
line-height: 30px;
margin: 20px;
padding: 15px;
width: 500px;
}

/*#steps{
background-color: #62b2ff;
width: auto;
height: auto;
padding: 8px;
.comment_header{
background-color: #fff4db;
font-size: 20px;
padding: 15px;
margin: 50px;
border-radius: 8px;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
}

#steps label.step{
color: white;
font-size: 20px;
font-weight:bold;
#your_milestones li{
background-color: #fff4db;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
font-family: Tahoma, Arial, sans-serif;
font-size: 25px;
line-height: 30px;
margin: 20px;
padding: 15px;
}

#steps input{
padding: 10px;
font-size: 14px;
.milestoneDescription{
font-size: 40px;
}

#steps label.completion{
background-color: red;
#lower_section{
clear: both;
}
*/

h1 {
font-family: Geometry_Soft_Pro-Bold_N, Helvetica Bold, sans-serif bold;
font-size: 40px;
font-family: Tahoma, Arial, sans-serif;
font-size: 65px;
color: #e41b2f;
text-align: center;
height: 80px;
width: auto;
}

h2{
font-family: Geometry_Soft_Pro-Bold_N, Helvetica Bold, sans-serif bold;
font-size: 30px;
color: #170f43;
font-family: dustismo, Helvetica, Arial, sans-serif;
font-size: 55px;
color: #ff2929;
text-align: center;
}

h3.yourMilestones{
font-family: dustismo, Helvetica, Arial, sans-serif;
font-size: 35px;
}

h4{
color: #060213;
}
Expand All @@ -211,7 +338,21 @@ p{
}

label{
color: #060213;
background-color: #ff4246;
font-family: dustismo, helvetica, Arial, sans-serif;
font-size: 30px;
padding: 15px;
margin: 10px;
padding: 8px 15px;
font-family: dustismo.ttf, helvetica, Arial, sans-serif;
font-weight: bold;
color: #ffffff;
line-height: 1;
border: none;
-webkit-border-radius: 31px;
-moz-border-radius: 31px;
-o-border-radius: 31px;
border-radius: 31px;
}


Expand Down
Binary file added app/assets/stylesheets/dustismo.ttf
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion app/models/goal.rb
View file
Expand Up @@ -5,7 +5,7 @@ class Goal < ActiveRecord::Base
accepts_nested_attributes_for :milestones

def self.preset_goals
["quit smoking", "get organized", "learn a musical instrument", "learn to drive", "overcome a fear", "overcome and addiction", "learn to cook", "learn to program", "learn to sew", "learn a sport", "learn a foreign language", "take a trip", "reconnect with old friends", "find birth-parents", "take a class", "get a degree", "learn to dance", "start a business", "lose weight", "make a movie", "write a book", "write a play", "get a raise", "run a marathon", "learn to knit", "build an app", "learn to paint", "learn to draw", "save money", "buy a house", "get a job"]
["quit smoking", "get organized", "learn a musical instrument", "learn to drive", "overcome a fear", "overcome an addiction", "learn to cook", "learn to program", "learn to sew", "learn a sport", "learn a foreign language", "take a trip", "reconnect with old friends", "find birth-parents", "take a class", "get a degree", "learn to dance", "start a business", "lose weight", "make a movie", "write a book", "write a play", "get a raise", "run a marathon", "learn to knit", "build an app", "learn to paint", "learn to draw", "save money", "buy a house", "get a job"]
# "<option>quit smoking</option><option>lose weight</option><option>run marathon</option><option>learn to knit</option>"
end

Expand Down

0 comments on commit f455b46

Please sign in to comment.