Css improvements and cleanup

This commit is contained in:
Sahat Yalkabov
2013-12-12 01:35:18 -05:00
parent 93a73da381
commit eb0a6b95c6
5 changed files with 29 additions and 30 deletions

View File

@ -1,9 +1,10 @@
//@import "bootstrap/bootstrap";
//@import "themes/ios7";
body { body {
padding-top: 80px; padding-top: 80px;
} }
//
// TODO: Refactor
//
.navbar-nav img { .navbar-nav img {
width: 40px; width: 40px;
height: 40px; height: 40px;
@ -32,11 +33,10 @@ body {
} }
.github { .github {
color: #fff;
background-color: #333; background-color: #333;
border-color: #333; border-color: #333;
}
}// TODO: REFACTOR
// Search field // Search field
.dataTables_filter { .dataTables_filter {
@ -170,3 +170,7 @@ body {
} }
} }

View File

@ -1,5 +1,4 @@
// iOS 7 Bootstrap Theme // iOS 7 Bootstrap Theme
// Sahat Yalkabov
// ----------------------------------------------------- // -----------------------------------------------------
// Variables ================================================================= // Variables =================================================================

View File

@ -1,7 +1,6 @@
extends layout extends layout
block content block content
h2 Account Management
ul.nav.nav-tabs ul.nav.nav-tabs
li.active li.active
a(href='#basic', data-toggle='tab') Basic Info a(href='#basic', data-toggle='tab') Basic Info
@ -10,6 +9,7 @@ block content
.tab-content .tab-content
#basic.tab-pane.fade.active.in #basic.tab-pane.fade.active.in
form.form-horizontal(action='/account/profile', method='POST') form.form-horizontal(action='/account/profile', method='POST')
legend Profile Information
.form-group .form-group
label.col-sm-2.control-label(for='name') Name label.col-sm-2.control-label(for='name') Name
.col-sm-4 .col-sm-4
@ -40,9 +40,8 @@ block content
button.btn.btn.btn-primary(type='submit') Update Profile button.btn.btn.btn-primary(type='submit') Update Profile
#settings.tab-pane.fade #settings.tab-pane.fade
.page-header
h3 Change Password
form.form-horizontal(action='/account/profile', method='POST') form.form-horizontal(action='/account/profile', method='POST')
legend Change Password
.form-group .form-group
label.col-sm-3.control-label(for='password') Password label.col-sm-3.control-label(for='password') Password
.col-sm-4 .col-sm-4

View File

@ -12,6 +12,7 @@ html
link(href='/css/lib/animate.css', rel='stylesheet') link(href='/css/lib/animate.css', rel='stylesheet')
link(href='/css/lib/jasny-bootstrap.css', rel='stylesheet') link(href='/css/lib/jasny-bootstrap.css', rel='stylesheet')
link(href='/css/lib/font-awesome.min.css', rel='stylesheet') link(href='/css/lib/font-awesome.min.css', rel='stylesheet')
link(href='/css/lib/bootstrap.min.css', rel='stylesheet')
link(href='/css/themes/flat-ui.min.css', rel='stylesheet') link(href='/css/themes/flat-ui.min.css', rel='stylesheet')
link(href='/css/styles.css', rel='stylesheet') link(href='/css/styles.css', rel='stylesheet')

View File

@ -5,34 +5,30 @@ block content
.alert.alert-danger .alert.alert-danger
strong= messages strong= messages
form.form-horizontal(method='POST') .col-sm-8.col-sm-offset-2
legend Login form(method='POST')
legend Sign In
.form-group .form-group
.col-sm-offset-2.col-sm-8 .btn-group.btn-group-justified
.btn-group.btn-group-justified.btn-group a.btn.btn-sm.btn-primary.facebook(href='/auth/facebook')
a.btn.btn-primary.facebook(href='/auth/facebook')
i.fa.fa-facebook i.fa.fa-facebook
| Facebook | Facebook
a.btn.btn-info.twitter(href='/auth/twitter') a.btn.btn-sm.btn-info.twitter(href='/auth/twitter')
i.fa.fa-twitter i.fa.fa-twitter
| Twitter | Twitter
a.btn.btn-default.github(href='/auth/github') a.btn.btn-sm.btn-default.github(href='/auth/github')
i.fa.fa-github i.fa.fa-github
| GitHub | GitHub
a.btn.btn-danger.google(href='/auth/google') a.btn.btn-sm.btn-danger.google(href='/auth/google')
i.fa.fa-google-plus i.fa.fa-google-plus
| Google | Google
.form-group .form-group
label.col-sm-2.control-label(for='username') Email label.control-label(for='username') Email
.col-sm-8
input.form-control(type='text', name='username', id='username', placeholder='Email', autofocus='') input.form-control(type='text', name='username', id='username', placeholder='Email', autofocus='')
.form-group .form-group
label.col-sm-2.control-label(for='username') Password label.control-label(for='username') Password
.col-sm-8
.input-group
input.form-control(type='password', name='password', id='password', placeholder='Password') input.form-control(type='password', name='password', id='password', placeholder='Password')
span.input-group-btn
button.btn.btn-default(type='submit') Go
.help-block .help-block
a.pull-right(href='#') Forgot password? a.pull-right(href='#') Forgot password?
.form-group
button.btn.btn-primary(type='submit') Login