Mercurial > zeropaste

changeset 386:bf9e350f8a2b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add styling to the alerts.
author nanaya <me@myconan.net>
date Sun, 07 Jun 2015 10:24:35 +0900
parents 62fef621f39c
children 6cd41974d4b0
files app/assets/stylesheets/_components.scss app/assets/stylesheets/_layout.scss app/assets/stylesheets/_variables.scss app/views/layouts/application.html.erb
diffstat 4 files changed, 21 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/app/assets/stylesheets/_components.scss	Sun Jun 07 10:13:25 2015 +0900
+++ b/app/assets/stylesheets/_components.scss	Sun Jun 07 10:24:35 2015 +0900
@@ -3,3 +3,15 @@
 input[type=radio] {
   margin-right: $spacing/2;
 }
+
+.alert {
+  padding: $spacing;
+}
+
+.alert-danger {
+  background-color: $danger;
+}
+
+.alert-info {
+  background-color: $info;
+}
--- a/app/assets/stylesheets/_layout.scss	Sun Jun 07 10:13:25 2015 +0900
+++ b/app/assets/stylesheets/_layout.scss	Sun Jun 07 10:24:35 2015 +0900
@@ -40,3 +40,7 @@
   font-family: Segoe UI, Helvetica Neue, Helvetica, Arial, sans-serif;
   font-size: 12px;
 }
+
+.alert {
+  flex: none;
+}
--- a/app/assets/stylesheets/_variables.scss	Sun Jun 07 10:13:25 2015 +0900
+++ b/app/assets/stylesheets/_variables.scss	Sun Jun 07 10:24:35 2015 +0900
@@ -1,2 +1,5 @@
 $spacing: 10px;
 $screen-sm: 600px;
+
+$danger: scale-color(#f00, $lightness: 90%);
+$info: scale-color(#0f0, $lightness: 90%);
--- a/app/views/layouts/application.html.erb	Sun Jun 07 10:13:25 2015 +0900
+++ b/app/views/layouts/application.html.erb	Sun Jun 07 10:24:35 2015 +0900
@@ -16,9 +16,9 @@
       </p>
     </header>
 
+    <%= render "layouts/alerts" %>
+
     <main>
-      <%= render "layouts/alerts" %>
-
       <%= yield %>
     </main>