From a14710353b24ad8c23ac31fd0d52a35a7ce22f24 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 30 Sep 2014 13:15:40 +0200 Subject: [PATCH] style admin section --- .../javascripts/app/views/maintenance.jst.eco | 46 ++++++++----------- .../javascripts/app/views/package.jst.eco | 4 +- .../app/views/settings/item.jst.eco | 11 +++-- app/assets/stylesheets/zzz.css.erb | 34 ++++++++++++++ 4 files changed, 61 insertions(+), 34 deletions(-) diff --git a/app/assets/javascripts/app/views/maintenance.jst.eco b/app/assets/javascripts/app/views/maintenance.jst.eco index 9eef2f1f2..e9ee7f9ce 100644 --- a/app/assets/javascripts/app/views/maintenance.jst.eco +++ b/app/assets/javascripts/app/views/maintenance.jst.eco @@ -1,29 +1,21 @@ -
-
-
-

<%- @T('Maintenance Message') %>

+
+

<%- @T('Maintenance Message') %>

+
+
+
+ +
+ +
- -
-
- -
- -
+
+ +
+
-
- -
- -
-
-
- -
- -
-
-
- -
-
\ No newline at end of file +
+
+ +
+ + \ No newline at end of file diff --git a/app/assets/javascripts/app/views/package.jst.eco b/app/assets/javascripts/app/views/package.jst.eco index 53c8741f9..f2721019c 100644 --- a/app/assets/javascripts/app/views/package.jst.eco +++ b/app/assets/javascripts/app/views/package.jst.eco @@ -11,9 +11,9 @@ -->

-

+ - +

diff --git a/app/assets/javascripts/app/views/settings/item.jst.eco b/app/assets/javascripts/app/views/settings/item.jst.eco index 8a6cb30e8..7825d7d00 100644 --- a/app/assets/javascripts/app/views/settings/item.jst.eco +++ b/app/assets/javascripts/app/views/settings/item.jst.eco @@ -1,7 +1,8 @@ -
+

<%- @T( @setting.title ) %>

<%- @T( @setting.description ) %>

-
- -
-
\ No newline at end of file +
+
+ +
+ \ No newline at end of file diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index 266dc92e2..6b94ad480 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -9,6 +9,11 @@ ol, ul { } +p { + color: hsl(198,19%,72%); + margin-bottom: 14px; +} + a.create { color: hsl(145,51%,45%); text-decoration: underline; @@ -547,6 +552,14 @@ textarea, margin-left: 10px; } +.help-block { + margin: 0; +} + +.help-block:not(:empty) { + margin: 5px 0 10px; +} + .help-block { color: #bcbcbc; } @@ -3618,6 +3631,27 @@ footer { border-color: hsl(0,0%,90%); } +.main .nav-tabs:first-child { + margin: 28px 0 50px; +} + +.settings-entry { + margin-bottom: 42px; + max-width: 700px; +} + +.form-item .form-group { + margin-bottom: 0; +} + +.form-item .form-group + .form-group { + margin-top: 15px; +} + +.form-item + .btn { + margin-left: 15px; +} + /* ----------------