summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/custom.css.scss8
-rw-r--r--app/assets/stylesheets/scaffolds.css.scss12
2 files changed, 17 insertions, 3 deletions
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index 3c9aef9..d4c81a0 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -16,6 +16,13 @@ header > nav {
&.signout { @extend .btn-danger; }
}
}
+ form.search {
+ @extend .navbar-form;
+ @extend .navbar-right;
+ input[type="submit"] {
+ @extend .btn-warning;
+ }
+ }
}
p.errors {
@@ -38,4 +45,3 @@ p.errors {
}
}
-
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index 28761fc..6700fef 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -1,3 +1,5 @@
+@import "bootstrap";
+
body {
background-color: #fff;
color: #333;
@@ -74,9 +76,11 @@ div {
}
.navbar-brand {
+ @extend .no-dec;
a{
- &:hover {
- color: #FFF;
+ color: white;
+ &:hover, &:active, &:focus {
+ color: white;
font-weight: normal;
text-decoration: none;
}
@@ -89,3 +93,7 @@ footer {
padding-top: 18px;
margin-top: 18px;
}
+
+button, input[type="submit"] {
+ @extend .btn;
+}