Permalink
Browse files

lot's of style improvement...

  • Loading branch information...
1 parent c640ec0 commit f5fda6e5e08dea7084018a3dc4860b5b0033dffa @stevemo committed May 31, 2012
View
@@ -1,54 +1,161 @@
body {
- background-color: #E1E1E1;
- background-image: url("../img/bg.png");
- background-repeat: repeat-x;
- padding-top: 60px;
- position: relative;
+ background-color: #e1e1e1;
+ background: url(../img/dark_brick_wall.png) center top repeat;
+ padding-top: 50px;
+}
+/* Navbar */
+.navbar-fixed-top .brand {
+ font-weight: bold;
+ color: #EFA92E;
+ text-shadow: 0 1px 0 rgba(255,255,255,.1), 0 0 30px rgba(255,255,255,.125);
+ -webkit-transition: all .2s linear;
+ -moz-transition: all .2s linear;
+ transition: all .2s linear;
}
-/*------------------- Header section ------------------------*/
-#logo {
- margin-bottom: 40px;
+.navbar-fixed-top .brand:hover {
+ text-decoration: none;
}
+/* HEADER */
+#header {
+ margin-bottom: 20px;
+}
+#header label.checkbox {
+ color: #FFFFFF;
+}
#logo h1 a, #logo h1 a:hover {
- color: #fff;
- font-size: 24px;
- line-height: 24px;
- text-decoration: none;
+ color: #EFA92E;
+ text-decoration: none;
}
-#logo h2 {
- color: #999999;
- font-size: 16px;
- line-height: 16px;
-}
+/* Sidebar */
+/*------------------------------------------------------------------
+[6. Widget / .widget]
+*/
-#header-login label {
- color: #FFFFFF;
+.widget {
+ position: relative;
+ clear: both;
+ width: auto;
+ margin-bottom: 2em;
+ overflow: hidden;
+}
+
+.widget-header {
+ position: relative;
+ height: 40px;
+ line-height: 40px;
+ background: #E9E9E9;
+ background:-moz-linear-gradient(top, #FAFAFA 0%, #E9E9E9 100%); /* FF3.6+ */
+ background:-webkit-gradient(linear, left top, left bottom, color-stop(0%,#FAFAFA), color-stop(100%,#E9E9E9)); /* Chrome,Safari4+ */
+ background:-webkit-linear-gradient(top, #FAFAFA 0%,#E9E9E9 100%); /* Chrome10+,Safari5.1+ */
+ background:-o-linear-gradient(top, #FAFAFA 0%,#E9E9E9 100%); /* Opera11.10+ */
+ background:-ms-linear-gradient(top, #FAFAFA 0%,#E9E9E9 100%); /* IE10+ */
+ background:linear-gradient(top, #FAFAFA 0%,#E9E9E9 100%); /* W3C */
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FAFAFA', endColorstr='#E9E9E9');
+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#FAFAFA', endColorstr='#E9E9E9')";
+ border: 1px solid #D5D5D5;
+ -webkit-border-top-left-radius: 4px;
+ -webkit-border-top-right-radius: 4px;
+ -moz-border-radius-topleft: 4px;
+ -moz-border-radius-topright: 4px;
+ border-top-left-radius: 4px;
+ border-top-right-radius: 4px;
+ -webkit-background-clip: padding-box;
+}
+
+.widget-header h3 {
+
+ position: relative;
+ top: 2px;
+ left: 10px;
+ display: inline-block;
+ margin-right: 3em;
+ font-size: 14px;
+ font-weight: 800;
+ color: #428dd0;
+ line-height: 18px;
+ text-shadow: 1px 1px 2px rgba(255,255,255,.5);
+}
+
+.widget-header [class^="icon-"], .widget-header [class*=" icon-"] {
+ display: inline-block;
+ margin-left: 13px;
+ margin-right: -2px;
+ font-size: 16px;
+ color: #555;
+ vertical-align: middle;
}
-/*------------------- users module ------------------------*/
-.account-container {
- background: none repeat scroll 0 0 #F9F9F9;
+.widget-content {
+ padding: 20px 15px 15px;
+ background: #FFF;
border: 1px solid #D5D5D5;
- border-radius: 5px 5px 5px 5px;
- box-shadow: 0 0 2px #DADADA, 0 -3px 0 #E6E6E6 inset;
- display: block;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ border-radius: 5px;
+}
+
+.widget-header+.widget-content {
+ border-top: none;
+ -webkit-border-top-left-radius: 0;
+ -webkit-border-top-right-radius: 0;
+ -moz-border-radius-topleft: 0;
+ -moz-border-radius-topright: 0;
+ border-top-left-radius: 0;
+ border-top-right-radius: 0;
}
-.account-container h1 {
- color: #0074CC;
- margin-bottom: 0.4em;
+
+.widget-nopad .widget-content {
+ padding: 0;
}
-.account-content {
- padding: 16px 28px 23px;
+
+/* Widget Content Clearfix */
+.widget-content:before,
+.widget-content:after {
+ content:"";
+ display:table;
+}
+
+.widget-content:after {
+ clear:both;
+}
+
+/* For IE 6/7 (trigger hasLayout) */
+.widget-content {
+ zoom:1;
+}
+
+/* users module */
+#register-steps {
+ padding-bottom: 10px;
+}
+
+/* General */
+.page-toolbar {
+ background-color: #e8e8e8;
+ padding: 10px;
+ border: solid 1px #dcdcdc;
+ border-radius: 5px;
+}
+
+.well {
+ border: solid 1px #dcdcdc;
+ background-color: #FFFFFF;
+}
+
+.table, .accordion-toggle {
+ background-color: #FFFFFF;
+}
+
+legend {
+ color: #F89406;
+ border-bottom: 1px solid #F89406;
+}
+
+.page-header {
+ color: #0f5ca1;
+ border-bottom: 1px solid #0f5ca1;
+ margin-top: 0px;
}
-/*------------------- General ------------------------*/
-.box {
- background: none repeat scroll 0 0 #F9F9F9;
- border: 1px solid #D5D5D5;
- border-radius: 5px 5px 5px 5px;
- box-shadow: 0 0 2px #DADADA, 0 -3px 0 #E6E6E6 inset;
- display: block;
- padding: 16px 30px;
-}
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -25,6 +25,7 @@
{{ theme:css file='bootstrap.css' }}
{{ theme:css file='style.css' }}
{{ theme:css file='bootstrap-responsive.css' }}
+
<!-- end CSS-->
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
@@ -46,18 +47,26 @@
<!--- main container -->
<div class="container" id="main">
- {{ theme:partial name='header' }}
+ <div class="row" id="header">{{ theme:partial name='header' }}</div>
+
+ <div class="row">
+ <div class="span9">
+ {{ session:messages success="alert alert-success" notice="alert alert-info" error="alert alert-error" }}
+ </div>
+ </div>
<div class="row">
- <!--- page content -->
- <section class="span9">{{ template:body }}</section>
- <!--- end of page content -->
- <aside class="span3"></aside>
+ <section class="span9">
+ <div class="well">{{ template:body }}</div>
+ </section>
+
+ <aside class="span3 hidden-phone">{{ theme:partial name='aside' }}</aside>
</div>
-
+
</div>
+
<!--- end main container -->
@@ -1,54 +1,50 @@
+<div class="page-header">
+ <h1><?php echo lang('user_login_header') ?></h1>
+</div>
+
<?php if( validation_errors() ): ?>
<div class="row">
- <div class="alert alert-block alert-error">
+ <div class="alert alert-block alert-error span8">
<a class="close" data-dismiss="alert" href="#">×</a>
<h4 class="alert-heading"><?php echo lang('general_error_label'); ?>!</h4>
<?php echo validation_errors(); ?>
</div>
</div>
<?php endif; ?>
+
+<?php echo form_open('users/login', array('id'=>'login','class'=>'form-horizontal'), array('redirect_to' => $redirect_to)); ?>
+ <fieldset>
+ <div class="control-group">
+ <label for="email" class="control-label">
+ <?php echo lang('user_email'); ?>
+ </label>
+ <div class="controls">
+ <input type="email" name="email" class="span3" value="<?php echo set_value('email', ''); ?>" placeholder="<?php echo lang('user_email'); ?>">
+ </div>
+ </div>
-<div class="row">
- <div class="account-container">
- <div class="account-content clearfix">
-
- <h1><?php echo lang('user_login_header') ?></h1>
-
- <?php echo form_open('users/login', array('id'=>'login'), array('redirect_to' => $redirect_to)); ?>
-
- <div class="control-group">
- <label for="email" class="control-label">
- <?php echo lang('user_email'); ?>
- </label>
- <div class="controls">
- <input type="email" name="email" class="span3" value="<?php echo set_value('email', ''); ?>" placeholder="<?php echo lang('user_email'); ?>">
- </div>
- </div>
-
- <div class="control-group">
- <label for="password" class="control-label">
- <?php echo lang('user_password'); ?>
- </label>
- <div class="controls">
- <input type="password" id="password" name="password" maxlength="20" class="span3" placeholder="<?php echo lang('user_password'); ?>" />
- </div>
- </div>
-
- <div class="control-group">
- <label class="checkbox">
- <?php echo lang('user_remember'); ?>
- <?php echo form_checkbox('remember', '1', FALSE); ?>
- </label>
- </div>
-
- <div class="form-actions">
- <button class="btn btn-primary" type="submit" name="btnLogin"><?php echo lang('user_login_btn') ?></button>
- </div>
-
- <?php echo anchor('users/reset_pass', lang('user_reset_password_link'));?>
+ <div class="control-group">
+ <label for="password" class="control-label">
+ <?php echo lang('user_password'); ?>
+ </label>
+ <div class="controls">
+ <input type="password" id="password" name="password" maxlength="20" class="span3" placeholder="<?php echo lang('user_password'); ?>" />
+ </div>
+ </div>
- <?php echo form_close(); ?>
+ <div class="control-group">
+ <label class="control-label">
+ <?php echo lang('user_remember'); ?>
+ </label>
+ <div class="controls">
+ <?php echo form_checkbox('remember', '1', FALSE); ?>
+ </div>
+ </div>
+ <div class="form-actions">
+ <button class="btn btn-primary" type="submit" name="btnLogin"><?php echo lang('user_login_btn') ?></button>
</div>
- </div>
-</div>
+
+ <?php echo anchor('users/reset_pass', lang('user_reset_password_link'));?>
+ </fieldset>
+<?php echo form_close(); ?>
Oops, something went wrong.

0 comments on commit f5fda6e

Please sign in to comment.