From 3fb57f372f016a795fa63fda9ed040ae7de685e4 Mon Sep 17 00:00:00 2001
From: tkimia
Date: Mon, 21 Apr 2014 23:30:03 -0400
Subject: prelim style 2.0
---
app/assets/stylesheets/custom.css.scss | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
(limited to 'app/assets/stylesheets/custom.css.scss')
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index febcbb8..420bb4a 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -22,11 +22,28 @@ a, input[type="submit"] {
@extend .btn;
&.user { @extend .btn-info; }
&.signup { @extend .btn-success; }
- &.signin { @extend .btn-info; }
+ &.signin { @extend .btn-warning; }
&.signout { @extend .btn-danger; }
&.server { @extend .btn-danger; }
}
+
+input[type="text"], input[type="password"]{
+ border: 3px inset #A5A5A5;
+ -webkit-box-shadow:
+ inset 0 0 8px rgba(0,0,0,0.1),
+ 0 0 16px rgba(0,0,0,0.1);
+ -moz-box-shadow:
+ inset 0 0 8px rgba(0,0,0,0.1),
+ 0 0 16px rgba(0,0,0,0.1);
+ box-shadow:
+ inset 0 0 8px rgba(0,0,0,0.1),
+ 0 0 16px rgba(0,0,0,0.1);
+ padding: 10px;
+ background: rgba(0,0,0,0.5);
+ margin: 0 0 5px 0;
+}
+
p.errors {
background-color: #FCF8C7;
color: red;
--
cgit v1.2.3-54-g00ecf
From 25d8d625e79556e29f41d1d9982747716abf98e7 Mon Sep 17 00:00:00 2001
From: tkimia
Date: Tue, 22 Apr 2014 00:02:35 -0400
Subject: new background texture. fixed inconsistency with login page
---
app/assets/images/bg.png | Bin 0 -> 2725 bytes
app/assets/stylesheets/custom.css.scss | 40 +++++++++++++++++++-----------
app/assets/stylesheets/scaffolds.css.scss | 31 +++--------------------
app/views/sessions/new.html.erb | 2 +-
4 files changed, 31 insertions(+), 42 deletions(-)
create mode 100644 app/assets/images/bg.png
(limited to 'app/assets/stylesheets/custom.css.scss')
diff --git a/app/assets/images/bg.png b/app/assets/images/bg.png
new file mode 100644
index 0000000..91c77c8
Binary files /dev/null and b/app/assets/images/bg.png differ
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index 420bb4a..1931c0d 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -18,6 +18,7 @@ header > nav {
}
}
+
a, input[type="submit"] {
@extend .btn;
&.user { @extend .btn-info; }
@@ -25,6 +26,7 @@ a, input[type="submit"] {
&.signin { @extend .btn-warning; }
&.signout { @extend .btn-danger; }
&.server { @extend .btn-danger; }
+ font-weight: bold;
}
@@ -39,32 +41,42 @@ input[type="text"], input[type="password"]{
box-shadow:
inset 0 0 8px rgba(0,0,0,0.1),
0 0 16px rgba(0,0,0,0.1);
- padding: 10px;
+ padding: 8px;
background: rgba(0,0,0,0.5);
margin: 0 0 5px 0;
}
p.errors {
- background-color: #FCF8C7;
+ background-color: rgba(0,0,0,0.5);;
color: red;
border-radius: 7px;
padding: 10px;
}
-#errorExplanation {
- h2 {
- font-size: 1em;
- color: red;
- font-weight: bold;
- }
- li {
- font-size: 1em;
- color: red;
- font-style: italic;
- }
-
+#error_explanation {
+ width: 450px;
+ border: 2px solid red;
+ padding: 7px;
+ padding-bottom: 0;
+ margin-bottom: 20px;
+ background-color: #f0f0f0;
+ h2 {
+ text-align: left;
+ font-weight: bold;
+ padding: 5px 5px 5px 15px;
+ font-size: 12px;
+ margin: -7px;
+ margin-bottom: 0px;
+ background-color: #c00;
+ color: #fff;
+ }
+ ul li {
+ font-size: 12px;
+ list-style: square;
+ }
}
+
#notice {
text-align: center;
font-weight: bold;
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index 36eec30..dd8c80e 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -10,7 +10,7 @@ html{
}
body {
- background-color: $page-color;
+ background: asset-url("bg.png", image) repeat scroll 0 0 $page-color;
color: $page-color;
font-family: verdana, arial, helvetica, sans-serif;
font-size: 13px;
@@ -70,6 +70,9 @@ div {
#notice {
color: green;
+ background-color: rgba(0,0,0,0.5);
+ border-radius: 7px;
+ padding: 10px;
}
.field_with_errors {
@@ -85,32 +88,6 @@ div {
margin-top: 10px;
}
-#error_explanation {
- width: 450px;
- border: 2px solid red;
- padding: 7px;
- padding-bottom: 0;
- margin-bottom: 20px;
- background-color: #f0f0f0;
- h2 {
- text-align: left;
- font-weight: bold;
- padding: 5px 5px 5px 15px;
- font-size: 12px;
- margin: -7px;
- margin-bottom: 0px;
- background-color: #c00;
- color: #fff;
- }
- ul li {
- font-size: 12px;
- list-style: square;
- }
-}
-
-
-
-
button, input[type="submit"] {
@extend .btn;
}
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index b4acf77..ff27762 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -14,7 +14,7 @@
<%= f.password_field :password %>
- <%= f.submit "Sign in", class: "btn btn-large btn-primary" %>
+ <%= f.submit "Log in", class: "signin" %>
<% end %>
--
cgit v1.2.3-54-g00ecf
From 594f1388802476b236e8eaa622fbb5aec181a0a0 Mon Sep 17 00:00:00 2001
From: tkimia
Date: Tue, 22 Apr 2014 00:38:12 -0400
Subject: styled captcha and notices
---
app/assets/stylesheets/custom.css.scss | 8 +-------
app/assets/stylesheets/scaffolds.css.scss | 9 ++++++++-
app/assets/stylesheets/users.css.scss | 7 +++++++
3 files changed, 16 insertions(+), 8 deletions(-)
(limited to 'app/assets/stylesheets/custom.css.scss')
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index 1931c0d..d7f1698 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -26,7 +26,7 @@ a, input[type="submit"] {
&.signin { @extend .btn-warning; }
&.signout { @extend .btn-danger; }
&.server { @extend .btn-danger; }
- font-weight: bold;
+ font-weight: bold !important;
}
@@ -74,10 +74,4 @@ p.errors {
font-size: 12px;
list-style: square;
}
-}
-
-
-#notice {
- text-align: center;
- font-weight: bold;
}
\ No newline at end of file
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index dd8c80e..fd2a1fb 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -69,10 +69,17 @@ div {
}
#notice {
- color: green;
background-color: rgba(0,0,0,0.5);
border-radius: 7px;
padding: 10px;
+ width: 80%;
+ margin: 0px auto;
+ text-align: center;
+
+ p{
+ color: lightgreen !important;
+ font-weight: bold;
+ }
}
.field_with_errors {
diff --git a/app/assets/stylesheets/users.css.scss b/app/assets/stylesheets/users.css.scss
index 1efc835..3453a55 100644
--- a/app/assets/stylesheets/users.css.scss
+++ b/app/assets/stylesheets/users.css.scss
@@ -1,3 +1,10 @@
// Place all the styles related to the users controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
+
+
+/*** FOR NEW USER - AKA SIGN UP ***/
+.simple_captcha {
+ background-color: rgba(255, 255, 255, 0.7);
+ margin: 10px 0px;
+}
\ No newline at end of file
--
cgit v1.2.3-54-g00ecf