Skip to content

Commit

Permalink
Merged with suras design
Browse files Browse the repository at this point in the history
  • Loading branch information
thamizh committed Jul 20, 2013
2 parents 2e2e244 + 6844ce0 commit 47269a1
Show file tree
Hide file tree
Showing 62 changed files with 1,572 additions and 281 deletions.
4 changes: 4 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ gem 'stripe'

gem 'stripe_event'


gem 'carmen', git: 'git://github.com/jim/carmen.git'
gem 'carmen-rails', git: 'git://github.com/jim/carmen-rails.git'

# To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'

Expand Down
16 changes: 16 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
GIT
remote: git://github.com/jim/carmen-rails.git
revision: 958b23d8e0d5de7883669950002e490fc22e2e82
specs:
carmen-rails (1.0.0.beta1)
carmen (~> 1.0.0.beta2)
rails

GIT
remote: git://github.com/jim/carmen.git
revision: 731c87ab041fa17be1b921f452e5bfd52d1e3002
specs:
carmen (1.0.0.beta2)

GIT
remote: git://github.com/seyhunak/twitter-bootstrap-rails.git
revision: cdda8d78b41275e1fa4a6d7aa71b370573ca2553
Expand Down Expand Up @@ -199,6 +213,8 @@ DEPENDENCIES
angular-ui-rails!
angularjs-rails
better_errors
carmen!
carmen-rails!
coffee-rails (~> 3.2.1)
devise
email_validator
Expand Down
Binary file added app/assets/images/border-top.png
Loading
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/btn-add-note.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/assets/images/btn-cancel-import.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/assets/images/btn-cancel.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/assets/images/btn-choose.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/assets/images/btn-green.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/assets/images/btn-save.jpg
100755 → 100644
Loading
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/btn-send-mail.png
Loading
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/btn-start-free.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/assets/images/btn-upgrade.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/assets/images/btn-upload-import.jpg
100755 → 100644
Loading
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/faq_divider.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/assets/images/glyphicons-halflings.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/assets/images/header-bg.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/assets/images/icon-add.png
100755 → 100644
Loading
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/icon-back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/assets/images/icon-call-list.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/assets/images/icon-delete.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/assets/images/icon-excel.png
100755 → 100644
Loading
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/icon-free.png
Loading
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/icon-hand.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/assets/images/icon-linkedin.png
100755 → 100644
Loading
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/icon-next.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/assets/images/icon-outlook.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/assets/images/icon-resume.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/assets/images/icon-search.png
100755 → 100644
Binary file added app/assets/images/icon-secure.png
Empty file modified app/assets/images/icon-stop.png
100755 → 100644
Binary file added app/assets/images/incon-next.png
Empty file modified app/assets/images/like.png
100755 → 100644
Binary file added app/assets/images/pricing_big_box.png
Binary file added app/assets/images/pricing_header.png
Binary file added app/assets/images/pricing_small_box.png
Binary file added app/assets/images/pricint_btn_big.png
Binary file added app/assets/images/pricint_btn_small.png
Empty file modified app/assets/images/profile-pic.jpg
100755 → 100644
Binary file added app/assets/images/profile-pic.png
Empty file modified app/assets/images/unlike.png
100755 → 100644
230 changes: 230 additions & 0 deletions app/assets/stylesheets/common.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,230 @@
/* Font face */
@font-face {
font-family: logoFonta;
src: url('Alternate Gothic No2 BT/Alternate Gothic No2 BT.eot');
src: local('☺'), url('Alternate Gothic No2 BT/Alternate Gothic No2 BT.woff') format('woff'), url('Alternate Gothic No2 BT/Alternate Gothic No2 BT.ttf') format('truetype'), url('Alternate Gothic No2 BT/Alternate Gothic No2 BT.svg') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: fgb;
src: url('font/Franklin Gothic Book/Franklin Gothic Book.eot');
src: local('☺'), url('font/Franklin Gothic Book/Franklin Gothic Book.woff') format('woff'), url('font/Franklin Gothic Book/Franklin Gothic Book.ttf') format('truetype'), url('font/Franklin Gothic Book/Franklin Gothic Book.svg') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: fgbi;
src: url('font/Franklin Gothic Book Italic/Franklin Gothic Book Italic.eot');
src: local('☺'), url('font/Franklin Gothic Book Italic/Franklin Gothic Book Italic.woff') format('woff'), url('font/Franklin Gothic Book Italic/Franklin Gothic Book Italic.ttf') format('truetype'), url('font/Franklin Gothic Book Italic/Franklin Gothic Book Italic.svg') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: fgd;
src: url('font/Franklin Gothic Demi/Franklin Gothic Demi.eot');
src: local('☺'), url('font/Franklin Gothic Demi/Franklin Gothic Demi.woff') format('woff'), url('font/Franklin Gothic Demi/Franklin Gothic Demi.ttf') format('truetype'), url('font/Franklin Gothic Demi/Franklin Gothic Demi.svg') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: fgdc;
src: url('font/Franklin Gothic Demi Cond/Franklin Gothic Demi Cond.eot');
src: local('☺'), url('font/Franklin Gothic Demi Cond/Franklin Gothic Demi Cond.woff') format('woff'), url('font/Franklin Gothic Demi Cond/Franklin Gothic Demi Cond.ttf') format('truetype'), url('font/Franklin Gothic Demi Cond/Franklin Gothic Demi Cond.svg') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: fgdi;
src: url('font/Franklin Gothic Demi Italic/Franklin Gothic Demi Italic.eot');
src: local('☺'), url('font/Franklin Gothic Demi Italic/Franklin Gothic Demi Italic.woff') format('woff'), url('font/Franklin Gothic Demi Italic/Franklin Gothic Demi Italic.ttf') format('truetype'), url('font/Franklin Gothic Demi Italic/Franklin Gothic Demi Italic.svg') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: fgm;
src: url('font/Franklin Gothic Medium/Franklin Gothic Medium.eot');
src: local('☺'), url('font/Franklin Gothic Medium/Franklin Gothic Medium.woff') format('woff'), url('font/Franklin Gothic Medium/Franklin Gothic Medium.ttf') format('truetype'), url('font/Franklin Gothic Medium/Franklin Gothic Medium.svg') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: fgmc;
src: url('font/Franklin Gothic Medium Cond/Franklin Gothic Medium Cond.eot');
src: local('☺'), url('font/Franklin Gothic Medium Cond/Franklin Gothic Medium Cond.woff') format('woff'), url('font/Franklin Gothic Medium Cond/Franklin Gothic Medium Cond.ttf') format('truetype'), url('font/Franklin Gothic Medium Cond/Franklin Gothic Medium Cond.svg') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: fgmi;
src: url('font/Franklin Gothic Medium Italic/Franklin Gothic Medium Italic.eot');
src: local('☺'), url('font/Franklin Gothic Medium Italic/Franklin Gothic Medium Italic.woff') format('woff'), url('font/Franklin Gothic Medium Italic/Franklin Gothic Medium Italic.ttf') format('truetype'), url('font/Franklin Gothic Medium Italic/Franklin Gothic Medium Italic.svg') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face
{
font-family: logoFont;
src: url('font/Alternate Gothic No2 BT.ttf');
}
@font-face
{
font-family: fgh;
src: url('font/Franklin Gothic Heavy.ttf');
}
@font-face
{
font-family: fghi;
src: url('font/Franklin Gothic Heavy Italic.ttf');
}


/* == Common == */

body{
font-family:fgb;
font-size: 14px;
color: #414141;
background: #f8f8f8;
}
input{
height: 30px !important;
}
a:hover, a:focus {
color: #0184ad;
}
p{
margin-bottom: 20px;
margin-top: 15px;
}
.title{
font-size: 20px;
padding: 25px 0px 25px 0px;
font-family: fgmc;
}
.body-content a{
text-decoration: underline;
}
.btn-custom{
margin-top: 10px;
}

.boldMe{
font-weight: bold;
font-size: 18px;
}
.calibri15{
font-size: 15px;
font-family: "Calibri";
}
.calibri17{
font-size: 17px;
font-family: "Calibri";
}
.profile-pic50,.profile-pic65,.profile-pic75,.profile-pic100,.profile-pic125{
border: 1px #CCC solid;
padding: 1px;
}
.profile-pic50{
border-radius: 25px;
height: 50px;
width: 50px;
}
.profile-pic65{
border-radius: 35px;
height: 65px;
width: 65px;
}
.profile-pic75{
border-radius: 40px;
height: 75px;
width: 75px;
}
.profile-pic100{
border-radius: 50px;
height: 100px;
width: 100px;
}
.profile-pic125{
border-radius: 65px;
height: 125px;
width: 125px;
}
.position-relative{
position: relative;
}
.h70{
height: 70px;
}
.displayBlock{
display: block;
}
.spanBlock span{
display: block;
}
.fgmc18{
font-size: 18px;
font-family: fgmc;
}

.profile-box{
position: absolute;
right: 30px;
top: 15px;
text-align: center;
}
/* == Header == */

.header{
background: url(../img/header-bg.jpg) repeat;
height: 60px;
}
.logoFont{
font-family: logoFont;
font-size: 35px;
}
.header .container{
color: #fff;
padding:18px;
}
.header a,.header a:hover{
color: #fff;
text-decoration: none;
}
.nav-list{
list-style: none;
}
.nav-list li{
float: left;
font-size: 18px;
padding-left: 20px;
}
.nav-list li span{
padding-right: 10px;
}
.right-nav{
margin-right: 30px;
}

.outlined{
padding: 5px 0px 0px 5px;
list-style: none;
outline: 1px solid #d6d6d6;
}
.rightSide{
background: #ecebeb;
height: 800px;
margin-left: 10px;
}
.textCenter{
text-align: center;
}
.colorBlack{
color: #000 !important;
}
.fontsize25{
font-size: 25px;
}
.fontsize30{
font-size: 30px;
}
Loading

0 comments on commit 47269a1

Please sign in to comment.