From e5976306709807461803cd0fa5f92310e0703a0e Mon Sep 17 00:00:00 2001 From: Beastie PC Date: Wed, 19 Jul 2017 20:37:54 +0300 Subject: [PATCH 1/2] Change type aplication for 500 and 404 page --- app/views/layouts/application.html.erb | 50 +++++++++---------- public/404.html | 67 -------------------------- public/500.html | 66 ------------------------- 3 files changed, 25 insertions(+), 158 deletions(-) delete mode 100644 public/404.html delete mode 100644 public/500.html diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 85521d3..fff1829 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -46,25 +46,24 @@ .navbar { padding: 0 0 0 15rem; = } - #first-block .notfound h1{ + #first-block h1{ color: #252525; font-size:24px; line-height: 24px; + font-family: GothaProBol; } - #first-block .notfound p{ - color: #009FE2; - font-size:72px; - line-height: 150px; + .fa-inverse { + color: #E5E5E5; + font-size: 12px; } - .center-justified { - text-align: justify; - -moz-text-align-last: center; - text-align-last: center; + .update-data p:nth-child(2), .rada-date p:nth-child(2){ + color: #949393; } <% end %> + <% unless request.path == "/500" %>
<% if controller.controller_path != "home" %> - <%= link_to "

Lviv.Rada4You.org

".html_safe, root_path, class: "navbar-brand text-uppercase logo", id: "logo" %> - -
-
-
+
+
+ <%= link_to "

Lviv.Rada4You.org

".html_safe, root_path, class: "col-4 navbar-brand text-uppercase logo", id: "logo" %> + <% if controller.controller_path != "errors" %> +
- -

Оновлення даних

-

<%= last_update_rada %>

-
-
+

Оновлення даних

+

<%= last_update_rada %>

+
+
- -

Засідання облради

-

<%= last_sessions_rada() %>

+

Засідання облради

+

<%= last_sessions_rada() %>

+
+ <% end %> +
-
-
+ <% end %> <% end %> <%= yield %> +<% unless request.path == "/500" %>

Проект Громадянської мережі <%= link_to "ОПОРА", "http://oporaua.org", target: "_blank" %>

@@ -188,7 +188,7 @@
- +<% end %> <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> diff --git a/public/404.html b/public/404.html deleted file mode 100644 index 2be3af2..0000000 --- a/public/404.html +++ /dev/null @@ -1,67 +0,0 @@ - - - - The page you were looking for doesn't exist (404) - - - - - - -
-
-

The page you were looking for doesn't exist.

-

You may have mistyped the address or the page may have moved.

-
-

If you are the application owner check the logs for more information.

-
- - diff --git a/public/500.html b/public/500.html deleted file mode 100644 index 78a030a..0000000 --- a/public/500.html +++ /dev/null @@ -1,66 +0,0 @@ - - - - We're sorry, but something went wrong (500) - - - - - - -
-
-

We're sorry, but something went wrong.

-
-

If you are the application owner check the logs for more information.

-
- - From ecdc54c64f1df2ac48f220466e80760586523fc1 Mon Sep 17 00:00:00 2001 From: Beastie PC Date: Wed, 19 Jul 2017 21:02:58 +0300 Subject: [PATCH 2/2] added about --- app/views/about/index.html.erb | 72 ++++++++++++++++++++++++++++++---- 1 file changed, 64 insertions(+), 8 deletions(-) diff --git a/app/views/about/index.html.erb b/app/views/about/index.html.erb index 6bcb287..c530512 100644 --- a/app/views/about/index.html.erb +++ b/app/views/about/index.html.erb @@ -1,12 +1,68 @@ <% content_for :title, 'Про проект— Вони голосують для тебе' %> -
-
-

Про проект

-

Забудь, що говорять політики. Справжню вагу мають лише їхні дії. Слідкуй за тим, як депутати голосують і - дізнавайся про їхню справжню позицію щодо питань, які впливають на нас усіх.

+ +
+ +
+

Про проект

+ +
+ +
+
-
-
- <%= render 'about/index' %> + +
+

Команда

+ + +
+ +
+

Партнери

+ +
текст текст текст текст текст текст текст текст текст текст текст текст текст текст текст текст текст текст текст текст текст текст текст текст текст текст текст
+ +
+ +
+

Як допомогти

+ +
текст
+ +
+ + +